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

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
index 77a93ea08d0d3cd432d36a7a84170ea31e58a1ab..b9e879a37babdac714c3168748d14d310266ef2b 100644 (file)
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
@@ -288,7 +288,7 @@ public class ServiceResult {
     /** This method may be called from a test case, using a syntax like ${oe9.reqValue("personauthorities_common","//shortIdentifier")}    */\r
     public String sent(String xpath) throws Exception {\r
         try {\r
-            String source = this.requestPayloadsRaw;\r
+            String source = this.requestPayload; // REM - 5/9/2012 : Changing to requestPayload from requestPayloadsRaw to get actual sent payload \r
             if (source == null){\r
                 return "ERROR:null:requestPayloadsRaw";\r
             }\r

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java
index 7e482471e7916cf9e2eeec9f2af6122d5028e9e5..1beebe5536c72daa89e9ac178d0574669e695379 100644 (file)
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayEval.java
@@ -116,7 +116,7 @@ public class XmlReplayEval {
             start = cursor;\r
 \r
             Expression expr = jexl.createExpression(var);\r
-            Object resultObj = expr.evaluate(jc);\r
+            Object resultObj = expr.evaluate(jc); //REM - 5/9/2011 - Usually calls back to fields and methods in ServiceResult class to do the evaluation -e.g., the "got" method.\r
             String resultStr;\r
             if (null == resultObj){\r
                 //debug: System.out.println("null found while evaluationg variable: '"+var+"' Jexl context: "+dumpContext(jc));\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml
index 17a5fc4d6634042293bbb92a16b94f098182f8c6..5638665d0abb613dc392d7d9c2d970b2488f1880 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml
@@ -2,11 +2,24 @@
 <document name="locations">
   <ns2:locations_common xmlns:ns2="http://collectionspace.org/services/location" xmlns:ns3="http://collectionspace.org/services/jaxb">
     <shortIdentifier>${shortIdentifier}</shortIdentifier>
-               <!-- <refName>urn:cspace:org.collectionspace.demo:locationauthority:name(${authShortIdentifier}):location:name(${shortIdentifier})</refName> -->
-    <termStatus>Approved</termStatus>
-    <displayNameComputed>true</displayNameComputed>
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>
-    <name>${name}</name>
+       <refName>urn:cspace:core.collectionspace.org:locationauthorities:name(${authShortIdentifier}):item:name(${shortIdentifier})'${name}'</refName>    
+
+       <locTermGroupList>
+           <locTermGroup>
+               <termPrefForLang>false</termPrefForLang>
+               <termName>${name}</termName>
+               <termDisplayName>${name}</termDisplayName>
+               <termType/>
+               <termSource/>
+               <termStatus>Approved</termStatus>
+               <termQualifier/>
+               <termSourceID/>
+               <termSourceDetail/>
+               <termSourceNote/>
+               <termLanguage/>
+           </locTermGroup>
+       </locTermGroupList>
+           
     <conditionGroupList>
       <conditionGroup>
         <conditionNote>Basically clean</conditionNote>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml
index cf1b8ecdd556e8d1684226ab30ff8f6819aa9482..7c81f5f66bca5bd67648342d363dfa462d1bc831 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/3-locations_w_relations_CSID.xml
@@ -4,9 +4,16 @@
     <!-- <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
                <refName>urn:cspace:org.collectionspace.demo:locationauthority:name(${authShortIdentifier}):location:name(${shortIdentifier})'${name}'</refName> -->\r
-    <displayName>${name}</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayNameComputed>true</shortDisplayNameComputed>\r
+\r
+       <locTermGroupList>\r
+           <locTermGroup>\r
+               <termPrefForLang>false</termPrefForLang>\r
+               <termName>${name}</termName>\r
+               <termDisplayName>${name}</termDisplayName>\r
+               <termStatus>Approved</termStatus>\r
+           </locTermGroup>\r
+       </locTermGroupList>\r
+           \r
   </ns2:locations_common>\r
   <!-- \r
        WARNING: ${itemCSID} does NOT get expanded by XmlReplay. \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/4-locations_w_relations_mixed.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/4-locations_w_relations_mixed.xml
index 3c79b2b2d76b87e70b6845f4395db2d86f4d8650..43d1b38a2cd8abac6e515d74fd541608371bbb0d 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/4-locations_w_relations_mixed.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/4-locations_w_relations_mixed.xml
@@ -4,9 +4,16 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:locationauthority:name(${authShortIdentifier}):location:name(${shortIdentifier})'${name}'</refName>\r
-    <displayName>${name}</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayNameComputed>true</shortDisplayNameComputed>\r
+\r
+       <locTermGroupList>\r
+           <locTermGroup>\r
+               <termPrefForLang>false</termPrefForLang>\r
+               <termName>${name}</termName>\r
+               <termDisplayName>${name}</termDisplayName>\r
+               <termStatus>Approved</termStatus>\r
+           </locTermGroup>\r
+       </locTermGroupList>\r
+           \r
   </ns2:locations_common>\r
   <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">\r
     <relation-list-item>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/5-locations_w_relations_RefNames.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/5-locations_w_relations_RefNames.xml
index f86783b256c28dcf54656ae1112458b457655874..2306f9ca54c05c4c7c85fa26fe4df8841326cfc8 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/5-locations_w_relations_RefNames.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/5-locations_w_relations_RefNames.xml
@@ -2,8 +2,16 @@
 <document name="locations">\r
   <ns2:locations_common xmlns:ns2="http://collectionspace.org/services/location" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
-    <displayName>${name}</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
+\r
+       <locTermGroupList>\r
+           <locTermGroup>\r
+               <termPrefForLang>false</termPrefForLang>\r
+               <termName>${name}</termName>\r
+               <termDisplayName>${name}</termDisplayName>\r
+               <termStatus>Approved</termStatus>\r
+           </locTermGroup>\r
+       </locTermGroupList>\r
+           \r
   </ns2:locations_common>\r
   <!-- \r
        WARNING: ${itemCSID} does NOT get expanded by XmlReplay. \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml
index ce28e2bc24d9206b5d4eb9b374cec26e2501fc83..20e2375b56b60f73c458390c762a645b14a35558 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit-display.xml
@@ -25,6 +25,7 @@
              <filename>objectexit/oePersonDisplayOnly.xml</filename>\r
              <vars>\r
                 <var ID="displayName">Finbar the DisplayName</var>\r
+                <var ID="shortIdentifier">Finbar_the_shortIdentifier</var>\r
              </vars>\r
         </test>\r
         <test ID="oePersonGET">\r
@@ -38,8 +39,10 @@
                     <!-- TODO: .got is not namespace aware yet, so you must make the xpath work around it for now.-->\r
                     <var ID="csidGot">${oePersonGET.got("//csid")}</var>                      \r
                     <var ID="inAuthority">${oePersonauthority.CSID}</var>\r
+                    <var ID="inAuthorityShortIdentifier">${oePersonauthority.sent("//shortIdentifier")}</var>\r
                        <var ID="displayName">${oePerson.sent("//displayName")}</var>\r
-                    <var ID="refName">urn:cspace:collectionspace.org:Personauthorities(${oePersonauthority.sent("//shortIdentifier")}):items(foobar)'${oePerson.sent("//displayName")}'</var>\r
+                       <var ID="shortIdentifier">${oePerson.sent("//shortIdentifier")}</var>\r
+                    <var ID="refName">urn:cspace:core.collectionspace.org:personauthorities:name(${inAuthorityShortIdentifier}):item:name(${shortIdentifier})'${displayName}'</var>\r
                 </vars>\r
              </response>\r
         </test>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml
index c2c16c90fe03389764951715459bae3907526731..28e4a7b008e049f4ca74ffd54fdfb0b6e1057f8a 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oePersonDisplayOnly.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 <document name="persons">\r
-<ns2:persons_common\r
-xmlns:ns2="http://collectionspace.org/services/person"\r
-xmlns:ns3="http://collectionspace.org/services/jaxb">\r
-  <!--<shortIdentifier>thePersonShortIdentifier</shortIdentifier>-->\r
-  <displayName>${displayName}</displayName>\r
-  <displayNameComputed>false</displayNameComputed>\r
-</ns2:persons_common>\r
+       <ns2:persons_common\r
+       xmlns:ns2="http://collectionspace.org/services/person"\r
+       xmlns:ns3="http://collectionspace.org/services/jaxb">\r
+               <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
+               <personTermGroupList>\r
+                       <personTermGroup>\r
+                               <termName>${displayName}</termName>\r
+                               <termPrefForLang>false</termPrefForLang>\r
+                               <termDisplayName>${displayName}</termDisplayName>\r
+                       </personTermGroup>\r
+               </personTermGroupList>  \r
+       </ns2:persons_common>\r
 </document>\r
-\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml
index f7845ad40cddb2813b62a187e15a010933fecc96..e3d4280e6308262e35236284108cc0c2ff2ce737 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oePersonDisplayGET.res.xml
@@ -1,37 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document name="persons">
   <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <nationalities />
-    <shortDisplayName />
-    <schoolsOrStyles />
-    <groups />
-    <occupations />
-    <displayNameComputed>false</displayNameComputed>
     <inAuthority>${inAuthority}</inAuthority>
-    <displayName>Finbar the DisplayName</displayName>
+    <shortIdentifier>${shortIdentifier}</shortIdentifier>
+    <refName>${refName}</refName>
   </ns2:persons_common>
-  <ns2:collectionspace_core xmlns:ns2="http://collectionspace.org/collectionspace_core/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <tenantId>1</tenantId>
-    <updatedAt>2011-04-23T23:02:16Z</updatedAt>
-    <createdAt>2011-04-23T23:02:16Z</createdAt>
-  </ns2:collectionspace_core>
-  <ns2:account_permission xmlns:ns2="http://collectionspace.org/services/authorization">
-    <account>
-      <accountId>6b296c92-bb90-42d8-a804-3ec87c5e21d6</accountId>
-      <userId>admin@core.collectionspace.org</userId>
-    </account>
-    <permission>
-      <permRelationshipId>70</permRelationshipId>
-      <permissionId>1aa2c5b8-ce60-412b-bb45-cadba34fab7d</permissionId>
-      <resourceName>/personauthorities/*/items/*/workflow/</resourceName>
-      <actionGroup>CRUDL</actionGroup>
-    </permission>
-    <permission>
-      <permRelationshipId>71</permRelationshipId>
-      <permissionId>a7f67d3d-ecee-41a5-9b8d-5a7f89345caa</permissionId>
-      <resourceName>persons</resourceName>
-      <actionGroup>CRUDL</actionGroup>
-    </permission>
-  </ns2:account_permission>
 </document>
 

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml
index b6b8a196fab4f3e404008ceebb36f4ed01d6e632..a5f9d98885339ec4f8028c8bf89ca426c4169e7e 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pmadry.xml
@@ -2,11 +2,16 @@
 <document name="persons">\r
   <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
        <shortIdentifier>pmadry</shortIdentifier>\r
-       <displayNameComputed>false</displayNameComputed>\r
-       <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-       <shortDisplayName>Penelope Madry</shortDisplayName>\r
-       <displayName>Penelope Madry, New York</displayName>\r
-       <termStatus>${termStatus}</termStatus>\r
+       \r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>Penelope Madry, New York</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>Penelope Madry, New York</termDisplayName>\r
+                       <termStatus>${termStatus}</termStatus>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+       \r
        <bioNote>Project Manager for CollectionSpace</bioNote>\r
   </ns2:persons_common>\r
 </document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml
index ee908b05572b8832fc2fc1b9dbf128c793feecfa..d7f2cb81ca1367e7a58fad0324ff79b1d546cb6e 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml
@@ -2,11 +2,16 @@
 <document name="persons">\r
   <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">\r
        <shortIdentifier>pschmitz</shortIdentifier>\r
-       <displayNameComputed>false</displayNameComputed>\r
-       <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-       <shortDisplayName>Patrick Schmitz</shortDisplayName>\r
-       <displayName>Patrick Schmitz, Berkeley</displayName>\r
-       <termStatus>${termStatus}</termStatus>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>Patrick Schmitz, Berkeley</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>Patrick Schmitz, Berkeley</termDisplayName>\r
+                       <termStatus>${termStatus}</termStatus>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
        <bioNote>Technical Lead for CollectionSpace</bioNote>\r
     <description>This is a test PersonAuthority item</description>\r
     <source>Some mythical book</source>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml
index f68b396ab544b0fa308346f1a9a00c69d3722813..40cd18033a2ae8b64fee5bd376b7956de778bcd3 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+        \r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+        \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
index d6532c2178eed19cb5834a19be2dde5e27db15d4..0f2742f2922474e6356a5b0e8db585abc9468bd4 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci.xml
@@ -2,12 +2,17 @@
 <document name="persons">
   <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
     <shortIdentifier>${shortIdentifier}</shortIdentifier>
-    <displayName>${foreName} ${surName}</displayName>
-    <displayNameComputed>false</displayNameComputed>
-    <shortDisplayName>>${foreName} ${surName}</shortDisplayName>
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>
-               <foreName>${foreName}</foreName>
-               <surName>${surName}</surName>
+    
+       <personTermGroupList>
+               <personTermGroup>
+                       <termName>${foreName} ${surName}</termName>
+                       <termPrefForLang>false</termPrefForLang>
+                       <termDisplayName>${foreName} ${surName}</termDisplayName>
+                   <foreName>${foreName}</foreName>
+                   <surName>${surName}</surName>
+               </personTermGroup>
+       </personTermGroupList>  
+    
        </ns2:persons_common>
        <ns4:persons_naturalhistory xmlns:ns4="http://collectionspace.org/services/person/domain/naturalhistory" xmlns:ns3="http://collectionspace.org/services/jaxb">
                <entityType>${entityType}</entityType>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
index 9955abb6b5fa1aafcaef17c99e029820c2e8c2d8..5a5f91a4b6d966aab30af69b5038c8152b10f8df 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_and_lifesci_set_broader.xml
@@ -2,12 +2,17 @@
 <document name="persons">
   <pers:persons_common xmlns:pers="http://collectionspace.org/services/person">
     <shortIdentifier>${shortIdentifier}</shortIdentifier>
-    <displayName>${foreName} ${surName}</displayName>
-    <displayNameComputed>false</displayNameComputed>
-    <shortDisplayName>>${foreName} ${surName}</shortDisplayName>
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>
-               <foreName>${foreName}</foreName>
-               <surName>${surName}</surName>
+    
+       <personTermGroupList>
+               <personTermGroup>
+                       <termName>${foreName} ${surName}</termName>
+                       <termPrefForLang>false</termPrefForLang>
+                       <termDisplayName>${foreName} ${surName}</termDisplayName>
+                   <foreName>${foreName}</foreName>
+                   <surName>${surName}</surName>
+               </personTermGroup>
+       </personTermGroupList>  
+    
        </pers:persons_common>
        <pnh:persons_naturalhistory xmlns:pnh="http://collectionspace.org/services/person/domain/naturalhistory">
                <entityType>${entityType}</entityType>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml
index 77d12cfc1250af011e8f90658262b623cc7f9746..4a36bf057d9d38abe30abc3c037d837af10cc284 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_all_relations_PUT.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml
index 827388bb827df7a4a118f1f40dfebd9bf63e1a80..820d7ad38d20bd99d20e4c105bd3c4299b491deb 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_delete_relations_PUT.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml
index 2934776f4d0721858e52be7e9d94c8486f36ee96..1564a871ad5a5e24c3848124e34e4606e6e4d317 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml
index c332ccac2ff938d4a142d208cabf11f252442f35..a257f38c885cb75d3dd5b0125e6dac012d196673 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_2.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml
index a573e0f7dafa0d43d6302d6d8fb868d223451d65..cc6175557e7f1704ebf4d5ae83585b0996b589ec 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_3.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml
index 326de1fa3bcdf6700e151c06d2c08067aa2964da..0d05a76115beeb02646a72a2bf95f46fcb47f22e 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common_w_relations_POST.xml
@@ -4,12 +4,17 @@
     <inAuthority>${inAuthority}</inAuthority>\r
     <shortIdentifier>${shortIdentifier}</shortIdentifier>\r
     <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier}):person:name(${shortIdentifier})'John Wayne'</refName>\r
-    <displayName>John Wayne</displayName>\r
-    <displayNameComputed>false</displayNameComputed>\r
-    <shortDisplayName>JohnWayne</shortDisplayName>\r
-    <shortDisplayNameComputed>false</shortDisplayNameComputed>\r
-    <foreName>John</foreName>\r
-    <surName>Wayne</surName>\r
+\r
+       <personTermGroupList>\r
+               <personTermGroup>\r
+                       <termName>John Wayne</termName>\r
+                       <termPrefForLang>false</termPrefForLang>\r
+                       <termDisplayName>John Wayne</termDisplayName>\r
+                   <foreName>John</foreName>\r
+                   <surName>Wayne</surName>\r
+               </personTermGroup>\r
+       </personTermGroupList>  \r
+    \r
     <birthDate>May 26, 1907</birthDate>\r
     <deathDate>June 11, 1979</deathDate>\r
     <birthPlace>Winterset, Iowa</birthPlace>\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 c1dd47a0fd9b194406f106e845d1e41df0963759..1a54443fb6e9f5a39bda72473a609689958ff555 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,27 +37,35 @@
     <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
     <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
-               <!-- No - this test is broken\r
-               <run controlFile="relation/relation.xml" testGroup="r2only" />\r
-               -->\r
+-->\r
+\r
+<!-- No - this test is broken\r
+       <run controlFile="relation/relation.xml" testGroup="r2only" />\r
+-->\r
+\r
     <run controlFile="person/person.xml" testGroup="postPerson" />\r
     <run controlFile="person/person.xml" testGroup="updatePerson" />\r
     <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
     <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="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />\r
-               <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />\r
+       <run controlFile="authrefs/authrefs.xml" testGroup="AuthRefs" />\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
 \r