From 4dc4c2a2380ad334f320ec09e87cf0d9d46d2e28 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 7 Sep 2012 12:00:35 -0700
Subject: [PATCH] CSPACE-5521: Trivial cleanup of XmlReplay master file.

---
 .../test-data/xmlreplay/xml-replay-master.xml | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 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 1691fe4bf..91a621ee9 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
@@ -8,30 +8,7 @@
     <auths default="admin@core.collectionspace.org">
         <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
-
-    <!--
-    This used to work, but for check-in, I'm commenting it out as it currently breaks if things are left around in DB.
-    <run controlFile="./security.xml" testGroup="security" />
-    -->
-
-    <!--
-    This was working but is not now because security db hangs onto results from failed tests.
-    However, it is more complete than testGroup="security", so is the correct testGroup to run.
-    When the DB is cleaned with [ant create_db import] it runs OK.
-    -->
-
-    <!-- run controlFile="./security.xml" testGroup="securityRemovingRoleperms" / -->
-    <!-- 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" />-->
-    
     
-    <!-- ============================================= -->
-    <!-- XmlReplay now compatible with POX payloads.
-         File below this line have been ported. -->
-    <!-- ============================================= -->
     
     <run controlFile="./security.xml" testGroup="deleteBug" />
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />
@@ -44,10 +21,6 @@
     <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" />
@@ -55,13 +28,42 @@
     <run controlFile="location/location-hierarchy.xml" testGroup="HierarchicLocation" />
     <run controlFile="organization/organization-hierarchy.xml" testGroup="HierarchicOrganization" />
  
-    <!-- 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" />
-     
+    
+    
+    <!-- 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" / -->
+
+    <!-- All other comments on broken tests, below, are historic, and lack JIRA issue context. - ADR 2012-09-07 -->
+    
+    <!-- No - this test is broken -->
+    <!-- run controlFile="relation/relation.xml" testGroup="r2only" / -->
+    
+    <!-- This used to work, but for check-in, I'm commenting it out as it currently breaks if things are left around in DB. -->
+    <!-- run controlFile="./security.xml" testGroup="security" / -->
+
+    <!--
+    This was working but is not now because security db hangs onto results from failed tests.
+    However, it is more complete than testGroup="security", so is the correct testGroup to run.
+    When the DB is cleaned with [ant create_db import] it runs OK.
+    -->
+    <!-- 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