From 04c8eca491b439125002a2a905e76b4599b286e8 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 8 Jan 2013 14:31:28 -0800
Subject: [PATCH] CSPACE-5728: Updated XmlReplay-based tests to verify that
 correct computedCurrentLocation value is present in CollectionObject record,
 following invocation of batch job.

---
 ...l => batch-invoke-updateobjloc-single.xml} |  0
 .../batch/batch-update-object-loc.xml         | 21 +++++++++++++++++--
 .../batch/res/collectionobject.res.xml        |  9 ++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)
 rename services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/{batch-invoke-updateobjloc.xml => batch-invoke-updateobjloc-single.xml} (100%)
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/res/collectionobject.res.xml

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-invoke-updateobjloc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-invoke-updateobjloc-single.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-invoke-updateobjloc.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-invoke-updateobjloc-single.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
index 63b308b5a..1e306a611 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/batch-update-object-loc.xml
@@ -7,7 +7,7 @@
         
     <!-- This tests the UpdateObjectLocationBatchJob -->
         
-    <testGroup ID="testSingleRecordBatchUpdate" autoDeletePOSTS="false">
+    <testGroup ID="testSingleRecordBatchUpdate" autoDeletePOSTS="true">
             
         <test ID="createBatchRecord">
             <method>POST</method>
@@ -34,6 +34,10 @@
             <expectedCodes>201</expectedCodes>
         </test>
         
+        <!-- The currentLocation value of this Movement record, which -->
+        <!-- has the most recent locationDate value, should thus be -->
+        <!-- reflected in the computedCurrentLocation value in the -->
+        <!-- CollectionObject record after invoking the batch job. -->
         <test ID="createMovement2">
             <method>POST</method>
             <uri>/cspace-services/movements</uri>
@@ -100,16 +104,29 @@
         <test ID="invokeBatch" auth="test" autoDeletePOSTS="false">
             <method>POST</method>
             <uri>/cspace-services/batch/${createBatchRecord.CSID}</uri>
-            <filename>batch/batch-invoke-updateobjloc.xml</filename>
+            <filename>batch/batch-invoke-updateobjloc-single.xml</filename>
             <vars>
                 <var ID="collectionObjectCSID">${createCollectionObject.CSID}</var>
             </vars>
+            <expectedCodes>200</expectedCodes>
         </test>
 
+        <!-- Verify that, following the invocation of the batch job, the -->
+        <!-- computedCurrentLocation field in the CollectionObject record -->
+        <!-- has been updated to the appropriate value, reflecting the -->
+        <!-- most recent movement (e.g. the Movement record with latest locationDate). -->
         <test ID="readUpdatedCollectionObjectRecord">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject.CSID}</uri>
             <filename>batch/updateobjloc.xml</filename>
+            <response>
+                <expected level="TEXT" />
+                <filename>batch/res/collectionobject.res.xml</filename>
+                <vars>
+                    <var ID="computedCurrentLocationValue">${createMovement2.currentLocation}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
         </test> 
         
     </testGroup>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/res/collectionobject.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/res/collectionobject.res.xml
new file mode 100644
index 000000000..865d89797
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/res/collectionobject.res.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="collectionobjects">
+
+  <ns2:collectionobjects_common
+    xmlns:ns2="http://collectionspace.org/services/collectionobject">
+    <computedCurrentLocation>${computedCurrentLocationValue}</computedCurrentLocation>
+  </ns2:collectionobjects_common>
+
+</document>
\ No newline at end of file
-- 
2.47.3