From: Laramie Crocker <laramie@berkeley.edu>
Date: Tue, 14 Dec 2010 00:52:22 +0000 (+0000)
Subject: CSPACE-3311 added acquisition XmlReplayTests
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0dd583c296ad87f5be334b95151140c29794e71b;p=tmp%2Fjakarta-migration.git

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
index 000000000..6bcb65fd3
--- /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"?>
+<ns3:acquisitions_common
+  xmlns:ns2="http://collectionspace.org/services/jaxb"
+  xmlns:ns3="http://collectionspace.org/services/acquisition">
+  <acquisitionDates>
+    <acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>
+    <acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>
+  </acquisitionDates>
+  <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>
+  <owners>
+    <owner>First Owner -1292275630222</owner>
+    <owner>Second Owner-1292275630222</owner>
+  </owners>
+  <acquisitionSources>
+    <acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>
+    <acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>
+  </acquisitionSources>
+</ns3:acquisitions_common>
+
+
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
index 000000000..41906ab58
--- /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"?>
+<ns3:acquisitions_common
+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>
+  </acquisitionDates>
+  <acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>
+  <owners>
+    <owner>First Owner -1292275631503</owner>
+    <owner>Second Owner-1292275631503</owner>
+  </owners>
+  <acquisitionSources>
+    <acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
+    <acquisitionSource>Museum 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
new file mode 100755
index 000000000..b060fdb9d
--- /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"?>
+<xmlReplay>
+    <auths>
+        <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
+        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
+        <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
+    </auths>
+   
+    <testGroup ID="makeone" autoDeletePOSTS="false">
+       <test ID="ac1"  auth="test">
+             <method>POST</method>
+             <uri>/cspace-services/acquisitions/</uri>
+             <part>
+                 <label>acquisitions_common</label>
+                 <filename>acquisitions/ac1.xml</filename>
+             </part>
+         </test>
+        <test ID="ac1get">
+            <method>GET</method>
+            <uri>/cspace-services/acquisitions/${ac1.CSID}</uri>
+            <response>
+                <expected level="TEXT" />
+                <part>
+                     <label>acquisitions_common</label>
+                     <filename>acquisitions/res/ac1.res.xml</filename>
+                 </part>
+             </response>
+         </test>
+    </testGroup>       
+
+    <testGroup ID="testList" autoDeletePOSTS="true">
+         <test ID="ac1"  auth="test">
+             <method>POST</method>
+             <uri>/cspace-services/acquisitions/</uri>
+             <part>
+                 <label>acquisitions_common</label>
+                 <filename>acquisitions/ac1.xml</filename>
+             </part>
+         </test>
+         
+         <test ID="ac1get">
+            <method>GET</method>
+            <uri>/cspace-services/acquisitions/${ac1.CSID}</uri>
+            <response>
+                <expected level="TEXT" />
+                <part>
+                     <label>acquisitions_common</label>
+                     <filename>acquisitions/res/ac1.res.xml</filename>
+                 </part>
+             </response>
+         </test>
+  <!--      
+        <test ID="ac2"  auth="test">
+             <method>POST</method>
+             <uri>/cspace-services/acquisitions/</uri>
+             <part>
+                 <label>acquisitions_common</label>
+                 <filename>acquisitions/ac2.xml</filename>
+             </part>
+         </test>
+         
+        <test ID="ac2get">
+            <method>GET</method>
+            <uri>/cspace-services/acquisitions/${ac2.CSID}</uri>
+            <response>
+                <expected level="TEXT" />
+                <part>
+                     <label>acquisitions_common</label>
+                     <filename>acquisitions/res/ac2.res.xml</filename>
+                 </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>
+                <expected level="TEXT" />
+                <part>
+                     <label>acquisitions_common</label>
+                     <filename>acquisitions/res/ac3list.res.xml</filename>
+                 </part>
+             </response-->
+        </test>
+        
+    </testGroup>
+     
+         
+             
+    <testGroup ID="cleanup" autoDeletePOSTS="true">
+         <test ID="ac1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/acquisitions/8080b6b8-393a-4e8a-b823</uri>
+         </test>
+         <test ID="ac1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/acquisitions/231e8787-4d77-4eaf-8d10</uri>
+         </test>
+         <test ID="ac1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/acquisitions/cbb82bbc-9513-4f83-ab4f</uri>
+         </test>
+         <test ID="ac1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/acquisitions/516c2435-4560-408c-8628</uri>
+         </test>
+    </testGroup>
+    
+
+</xmlReplay>
+        
+        
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
index 000000000..addfdc952
--- /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"?>
+<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">
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>
+<acquisitionFundingList/>
+<acquisitionDates>
+<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>
+<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>
+</acquisitionDates>
+<acquisitionSources>
+<acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>
+<acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>
+</acquisitionSources>
+<owners>
+<owner>First Owner -1292275630222</owner>
+<owner>Second Owner-1292275630222</owner>
+</owners>
+<fieldCollectionEventNames/>
+</ns2:acquisitions_common>
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
index 000000000..1d7f3a5e5
--- /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"?>
+<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">
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275631503</acquisitionReferenceNumber>
+<acquisitionFundingList/>
+<acquisitionDates>
+<acquisitionDate>First Acquisition Date -1292275631503</acquisitionDate>
+<acquisitionDate>Second Acquisition Date-1292275631503</acquisitionDate>
+</acquisitionDates>
+<acquisitionSources>
+<acquisitionSource>Donor Acquisition Source-1292275631503</acquisitionSource>
+<acquisitionSource>Museum Acquisition Source-1292275631503</acquisitionSource>
+</acquisitionSources>
+<owners>
+<owner>First Owner -1292275631503</owner>
+<owner>Second Owner-1292275631503</owner>
+</owners>
+<fieldCollectionEventNames/>
+</ns2:acquisitions_common>
+
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
index 000000000..83994584d
--- /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"?>
+<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">
+<acquisitionReferenceNumber>acquisitionReferenceNumber-1292275630222</acquisitionReferenceNumber>
+<acquisitionFundingList/>
+<acquisitionDates>
+<acquisitionDate>First Acquisition Date -1292275630222</acquisitionDate>
+<acquisitionDate>Second Acquisition Date-1292275630222</acquisitionDate>
+</acquisitionDates>
+<acquisitionSources>
+<acquisitionSource>Donor Acquisition Source-1292275630222</acquisitionSource>
+<acquisitionSource>Museum Acquisition Source-1292275630222</acquisitionSource>
+</acquisitionSources>
+<owners>
+<owner>First Owner -1292275630222</owner>
+<owner>Second Owner-1292275630222</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
new file mode 100755
index 000000000..27ada6606
--- /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"?>
+<ns3:acquisitions-common-list
+xmlns:ns2="http://collectionspace.org/services/jaxb"
+xmlns:ns3="http://collectionspace.org/services/acquisition">
+  <pageNum>0</pageNum>
+  <pageSize>10</pageSize>
+  <itemsInPage>2</itemsInPage>
+  <totalItems>2</totalItems>
+  <fieldsReturned>
+  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 />
+    <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 />
+    <uri>/acquisitions/549dd907-01cd-4f20-aeb7</uri>
+    <csid>549dd907-01cd-4f20-aeb7</csid>
+  </acquisition-list-item>
+</ns3:acquisitions-common-list>
+
+
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 c4aa24b44..29c7ee2fb 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,10 +8,10 @@
      below about not leaving any active testGroups enabled in this file
      when you check it in.
 -->
