From 010281c54ddf64bf15b935a0ceb1e099e1448fab Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 13 May 2013 20:36:48 -0700
Subject: [PATCH] CSPACE-5304: Initial attempt at writing an XmlReplay-based
 test of the contents of a generated report. This is still a placeholder,
 basically just verifying that, with a report returned using the
 'application/xml' MIME type, the resultant document can be parsed by an XML
 parser, in XmlReplay's context. Attempts to verify additional fidelity to an
 expected document have failed so far.

---
 .../report/{ac1.xml => acquisition1.xml}      |  32 ++---
 .../test-data/xmlreplay/report/report.xml     | 131 +++++++-----------
 .../test-data/xmlreplay/report/report1.xml    |  17 ---
 .../report/report1InvContextStandalone.xml    |  10 +-
 .../xmlreplay/report/report1Record.xml        |  17 +++
 .../xmlreplay/report/res/report1.res.xml      |   5 +
 6 files changed, 95 insertions(+), 117 deletions(-)
 rename services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/{ac1.xml => acquisition1.xml} (91%)
 delete mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/report1Record.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/report/res/report1.res.xml

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 99747809b..7fafcf38f 100644
--- 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"?>
-<document name="acquisitions">
-	<ns2:acquisitions_common xmlns:ns2="http://collectionspace.org/services/acquisition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<acquisitionReferenceNumber>Ac2011.1.2</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>
-
+<?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 ae99dd207..951c8d4d7 100644
--- 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"?>
 <xmlReplay>
