CSPACE-5304: Initial attempt at writing an XmlReplay-based test of the contents of...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/ac1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/acquisition1.xml
similarity index 91%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/ac1.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/acquisition1.xml
index 99747809b6c893eede562e4bf146d8125ea807c8..7fafcf38fdee17b76e5524df30a23c955b9ad6d3 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/ac1.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/acquisition1.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<document name="acquisitions">\r
-       <ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-               <acquisitionReferenceNumber>Ac2011.1.2</acquisitionReferenceNumber>\r
-               <objectOfferPriceCurrency>usd</objectOfferPriceCurrency>\r
-               <acquisitionAuthorizerDate>2011-07-04</acquisitionAuthorizerDate>\r
-               <accessionDate>2011-07-04</accessionDate>\r
-               <originalObjectPurchasePriceCurrency>usd</originalObjectPurchasePriceCurrency>\r
-               <acquisitionReason>Bargain</acquisitionReason>\r
-               <acquisitionMethod>purchase</acquisitionMethod>\r
-               <originalObjectPurchasePriceValue>1</originalObjectPurchasePriceValue>\r
-               <objectPurchaseOfferPriceCurrency>usd</objectPurchaseOfferPriceCurrency>\r
-               <acquisitionAuthorizer>urn:cspace:org.collectionspace.demo:personauthority:id(4c300397-746f-48f0-bc29):person:id(fadd6312-486e-4ada-92c9)'Patrick+Schmitz'</acquisitionAuthorizer>\r
-       </ns2:acquisitions_common>\r
-</document>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="acquisitions">
+       <ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+               <acquisitionReferenceNumber>${acquisitionReferenceNumber}</acquisitionReferenceNumber>
+               <objectOfferPriceCurrency>usd</objectOfferPriceCurrency>
+               <acquisitionAuthorizerDate>2011-07-04</acquisitionAuthorizerDate>
+               <accessionDate>2011-07-04</accessionDate>
+               <originalObjectPurchasePriceCurrency>usd</originalObjectPurchasePriceCurrency>
+               <acquisitionReason>Bargain</acquisitionReason>
+               <acquisitionMethod>purchase</acquisitionMethod>
+               <originalObjectPurchasePriceValue>1</originalObjectPurchasePriceValue>
+               <objectPurchaseOfferPriceCurrency>usd</objectPurchaseOfferPriceCurrency>
+               <acquisitionAuthorizer>urn:cspace:org.collectionspace.demo:personauthority:id(4c300397-746f-48f0-bc29):person:id(fadd6312-486e-4ada-92c9)'Patrick+Schmitz'</acquisitionAuthorizer>
+       </ns2:acquisitions_common>
+</document>
+

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report.xml
index ae99dd2072d3d31273e1617ac8f21fe0d6d4a48d..951c8d4d70420f4b468360e2d360f592610a0ae9 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report.xml
@@ -1,83 +1,56 @@
 <?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@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>\r
