From: remillet <remillet@yahoo.com>
Date: Wed, 24 Jan 2018 07:37:09 +0000 (-0800)
Subject: DRYD-202: XMLReplay test cleanup.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8b0915d2b3ee764bd1c8cdc7cc4d858065403eb1;p=tmp%2Fjakarta-migration.git

DRYD-202: XMLReplay test cleanup.
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
index 244dbaeef..c9628f926 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
@@ -12,14 +12,14 @@
       http://nightly.collectionspace.org:8180/cspace-services/objectexit/d781aed4-2e2c-45e2-ad8d/authorityrefs
     -->
     <testGroup ID="authrefs" autoDeletePOSTS="true">
-        <test ID="oe9">
+        <test ID="oe9_authrefs">
             <method>POST</method>
             <uri>/cspace-services/personauthorities/</uri>
             <filename>objectexit/oe9.xml</filename>
         </test>
         <test ID="oe11">
             <method>POST</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/</uri>
+            <uri>/cspace-services/personauthorities/${oe9_authrefs.CSID}/items/</uri>
             <filename>objectexit/oe11.xml</filename>
         </test>
         <test ID="oe15">
@@ -37,7 +37,7 @@
         </test>
     </testGroup>
 
-    <testGroup ID="makeone" autoDeletePOSTS="false">
+    <testGroup ID="makeone" autoDeletePOSTS="true">
         <test ID="oe1">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
@@ -58,7 +58,7 @@
         </test>
     </testGroup>
 
-    <testGroup ID="testStartName" autoDeletePOSTS="false">
+    <testGroup ID="testStartName" autoDeletePOSTS="true">
         <test ID="oe1x">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
@@ -66,7 +66,7 @@
         </test>
         <test ID="oe2x">
             <method>GET</method>
-            <uri>/cspace-services/objectexit/${oe1.CSID}</uri>
+            <uri>/cspace-services/objectexit/${oe1x.CSID}</uri>
             <response>
                 <expected level="ADDOK"></expected>
                 <filename>objectexit/res/oe2.res.xml</filename>
@@ -95,37 +95,19 @@
                     <var ID="targetCSID">${oe35.CSID}</var>
                 </vars>
                 <!--
-		    Look for one <list-item> with the <exitNumber> that
-                    we set in the POST, and see if it is in the response
+		              Look for one <list-item> with the <exitNumber> that
+                      we set in the POST, and see if it is in the response
                 -->
                 <startElement>//list-item[./exitNumber='checkList-1234']</startElement>
             </response>
         </test>
     </testGroup>
 
-    <testGroup ID="cleanup" autoDeletePOSTS="true">
-        <test ID="oe1">
-            <method>DELETE</method>
-            <uri>/cspace-services/objectexit/065aa56e-a4f5-44b7-955e</uri>
-        </test>
-        <test ID="oe1">
-            <method>DELETE</method>
-            <uri>/cspace-services/objectexit/1735327c-f9bb-42c7-959b</uri>
-        </test>
-        <test ID="oe1">
-            <method>DELETE</method>
-            <uri>/cspace-services/objectexit/106cb53d-ee79-44e3-8665</uri>
-        </test>
-    </testGroup>
-
-    <testGroup ID="domwalk" autoDeletePOSTS="false">
+    <testGroup ID="domwalk" autoDeletePOSTS="true">
         <test ID="oe1">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe1.xml</filename>
-            </part>
+            <filename>objectexit/oe1.xml</filename>
         </test>
         <test ID="oe2">
             <method>GET</method>
@@ -145,10 +127,7 @@
         <test ID="oeRepeat" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oeRepeat.xml</filename>
-            </part>
+            <filename>objectexit/oeRepeat.xml</filename>
         </test>
     </testGroup>
 
@@ -158,10 +137,7 @@
         <test ID="oe1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe1.xml</filename>
-            </part>
+            <filename>objectexit/oe1.xml</filename>
         </test>
         <test ID="oe2">
             <method>GET</method>
