From 29fdae7932574adf4394939c7daad2f9b2a14328 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 16 Jan 2013 13:01:10 -0800
Subject: [PATCH] CSPACE-5764: XmlReplay-based tests now cover both update and
 soft delete cases.

---
 .../listener/listener-update-object-loc.xml   | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
index aef4fcb72..5e63e6436 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/listener-update-object-loc.xml
@@ -271,10 +271,6 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-    </testGroup>
-    
-    <testGroup ID="TestsStillUnderDevelopment">
-                
         <test ID="softDeleteRelationBetweenCollectionObject1AndMovement5">
             <method>PUT</method>
             <uri>/cspace-services/relations/${relateCollectionObject1ToMovement5.CSID}/workflow/delete</uri>
@@ -285,6 +281,17 @@
             </vars>
         </test>
         
+        <test ID="updateMovement4">
+            <method>PUT</method>
+            <uri>/cspace-services/movements/${createMovement4.CSID}</uri>
+            <filename>listener/movement.xml</filename>
+            <vars>
+                <var ID="currentLocation">urn:cspace:core.collectionspace.org:locationauthorities:name(offsite_sla):item:name(Vancouver1358215545518)'Vancouver, BC, Canada'</var>
+                <var ID="locationDate">1900-02-01</var>
+            </vars>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
         <test ID="readCollectionObject1AfterRelationSoftDelete">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject1.CSID}</uri>
@@ -298,6 +305,38 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
+        <test ID="softDeleteMovement4">
+            <method>PUT</method>
+            <uri>/cspace-services/movements/${createMovement4.CSID}/workflow/delete</uri>
+            <expectedCodes>200</expectedCodes>
+            <!-- XmlReplay appears to require a filename on PUT. -->
+            <!-- If not present, throws "java.io.FileNotFoundException: File '' does not exist" -->
+            <!-- The contents of that file, sent in the PUT payload, will be ignored by the services. -->
+            <!-- Note that the filename below is in a different module than -->
+            <!-- the present XmlReplay control file. -->
+            <filename>relation/res/workflowState.res.xml</filename>
+            <vars>
+                <var ID="workflowState">deleted</var>
+            </vars>
+        </test>
+        
+        <test ID="readCollectionObject1AfterMovement4SoftDelete">
+            <method>GET</method>
+            <uri>/cspace-services/collectionobjects/${createCollectionObject1.CSID}</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>listener/res/collectionobject.res.xml</filename>
+                <vars>
+                    <var ID="computedCurrentLocationValue">${createMovement3.currentLocation}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
+    </testGroup>
+    
+    <testGroup ID="TestsStillUnderDevelopment">
+        
         <test ID="deleteRelationBetweenCollectionObject1AndMovement4">
             <method>DELETE</method>
             <uri>/cspace-services/relations/${relateCollectionObject1ToMovement4.CSID}</uri>
-- 
2.47.3