CSPACE-3311 added acquisition XmlReplayTests

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
new file mode 100755 (executable)
index 0000000..6bcb65f
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns3:acquisitions_common\r
+  xmlns:ns2="http://collectionspace.org/services/jaxb"\r
+  xmlns:ns3="http://collectionspace.org/services/acquisition">\r
+  <acquisitionDates>\r
+    <acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>\r
+    <acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+  </acquisitionDates>\r
+  <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+  <owners>\r
+    <owner>First Owner -1292275630222</owner>\r
+    <owner>Second Owner-1292275630222</owner>\r
+  </owners>\r
+  <acquisitionSources>\r
+    <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r
+    <acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>\r
+  </acquisitionSources>\r
+</ns3:acquisitions_common>\r
+\r
+\r

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
new file mode 100755 (executable)
index 0000000..41906ab
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/ac2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns3:acquisitions_common\r
+xmlns:ns2="http://collectionspace.org/services/jaxb"\r
+xmlns:ns3="http://collectionspace.org/services/acquisition">\r
+  <acquisitionDates>\r
+    <acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>\r
+    <acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>\r
+  </acquisitionDates>\r
+  <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>\r
+  <owners>\r
+    <owner>First Owner -1292275631503</owner>\r
+    <owner>Second Owner-1292275631503</owner>\r
+  </owners>\r
+  <acquisitionSources>\r
+    <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>\r
+    <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>\r
+  </acquisitionSources>\r
+</ns3:acquisitions_common>\r
+\r
+\r

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
new file mode 100755 (executable)
index 0000000..b060fdb
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/acquisitions.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<xmlReplay>\r
+    <auths>\r
+        <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
+        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+        <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
+    </auths>\r
+   \r
+    <testGroup ID="makeone" autoDeletePOSTS="false">\r
+       <test ID="ac1"  auth="test">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/acquisitions/</uri>\r
+             <part>\r
+                 <label>acquisitions_common</label>\r
+                 <filename>acquisitions/ac1.xml</filename>\r
+             </part>\r
+         </test>\r
+        <test ID="ac1get">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/acquisitions/${ac1.CSID}</uri>\r
+            <response>\r
+                <expected level="TEXT" />\r
+                <part>\r
+                     <label>acquisitions_common</label>\r
+                     <filename>acquisitions/res/ac1.res.xml</filename>\r
+                 </part>\r
+             </response>\r
+         </test>\r
+    </testGroup>       \r
+\r
+    <testGroup ID="testList" autoDeletePOSTS="true">\r
+         <test ID="ac1"  auth="test">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/acquisitions/</uri>\r
+             <part>\r
+                 <label>acquisitions_common</label>\r
+                 <filename>acquisitions/ac1.xml</filename>\r
+             </part>\r
+         </test>\r
+         \r
+         <test ID="ac1get">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/acquisitions/${ac1.CSID}</uri>\r
+            <response>\r
+                <expected level="TEXT" />\r
+                <part>\r
+                     <label>acquisitions_common</label>\r
+                     <filename>acquisitions/res/ac1.res.xml</filename>\r
+                 </part>\r
+             </response>\r
+         </test>\r
+  <!--      \r
+        <test ID="ac2"  auth="test">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/acquisitions/</uri>\r
+             <part>\r
+                 <label>acquisitions_common</label>\r
+                 <filename>acquisitions/ac2.xml</filename>\r
+             </part>\r
+         </test>\r
+         \r
+        <test ID="ac2get">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/acquisitions/${ac2.CSID}</uri>\r
+            <response>\r
+                <expected level="TEXT" />\r
+                <part>\r
+                     <label>acquisitions_common</label>\r
+                     <filename>acquisitions/res/ac2.res.xml</filename>\r
+                 </part>\r
+             </response>\r
+        </test>\r
+        -->\r
+        <test ID="ac3list">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/acquisitions/?sortBy=&amp;pgNum=0&amp;pgSz=10</uri>\r
+            <reponse>acquisitions/res/ac3list.res.xml</reponse>\r
+            <!--response>\r
+                <expected level="TEXT" />\r
+                <part>\r
+                     <label>acquisitions_common</label>\r
+                     <filename>acquisitions/res/ac3list.res.xml</filename>\r
+                 </part>\r
+             </response-->\r
+        </test>\r
+        \r
+    </testGroup>\r
+     \r
+         \r
+             \r
+    <testGroup ID="cleanup" autoDeletePOSTS="true">\r
+         <test ID="ac1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/acquisitions/8080b6b8-393a-4e8a-b823</uri>\r
+         </test>\r
+         <test ID="ac1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/acquisitions/231e8787-4d77-4eaf-8d10</uri>\r
+         </test>\r
+         <test ID="ac1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/acquisitions/cbb82bbc-9513-4f83-ab4f</uri>\r
+         </test>\r
+         <test ID="ac1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/acquisitions/516c2435-4560-408c-8628</uri>\r
+         </test>\r
+    </testGroup>\r
+    \r
+\r
+</xmlReplay>\r
+        \r
+        \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
new file mode 100755 (executable)
index 0000000..addfdc9
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac1.res.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd">\r
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+<acquisitionFundingList/>\r
+<acquisitionDates>\r
+<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>\r
+<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+</acquisitionDates>\r
+<acquisitionSources>\r
+<acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r
+<acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>\r
+</acquisitionSources>\r
+<owners>\r
+<owner>First Owner -1292275630222</owner>\r
+<owner>Second Owner-1292275630222</owner>\r
+</owners>\r
+<fieldCollectionEventNames/>\r
+</ns2:acquisitions_common>\r

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
new file mode 100755 (executable)
index 0000000..1d7f3a5
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac2.res.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd">\r
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>\r
+<acquisitionFundingList/>\r
+<acquisitionDates>\r
+<acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>\r
+<acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>\r
+</acquisitionDates>\r
+<acquisitionSources>\r
+<acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>\r
+<acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>\r
+</acquisitionSources>\r
+<owners>\r
+<owner>First Owner -1292275631503</owner>\r
+<owner>Second Owner-1292275631503</owner>\r
+</owners>\r
+<fieldCollectionEventNames/>\r
+</ns2:acquisitions_common>\r
+\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml
new file mode 100755 (executable)
index 0000000..8399458
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3.res.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd">\r
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+<acquisitionFundingList/>\r
+<acquisitionDates>\r
+<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>\r
+<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>\r
+</acquisitionDates>\r
+<acquisitionSources>\r
+<acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r
+<acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>\r
+</acquisitionSources>\r
+<owners>\r
+<owner>First Owner -1292275630222</owner>\r
+<owner>Second Owner-1292275630222</owner>\r
+</owners>\r
+<fieldCollectionEventNames/>\r
+</ns2:acquisitions_common>\r
+\r

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
new file mode 100755 (executable)
index 0000000..27ada66
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/acquisitions/res/ac3list.res.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<ns3:acquisitions-common-list\r
+xmlns:ns2="http://collectionspace.org/services/jaxb"\r
+xmlns:ns3="http://collectionspace.org/services/acquisition">\r
+  <pageNum>0</pageNum>\r
+  <pageSize>10</pageSize>\r
+  <itemsInPage>2</itemsInPage>\r
+  <totalItems>2</totalItems>\r
+  <fieldsReturned>\r
+  acquisitionReferenceNumber|acquisitionSources|owners|uri|csid</fieldsReturned>\r
+  <acquisition-list-item>\r
+    <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>\r
+    <acquisitionSources>\r
+      <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>\r
+      <acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>\r
+      <acquisitionSource>First Owner -1292275631503</acquisitionSource>\r
+      <acquisitionSource>Second Owner-1292275631503</acquisitionSource>\r
+    </acquisitionSources>\r
+    <owners />\r
+    <uri>/acquisitions/bff1deb6-03af-457c-af98</uri>\r
+    <csid>bff1deb6-03af-457c-af98</csid>\r
+  </acquisition-list-item>\r
+  <acquisition-list-item>\r
+    <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>\r
+    <acquisitionSources>\r
+      <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>\r
+      <acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>\r
+      <acquisitionSource>First Owner -1292275630222</acquisitionSource>\r
+      <acquisitionSource>Second Owner-1292275630222</acquisitionSource>\r
+    </acquisitionSources>\r
+    <owners />\r
+    <uri>/acquisitions/549dd907-01cd-4f20-aeb7</uri>\r
+    <csid>549dd907-01cd-4f20-aeb7</csid>\r
+  </acquisition-list-item>\r
+</ns3:acquisitions-common-list>\r
+\r
+\r

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 c4aa24b445da22fda7d67443db3ab10d757241b5..29c7ee2fb79b2894062753ff1011f69850b9ca00 100644 (file)
--- 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,10 +8,10 @@
      below about not leaving any active testGroups enabled in this file\r
      when you check it in.\r
 -->\r