@@ -174,26 +150,17 @@
         <test ID="oe3">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe3.xml</filename>
-            </part>
+            <filename>objectexit/oe3.xml</filename>
         </test>
         <test ID="oe4">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe4.xml</filename>
-            </part>
+            <filename>objectexit/oe4.xml</filename>
         </test>
         <test ID="oe5">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe5.xml</filename>
-            </part>
+            <filename>objectexit/oe5.xml</filename>
         </test>
         <!--
          <test ID="oe6">
@@ -220,50 +187,37 @@
             <uri>/cspace-services/objectexit/${oe1.CSID}</uri>
             <reponse>oe8.res.xml</reponse>
         </test>
-        <test ID="oe9">
+        <test ID="oe9_crudl">
             <method>POST</method>
             <uri>/cspace-services/personauthorities/</uri>
-            <part>
-                <label>personauthorities_common</label>
-                <filename>objectexit/oe9.xml</filename>
-            </part>
+            <filename>objectexit/oe9.xml</filename>
         </test>
         <test ID="oe10">
             <method>GET</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}</uri>
         </test>
-
         <test ID="oe11">
             <method>POST</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/</uri>
-            <part>
-                <label>persons_common</label>
-                <filename>objectexit/oe11.xml</filename>
-            </part>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/</uri>
+            <filename>objectexit/oe11.xml</filename>
         </test>
         <test ID="oe12">
             <method>GET</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/${oe11.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/${oe11.CSID}</uri>
         </test>
         <test ID="oe13">
             <method>POST</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/</uri>
-            <part>
-                <label>persons_common</label>
-                <filename>objectexit/oe13.xml</filename>
-            </part>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/</uri>
+            <filename>objectexit/oe13.xml</filename>
         </test>
         <test ID="oe14">
             <method>GET</method>
-            <uri>/cspace-services/personauthorities/${oe11.CSID}/items/${oe13.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/${oe13.CSID}</uri>
         </test>
         <test ID="oe15">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe15.xml</filename>
-            </part>
+            <filename>objectexit/oe15.xml</filename>
         </test>
         <test ID="oe16">
             <method>GET</method>
@@ -275,16 +229,15 @@
         </test>
         <test ID="oe18">
             <method>DELETE</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/${oe11.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/${oe11.CSID}</uri>
         </test>
-
         <test ID="oe19">
             <method>DELETE</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}/items/${oe13.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}/items/${oe13.CSID}</uri>
         </test>
         <test ID="oe20">
             <method>DELETE</method>
-            <uri>/cspace-services/personauthorities/${oe9.CSID}</uri>
+            <uri>/cspace-services/personauthorities/${oe9_crudl.CSID}</uri>
         </test>
         <test ID="oe21">
             <method>DELETE</method>
@@ -297,10 +250,7 @@
         <test ID="oe23">
             <method>PUT</method>
             <uri>/cspace-services/objectexit/${oe1.CSID}</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe23.xml</filename>
-            </part>
+            <filename>objectexit/oe23.xml</filename>
         </test>
         <test ID="oe24">
             <method>DELETE</method>
@@ -314,11 +264,7 @@
         <test ID="oe26">
             <method>PUT</method>
             <uri>/cspace-services/objectexit/9223372036854775807</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe23.xml</filename>
-                <!-- won't be found, so just re-using older post file as payload.-->
-            </part>
+            <filename>objectexit/oe23.xml</filename>
             <expectedCodes>404</expectedCodes>
         </test>
         <test ID="oe27">
@@ -354,7 +300,6 @@
             <method>DELETE</method>
             <uri>/cspace-services/objectexit/${oe5.CSID}</uri>
         </test>
-
     </testGroup>
 
     <!-- =========== domlist Walk a DOM ================================================ -->
@@ -363,34 +308,22 @@
         <test ID="oe1" auth="admin@core.collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe1.xml</filename>
-            </part>
+            <filename>objectexit/oe1.xml</filename>
         </test>
         <test ID="oe3">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe3.xml</filename>
-            </part>
+            <filename>objectexit/oe3.xml</filename>
         </test>
         <test ID="oe4">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe4.xml</filename>
-            </part>
+            <filename>objectexit/oe4.xml</filename>
         </test>
         <test ID="oe5">
             <method>POST</method>
             <uri>/cspace-services/objectexit/</uri>
-            <part>
-                <label>objectexit_common</label>
-                <filename>objectexit/oe5.xml</filename>
-            </part>
+            <filename>objectexit/oe5.xml</filename>
         </test>
         <test ID="oe6">
             <method>GET</method>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe1.xml
index 1e94f2838..e0274d2ee 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe1.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="objectexit">
-    <ns2:objectexit_common
-            xmlns:ns2="http://collectionspace.org/services/objectexit"
-            xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
         <exitNumber>objectexitNumber-1290026472360</exitNumber>
     </ns2:objectexit_common>
 </document>
-
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe13.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe13.xml
index 6dfd4603d..903212b8c 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe13.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe13.xml
@@ -1,2 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb"><inAuthority>7f441679-ab83-4832-85f9</inAuthority><shortIdentifier>davenportDepositor</shortIdentifier><refName>urn:cspace:org.collectionspace.demo:personauthority:name(ObjectexitPersonAuth)'ObjectexitPersonAuth':person:name(davenportDepositor)</refName><displayNameComputed>true</displayNameComputed><shortDisplayNameComputed>true</shortDisplayNameComputed><foreName>Davenport</foreName><surName>Depositor</surName></ns2:persons_common>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="persons">
+    <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <shortIdentifier>davenportDepositor</shortIdentifier>
+        <foreName>Davenport</foreName>
+        <surName>Depositor</surName>
+        <personTermGroupList>
+            <personTermGroup>
+                <termName>John Wayneoe13</termName>
+                <termPrefForLang>false</termPrefForLang>
+                <termDisplayName>John Wayneoe13</termDisplayName>
+                <foreName>oe13forename</foreName>
+                <surName>oe13surname</surName>
+            </personTermGroup>
+        </personTermGroupList>
+    </ns2:persons_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe23.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe23.xml
index 01e31df12..be34b21da 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe23.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe23.xml
@@ -1,2 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb"><depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor><exitNumber>updated-objectexitNumber-1290026472360</exitNumber></ns2:objectexit_common>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
+        <exitNumber>updated-objectexitNumber-1290026472360</exitNumber>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe3.xml
index 44d98316f..859e42af6 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe3.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe3.xml
@@ -1,2 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb"><depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor><exitNumber>objectexitNumber-1290026473391</exitNumber></ns2:objectexit_common>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
+        <exitNumber>objectexitNumber-1290026473391</exitNumber>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe35.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe35.xml
index 988c995d4..8c6ad72eb 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe35.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe35.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="objectexit">
-    <ns2:objectexit_common
-            xmlns:ns2="http://collectionspace.org/services/objectexit"
-            xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
         <exitNumber>${exitNumber}</exitNumber>
     </ns2:objectexit_common>
 </document>
-
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe4.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe4.xml
index 2554e2859..fb252720b 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe4.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe4.xml
@@ -1,2 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb"><depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor><exitNumber>objectexitNumber-1290026473626</exitNumber></ns2:objectexit_common>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
+        <exitNumber>objectexitNumber-1290026473626</exitNumber>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe5.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe5.xml
index 5d82a1e2b..0a076ad8a 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe5.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe5.xml
@@ -1,2 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb"><depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor><exitNumber>objectexitNumber-1290026473860</exitNumber></ns2:objectexit_common>
-
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
+        <exitNumber>objectexitNumber-1290026473860</exitNumber>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe9.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe9.xml
index ca8c61e8e..0b8559a84 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe9.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oe9.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<document name="persons">
+<document name="personauthorities">
     <ns2:personauthorities_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <displayName>ObjectexitPersonAuth</displayName>
         <shortIdentifier>ObjectexitPersonAuth</shortIdentifier>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeObject.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeObject.xml
index 2db2785ce..9a5a9d8cf 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeObject.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeObject.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns2:objectexit_common
-xmlns:ns2="http://collectionspace.org/services/objectexit"
-xmlns:ns3="http://collectionspace.org/services/jaxb">
-  <depositor>${depositor}</depositor>
-  <currentOwner>${currentOwner}</currentOwner>
-  <exitDate>exitDate-1290026474563</exitDate>
-  <exitNumber>${exitNumber}</exitNumber>
-</ns2:objectexit_common>
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>${depositor}</depositor>
+        <currentOwner>${currentOwner}</currentOwner>
+        <exitDate>exitDate-1290026474563</exitDate>
+        <exitNumber>${exitNumber}</exitNumber>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeRepeat.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeRepeat.xml
index 38eeff9a3..5b61ce9a3 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeRepeat.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/oeRepeat.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns2:objectexit_common
-xmlns:ns2="http://collectionspace.org/services/objectexit"
-xmlns:ns3="http://collectionspace.org/services/jaxb">
-  <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
-  <exitNumber>objectexitNumber-1290026472360</exitNumber>
-  <exitMethods>
-      <exitMethods>courier</exitMethods>
-  </exitMethods>
-</ns2:objectexit_common>
-
+<document name="objectexit">
+    <ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <depositor>urn:cspace:org.collectionspace.demo:orgauthority:name(TestOrgAuth):organization:name(Northern Climes Museum)'Northern Climes Museum'</depositor>
+        <exitNumber>objectexitNumber-1290026472360</exitNumber>
+        <exitMethods>
+            <exitMethods>courier</exitMethods>
+        </exitMethods>
+    </ns2:objectexit_common>
+</document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oe6.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oe6.res.xml
index 0518b77ee..c9cab3aeb 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oe6.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/res/oe6.res.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns2:objectexit_common_list
-xmlns:ns2="http://collectionspace.org/services/objectexit"
-xmlns:ns3="http://collectionspace.org/services/jaxb">
-  <pageNum>0</pageNum>
-  <pageSize>40</pageSize>
-  <itemsInPage>4</itemsInPage>
-  <totalItems>4</totalItems>
-  <fieldsReturned>exitNumber|currentOwner|uri|csid</fieldsReturned>
+<ns2:objectexit_common_list xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <pageNum>0</pageNum>
+    <pageSize>40</pageSize>
+    <itemsInPage>4</itemsInPage>
+    <totalItems>4</totalItems>
 
-  <objectexit_list_item ID="e1-oe5">
-    <exitNumber>objectexitNumber-1290026473860</exitNumber>
-    <uri>/objectexit/${oe5.CSID}</uri>
-    <csid>${oe5.CSID}</csid>
-  </objectexit_list_item>
-  
-  <objectexit_list_item ID="e2-oe3">
-    <exitNumber>objectexitNumber-1290026473391</exitNumber>
-    <uri>/objectexit/${oe3.CSID}</uri>
-    <csid>${oe3.CSID}</csid>
-  </objectexit_list_item>
-  
-  <objectexit_list_item ID="e3-oe4">
-    <exitNumber>objectexitNumber-1290026473626</exitNumber>
-    <uri>/objectexit/${oe4.CSID}</uri>
-    <csid>${oe4.CSID}</csid>
-  </objectexit_list_item>
+    <objectexit_list_item ID="e1-oe5">
+        <exitNumber>objectexitNumber-1290026473860</exitNumber>
+        <uri>/objectexit/${oe5.CSID}</uri>
+        <csid>${oe5.CSID}</csid>
+    </objectexit_list_item>
 
-  <objectexit_list_item ID="e4-oe1">
-    <exitNumber>objectexitNumber-1290026472360</exitNumber>
-    <uri>/objectexit/${oe1.CSID}</uri>
-    <csid>${oe1.CSID}</csid>
-  </objectexit_list_item>
-  </ns2:objectexit_common_list>
+    <objectexit_list_item ID="e2-oe3">
+        <exitNumber>objectexitNumber-1290026473391</exitNumber>
+        <uri>/objectexit/${oe3.CSID}</uri>
+        <csid>${oe3.CSID}</csid>
+    </objectexit_list_item>
 
+    <objectexit_list_item ID="e3-oe4">
+        <exitNumber>objectexitNumber-1290026473626</exitNumber>
+        <uri>/objectexit/${oe4.CSID}</uri>
+        <csid>${oe4.CSID}</csid>
+    </objectexit_list_item>
 
+    <objectexit_list_item ID="e4-oe1">
+        <exitNumber>objectexitNumber-1290026472360</exitNumber>
+        <uri>/objectexit/${oe1.CSID}</uri>
+        <csid>${oe1.CSID}</csid>
+    </objectexit_list_item>
+</ns2:objectexit_common_list>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/authrefs-listAuthrefs.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/authrefs-listAuthrefs.xml
deleted file mode 100644
index bc55d9643..000000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/res/authrefs-listAuthrefs.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<ns3:authority-ref-list xmlns:ns2="http://collectionspace.org/services/jaxb" xmlns:ns3="http://collectionspace.org/services/common/authorityref">
-    <pageNum>0</pageNum>
-    <pageSize>40</pageSize>
-    <itemsInPage>1</itemsInPage>
-    <totalItems>1</totalItems>
-    <authority-ref-item>
-        <sourceField>objectexit_common:depositor</sourceField>
-        <refName>
-            urn:cspace:org.collectionspace.demo:personauthority:name(ObjectexitPersonAuth)'ObjectexitPersonAuth':person:name(davenportDepositor)
-        </refName>
-        <authDisplayName>ObjectexitPersonAuth</authDisplayName>
-        <uri>
-            /personauthorities/urn:cspace:name(ObjectexitPersonAuth)/items/urn:cspace:name(davenportDepositor)
-        </uri>
-    </authority-ref-item>
-</ns3:authority-ref-list>
\ No newline at end of file
diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
index ed4e8c4e4..5916fdf86 100644
--- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
+++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
@@ -259,7 +259,8 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
      * may be expected to be deleted by certain tests.
      * @throws Exception 
      */
-    @AfterClass(alwaysRun = true)
+    @Override
+	@AfterClass(alwaysRun = true)
     public void cleanUp() throws Exception {
         String noTest = System.getProperty("noTestCleanup");
         if (Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
@@ -267,22 +268,30 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
             return;
         }
         logger.debug("Cleaning up temporary resources created for testing ...");
+        //
+        // First delete the referring records
+        //
+        ObjectExitClient objectexitClient = new ObjectExitClient();
+        for (String resourceId : objectexitIdsCreated) {
+            // Note: Any non-success responses are ignored and not reported.
+            objectexitClient.delete(resourceId).close();
+        }
+        //
+        // Next, delete the terms
+        //
         PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
         // Delete Person resource(s) (before PersonAuthority resources).
         for (String resourceId : personIdsCreated) {
             // Note: Any non-success responses are ignored and not reported.
             personAuthClient.deleteItem(personAuthCSID, resourceId).close();
         }
-        // Delete PersonAuthority resource(s).
+        //
+        // Lastly, delete PersonAuthority resource(s).
         // Note: Any non-success response is ignored and not reported.
+        //
         if (personAuthCSID != null) {
             personAuthClient.delete(personAuthCSID).close();
             // Delete Loans In resource(s).
-            ObjectExitClient objectexitClient = new ObjectExitClient();
-            for (String resourceId : objectexitIdsCreated) {
-                // Note: Any non-success responses are ignored and not reported.
-                objectexitClient.delete(resourceId).close();
-            }
         }
     }