From: Aron Roberts Date: Tue, 15 Nov 2011 00:12:10 +0000 (+0000) Subject: CSPACE-3268: Fixed errors related to loanStatusGroupList and its child elements in... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3f6fa24fe2727552a0ca875f18575d0572b035b5;p=tmp%2Fjakarta-migration.git CSPACE-3268: Fixed errors related to loanStatusGroupList and its child elements in services Loan Out schema and tests. --- diff --git a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd index d29df396f..beee4fe49 100644 --- a/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd +++ b/services/loanout/3rdparty/nuxeo-platform-cs-loanout/src/main/resources/schemas/loansout_common.xsd @@ -30,7 +30,7 @@ - + @@ -39,9 +39,9 @@ - + - + diff --git a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java index e33b8f3e7..346b757f1 100644 --- a/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java +++ b/services/loanout/client/src/test/java/org/collectionspace/services/client/test/LoanoutServiceTest.java @@ -35,8 +35,8 @@ import org.collectionspace.services.client.PoxPayloadOut; import org.collectionspace.services.common.AbstractCommonListUtils; import org.collectionspace.services.common.datetime.GregorianCalendarDateTimeUtils; import org.collectionspace.services.jaxb.AbstractCommonList; -import org.collectionspace.services.loanout.LoanedObjectStatusGroup; -import org.collectionspace.services.loanout.LoanedObjectStatusGroupList; +import org.collectionspace.services.loanout.LoanStatusGroup; +import org.collectionspace.services.loanout.LoanStatusGroupList; import org.collectionspace.services.loanout.LoansoutCommon; import org.jboss.resteasy.client.ClientResponse; @@ -306,14 +306,14 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl { // Check selected fields in the common part. Assert.assertNotNull(loanoutCommon.getLoanOutNumber()); - LoanedObjectStatusGroupList statusGroupList = loanoutCommon.getLoanedObjectStatusGroupList(); + LoanStatusGroupList statusGroupList = loanoutCommon.getLoanStatusGroupList(); Assert.assertNotNull(statusGroupList); - List statusGroups = statusGroupList.getLoanedObjectStatusGroup(); + List statusGroups = statusGroupList.getLoanStatusGroup(); Assert.assertNotNull(statusGroups); Assert.assertTrue(statusGroups.size() > 0); - LoanedObjectStatusGroup statusGroup = statusGroups.get(0); + LoanStatusGroup statusGroup = statusGroups.get(0); Assert.assertNotNull(statusGroup); - Assert.assertNotNull(statusGroup.getLoanedObjectStatus()); + Assert.assertNotNull(statusGroup.getLoanStatus()); // Check the values of fields containing Unicode UTF-8 (non-Latin-1) characters. if (logger.isDebugEnabled()) { @@ -439,18 +439,18 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl { // Update the content of this resource. loanoutCommon.setLoanOutNumber("updated-" + loanoutCommon.getLoanOutNumber()); - LoanedObjectStatusGroupList statusGroupList = loanoutCommon.getLoanedObjectStatusGroupList(); + LoanStatusGroupList statusGroupList = loanoutCommon.getLoanStatusGroupList(); Assert.assertNotNull(statusGroupList); - List statusGroups = statusGroupList.getLoanedObjectStatusGroup(); + List statusGroups = statusGroupList.getLoanStatusGroup(); Assert.assertNotNull(statusGroups); Assert.assertTrue(statusGroups.size() > 0); - LoanedObjectStatusGroup statusGroup = statusGroups.get(0); + LoanStatusGroup statusGroup = statusGroups.get(0); Assert.assertNotNull(statusGroup); - String loanedObjectStatus = statusGroup.getLoanedObjectStatus(); - Assert.assertNotNull(loanedObjectStatus); - String updatedLoanedObjectStatus = "updated-" + loanedObjectStatus; - statusGroups.get(0).setLoanedObjectStatus(updatedLoanedObjectStatus); - loanoutCommon.setLoanedObjectStatusGroupList(statusGroupList); + String loanStatus = statusGroup.getLoanStatus(); + Assert.assertNotNull(loanStatus); + String updatedLoanStatus = "updated-" + loanStatus; + statusGroups.get(0).setLoanStatus(updatedLoanStatus); + loanoutCommon.setLoanStatusGroupList(statusGroupList); if (logger.isDebugEnabled()) { logger.debug("to be updated object"); logger.debug(objectAsXmlString(loanoutCommon, LoansoutCommon.class)); @@ -486,16 +486,16 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl { loanoutCommon.getLoanOutNumber(), "Data in updated object did not match submitted data."); - LoanedObjectStatusGroupList updatedStatusGroupList = - updatedLoanoutCommon.getLoanedObjectStatusGroupList(); + LoanStatusGroupList updatedStatusGroupList = + updatedLoanoutCommon.getLoanStatusGroupList(); Assert.assertNotNull(updatedStatusGroupList); - List updatedStatusGroups = - updatedStatusGroupList.getLoanedObjectStatusGroup(); + List updatedStatusGroups = + updatedStatusGroupList.getLoanStatusGroup(); Assert.assertNotNull(updatedStatusGroups); Assert.assertTrue(updatedStatusGroups.size() > 0); Assert.assertNotNull(updatedStatusGroups.get(0)); - Assert.assertEquals(updatedLoanedObjectStatus, - updatedStatusGroups.get(0).getLoanedObjectStatus(), + Assert.assertEquals(updatedLoanStatus, + updatedStatusGroups.get(0).getLoanStatus(), "Data in updated object did not match submitted data."); // Check the values of fields containing Unicode UTF-8 (non-Latin-1) characters. @@ -795,13 +795,13 @@ public class LoanoutServiceTest extends AbstractServiceTestImpl { loanoutCommon.setBorrowersContact( "urn:cspace:org.collectionspace.demo:personauthorities:name(TestPersonAuth):item:name(ChrisContact)'Chris Contact'"); loanoutCommon.setLoanPurpose("Allow people in cold climes to share the magic of Surfboards of the 1960s."); - LoanedObjectStatusGroupList statusGroupList = new LoanedObjectStatusGroupList(); - List statusGroups = statusGroupList.getLoanedObjectStatusGroup(); - LoanedObjectStatusGroup statusGroup = new LoanedObjectStatusGroup(); - statusGroup.setLoanedObjectStatus("returned"); - statusGroup.setLoanedObjectStatusNote("Left under the front mat."); + LoanStatusGroupList statusGroupList = new LoanStatusGroupList(); + List statusGroups = statusGroupList.getLoanStatusGroup(); + LoanStatusGroup statusGroup = new LoanStatusGroup(); + statusGroup.setLoanStatus("returned"); + statusGroup.setLoanStatusNote("Left under the front mat."); statusGroups.add(statusGroup); - loanoutCommon.setLoanedObjectStatusGroupList(statusGroupList); + loanoutCommon.setLoanStatusGroupList(statusGroupList); loanoutCommon.setLoanOutNote(getUTF8DataFragment()); // For UTF-8 tests PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent()); diff --git a/services/loanout/jaxb/src/main/resources/loansout-common.xsd b/services/loanout/jaxb/src/main/resources/loansout-common.xsd index ce575b2d0..0bbb9b50e 100644 --- a/services/loanout/jaxb/src/main/resources/loansout-common.xsd +++ b/services/loanout/jaxb/src/main/resources/loansout-common.xsd @@ -41,7 +41,7 @@ - + @@ -53,20 +53,19 @@ - + - + - + - - - + + + -