cspace-3899 schema working, client tests not working yet

diff --git a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common.xsd b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common.xsd
index 749ab3afc5b6df7bece3e965743c70b1b7e45d9e..6ce08a59f330b7e981790e94953c2d0388ebbbf6 100644 (file)
--- a/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common.xsd
+++ b/services/batch/3rdparty/nuxeo-platform-cs-batch/src/main/resources/schemas/batch_common.xsd
@@ -21,18 +21,11 @@
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Loans+Out+Schema -->\r
 \r
     <!--  Batch Information Group -->\r
-    <xs:element name="currentOwner" type="xs:string"/>\r
-    <xs:element name="depositor" type="xs:string"/>\r
-    <xs:element name="exitDate" type="xs:string"/>\r
-    <xs:element name="exitMethods">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="exitMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-   </xs:element>\r
-    <xs:element name="exitNote" type="xs:string"/>\r
-    <xs:element name="exitNumber" type="xs:string"/>\r
-    <xs:element name="exitReason" type="xs:string"/>\r
-    <xs:element name="packingNote" type="xs:string"/>    \r
+    \r
+    <xs:element name="name" type="xs:string"/>\r
+       <xs:element name="notes" type="xs:string"/>\r
+       <xs:element name="forDocType" type="xs:string"/>\r
+       <xs:element name="forSingleDoc" type="xs:boolean"/>\r
+       <xs:element name="createsNewFocus" type="xs:boolean"/>\r
+       <xs:element name="className" type="xs:string"/>\r
 </xs:schema>\r

