From b0d9dbe7a8ed461ad233657fe61ef120a040984b Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 26 Oct 2012 17:35:52 -0700
Subject: [PATCH] CSPACE-5677: Added the remaining initial versioning tests
 requested by Patrick.

---
 .../versioning/res/movement-list.res.xml      |  2 +-
 .../xmlreplay/versioning/versioning.xml       | 45 ++++++++++++++-----
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/res/movement-list.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/res/movement-list.res.xml
index 0021996a6..25cdcca92 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/res/movement-list.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/res/movement-list.res.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
-    <totalItems>1</totalItems>
+    <totalItems>${totalItemsValue}</totalItems>
 </ns2:abstract-common-list>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
index 4b00a2d95..9ab52ab0f 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/versioning/versioning.xml
@@ -13,17 +13,22 @@
       <uri>/cspace-services/movements/</uri>
       <filename>versioning/movement.xml</filename>
       <vars>
-        <!-- The currentLocation value should properly be a Storage Location or Organization -->
-        <!-- refName, but for the test-only function served by this temporary record, this -->
-        <!-- value is instead an arbitrary string. -->
-        <!-- (Note: that arbitrary string must also be present in one and only one -->
-        <!-- Movement record for the search test below to succeed.) -->
+        <!-- This currentLocation value should properly be a Storage Location -->
+        <!-- or Organization refName, but for the test-only function served by -->
+        <!-- this temporary record, this value can instead be an arbitrary string. -->
+        <!-- (Note: that this arbitrary string must be uniquely present in one -->
+        <!-- and only one Movement record for the search test below to succeed.) -->
         <var ID="currentLocationValue">jlmbsoqtqbfjotldjlmbsoq</var>
         <var ID="currentLocationNoteValue">old current location note</var>
       </vars>
       <expectedCodes>201</expectedCodes>
     </test>
     
+    <test ID="ListAllMovementRecords">
+      <method>GET</method>
+      <uri>/cspace-services/movements</uri>
+    </test>
+    
     <test ID="UpdateMovement" auth="admin@lifesci.collectionspace.org">
       <method>PUT</method>
       <uri>/cspace-services/movements/${CreateMovement.CSID}</uri>
@@ -35,20 +40,40 @@
       <expectedCodes>200</expectedCodes>
     </test>
     
-    <!-- A keyword search on the current location value should retrieve only one -->
-    <!-- document, even though there are now two documents extant: the current -->
-    <!-- version and one past version, which was created as a result of the update. -->
+    <!-- The total number of Movement records reported should not change following -->
+    <!-- the update, even though a new version of one Movement document was created -->
+    <!-- as a result of that update. -->
+    <test ID="ListAllMovementRecordsFollowingUpdate">
+      <method>GET</method>
+      <uri>/cspace-services/movements</uri>
+      <response>
+        <expected level="ADDOK"/>
+        <vars>
+          <var ID="totalItemsValue">${ListAllMovementRecords.got("//totalItems")}</var>
+        </vars>
+        <filename>versioning/res/movement-list.res.xml</filename>
+      </response>
+    </test>
+    
+    <!-- A keyword search on the (intended to be unique) currentLocation value -->
+    <!-- should retrieve only one document record, even though there are now two -->
+    <!-- documents extant containing that value: the current version and one past -->
+    <!-- version, which was created as a result of the update. -->
     <test ID="SearchReturnsOnlyCurrentVersion">
       <method>GET</method>
       <uri>/cspace-services/movements?kw=${CreateMovement.currentLocationValue}</uri>
       <response>
         <expected level="ADDOK"/>
+        <vars>
+          <var ID="totalItemsValue">1</var>
+        </vars>
         <filename>versioning/res/movement-list.res.xml</filename>
       </response>
     </test>
     
-    <!-- Retrieving the document via a read (GET) request should also verify that only the -->
-    <!-- current version, containing the most recently updated value(s), is returned. -->
+    <!-- Retrieving the document via a read (GET) request should also verify -->
+    <!-- that only the current version, containing the most recently updated -->
+    <!-- value(s), is returned. -->
     <test ID="ReadReturnsOnlyCurrentVersion">
       <method>GET</method>
       <uri>/cspace-services/movements/${CreateMovement.CSID}</uri>
-- 
2.47.3