CSPACE-5126: Payloads for XmlReplay tests for person, location, organization, and...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson.xml
index eef3b8b76aee87f1a513d6436f73f4899f241228..01634aa30979926dd3d9cc06879eead6c55eac92 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson.xml
@@ -1,9 +1,21 @@
+<!--\r
+       THIS SEEMS TO BE UNUSED.  PLEASE VERIFY AND REMOVE THIS FILE FROM OUR SOURCE CONTROL REPOSITORY. \r
+ -->\r
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
-<inAuthority>4a6dc8f3-3329-4c5d-a1a8</inAuthority>\r
-<shortIdentifier>connieContactPerson</shortIdentifier>\r
-<refName>urn:cspace:org.collectionspace.demo:personauthority:name(TestPersonAuth)'TestPersonAuth':person:name(connieContactPerson)</refName>\r
-<displayNameComputed>true</displayNameComputed>\r
-<foreName>Connie</foreName>\r
-<surName>ContactPerson</surName>\r
+       <inAuthority>4a6dc8f3-3329-4c5d-a1a8</inAuthority>\r
+       <shortIdentifier>connieContactPerson</shortIdentifier>\r
+       <refName>urn:cspace:org.collectionspace.demo:personauthority:name(TestPersonAuth)'TestPersonAuth':person:name(connieContactPerson)</refName>\r
+       \r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>Connie ContactPerson</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>Connie ContactPerson</termDisplayName>\r
+                       <termStatus>${termStatus}</termStatus>\r
+                       <foreName>Connie</foreName>\r
+                       <surName>ContactPerson</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>\r
+       \r
 </ns2:persons_common>
\ No newline at end of file

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson1.xml
index ee80f561a4bcec2a754795d6e457057debda90cf..308cf12152c07e5dea015ba8279bb417eca6598b 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson1.xml
@@ -2,8 +2,17 @@
 <document name="persons">\r
        <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
                <shortIdentifier>connieContactPerson</shortIdentifier>\r
-               <displayNameComputed>true</displayNameComputed>\r
-               <foreName>Connie</foreName>\r
-               <surName>ContactPerson</surName>\r
+       \r
+               <personTermGroupList>\r
+                       <personTermGroup>\r
+                               <termName>Connie ContactPerson</termName>\r
+                               <termPrefForLang>false</termPrefForLang>\r
+                               <termDisplayName>Connie ContactPerson</termDisplayName>\r
+                               <termStatus>${termStatus}</termStatus>\r
+                               <foreName>Connie</foreName>\r
+                               <surName>ContactPerson</surName>\r
+                       </personTermGroup>\r
+               </personTermGroupList>\r
+               \r
        </ns2:persons_common>\r
 </document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson2.xml
index 7fc57fadc251d4805f9f4e8249588ba4f64e764d..610c72e45afc001c5c5ecf43bee92ac74c1bf8f5 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/newPerson2.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 <document name="persons">\r
        <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
-               <shortIdentifier>debbieDoNothingPerson</shortIdentifier>\r
-               <displayNameComputed>true</displayNameComputed>\r
-               <foreName>Debbie</foreName>\r
-               <surName>DoNothingPerson</surName>\r
+       <shortIdentifier>debbieDoNothingPerson</shortIdentifier>\r
+       \r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>Debbie DoNothingPerson</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>Debbie DoNothingPerson</termDisplayName>\r
+                       <termStatus>${termStatus}</termStatus>\r
+                       <foreName>Debbie</foreName>\r
+                       <surName>DoNothingPerson</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>\r
+       \r
        </ns2:persons_common>\r
 </document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/organizations_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/organizations_common.xml
index 0172a113121cb7fd15b5e6beaa05f28c38b185ea..0b392fdd4983d03e3757c99aeba9703ac06fff5c 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/organizations_common.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/organizations_common.xml
@@ -3,10 +3,24 @@
        <ns2:organizations_common xmlns:ns2="http://collectionspace.org/services/organization"\r
                xmlns:ns3="http://collectionspace.org/services/jaxb">\r
                <shortIdentifier>1288047801161</shortIdentifier>\r
-               <displayNameComputed>true</displayNameComputed>\r
-               <shortDisplayNameComputed>true</shortDisplayNameComputed>\r
-               <shortName>Test Organization-1288047801161</shortName>\r
-               <longName>Test Organization Name</longName>\r
+\r
+               <orgTermGroupList>\r
+                       <orgTermGroup>\r
+                               <additionsToName/>\r
+                               <termName>Test Organization-1288047801161</termName>\r
+                               <termSource/>\r
+                               <termSourceID/>\r
+                               <termSourceNote/>\r
+                               <termLanguage/>\r
+                               <termPrefForLang>false</termPrefForLang>\r
+                               <termDisplayName>Test Organization Name</termDisplayName>\r
+                               <termType/>\r
+                               <termStatus/>\r
+                               <termQualifier/>\r
+                               <termSourceDetail/>\r
+                       </orgTermGroup>\r
+               </orgTermGroupList>\r
+\r
                <contactNames>\r
                        <contactName>${person1}</contactName>\r
                        <contactName>${person2}</contactName>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson1.xml