-	<auths>
-		<!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-		<auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
-	</auths>
-	<testGroup ID="testSingle" autoDeletePOSTS="false">
-		<test ID="createReport1" auth="test">
-			<method>POST</method>
-			<uri>/cspace-services/reports/</uri>
-			<filename>report/report1.xml</filename>
-		</test>
-		<test ID="readReport1" auth="test">
-			<method>GET</method>
-			<uri>/cspace-services/reports/${createReport1.CSID}</uri>
-		</test>
-		<test ID="createAcq" auth="test">
-			<method>POST</method>
-			<uri>/cspace-services/acquisitions/</uri>
-			<filename>report/ac1.xml</filename>
-		</test>
-		<!-- XmlReplay does not know how to ask for anything except XML, so gets a 406
-		     Even if it could ask for PDF, it could not handle the response...
-		<test ID="testInvokeSingle" auth="test" autoDeletePOSTS="false">
-			<method>POST</method>
-			<uri>/cspace-services/reports/${createReport1.CSID}</uri>
-			<filename>report/report1InvContext.xml</filename>
-			<vars>
-				<var ID="Acq1">${createAcq.CSID}</var>
-			</vars>
-		</test>
-		-->
-		<!--
-		<test ID="testInvokeList" auth="test" autoDeletePOSTS="false">
-			<method>POST</method>
-			<uri>/cspace-services/batch/${createCollObj1.CSID}</uri>
-			<filename>batch/batchInvContextList.xml</filename>
-			<vars>
-				<var ID="CollObj1">${createBatch.CSID}</var>
-			</vars>
-		</test>
-		<test ID="testBadInvoke" auth="test" autoDeletePOSTS="false">
-			<method>POST</method>
-			<expectedCodes>400</expectedCodes>
-			<uri>/cspace-services/batch/${createCollObj1.CSID}</uri>
-			<filename>batch/batchBadInvContext.xml</filename>
-			<vars>
-				<var ID="CollObj1">${createBatch.CSID}</var>
-			</vars>
-		</test>
-		<test ID="testInvokeEmptyList" auth="test" autoDeletePOSTS="false">
-			<method>POST</method>
-			<expectedCodes>400</expectedCodes>
-			<uri>/cspace-services/batch/${createCollObj1.CSID}</uri>
-			<filename>batch/batchBadInvContextList.xml</filename>
-			<vars>
-				<var ID="CollObj1">${createBatch.CSID}</var>
-			</vars>
-		</test>
-		<test ID="testFilteredList1" auth="test">
-			<method>GET</method>
-			<uri>/cspace-services/batch?doctype=CollectionObject&amp;inv=single</uri>
-		</test>
-		<test ID="testFilteredList2" auth="test">
-			<method>GET</method>
-			<uri>/cspace-services/batch?doctype=Intake&amp;inv=group</uri>
-		</test>
-		-->
-	</testGroup>
-	<!-- 
-     <testGroup ID="cleanup" autoDeletePOSTS="true">
-         <test ID="cl1"  auth="test">
-             <method>DELETE</method>
-             <uri>/cspace-services/batch/${createCollObj1.CSID}</uri>
-         </test>
-         <test ID="cl2"  auth="test">
-             <method>DELETE</method>
-             <uri>/cspace-services/collectionobjects/${createBatch.CSID}</uri>
-         </test>
-			 </testGroup>
-			 -->
+    
+    <auths>
+        <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+    </auths>
+    
+    <testGroup ID="testSingle" autoDeletePOSTS="true">
+        
+        <test ID="createReport1" auth="test">
+            <method>POST</method>
+            <uri>/cspace-services/reports/</uri>
+            <filename>report/report1Record.xml</filename>
+            <expectedCodes>201</expectedCodes>
+        </test>
+        <test ID="readReport1" auth="test">
+            <method>GET</method>
+            <uri>/cspace-services/reports/${createReport1.CSID}</uri>
+        </test>
+        
+        <test ID="createAcquisition1" auth="test">
+            <method>POST</method>
+            <uri>/cspace-services/acquisitions/</uri>
+            <filename>report/acquisition1.xml</filename>
+            <vars>
+                <var ID="acquisitionReferenceNumber">Ac2011.1.2-jdlmbsoq</var>
+            </vars>
+            <expectedCodes>201</expectedCodes>
+        </test>
+        
+        <test ID="testInvokeSingle" auth="test" autoDeletePOSTS="false">
+            <method>POST</method>
+            <uri>/cspace-services/reports/${createReport1.CSID}</uri>
+            <filename>report/report1InvContextStandalone.xml</filename>
+            <vars>
+                <var ID="acquisitionCSID">${createAcquisition1.CSID}</var>
+            </vars>
+            <response>
+                <expected level="ADDOK"/>
+                <filename>report/res/report1.res.xml</filename>
+                <vars>
+                    <var ID="acquisitionReferenceNumber">${createAcquisition1.acquisitionReferenceNumber}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
+        <!-- See the Batch service tests within the IntegrationTests -->
+        <!-- module for templates for additional report invocation tests -->
+        <!-- that can be added here. -->
+        
+    </testGroup>
+
 </xmlReplay>
 
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
index 1f1d813ef..000000000
--- 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"?>
-<document name="report">
-	<ns2:reports_common
-	xmlns:ns2="http://collectionspace.org/services/report">
-		<name>Acquisition Summary</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/pdf</outputMIME>
-	</ns2:reports_common>
-</document>
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 ffed4b3ff..ba95d818f 100644
--- 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"?>
 <ns2:invocationContext
-xmlns:ns2="http://collectionspace.org/services/common/invocable"
-xmlns:ns3="http://collectionspace.org/services/jaxb">
-  <mode>single</mode>
-	<docType>Acquisition</docType>
-	<singleCSID>605e9252-598d-4459-8380</singleCSID>
+    xmlns:ns2="http://collectionspace.org/services/common/invocable"
+    xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <mode>single</mode>
+    <docType>Acquisition</docType>
+    <singleCSID>${acquisitionCSID}</singleCSID>
 </ns2:invocationContext>
 
 
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
index 000000000..33f1bb8da
--- /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
index 000000000..d7d04d5a5
--- /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>
+
+
+
-- 
2.47.3