-    <protoHostPort>http://localhost:8180</protoHostPort>\r
+    <protoHostPort>http://localhost:8280</protoHostPort>\r
     \r
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->\r
-    <dump payloads="false" dumpServiceResult="minimal" />\r
+    <dump payloads="false" dumpServiceResult="full" />\r
     \r
     <auths default="admin@collectionspace.org">\r
        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
@@ -28,9 +28,14 @@
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />   \r
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="repeat" />\r
-    <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />   \r
-    <run controlFile="objectexit/object-exit.xml" testGroup="DOMLIST" />\r
+    <run controlFile="objectexit/object-exit.xml" testGroup="domlist" />\r
+    <run controlFile="objectexit/object-exit.xml" testGroup="authrefs" />\r
+    <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />\r
+    <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />\r
+    \r
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />\r
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
     -->\r
     \r
     \r

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 d12f6d6babc53e74e8389d2801f07c9360e3556e..b17649c10079d72432e827f2da00286b56c6fedc 100644 (file)
--- 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
@@ -5,15 +5,80 @@
         <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
-    \r
+   \r
+    <!-- ============= authrefs ============================================== -->\r
+    <!-- run this group with autoDeletePOSTS="false" and then you can hit\r
+      http://nightly.collectionspace.org:8180/cspace-services/objectexit/\r
+    then grab a CSID, and paste it in here:\r
+      http://nightly.collectionspace.org:8180/cspace-services/objectexit/d781aed4-2e2c-45e2-ad8d/authorityrefs\r
+    -->\r
+    <testGroup ID="authrefs" autoDeletePOSTS="false">\r
+        <test ID="oe9">\r
+         <method>POST</method>\r
+         <uri>/cspace-services/personauthorities/</uri>\r
+         <part>\r
+             <label>personauthorities_common</label>\r
+             <filename>objectexit/oe9.xml</filename>\r
+         </part>\r
+      </test>\r
+      <test ID="oe11">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/personauthorities/${oe9.CSID}/items/</uri>\r
+             <part>\r
+                 <label>persons_common</label>\r
+                 <filename>objectexit/oe11.xml</filename>\r
+             </part>\r
+        </test>\r
+        <test ID="oe15">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/objectexit/</uri>\r
+             <part>\r
+                 <label>objectexit_common</label>\r
+                 <filename>objectexit/oe15.xml</filename>\r
+             </part>\r
+        </test>\r
+    </testGroup>\r
+     \r
+    <testGroup ID="makeone" autoDeletePOSTS="false">\r
+         <test ID="oe1"  auth="test">\r
+             <method>POST</method>\r
+             <uri>/cspace-services/objectexit/</uri>\r
+             <part>\r
+                 <label>objectexit_common</label>\r
+                 <filename>objectexit/oe1.xml</filename>\r
+             </part>\r
+         </test>\r
+        <test ID="oe2">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/objectexit/${oe1.CSID}</uri>\r
+            <response>\r
+                <expected level="TEXT" />\r
+                <part>\r
+                     <label>objectexit_common</label>\r
+                     <filename>objectexit/res/oe2.res.xml</filename>\r
+                 </part>\r
+             </response>\r
+        </test>\r
+    </testGroup>\r
+     \r
+         \r
+             \r
     <testGroup ID="cleanup" autoDeletePOSTS="true">\r
          <test ID="oe1"  auth="test">\r
              <method>DELETE</method>\r