index 7d3103a3157fa93d6b72a90ef7717d5dceaac0a8..ff4147715fe07a62173faee97b06a5fba3f6212d 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson1.xml
@@ -2,8 +2,17 @@
 <document name="persons">\r
        <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
                <shortIdentifier>connieContactPerson</shortIdentifier>\r
-               <displayNameComputed>true</displayNameComputed>\r
-               <foreName>Connie</foreName>\r
-               <surName>ContactPersonlity</surName>\r
+               \r
+               <personTermGroupList>\r
+                       <personTermGroup>\r
+                               <termName>Connie ContactPerson</termName>\r
+                               <termPrefForLang>false</termPrefForLang>\r
+                               <termDisplayName>Connie ContactPerson</termDisplayName>\r
+                               <termStatus>${termStatus}</termStatus>\r
+                               <foreName>Connie</foreName>\r
+                               <surName>ContactPersonlity</surName>\r
+                       </personTermGroup>\r
+               </personTermGroupList>\r
+               \r
        </ns2:persons_common>\r
 </document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson2.xml
index 73cc9431b32891f5c71ae33885d8c40d3b6c7fbc..89508b600d7fbb8d5c70f970890422acc48f04ad 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authrefs/updatePerson2.xml
@@ -2,8 +2,17 @@
 <document name="persons">\r
        <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
                <shortIdentifier>debbieDoNothingPerson</shortIdentifier>\r
-               <displayNameComputed>true</displayNameComputed>\r
-               <foreName>Debbie</foreName>\r
-               <surName>Do Nothing Personality</surName>\r
+       \r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>Debbie DoNothingPerson</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>Debbie DoNothingPerson</termDisplayName>\r
+                       <termStatus>${termStatus}</termStatus>\r
+                       <foreName>Debbie</foreName>\r
+                       <surName>Do Nothing Personality</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>\r
+       \r
        </ns2:persons_common>\r
 </document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/1-authority.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/1-authority.xml
index c58cf0ce602761382c593aedbc13f99f7cc8274f..24f200d2539433c3bd730c3427aa1ed5f76608c8 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/1-authority.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/1-authority.xml
@@ -2,9 +2,27 @@
 <document name="orgauthorities">
   <ns3:orgauthorities_common xmlns:ns3="http://collectionspace.org/services/organization" xmlns:ns2="http://collectionspace.org/services/jaxb">
     <shortIdentifier>${shortIdentifier}</shortIdentifier>
-    <displayName>${displayName}</displayName>
     <refName>urn:cspace:org.collectionspace.demo:orgauthority:name(${shortIdentifier})'${displayName}'</refName>
     <vocabType>OrgAuthority</vocabType>
+    
+       <orgTermGroupList>
+               <orgTermGroup>
+                       <additionsToName/>
+                       <termName>${displayName}</termName>
+                       <termSource/>
+                       <termSourceID/>
+                       <termSourceNote/>
+                       <termLanguage/>
+                       <termPrefForLang>false</termPrefForLang>
+                       <termDisplayName>${displayName}</termDisplayName>
+                       <termType/>
+                       <mainBodyName>The real official test organization</mainBodyName>
+                       <termStatus/>
+                       <termQualifier/>
+                       <termSourceDetail/>
+               </orgTermGroup>
+       </orgTermGroupList>
+        
   </ns3:orgauthorities_common>
 </document>
 

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/2-item.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/2-item.xml
index efb3fba28f11afb5044b9ae7c4ee8a0ea864fdd1..140a511dd68a277ba80d63abf7182f83ff7b9122 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/2-item.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/2-item.xml
@@ -3,8 +3,25 @@
   <ns3:organizations_common xmlns:ns3="http://collectionspace.org/services/organization" xmlns:ns2="http://collectionspace.org/services/jaxb">
     <shortIdentifier>${shortIdentifier}</shortIdentifier>
     <refName>urn:cspace:org.collectionspace.demo:orgauthority:name(${authShortIdentifier}):organization:name(${shortIdentifier})</refName>
