CSPACE-5728,CSPACE-5472: Re-enabled batch tests in IntegrationTests module.

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 43747c2cd62479f05b02ec54648513e705fae805..2619016e668a1e08419dbc62ee7a2662a35246c2 100644 (file)
--- 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 @@
         \r
     <!-- This tests the UpdateObjectLocationBatchJob -->\r
         \r
-    <testGroup ID="testBatchUpdateComputedCurrentLocationInvModeSingle" autoDeletePOSTS="true">\r
+    <testGroup ID="invocationModeSingle" autoDeletePOSTS="true">\r
         \r
         <!-- Tests with CollectionObject->Movement relations -->\r
             \r
@@ -190,7 +190,7 @@
         \r
     </testGroup>\r
     \r
-    <testGroup ID="testBatchUpdateComputedCurrentLocationInvModeList" autoDeletePOSTS="true">\r
+    <testGroup ID="invocationModeModeList" autoDeletePOSTS="true">\r
         \r
         <test ID="createBatchRecord">\r
             <method>POST</method>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index c0608a741210a58e9a3417eb4af64173f0a808b6..258e96384f7fdd35b58f3d1ddb7e65e0c222b73f 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -43,16 +43,21 @@
     \r
     <run controlFile="versioning/versioning.xml" testGroup="VersionedRecordFiltering" />\r
     \r
-    <run controlFile="batch/batch-update-object-loc.xml" testGroup="testBatchUpdateComputedCurrentLocationInvModeSingle" />\r
-    <run controlFile="batch/batch-update-object-loc.xml" testGroup="testBatchUpdateComputedCurrentLocationInvModeList" />\r
-\r
+    <run controlFile="batch/batch.xml" />\r
+    <run controlFile="batch/batch-update-object-loc.xml" testGroup="invocationModeSingle" />\r
+    <run controlFile="batch/batch-update-object-loc.xml" testGroup="invocationModeList" />\r
+    \r
     <!-- Broken tests -->\r
     \r
-    <!-- After most tests above were re-enabled in August 2012, the Batch test -->\r
-    <!-- was still failing.  See comments on CSPACE-5472 - ADR 2012-09-07 -->\r
-    <!-- run controlFile="batch/batch.xml" / -->\r
+    <!-- FIXME: the following tests were commented out without any annotation as to why this was done. -->\r
+    <!-- We might check whether any of these tests should be re-enabled - ADR 2012-09-07 -->\r
+    \r
+    <!-- run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" / -->\r
+    <!-- run controlFile="objectexit/object-exit.xml" testGroup="domwalk" / -->\r
+    <!-- run controlFile="media/media.xml" testGroup="authrefs" / -->\r
+    <!-- run controlFile="./organization.xml" testGroup="organization" / -->\r
 \r
-    <!-- All other comments on broken tests, below, are historic, and lack JIRA issue context. - ADR 2012-09-07 -->\r
+    <!-- Comments on broken tests, below, are historic, were written by various authors, and lack JIRA issue context. - ADR 2012-09-07 -->\r
     \r
     <!-- No - this test is broken -->\r
     <!-- run controlFile="relation/relation.xml" testGroup="r2only" / -->\r
@@ -67,13 +72,5 @@
     -->\r
     <!-- run controlFile="./security.xml" testGroup="securityRemovingRoleperms" / -->\r
     \r
-    <!-- FIXME: We might check whether any of the following tests should be re-enabled - ADR 2012-09-07 -->\r
-    \r
-    <!-- run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" / -->\r
-    <!-- run controlFile="objectexit/object-exit.xml" testGroup="domwalk" / -->\r
-    <!-- run controlFile="media/media.xml" testGroup="authrefs" / -->\r
-    <!-- run controlFile="./organization.xml" testGroup="organization" / -->\r
-    \r
-    \r
 </xmlReplayMaster>\r
 \r