From: Aron Roberts Date: Thu, 22 Jul 2010 22:06:47 +0000 (+0000) Subject: CSPACE-2528: Made acquisitionDate field a repeatable field in Acquisition records... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e81faee3162a5e9b435b7fb686b3caa34ec888d3;p=tmp%2Fjakarta-migration.git CSPACE-2528: Made acquisitionDate field a repeatable field in Acquisition records, in the services layer. Changes the relevant Nuxeo document type schema, and as such requires an 'ant deploy' and a 2-server restart. --- diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd index c67a95356..d246ae475 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd @@ -24,7 +24,13 @@ - + + + + + + + diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index 81cc31267..e1b84e226 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -32,6 +32,7 @@ import org.collectionspace.services.jaxb.AbstractCommonList; import org.collectionspace.services.acquisition.AcquisitionsCommon; import org.collectionspace.services.acquisition.AcquisitionsCommonList; +import org.collectionspace.services.acquisition.AcquisitionDateList; import org.collectionspace.services.acquisition.AcquisitionSourceList; import org.jboss.resteasy.client.ClientResponse; @@ -91,7 +92,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup, such as initializing the type of service request // (e.g. CREATE, DELETE), its valid and expected status codes, and @@ -247,7 +248,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupRead(); @@ -272,6 +273,18 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { client.getCommonPartName(), AcquisitionsCommon.class); Assert.assertNotNull(acquisitionObject); + // Verify the number and contents of values in repeatable fields, + // as created in the instance record used for testing. + List acqSources = + acquisitionObject.getAcquisitionSources().getAcquisitionSource(); + Assert.assertTrue(acqSources.size() > 0); + Assert.assertNotNull(acqSources.get(0)); + + List acqDates = + acquisitionObject.getAcquisitionDates().getAcquisitionDate(); + Assert.assertTrue(acqDates.size() > 0); + Assert.assertNotNull(acqDates.get(0)); + } // Failure outcomes @@ -285,7 +298,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupReadNonExistent(); @@ -319,7 +332,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupReadList(); @@ -381,7 +394,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupUpdate(); @@ -592,7 +605,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupUpdateNonExistent(); @@ -661,7 +674,7 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { if (logger.isDebugEnabled()) { logger.debug(testBanner(testName, CLASS_NAME)); - }; + } // Perform setup. setupDeleteNonExistent(); @@ -733,12 +746,19 @@ public class AcquisitionServiceTest extends AbstractServiceTestImpl { AcquisitionsCommon acquisition = new AcquisitionsCommon(); acquisition.setAcquisitionReferenceNumber("acquisitionReferenceNumber-" + identifier); AcquisitionSourceList acqSourcesList = new AcquisitionSourceList(); - List sources = acqSourcesList.getAcquisitionSource(); - // @TODO Use properly formatted refNames for representative acquisition + List acqSources = acqSourcesList.getAcquisitionSource(); + // FIXME Use properly formatted refNames for representative acquisition // sources in this example test record. The following are mere placeholders. - sources.add("Donor Acquisition Source-" + identifier); - sources.add("Museum Acquisition Source-" + identifier); + acqSources.add("Donor Acquisition Source-" + identifier); + acqSources.add("Museum Acquisition Source-" + identifier); acquisition.setAcquisitionSources(acqSourcesList); + AcquisitionDateList acqDatesList = new AcquisitionDateList(); + List acqDates = acqDatesList.getAcquisitionDate(); + // FIXME Use properly timestamps for representative acquisition + // dates in this example test record. The following are mere placeholders. + acqDates.add("First Acquisition Date -" + identifier); + acqDates.add("Second Acquisition Date-" + identifier); + acquisition.setAcquisitionDates(acqDatesList); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(acquisition, MediaType.APPLICATION_XML_TYPE); diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index 8dbfeefa3..ae2afcfa9 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -36,7 +36,7 @@ - + @@ -70,6 +70,12 @@ + + + + + +