From: Aron Roberts Date: Tue, 15 Nov 2011 05:17:52 +0000 (+0000) Subject: CSPACE-4057: Fixed various authRefs tests to reflect change of fields to date datatype. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e19ffd4316d91045383f1f1ca61d49fc4ff12108;p=tmp%2Fjakarta-migration.git CSPACE-4057: Fixed various authRefs tests to reflect change of fields to date datatype. --- diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java index eb826ced6..c2c377d18 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeAuthRefsTest.java @@ -39,6 +39,7 @@ import org.collectionspace.services.client.PersonAuthorityClientUtils; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.authorityref.AuthorityRefList; +import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.intake.ConditionCheckerOrAssessorList; import org.collectionspace.services.intake.IntakesCommon; import org.collectionspace.services.intake.InsurerList; @@ -81,6 +82,8 @@ public class IntakeAuthRefsTest extends BaseServiceTest { private String insurerRefName = null; private String valuerRefName = null; private final int NUM_AUTH_REFS_EXPECTED = 5; + private final static String CURRENT_DATE_UTC = + GregorianCalendarDateTimeUtils.currentDateUTC(); @Override protected String getServiceName() { @@ -126,7 +129,7 @@ public class IntakeAuthRefsTest extends BaseServiceTest { IntakeClient intakeClient = new IntakeClient(); PoxPayloadOut multipart = createIntakeInstance( "entryNumber-" + identifier, - "entryDate-" + identifier, + CURRENT_DATE_UTC, currentOwnerRefName, depositorRefName, conditionCheckerOrAssessorRefName, diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java index 51b062e45..03cf89909 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/OrganizationAuthRefDocsTest.java @@ -38,6 +38,7 @@ import org.collectionspace.services.client.OrgAuthorityClientUtils; import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.authorityref.AuthorityRefDocList; +import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.intake.ConditionCheckerOrAssessorList; import org.collectionspace.services.intake.IntakesCommon; import org.collectionspace.services.intake.InsurerList; @@ -82,6 +83,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest { private String insurerRefName = null; private String valuerRefName = null; private final int NUM_AUTH_REF_DOCS_EXPECTED = 1; + private final static String CURRENT_DATE_UTC = + GregorianCalendarDateTimeUtils.currentDateUTC(); @Override protected String getServiceName() { @@ -126,7 +129,7 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest { IntakeClient intakeClient = new IntakeClient(); PoxPayloadOut multipart = createIntakeInstance( "entryNumber-" + identifier, - "entryDate-" + identifier, + CURRENT_DATE_UTC, currentOwnerRefName, // Use currentOwnerRefName twice to test fix for CSPACE-2863 currentOwnerRefName, //depositorRefName, diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java index 8d99147c6..0cbb97b3e 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/PersonAuthRefDocsTest.java @@ -38,6 +38,7 @@ import org.collectionspace.services.client.PersonAuthorityClient; import org.collectionspace.services.client.PersonAuthorityClientUtils; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.authorityref.AuthorityRefDocList; +import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.intake.ConditionCheckerOrAssessorList; import org.collectionspace.services.intake.IntakesCommon; import org.collectionspace.services.intake.InsurerList; @@ -84,6 +85,8 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { private String valuerRefName = null; private String valuerShortId = null; private final int NUM_AUTH_REF_DOCS_EXPECTED = 1; + private final static String CURRENT_DATE_UTC = + GregorianCalendarDateTimeUtils.currentDateUTC(); @Override public String getServiceName() { @@ -128,7 +131,7 @@ public class PersonAuthRefDocsTest extends BaseServiceTest { IntakeClient intakeClient = new IntakeClient(); PoxPayloadOut multipart = createIntakeInstance( "entryNumber-" + identifier, - "entryDate-" + identifier, + CURRENT_DATE_UTC, currentOwnerRefName, depositorRefName, conditionCheckerAssessorRefName, diff --git a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java index f6e2dcf3c..c21b3a400 100644 --- a/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java +++ b/services/loanin/client/src/test/java/org/collectionspace/services/client/test/LoaninAuthRefsTest.java @@ -41,6 +41,7 @@ import org.collectionspace.services.client.PayloadOutputPart; import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.authorityref.AuthorityRefList; +import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.loanin.LenderGroup; import org.collectionspace.services.loanin.LenderGroupList; @@ -83,6 +84,8 @@ public class LoaninAuthRefsTest extends BaseServiceTest { // FIXME: Value changed from 5 to 2 when repeatable / multivalue 'lenders' // group was added to tenant-bindings.xml private final int NUM_AUTH_REFS_EXPECTED = 2; + private final static String CURRENT_DATE_UTC = + GregorianCalendarDateTimeUtils.currentDateUTC(); /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance() @@ -126,7 +129,7 @@ public class LoaninAuthRefsTest extends BaseServiceTest { LoaninClient loaninClient = new LoaninClient(); PoxPayloadOut multipart = createLoaninInstance( "loanInNumber-" + identifier, - "returnDate-" + identifier, + CURRENT_DATE_UTC, lenderRefName, lendersAuthorizerRefName, lendersContactRefName, diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java index dd96fe9cc..543f355d9 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutAuthRefsTest.java @@ -40,6 +40,7 @@ import org.collectionspace.services.client.PoxPayloadIn; import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.authorityref.AuthorityRefList; //import org.collectionspace.services.common.authorityref.AuthorityRefList.AuthorityRefItem; +import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.loanout.LoansoutCommon; //import org.collectionspace.services.loanout.LoansoutCommonList; @@ -82,6 +83,9 @@ public class LoanoutAuthRefsTest extends BaseServiceTest { // authority - as an authRef to tests below, and increase the // number of expected authRefs to 4. private final int NUM_AUTH_REFS_EXPECTED = 4; + + private final static String CURRENT_DATE_UTC = + GregorianCalendarDateTimeUtils.currentDateUTC(); /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance() @@ -125,7 +129,7 @@ public class LoanoutAuthRefsTest extends BaseServiceTest { LoanoutClient loanoutClient = new LoanoutClient(); PoxPayloadOut multipart = createLoanoutInstance( "loanOutNumber-" + identifier, - "returnDate-" + identifier, + CURRENT_DATE_UTC, borrowerRefName, borrowersContactRefName, lendersAuthorizerRefName,