-       </auths>\r
-       <testGroup ID="testSingle" autoDeletePOSTS="false">\r
-               <test ID="createReport1" auth="test">\r
-                       <method>POST</method>\r
-                       <uri>/cspace-services/reports/</uri>\r
-                       <filename>report/report1.xml</filename>\r
-               </test>\r
-               <test ID="readReport1" auth="test">\r
-                       <method>GET</method>\r
-                       <uri>/cspace-services/reports/${createReport1.CSID}</uri>\r
-               </test>\r
-               <test ID="createAcq" auth="test">\r
-                       <method>POST</method>\r
-                       <uri>/cspace-services/acquisitions/</uri>\r
-                       <filename>report/ac1.xml</filename>\r
-               </test>\r
-               <!-- XmlReplay does not know how to ask for anything except XML, so gets a 406\r
-                    Even if it could ask for PDF, it could not handle the response...\r
-               <test ID="testInvokeSingle" auth="test" autoDeletePOSTS="false">\r
-                       <method>POST</method>\r
-                       <uri>/cspace-services/reports/${createReport1.CSID}</uri>\r
-                       <filename>report/report1InvContext.xml</filename>\r
-                       <vars>\r
-                               <var ID="Acq1">${createAcq.CSID}</var>\r
-                       </vars>\r
-               </test>\r
-               -->\r
-               <!--\r
-               <test ID="testInvokeList" auth="test" autoDeletePOSTS="false">\r
-                       <method>POST</method>\r
-                       <uri>/cspace-services/batch/${createCollObj1.CSID}</uri>\r
-                       <filename>batch/batchInvContextList.xml</filename>\r
-                       <vars>\r
-                               <var ID="CollObj1">${createBatch.CSID}</var>\r
-                       </vars>\r
-               </test>\r
-               <test ID="testBadInvoke" auth="test" autoDeletePOSTS="false">\r
-                       <method>POST</method>\r
-                       <expectedCodes>400</expectedCodes>\r
-                       <uri>/cspace-services/batch/${createCollObj1.CSID}</uri>\r
-                       <filename>batch/batchBadInvContext.xml</filename>\r
-                       <vars>\r
-                               <var ID="CollObj1">${createBatch.CSID}</var>\r
-                       </vars>\r
-               </test>\r
-               <test ID="testInvokeEmptyList" auth="test" autoDeletePOSTS="false">\r
-                       <method>POST</method>\r
-                       <expectedCodes>400</expectedCodes>\r
-                       <uri>/cspace-services/batch/${createCollObj1.CSID}</uri>\r
-                       <filename>batch/batchBadInvContextList.xml</filename>\r
-                       <vars>\r
-                               <var ID="CollObj1">${createBatch.CSID}</var>\r
-                       </vars>\r
-               </test>\r
-               <test ID="testFilteredList1" auth="test">\r
-                       <method>GET</method>\r
-                       <uri>/cspace-services/batch?doctype=CollectionObject&amp;inv=single</uri>\r
-               </test>\r
-               <test ID="testFilteredList2" auth="test">\r
-                       <method>GET</method>\r
-                       <uri>/cspace-services/batch?doctype=Intake&amp;inv=group</uri>\r
-               </test>\r
-               -->\r
-       </testGroup>\r
-       <!-- \r
-     <testGroup ID="cleanup" autoDeletePOSTS="true">\r
-         <test ID="cl1"  auth="test">\r
-             <method>DELETE</method>\r
-             <uri>/cspace-services/batch/${createCollObj1.CSID}</uri>\r
-         </test>\r
-         <test ID="cl2"  auth="test">\r
-             <method>DELETE</method>\r
-             <uri>/cspace-services/collectionobjects/${createBatch.CSID}</uri>\r
-         </test>\r
-                        </testGroup>\r
-                        -->\r
+    \r
+    <auths>\r
+        <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->\r
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>\r
+    </auths>\r
+    \r
+    <testGroup ID="testSingle" autoDeletePOSTS="true">\r
+        \r
+        <test ID="createReport1" auth="test">\r
+            <method>POST</method>\r
+            <uri>/cspace-services/reports/</uri>\r
+            <filename>report/report1Record.xml</filename>\r
+            <expectedCodes>201</expectedCodes>\r
+        </test>\r
+        <test ID="readReport1" auth="test">\r
+            <method>GET</method>\r
+            <uri>/cspace-services/reports/${createReport1.CSID}</uri>\r
+        </test>\r
+        \r
+        <test ID="createAcquisition1" auth="test">\r
+            <method>POST</method>\r
+            <uri>/cspace-services/acquisitions/</uri>\r
+            <filename>report/acquisition1.xml</filename>\r
+            <vars>\r
+                <var ID="acquisitionReferenceNumber">Ac2011.1.2-jdlmbsoq</var>\r
+            </vars>\r
+            <expectedCodes>201</expectedCodes>\r
+        </test>\r
+        \r
+        <test ID="testInvokeSingle" auth="test" autoDeletePOSTS="false">\r
+            <method>POST</method>\r
+            <uri>/cspace-services/reports/${createReport1.CSID}</uri>\r
+            <filename>report/report1InvContextStandalone.xml</filename>\r
+            <vars>\r
+                <var ID="acquisitionCSID">${createAcquisition1.CSID}</var>\r
+            </vars>\r
+            <response>\r
+                <expected level="ADDOK"/>\r
+                <filename>report/res/report1.res.xml</filename>\r
+                <vars>\r
+                    <var ID="acquisitionReferenceNumber">${createAcquisition1.acquisitionReferenceNumber}</var>\r
+                </vars>\r
+            </response>\r
+            <expectedCodes>200</expectedCodes>\r
+        </test>\r
+        \r
+        <!-- See the Batch service tests within the IntegrationTests -->\r
+        <!-- module for templates for additional report invocation tests -->\r
+        <!-- that can be added here. -->\r
+        \r
+    </testGroup>\r
+\r
 </xmlReplay>\r
 \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1.xml
