From fba9953a96d213ee11155270859829ff110168a2 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 9 Jan 2013 16:41:34 -0800
Subject: [PATCH] CSPACE-5728,CSPACE-5472: Re-enabled batch tests in
 IntegrationTests module.

---
 .../batch/batch-update-object-loc.xml         |  4 +--
 .../test-data/xmlreplay/xml-replay-master.xml | 27 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

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 43747c2cd..2619016e6 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="testBatchUpdateComputedCurrentLocationInvModeSingle" autoDeletePOSTS="true">
+    <testGroup ID="invocationModeSingle" autoDeletePOSTS="true">
         
         <!-- Tests with CollectionObject->Movement relations -->
             
@@ -190,7 +190,7 @@
         
     </testGroup>
     
-    <testGroup ID="testBatchUpdateComputedCurrentLocationInvModeList" autoDeletePOSTS="true">
+    <testGroup ID="invocationModeModeList" autoDeletePOSTS="true">
         
         <test ID="createBatchRecord">
             <method>POST</method>
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 c0608a741..258e96384 100644
--- 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 @@
     
     <run controlFile="versioning/versioning.xml" testGroup="VersionedRecordFiltering" />
     
-    <run controlFile="batch/batch-update-object-loc.xml" testGroup="testBatchUpdateComputedCurrentLocationInvModeSingle" />
-    <run controlFile="batch/batch-update-object-loc.xml" testGroup="testBatchUpdateComputedCurrentLocationInvModeList" />
-
+    <run controlFile="batch/batch.xml" />
+    <run controlFile="batch/batch-update-object-loc.xml" testGroup="invocationModeSingle" />
+    <run controlFile="batch/batch-update-object-loc.xml" testGroup="invocationModeList" />
+    
     <!-- Broken tests -->
     
-    <!-- After most tests above were re-enabled in August 2012, the Batch test -->
-    <!-- was still failing.  See comments on CSPACE-5472 - ADR 2012-09-07 -->
-    <!-- run controlFile="batch/batch.xml" / -->
+    <!-- FIXME: the following tests were commented out without any annotation as to why this was done. -->
+    <!-- We might check whether any of these tests should be re-enabled - ADR 2012-09-07 -->
+    
+    <!-- run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" / -->
+    <!-- run controlFile="objectexit/object-exit.xml" testGroup="domwalk" / -->
+    <!-- run controlFile="media/media.xml" testGroup="authrefs" / -->
+    <!-- run controlFile="./organization.xml" testGroup="organization" / -->
 
-    <!-- All other comments on broken tests, below, are historic, and lack JIRA issue context. - ADR 2012-09-07 -->
+    <!-- Comments on broken tests, below, are historic, were written by various authors, and lack JIRA issue context. - ADR 2012-09-07 -->
     
     <!-- No - this test is broken -->
     <!-- run controlFile="relation/relation.xml" testGroup="r2only" / -->
@@ -67,13 +72,5 @@
     -->
     <!-- run controlFile="./security.xml" testGroup="securityRemovingRoleperms" / -->
     
-    <!-- FIXME: We might check whether any of the following tests should be re-enabled - ADR 2012-09-07 -->
-    
-    <!-- run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" / -->
-    <!-- run controlFile="objectexit/object-exit.xml" testGroup="domwalk" / -->
-    <!-- run controlFile="media/media.xml" testGroup="authrefs" / -->
-    <!-- run controlFile="./organization.xml" testGroup="organization" / -->
-    
-    
 </xmlReplayMaster>
 
-- 
2.47.3