diff --git a/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchAuthRefsTest.java b/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchAuthRefsTest.java
index 38e1f0586c1e847f16d83a274c976354ce5a6bcc..5eac14ff159c42397fa1f3897c0e8738df676892 100644 (file)
--- a/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchAuthRefsTest.java
+++ b/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchAuthRefsTest.java
@@ -68,8 +68,11 @@ public class BatchAuthRefsTest extends BaseServiceTest {
     private List<String> personIdsCreated = new ArrayList<String>();
     private String personAuthCSID = null;
     private String depositorRefName = null;
-    private String exitDate = null;
-    private String exitNumber = null;
+
+    private String name = null;
+    private String className = null;
+    private String forDocType = null;
+    private String notes = null;
 
     @Override
        public String getServicePathComponent() {
@@ -91,14 +94,15 @@ public class BatchAuthRefsTest extends BaseServiceTest {
         throw new UnsupportedOperationException(); //method not supported (or needed) in this test class
     }
 
-    private PoxPayloadOut createBatchInstance(String depositorRefName, String exitNumber, String exitDate) {
-        this.exitDate = exitDate;
-        this.exitNumber = exitNumber;
-        this.depositorRefName = depositorRefName;
+    private PoxPayloadOut createBatchInstance(String className, String forDocType, String notes) {
+        this.className = className;
+        this.forDocType = forDocType;
+        this.notes = notes;
+
         BatchCommon batch = new BatchCommon();
-        batch.setDepositor(depositorRefName);
-        batch.setExitNumber(exitNumber);
-        batch.setExitDate(exitDate);
+        batch.setClassName(className);
+        batch.setForDocType(forDocType);
+        batch.setNotes(notes);
 
         PoxPayloadOut multipart = new PoxPayloadOut(BatchClient.SERVICE_PAYLOAD_NAME);
         PayloadOutputPart commonPart = multipart.addPart(batch, MediaType.APPLICATION_XML_TYPE);
@@ -170,9 +174,10 @@ public class BatchAuthRefsTest extends BaseServiceTest {
         logger.debug(objectAsXmlString(batch, BatchCommon.class));
 
         // Check a couple of fields
-        Assert.assertEquals(batch.getDepositor(), depositorRefName);
-        Assert.assertEquals(batch.getExitDate(), exitDate);
-        Assert.assertEquals(batch.getExitNumber(), exitNumber);
+        Assert.assertEquals(batch.getClassName(), className);
+        Assert.assertEquals(batch.getForDocType(), forDocType);
+        Assert.assertEquals(batch.getName(), name);
+        Assert.assertEquals(batch.getNotes(), notes);
 
         // Get the auth refs and check them
         ClientResponse<AuthorityRefList> res2 = batchClient.getAuthorityRefs(knownResourceId);

diff --git a/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchServiceTest.java b/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchServiceTest.java
index 8b6551006dcb8037e1f8e32d7e4ddc72c92deb0e..efc5051ac67c68000812b5d0cf7a5a8f95e2dc65 100644 (file)
--- a/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchServiceTest.java
+++ b/services/batch/client/src/test/java/org/collectionspace/services/client/test/BatchServiceTest.java
@@ -172,7 +172,7 @@ public class BatchServiceTest extends AbstractServiceTestImpl {
         BatchCommon batch = (BatchCommon) extractPart(input, client.getCommonPartName(), BatchCommon.class);
         Assert.assertNotNull(batch);
 
-        batch.setExitNumber("updated-" + batch.getExitNumber());
+        batch.setName("updated-" + batch.getName());
         logger.debug("Object to be updated:"+objectAsXmlString(batch, BatchCommon.class));
         PoxPayloadOut output = new PoxPayloadOut(BatchClient.SERVICE_PAYLOAD_NAME);
         PayloadOutputPart commonPart = output.addPart(batch, MediaType.APPLICATION_XML_TYPE);
@@ -288,8 +288,7 @@ public class BatchServiceTest extends AbstractServiceTestImpl {
     private PoxPayloadOut createBatchInstance(String exitNumber) {
         String identifier = "batchNumber-" + exitNumber;
         BatchCommon batch = new BatchCommon();
-        batch.setExitNumber(identifier);
-        batch.setDepositor("urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'");
+        batch.setName(identifier);
         PoxPayloadOut multipart = new PoxPayloadOut(BatchClient.SERVICE_PAYLOAD_NAME);
         PayloadOutputPart commonPart = multipart.addPart(batch, MediaType.APPLICATION_XML_TYPE);
         commonPart.setLabel(new BatchClient().getCommonPartName());

diff --git a/services/batch/jaxb/src/main/resources/batch_common.xsd b/services/batch/jaxb/src/main/resources/batch_common.xsd
index 9645abe9c1702d5ca09853e7e658ff02c48f6b63..181e5972423c27c6bd23d31e3787fc759c86d6cf 100644 (file)
--- a/services/batch/jaxb/src/main/resources/batch_common.xsd
+++ b/services/batch/jaxb/src/main/resources/batch_common.xsd
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<!--
-    Loan Out schema (XSD)
-    
-    Entity  : Batch
-    Part    : Common
-    Used for: JAXB binding between XML and Java objects
-
-    $LastChangedRevision: 2316 $
-    $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
--->
-
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
@@ -32,23 +21,15 @@
         <xs:complexType>
             <xs:sequence>
                 <!--  Batch Information Group -->
-                <xs:element name="currentOwner" type="xs:string"/>
-                <xs:element name="depositor" type="xs:string"/>
-                <xs:element name="exitDate" type="xs:string"/>
-                <xs:element name="exitMethods" type="exitMethods"/>
-                <xs:element name="exitNote" type="xs:string"/>
-                <xs:element name="exitNumber" type="xs:string"/>
-                <xs:element name="exitReason" type="xs:string"/>
-                <xs:element name="packingNote" type="xs:string"/>
+                <xs:element name="name" type="xs:string"/>
+                <xs:element name="notes" type="xs:string"/>
+                <xs:element name="forDocType" type="xs:string"/>
+                <xs:element name="forSingleDoc" type="xs:boolean"/>
+                <xs:element name="createsNewFocus" type="xs:boolean"/>
+                <xs:element name="className" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    
-    <xs:complexType name="exitMethods">
-        <xs:sequence>
-            <xs:element name="exitMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
 
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonList">
@@ -69,17 +50,10 @@
                         <xs:element name="batch-list-item" maxOccurs="unbounded">
                             <xs:complexType>
                                 <xs:sequence>
-                                    <xs:element name="exitNumber" type="xs:string"
-                                        minOccurs="1" />
-                                    <xs:element name="currentOwner" type="xs:string"
-                                        minOccurs="1" />
-                                    <xs:element name="uri" type="xs:anyURI"
-                                        minOccurs="1" />
-                                    <xs:element name="csid" type="xs:string"
-                                        minOccurs="1" />
-
-
-
+                                    <xs:element name="name" type="xs:string" minOccurs="1" />
+                                    <xs:element name="forDocType" type="xs:string" minOccurs="1" />
+                                    <xs:element name="uri" type="xs:anyURI" minOccurs="1" />
+                                    <xs:element name="csid" type="xs:string" minOccurs="1" />
                                 </xs:sequence>
                             </xs:complexType>
                         </xs:element>