deleted file mode 100644 (file)
index 1f1d813..0000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<document name="report">\r
-       <ns2:reports_common\r
-       xmlns:ns2="http://collectionspace.org/services/report">\r
-               <name>Acquisition Summary</name>\r
-               <notes>Just a few fields about a single acquisition</notes>\r
-    <forDocTypes>\r
-               <forDocType>Acquisition</forDocType>\r
-               </forDocTypes>\r
-               <supportsSingleDoc>true</supportsSingleDoc>\r
-               <supportsDocList>false</supportsDocList>\r
-               <supportsGroup>false</supportsGroup>\r
-               <supportsNoContext>true</supportsNoContext>\r
-               <filename>acq_basic.jasper</filename>\r
-               <outputMIME>application/pdf</outputMIME>\r
-       </ns2:reports_common>\r
-</document>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1InvContextStandalone.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1InvContextStandalone.xml
index ffed4b3ffe0fac56ea686257e8125ef85e7ee14d..ba95d818fe3ec3ba98ec92b94d968ec4e0f521f4 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1InvContextStandalone.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1InvContextStandalone.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 <ns2:invocationContext\r
-xmlns:ns2="http://collectionspace.org/services/common/invocable"\r
-xmlns:ns3="http://collectionspace.org/services/jaxb">\r
-  <mode>single</mode>\r
-       <docType>Acquisition</docType>\r
-       <singleCSID>605e9252-598d-4459-8380</singleCSID>\r
+    xmlns:ns2="http://collectionspace.org/services/common/invocable"\r
+    xmlns:ns3="http://collectionspace.org/services/jaxb">\r
+    <mode>single</mode>\r
+    <docType>Acquisition</docType>\r
+    <singleCSID>${acquisitionCSID}</singleCSID>\r
 </ns2:invocationContext>\r
 \r
 \r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1Record.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1Record.xml
new file mode 100644 (file)
index 0000000..33f1bb8
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1Record.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="report">
+    <ns2:reports_common
+        xmlns:ns2="http://collectionspace.org/services/report">
+        <name>Acquisition Summary Test</name>
+        <notes>Just a few fields about a single acquisition</notes>
+        <forDocTypes>
+            <forDocType>Acquisition</forDocType>
+        </forDocTypes>
+        <supportsSingleDoc>true</supportsSingleDoc>
+        <supportsDocList>false</supportsDocList>
+        <supportsGroup>false</supportsGroup>
+        <supportsNoContext>true</supportsNoContext>
+        <filename>acq_basic.jasper</filename>
+        <outputMIME>application/xml</outputMIME>
+    </ns2:reports_common>
+</document>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/res/report1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/res/report1.res.xml
new file mode 100644 (file)
index 0000000..d7d04d5
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/res/report1.res.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<textContent><![CDATA[${acquisitionReferenceNumber}]]></textContent>
+
+
+