-    <displayNameComputed>true</displayNameComputed>
-    <shortDisplayNameComputed>true</shortDisplayNameComputed>
+
+       <orgTermGroupList>
+               <orgTermGroup>
+                       <additionsToName/>
+                       <termName>2-item-termName</termName>
+                       <termSource/>
+                       <termSourceID/>
+                       <termSourceNote/>
+                       <termLanguage/>
+                       <termPrefForLang>false</termPrefForLang>
+                       <termDisplayName>2-item-termDisplayName</termDisplayName>
+                       <termType/>
+                       <mainBodyName>The real test official test organization</mainBodyName>
+                       <termStatus/>
+                       <termQualifier/>
+                       <termSourceDetail/>
+               </orgTermGroup>
+       </orgTermGroupList>
+
     <mainBodyGroupList>
       <mainBodyGroup>
         <longName>Test Organization Name</longName>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/3-organizations_w_relations.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/3-organizations_w_relations.xml
index ed27f01398f10207e710066a86b4fe2c2bba3159..16bb193149e4c6d015655fcae3c31b5890f66c2e 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/3-organizations_w_relations.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/hierarchy/3-organizations_w_relations.xml
@@ -4,9 +4,25 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:organizationauthority:name(${authShortIdentifier}):organization:name(${shortIdentifier})'${name}'</refName>\r
-    <displayName>${name}</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayNameComputed>true</shortDisplayNameComputed>\r
+\r
+       <orgTermGroupList>\r
+               <orgTermGroup>\r
+                       <additionsToName/>\r
+                       <termName>${name}</termName>\r
+                       <termSource/>\r
+                       <termSourceID/>\r
+                       <termSourceNote/>\r
+                       <termLanguage/>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>${name}</termDisplayName>\r
+                       <termType/>\r
+                       <mainBodyName>The real test official test organization</mainBodyName>\r
+                       <termStatus/>\r
+                       <termQualifier/>\r
+                       <termSourceDetail/>\r
+               </orgTermGroup>\r
+       </orgTermGroupList>\r
+\r
   </ns2:organizations_common>\r
   <!-- \r
        WARNING: ${itemCSID} does NOT get expanded by XmlReplay. \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 1a54443fb6e9f5a39bda72473a609689958ff555..39f72a28bea0ede798f6a43ab88d509fc00521f9 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -37,13 +37,15 @@
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />\r
     <run controlFile="objectexit/object-exit-display.xml" testGroup="refNameDisplayNameOnly" />\r
-\r
-<!--\r
+<!--     \r
+ -->\r
+ \r
     <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchCommonSchema" />\r
     <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchExtensionSchema" />\r
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />\r
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />\r
+<!--\r
 -->\r
 \r
 <!-- No - this test is broken\r
@@ -55,16 +57,16 @@
     <run controlFile="person/person.xml" testGroup="PersonAddRelsDeleteRels" />\r
 \r
     <run controlFile="location/location-hierarchy.xml" testGroup="HierarchicLocation" />\r
-\r
-<!--           \r
     <run controlFile="organization/organization-hierarchy.xml" testGroup="HierarchicOrganization" />\r
+ \r
     <run controlFile="batch/batch.xml" />\r
     <run controlFile="report/report.xml" />\r
-    <run controlFile="vocabulary/vocabulary.xml" testGroup="TestOrder" />\r
        <run controlFile="authrefs/authrefs.xml" testGroup="AuthRefs" />\r
+    <run controlFile="vocabulary/vocabulary.xml" testGroup="TestOrder" />\r
        <run controlFile="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />\r
        <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />\r
     <run controlFile="imports/imports.xml" testGroup="importsTestGroup" />\r
+<!--           \r
 -->\r
     \r
 </xmlReplayMaster>\r

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
index f05ee9a9f1700b411a674c70fc407160ccb20aee..c424b2ee95bf902f70fccb2c0edbee789091bbbb 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RemoteDocumentModelHandlerImpl.java
@@ -745,11 +745,13 @@ public abstract class   RemoteDocumentModelHandlerImpl<T, TL>
                                        // Some other variant on a missing sub-field; quietly
                                        // absorb.
                                        result = "";
-                               } // Otherwise, e.g., for true OOB indices, propagate the
-                                       // exception.
+                               }
+                       }
+                       // Otherwise, e.g., for true OOB indices, propagate the exception.
+                       if (result == null) {
+                               throw new RuntimeException("Problem retrieving property {" + xpath
+                                               + "}:" + ioobe.getLocalizedMessage());
                        }
-                       throw new RuntimeException("Problem retrieving property {" + xpath
-                                       + "}:" + ioobe.getLocalizedMessage());
                } catch (Exception e) {
                        throw new RuntimeException("Unknown problem retrieving property {"
                                        + xpath + "}." + e.getLocalizedMessage());