-    <protoHostPort>http://localhost:8180</protoHostPort>
+    <protoHostPort>http://localhost:8280</protoHostPort>
     
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
-    <dump payloads="false" dumpServiceResult="minimal" />
+    <dump payloads="false" dumpServiceResult="full" />
     
     <auths default="admin@collectionspace.org">
        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
@@ -28,9 +28,14 @@
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />   
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />
     <run controlFile="objectexit/object-exit.xml" testGroup="repeat" />
-    <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />
     <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />   
-    <run controlFile="objectexit/object-exit.xml" testGroup="DOMLIST" />
+    <run controlFile="objectexit/object-exit.xml" testGroup="domlist" />
+    <run controlFile="objectexit/object-exit.xml" testGroup="authrefs" />
+    <run controlFile="objectexit/object-exit.xml" testGroup="cleanup" />
+    <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />
+    
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />
     -->
     
     
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 d12f6d6ba..b17649c10 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
@@ -5,15 +5,80 @@
         <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
-    
+   
+    <!-- ============= authrefs ============================================== -->
+    <!-- run this group with autoDeletePOSTS="false" and then you can hit
+      http://nightly.collectionspace.org:8180/cspace-services/objectexit/
+    then grab a CSID, and paste it in here:
+      http://nightly.collectionspace.org:8180/cspace-services/objectexit/d781aed4-2e2c-45e2-ad8d/authorityrefs
+    -->
+    <testGroup ID="authrefs" autoDeletePOSTS="false">
+        <test ID="oe9">
+         <method>POST</method>
+         <uri>/cspace-services/personauthorities/</uri>
+         <part>
+             <label>personauthorities_common</label>
+             <filename>objectexit/oe9.xml</filename>
+         </part>
+      </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>
+        </test>
+        <test ID="oe15">
+             <method>POST</method>
+             <uri>/cspace-services/objectexit/</uri>
+             <part>
+                 <label>objectexit_common</label>
+                 <filename>objectexit/oe15.xml</filename>
+             </part>
+        </test>
+    </testGroup>
+     
+    <testGroup ID="makeone" autoDeletePOSTS="false">
+         <test ID="oe1"  auth="test">
+             <method>POST</method>
+             <uri>/cspace-services/objectexit/</uri>
+             <part>
+                 <label>objectexit_common</label>
+                 <filename>objectexit/oe1.xml</filename>
+             </part>
+         </test>
+        <test ID="oe2">
+            <method>GET</method>
+            <uri>/cspace-services/objectexit/${oe1.CSID}</uri>
+            <response>
+                <expected level="TEXT" />
+                <part>
+                     <label>objectexit_common</label>
+                     <filename>objectexit/res/oe2.res.xml</filename>
+                 </part>
+             </response>
+        </test>
+    </testGroup>
+     
+         
+             
     <testGroup ID="cleanup" autoDeletePOSTS="true">
          <test ID="oe1"  auth="test">
              <method>DELETE</method>
