From 4c48fd21a4447735ecdddf5a5f8f4a22a651b2ae Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 14 Dec 2010 02:26:44 +0000
Subject: [PATCH] CSPACE-3211: Temporarily commented out list tests for object
 exit, acquisitions to preclude list failures where there are existing
 records. See oe6.xml.

---
 .../test-data/xmlreplay/acquisitions/ac2.xml   |  6 +++---
 .../xmlreplay/acquisitions/acquisitions.xml    | 12 +++++++-----
 .../xmlreplay/acquisitions/res/ac2.res.xml     |  6 +++---
 .../xmlreplay/acquisitions/res/ac3list.res.xml | 18 ++++--------------
 .../test-data/xmlreplay/dev-master.xml         |  6 +++---
 .../xmlreplay/objectexit/object-exit.xml       |  9 ++++++---
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
index 41906ab58..8cd581fa5 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
@@ -3,17 +3,17 @@
 xmlns:ns2="http://collectionspace.org/services/jaxb"
 xmlns:ns3="http://collectionspace.org/services/acquisition">
   <acquisitionDates>
-    <acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>
     <acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>
+    <acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>
   </acquisitionDates>
   <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>
   <owners>
-    <owner>First Owner -1292275631503</owner>
     <owner>Second Owner-1292275631503</owner>
+    <owner>First Owner -1292275631503</owner>
   </owners>
   <acquisitionSources>
-    <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
     <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>
+    <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
   </acquisitionSources>
 </ns3:acquisitions_common>
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml
index b060fdb9d..44cfa508a 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml
@@ -49,7 +49,7 @@
                  </part>
              </response>
          </test>
-  <!--      
+
         <test ID="ac2"  auth="test">
              <method>POST</method>
              <uri>/cspace-services/acquisitions/</uri>
@@ -70,19 +70,21 @@
                  </part>
              </response>
         </test>
-        -->
+
+        <!--
         <test ID="ac3list">
             <method>GET</method>
             <uri>/cspace-services/acquisitions/?sortBy=&amp;pgNum=0&amp;pgSz=10</uri>
-            <reponse>acquisitions/res/ac3list.res.xml</reponse>
-            <!--response>
+            <response>acquisitions/res/ac3list.res.xml</response>
+            <response>
                 <expected level="TEXT" />
                 <part>
                      <label>acquisitions_common</label>
                      <filename>acquisitions/res/ac3list.res.xml</filename>
                  </part>
-             </response-->
+             </response>
         </test>
+        -->
         
     </testGroup>
      
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
index 1d7f3a5e5..0eedfe9f1 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
@@ -3,16 +3,16 @@
 <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>
 <acquisitionFundingList/>
 <acquisitionDates>
-<acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>
 <acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>
+<acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>
 </acquisitionDates>
 <acquisitionSources>
-<acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
 <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>
+<acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
 </acquisitionSources>
 <owners>
-<owner>First Owner -1292275631503</owner>
 <owner>Second Owner-1292275631503</owner>
+<owner>First Owner -1292275631503</owner>
 </owners>
 <fieldCollectionEventNames/>
 </ns2:acquisitions_common>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3list.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3list.res.xml
index 27ada6606..fe21664bc 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3list.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3list.res.xml
@@ -10,25 +10,15 @@ xmlns:ns3="http://collectionspace.org/services/acquisition">
   acquisitionReferenceNumber|acquisitionSources|owners|uri|csid</fieldsReturned>
   <acquisition-list-item>
     <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>
-    <acquisitionSources>
-      <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
-      <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>
-      <acquisitionSource>First Owner -1292275631503</acquisitionSource>
-      <acquisitionSource>Second Owner-1292275631503</acquisitionSource>
-    </acquisitionSources>
-    <owners />
+    <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
+    <owner>First Owner -1292275631503</owner>
     <uri>/acquisitions/bff1deb6-03af-457c-af98</uri>
     <csid>bff1deb6-03af-457c-af98</csid>
   </acquisition-list-item>
   <acquisition-list-item>
     <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>
-    <acquisitionSources>
-      <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>
-      <acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>
-      <acquisitionSource>First Owner -1292275630222</acquisitionSource>
-      <acquisitionSource>Second Owner-1292275630222</acquisitionSource>
-    </acquisitionSources>
-    <owners />
+    <acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>
+    <owner>Second Owner-1292275630222</owner>
     <uri>/acquisitions/549dd907-01cd-4f20-aeb7</uri>
     <csid>549dd907-01cd-4f20-aeb7</csid>
   </acquisition-list-item>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
index 29c7ee2fb..4bc581a0b 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
@@ -8,7 +8,7 @@
      below about not leaving any active testGroups enabled in this file
      when you check it in.
 -->
-    <protoHostPort>http://localhost:8280</protoHostPort>
+    <protoHostPort>http://localhost:8180</protoHostPort>
     
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
     <dump payloads="false" dumpServiceResult="full" />
@@ -24,9 +24,9 @@
                       and a testGroup, so you can test just one thing at a time, or a limited suite.
     -->
     
-    <!--
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />   
-    <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />
+     <!--
+   <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />
     <run controlFile="objectexit/object-exit.xml" testGroup="repeat" />
     <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />   
     <run controlFile="objectexit/object-exit.xml" testGroup="domlist" />
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 b17649c10..7b7235751 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
@@ -159,6 +159,7 @@
                  <filename>objectexit/oe5.xml</filename>
              </part>
          </test>
+         <!--
          <test ID="oe6">
             <method>GET</method>
             <uri>/cspace-services/objectexit/</uri>
@@ -166,11 +167,13 @@
                 <expected level="ADDOK" />
                 <filename>objectexit/res/oe6.res.xml</filename>
              </response>
-            <!--reponse>oe6.res.xml</reponse-->
+         -->
+            <!-- response>oe6.res.xml</response -->
             <!--response elements will need parts, too, e.g. personauthorities_common -->
-            <!-- inside oe6.res.xml, there is a CSID which will change every time, and should be ref'd as 6f7a1e3e-5821-4ef2-bfcf ==> ${oe1.CSID}
-            -->
+            <!-- inside oe6.res.xml, there is a CSID which will change every time, and should be ref'd as 6f7a1e3e-5821-4ef2-bfcf ==> ${oe1.CSID} -->
+        <!--
         </test>
+         -->
          <test ID="oe7">
             <method>GET</method>
             <uri>/cspace-services/objectexit/9223372036854775807</uri>
-- 
2.47.3