CSPACE-5521: Trivial cleanup of XmlReplay master file.

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 1691fe4bf43fa33e1e20784e97d367e9ef67b5c2..91a621ee981ed5b6e7143cc515aa690258312d30 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
@@ -8,30 +8,7 @@
     <auths default="admin@core.collectionspace.org">\r
         <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>\r
     </auths>\r
-\r
-    <!--\r
-    This used to work, but for check-in, I'm commenting it out as it currently breaks if things are left around in DB.\r
-    <run controlFile="./security.xml" testGroup="security" />\r
-    -->\r
-\r
-    <!--\r
-    This was working but is not now because security db hangs onto results from failed tests.\r
-    However, it is more complete than testGroup="security", so is the correct testGroup to run.\r
-    When the DB is cleaned with [ant create_db import] it runs OK.\r
-    -->\r
-\r
-    <!-- run controlFile="./security.xml" testGroup="securityRemovingRoleperms" / -->\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
-\r
-    <!--<run controlFile="./organization.xml" testGroup="organization" />-->\r
-    \r
     \r
-    <!-- ============================================= -->\r
-    <!-- XmlReplay now compatible with POX payloads.\r
-         File below this line have been ported. -->\r
-    <!-- ============================================= -->\r
     \r
     <run controlFile="./security.xml" testGroup="deleteBug" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="makeone" />\r
@@ -44,10 +21,6 @@
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />\r
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />\r
 \r
-<!-- No - this test is broken\r
-       <run controlFile="relation/relation.xml" testGroup="r2only" />\r
--->\r
-\r
     <run controlFile="person/person.xml" testGroup="postPerson" />\r
     <run controlFile="person/person.xml" testGroup="updatePerson" />\r
     <run controlFile="person/person.xml" testGroup="PersonAddRelsDeleteRels" />\r
@@ -55,13 +28,42 @@
     <run controlFile="location/location-hierarchy.xml" testGroup="HierarchicLocation" />\r
     <run controlFile="organization/organization-hierarchy.xml" testGroup="HierarchicOrganization" />\r
  \r
-    <!-- run controlFile="batch/batch.xml" / -->\r
     <run controlFile="report/report.xml" />\r
     <run controlFile="authrefs/authrefs.xml" testGroup="AuthRefs" />\r
     <run controlFile="vocabulary/vocabulary.xml" testGroup="TestOrder" />\r
     <run controlFile="authrefs/authrefsSimple.xml" testGroup="AuthRefsSimple" />\r
     <run controlFile="authrefs/authrefsComplex.xml" testGroup="AuthRefsComplex" />\r
     <run controlFile="imports/imports.xml" testGroup="importsTestGroup" />\r
-     \r
+    \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
+\r
+    <!-- All other comments on broken tests, below, are historic, 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
+    \r
+    <!-- This used to work, but for check-in, I'm commenting it out as it currently breaks if things are left around in DB. -->\r
+    <!-- run controlFile="./security.xml" testGroup="security" / -->\r
+\r
+    <!--\r
+    This was working but is not now because security db hangs onto results from failed tests.\r
+    However, it is more complete than testGroup="security", so is the correct testGroup to run.\r
+    When the DB is cleaned with [ant create_db import] it runs OK.\r
+    -->\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