From 7e616d6d8f714e467918e2ec8baf998e5c07614c Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 18 Apr 2012 20:33:42 -0700
Subject: [PATCH] CSPACE-3560,CSPACE-3923,CSPACE-5049: XmlReplay-based tests of
 the Imports service now clean up more records created during testing.

---
 .../imports/import-objectexit-media.xml       |  7 ---
 .../test-data/xmlreplay/imports/imports.xml   | 55 ++++++++++---------
 .../res/import-objectexit-media.res.xml       |  4 +-
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-media.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-media.xml
index 9507bc802..470337de6 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-media.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-media.xml
@@ -7,13 +7,6 @@
             <exitNumber>OE-IMPORT-TEST-1999.3</exitNumber>
         </schema>
     </import>
-    <import service="ObjectExit" type="ObjectExit">
-        <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
-                name="objectexit_common">
-            <exitNote>This is another exit note.</exitNote>
-            <exitNumber>OE-IMPORT-TEST-1999.4</exitNumber>
-        </schema>
-    </import>
     <import service="Media" type="Media">
         <schema xmlns:media_common="http://collectionspace.org/services/media/" name="media_common">
             <media_common:dateGroupList>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
index e952a8b1e..688c774d6 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
@@ -7,7 +7,7 @@
     
    <!-- ================================================================================ -->
     
-    <testGroup ID="importsTestGroup" autoDeletePOSTS="true">
+    <testGroup ID="importsTestGroup" autoDeletePOSTS="false">
 
         <!-- Import a single ObjectExit record -->
         <test ID="importObjectExit">
@@ -41,12 +41,7 @@
                 <filename>imports/res/import-objectexit.res.xml</filename>
             </response>
         </test>
-        <test ID="deleteObjectExitUTF8">
-            <expectedCodes>200</expectedCodes>
-            <method>DELETE</method>
-            <uri>/cspace-services/objectexit/${importObjectExitUTF8.got("//csid")}</uri>
-        </test>
-        
+        <!-- This test is not currently working, and thus is commented out. -->
         <!--
         <test ID="verifyObjectExitUTF8">
             <expectedCodes>200</expectedCodes>
@@ -59,6 +54,11 @@
             </response>
         </test>
         -->
+        <test ID="deleteObjectExitUTF8">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/objectexit/${importObjectExitUTF8.got("//csid")}</uri>
+        </test>
                 
         <!--
             Import a single ObjectExit record, at least one of whose fields
@@ -83,8 +83,8 @@
         </test>
         
         <!--
-            Import a mixed set of records, containing of two (2) Object Exit
-            records and one (1) Media record.  (The latter also includes
+            Import a mixed set of records, containing of one Object Exit
+            records and one Media record.  (The latter also includes
             (optional) namespace prefixes on its child elements, as an
             additional variation.)
         -->
@@ -98,29 +98,17 @@
                 <filename>imports/res/import-objectexit-media.res.xml</filename>
             </response>
         </test>
-        <!--
-        <test ID="deleteObjectExitSpecialCharsObjExit1">
-            <expectedCodes>200</expectedCodes>
-            <method>DELETE</method>
-            <uri>/cspace-services/objectexit/${importObjectExitMedia.got("//importedRecords/importedRecord[0]/csid[0]")}</uri>
-        </test>
-        <test ID="deleteObjectExitSpecialCharsObjExit2">
+        <test ID="deleteMediaFromObjectExitMedia">
             <expectedCodes>200</expectedCodes>
             <method>DELETE</method>
-            <uri>/cspace-services/objectexit/${importObjectExitMedia.got("//importedRecords/importedRecord[1]/csid[0]")}</uri>
+            <uri>/cspace-services/media/${importObjectExitMedia.got("//csid[preceding-sibling::doctype[1][text()='Media']]")}</uri>
         </test>
-        <test ID="deleteObjectExitSpecialCharsMedia">
+        <test ID="deleteObjectExitFromObjectExitMedia">
             <expectedCodes>200</expectedCodes>
             <method>DELETE</method>
-            <uri>/cspace-services/media/${importObjectExitMedia.got("//importedRecords/importedRecord[2]/csid[0]")}</uri>
+            <uri>/cspace-services/objectexit/${importObjectExitMedia.got("//csid[preceding-sibling::doctype[1][text()='ObjectExit']]")}</uri>
         </test>
-        -->
-        
-        <!-- FIXME: Add test with special chars in request payloads -->
-        <!-- (CSPACE-3923), via each imports path -->
-
-        <!-- FIXME: Add tests with invalid payloads, via each imports path -->
-        
+                
         <!-- FIXME: Add forms-based import test -->
         <!--
         <test ID="import-post-form">
@@ -135,7 +123,22 @@
         </test>
         -->
         
+        <!-- FIXME: Add tests with invalid payloads, via each imports path -->
+
     </testGroup>
+    
+    <!--
+      Temporary test group for testing changes or additions to this control file.
+      To use:
+      * Clone dev-master-example.xml to dev-master.xml
+      * Add this line to dev-master.xml:
+        <run controlFile="imports/imports.xml" testGroup="importsTemporaryTestGroup" />
+      * Run XmlReplay tests listed in dev-master.xml via 'mvn test -Dtest=XmlReplayDevTest'
+    -->
+    <testGroup ID="importsTemporaryTestGroup" autoDeletePOSTS="false">
+        <!-- Add new or changed tests here -->
+    </testGroup>
+
 </xmlReplay>
         
         
\ No newline at end of file
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-media.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-media.res.xml
index 1e1fba581..316a0cddc 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-media.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-media.res.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <import>
-    <totalRecordsImported>3</totalRecordsImported>
+    <totalRecordsImported>2</totalRecordsImported>
     <numRecordsImported>
         <docType>ObjectExit</docType>
-        <numRecords>2</numRecords>
+        <numRecords>1</numRecords>
     </numRecordsImported>
     <numRecordsImported>
         <docType>Media</docType>
-- 
2.47.3