CSPACE-5793: Integrated tests of hard deletion, confirming that computedCurrentLocati...

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 dd4eb773cc1eb78642d5c25bba6a1fb529719c34..ec0826a76ce2ebe295041fcecc0bdb9c9f1f02c8 100644 (file)
--- 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
@@ -135,12 +135,12 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <!-- Computed current location doesn't appear to be updated -->
-        <!-- merely upon a Relation being created; some intervening action -->
-        <!-- invoking the listener must also occur. This appears to be -->
-        <!-- because newly-created relations aren't being returned in results -->
-        <!-- from the first query - which returns a list of Relation document -->
-        <!-- models - that is made in AbstractUpdateObjectLocationValues.handleEvent() --> 
+        <!-- Computed current location doesn't appear to be updated
+             merely upon a Relation being created; some intervening action
+             invoking the listener must also occur. This appears to be
+             because newly-created relations aren't being returned in results
+             from the first query - which returns a list of Relation document
+             models - that is made in AbstractUpdateObjectLocationValues.handleEvent(). -->
         <test ID="updateMovement1">
             <method>PUT</method>
             <uri>/cspace-services/movements/${createMovement1.CSID}</uri>
@@ -224,7 +224,7 @@
                 <expected level="ADDOK" />
                 <filename>listener/res/collectionobject.res.xml</filename>
                 <vars>
-                    <var ID="computedCurrentLocationValue">${createMovement2.currentLocation}</var>
+                    <var ID="computedCurrentLocationValue">${updateMovement2.currentLocation}</var>
                 </vars>
             </response>
             <expectedCodes>200</expectedCodes>
@@ -242,6 +242,21 @@
             </vars>
             <expectedCodes>201</expectedCodes>
         </test>
+        <test ID="readRelateMovement3ToCollectionObject1">
+            <method>GET</method>
+            <uri>/cspace-services/relations/${relateMovement3ToCollectionObject1.CSID}</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>listener/res/relation.res.xml</filename>
+                <vars>
+                    <var ID="subjectCsid">${createMovement3.CSID}</var>
+                    <var ID="subjectDocumentType">Movement</var>
+                    <var ID="objectCsid">${createCollectionObject1.CSID}</var>
+                    <var ID="objectDocumentType">CollectionObject</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
         
         <test ID="updateMovement3">
             <method>PUT</method>
@@ -338,7 +353,7 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-        <test ID="readCollectionObject1AfterRelationSoftDelete">
+        <test ID="readCollectionObject1AfterRelationToMovement5SoftDelete">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject1.CSID}</uri>
             <response>
@@ -381,11 +396,11 @@
         
         <test ID="updateMovement3WithBlankCurrentLocation">
             <method>PUT</method>
-            <uri>/cspace-services/movements/${createMovement2.CSID}</uri>
+            <uri>/cspace-services/movements/${createMovement3.CSID}</uri>
             <filename>listener/movement.xml</filename>
             <vars>
                 <var ID="currentLocation"></var>
-                <var ID="locationDate">1800-02-01</var>
+                <var ID="locationDate">1800-02-02</var>
             </vars>
             <expectedCodes>200</expectedCodes>
         </test>
@@ -413,15 +428,29 @@
         
         <test ID="updateMovement3WithNonBlankCurrentLocation">
             <method>PUT</method>
-            <uri>/cspace-services/movements/${createMovement2.CSID}</uri>
+            <uri>/cspace-services/movements/${createMovement3.CSID}</uri>
             <filename>listener/movement.xml</filename>
             <vars>
                 <var ID="currentLocation">urn:cspace:core.collectionspace.org:locationauthorities:name(offsite_sla):item:name(Ottawa1358215545567)'Ottawa, ON, Canada'</var>
-                <var ID="locationDate">1800-02-01</var>
+                <var ID="locationDate">1800-02-03</var>
             </vars>
             <expectedCodes>200</expectedCodes>
         </test>
-
+        <test ID="readMovement3AfterUpdateWithNonBlankCurrentLocation">
+            <method>GET</method>
+            <uri>/cspace-services/movements/${createMovement3.CSID}</uri>
+            <filename>listener/movement.xml</filename>
+            <response>
+                <expected level="ADDOK" />
+                <filename>listener/res/movement.res.xml</filename>
+                <vars>
+                    <var ID="currentLocationValue">${updateMovement3WithNonBlankCurrentLocation.currentLocation}</var>
+                    <var ID="locationDateValue">${updateMovement3WithNonBlankCurrentLocation.got("//locationDate")}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
         <test ID="readCollectionObject1AfterMovement3NonBlankCurrentLocationUpdate">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${createCollectionObject1.CSID}</uri>
@@ -435,6 +464,46 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
+        <!-- The following tests pertain to CSPACE-5793 -->
+        
+        <test ID="hardDeleteRelationBetweenCollectionObject1AndMovement3">
+            <method>DELETE</method>
+            <uri>/cspace-services/relations/${relateMovement3ToCollectionObject1.CSID}</uri>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
+        <test ID="readCollectionObject1AfterRelationDelete">
+            <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">${createMovement2.currentLocation}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
+        <test ID="hardDeleteMovement2">
+            <method>DELETE</method>
+            <uri>/cspace-services/movements/${createMovement2.CSID}</uri>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
+        <test ID="readCollectionObject1AfterMovement3Delete">
+            <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">${createMovement1.currentLocation}</var>
+                </vars>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+        
         <!-- CSPACE-6309: A Movement with a later update timestamp is -->
         <!-- deemed to have taken place later than a Movement with an earlier -->
         <!-- update timestamp, if both have identical location dates. -->
@@ -626,50 +695,5 @@
         
     </testGroup>
         
-    <!-- Some of the following tests pertain to CSPACE-5793, not yet -->
-    <!-- resolved as of this writing. - ADR 2013-02-14 -->
-    
-    <testGroup ID="TestsStillUnderDevelopment">
-        
-        <test ID="deleteRelationBetweenCollectionObject1AndMovement3">
-            <method>DELETE</method>
-            <uri>/cspace-services/relations/${relateCollectionObject1ToMovement3.CSID}</uri>
-            <expectedCodes>200</expectedCodes>
-        </test>
-        
-        <test ID="readCollectionObject1AfterRelationDelete">
-            <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">${createMovement2.currentLocation}</var>
-                </vars>
-            </response>
-            <expectedCodes>200</expectedCodes>
-        </test>
-        
-        <test ID="deleteMovement2">
-            <method>DELETE</method>
-            <uri>/cspace-services/movements/${createMovement2.CSID}</uri>
-            <expectedCodes>200</expectedCodes>
-        </test>
-        
-        <test ID="readCollectionObject1AfterMovement2Delete">
-            <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">${createMovement1.currentLocation}</var>
-                </vars>
-            </response>
-            <expectedCodes>200</expectedCodes>
-        </test>
-        
-    </testGroup>
-        
 </xmlReplay>
 

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/res/relation.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/res/relation.res.xml
new file mode 100644 (file)
index 0000000..473f931
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/listener/res/relation.res.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="relations">
+  <ns2:relations_common 
+          xmlns:ns2="http://collectionspace.org/services/relation" 
+          xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <subjectCsid>${subjectCsid}</subjectCsid>
+    <subjectDocumentType>${subjectDocumentType}</subjectDocumentType>
+    <objectCsid>${objectCsid}</objectCsid>
+    <objectDocumentType>${objectDocumentType}</objectDocumentType>
+    <relationshipType>affects</relationshipType>
+  </ns2:relations_common>
+</document>
+