From ce2f78e4a0a4a72b40d7c129358acd41c96a5701 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 16 Aug 2012 17:14:47 -0700
Subject: [PATCH] CSPACE-5472: Re-enabled most XmlReplay-based tests in the
 services. Batch services-related tests need examination, as several test
 cases are currently failing, and as a result, the Batch control file has been
 left commented out in xml-replay-master.xml.

---
 .../resources/test-data/xmlreplay/xml-replay-master.xml     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 629a1c583..1691fe4bf 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
@@ -33,7 +33,6 @@
          File below this line have been ported. -->
     <!-- ============================================= -->
     
-<!--     
     <run controlFile="./security.xml" testGroup="deleteBug" />
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />
     <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />
@@ -44,13 +43,11 @@
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />
- -->    
 
 <!-- No - this test is broken
 	<run controlFile="relation/relation.xml" testGroup="r2only" />
 -->
 
-<!-- 
     <run controlFile="person/person.xml" testGroup="postPerson" />
     <run controlFile="person/person.xml" testGroup="updatePerson" />
     <run controlFile="person/person.xml" testGroup="PersonAddRelsDeleteRels" />
@@ -58,13 +55,12 @@
     <run controlFile="location/location-hierarchy.xml" testGroup="HierarchicLocation" />
     <run controlFile="organization/organization-hierarchy.xml" testGroup="HierarchicOrganization" />
  
-    <run controlFile="batch/batch.xml" />
+    <!-- run controlFile="batch/batch.xml" / -->
     <run controlFile="report/report.xml" />
     <run controlFile="authrefs/authrefs.xml" testGroup="AuthRefs" />
     <run controlFile="vocabulary/vocabulary.xml" testGroup="TestOrder" />
     <run controlFile="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />
     <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />
- -->    
     <run controlFile="imports/imports.xml" testGroup="importsTestGroup" />
      
 </xmlReplayMaster>
-- 
2.47.3