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 eb826ced6eae3af8541763bf2da76777bf3832cd..c2c377d1862b1f35a3b8b9b776c76ebee45b9172 100644 (file)
--- 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 51b062e451f14e3682eadbce30b0349c692dd1e4..03cf89909d41cf2b5c33f48e414dbbb5ac9df5d9 100644 (file)
--- 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;\r
 import org.collectionspace.services.client.PoxPayloadOut;\r
 import org.collectionspace.services.common.authorityref.AuthorityRefDocList;\r
+import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils;\r
 import org.collectionspace.services.intake.ConditionCheckerOrAssessorList;\r
 import org.collectionspace.services.intake.IntakesCommon;\r
 import org.collectionspace.services.intake.InsurerList;\r
@@ -82,6 +83,8 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
     private String insurerRefName = null;\r
     private String valuerRefName = null;\r
     private final int NUM_AUTH_REF_DOCS_EXPECTED = 1;\r
+    private final static String CURRENT_DATE_UTC =\r
+            GregorianCalendarDateTimeUtils.currentDateUTC();\r
 \r
        @Override\r
        protected String getServiceName() {\r
@@ -126,7 +129,7 @@ public class OrganizationAuthRefDocsTest extends BaseServiceTest {
         IntakeClient intakeClient = new IntakeClient();\r
         PoxPayloadOut multipart = createIntakeInstance(\r
                 "entryNumber-" + identifier,\r
-                "entryDate-" + identifier,\r
+                CURRENT_DATE_UTC,\r
                 currentOwnerRefName,\r
                 // Use currentOwnerRefName twice to test fix for CSPACE-2863\r
                 currentOwnerRefName,    //depositorRefName,\r

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 8d99147c62e9a52555e8834a2382c04940c0a01a..0cbb97b3efe5f6971a501681099ccceaa2761c4e 100644 (file)
--- 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 f6e2dcf3cffadd8773da45be6b7c8b4983a5713e..c21b3a400185b36724600539ec7de991365d1cb1 100644 (file)
--- 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 dd96fe9cc2906a9864925bfbab5068263e581c2f..543f355d90ab1105d80992beb35e8f0a711b6afa 100644 (file)
--- 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,