-             <uri>/cspace-services/objectexit/98d61417-3986-4de6-bb98</uri>
+             <uri>/cspace-services/objectexit/065aa56e-a4f5-44b7-955e</uri>
+         </test>
+         <test ID="oe1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/objectexit/1735327c-f9bb-42c7-959b</uri>
+         </test>
+         <test ID="oe1"  auth="test">
+             <method>DELETE</method>
+             <uri>/cspace-services/objectexit/106cb53d-ee79-44e3-8665</uri>
          </test>
     </testGroup>
     
-    <testGroup ID="domwalk" autoDeletePOSTS="true">
+    <testGroup ID="domwalk" autoDeletePOSTS="false">
          <test ID="oe1"  auth="test">
              <method>POST</method>
              <uri>/cspace-services/objectexit/</uri>
@@ -252,9 +317,9 @@
 
      </testGroup>
 
-    <!-- =========== DOMWALK LIST ================================================ -->
+    <!-- =========== domlist Walk a DOM ================================================ -->
 
-    <testGroup ID="DOMLIST" autoDeletePOSTS="true">
+    <testGroup ID="domlist" autoDeletePOSTS="true">
          <test ID="oe1"  auth="admin@collectionspace.org">
              <method>POST</method>
              <uri>/cspace-services/objectexit/</uri>
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 d70645fbf..892495ca1 100755
--- 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" />
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />
+    <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />
 
     <!--<run controlFile="./organization.xml" testGroup="organization" />-->