-             <uri>/cspace-services/objectexit/98d61417-3986-4de6-bb98</uri>\r
+             <uri>/cspace-services/objectexit/065aa56e-a4f5-44b7-955e</uri>\r
+         </test>\r
+         <test ID="oe1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/objectexit/1735327c-f9bb-42c7-959b</uri>\r
+         </test>\r
+         <test ID="oe1"  auth="test">\r
+             <method>DELETE</method>\r
+             <uri>/cspace-services/objectexit/106cb53d-ee79-44e3-8665</uri>\r
          </test>\r
     </testGroup>\r
     \r
-    <testGroup ID="domwalk" autoDeletePOSTS="true">\r
+    <testGroup ID="domwalk" autoDeletePOSTS="false">\r
          <test ID="oe1"  auth="test">\r
              <method>POST</method>\r
              <uri>/cspace-services/objectexit/</uri>\r
@@ -252,9 +317,9 @@
 \r
      </testGroup>\r
 \r
-    <!-- =========== DOMWALK LIST ================================================ -->\r
+    <!-- =========== domlist Walk a DOM ================================================ -->\r
 \r
-    <testGroup ID="DOMLIST" autoDeletePOSTS="true">\r
+    <testGroup ID="domlist" autoDeletePOSTS="true">\r
          <test ID="oe1"  auth="admin@collectionspace.org">\r
              <method>POST</method>\r
              <uri>/cspace-services/objectexit/</uri>\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 d70645fbf05259a6c5b13f9ae28ce047bd954f38..892495ca13c6628a9fbc0e6ab8ee049feeb5d1d0 100755 (executable)
--- 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
@@ -23,6 +23,7 @@
     <run controlFile="./security.xml" testGroup="securityRemovingRoleperms" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />\r
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
 \r
     <!--<run controlFile="./organization.xml" testGroup="organization" />-->\r
 \r