CSPACE-3560,CSPACE-3923,CSPACE-5049: XmlReplay-based tests of the Imports service...

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit.xml
index ef3d137cc56059081daab557e71dcbf8e19c4e6a..bd6616889f76ec19be4ed0a13dc85c30cbcefbbc 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <imports>
-    <import service="ObjectExit" type="ObjectExit">
+    <import service="ObjectExit" type="ObjectExit" CSID="920c578f-e5d6-45da-adab-6f26f6a491ff">
         <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
             name="objectexit_common">
             <exitNote>This is an exit note.</exitNote>

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 521c2d8d57579f1b060a980522f70e16a9581420..e952a8b1e0309700d361f612a046ab2b81586583 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/imports.xml
@@ -2,15 +2,15 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-       <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@core.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
     
    <!-- ================================================================================ -->
     
-   <testGroup ID="importsTestGroup" autoDeletePOSTS="true">
+    <testGroup ID="importsTestGroup" autoDeletePOSTS="true">
 
         <!-- Import a single ObjectExit record -->
-        <test ID="import-objectexit">
+        <test ID="importObjectExit">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
@@ -18,7 +18,12 @@
             <response>
                 <expected level="TEXT" />
                 <filename>imports/res/import-objectexit.res.xml</filename>
-             </response>
+            </response>
+        </test>
+        <test ID="deleteObjectExit">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/objectexit/${importObjectExit.got("//csid")}</uri>
         </test>
         
         <!--
@@ -26,7 +31,7 @@
             contains a set of UTF-8 characters outside the USASCII range.
             (See CSPACE-3923 and CSPACE-4866.)
         -->
-        <test ID="import-objectexit-utf8">
+        <test ID="importObjectExitUTF8">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
@@ -34,16 +39,34 @@
             <response>
                 <expected level="TEXT" />
                 <filename>imports/res/import-objectexit.res.xml</filename>
-             </response>
+            </response>
+        </test>
+        <test ID="deleteObjectExitUTF8">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/objectexit/${importObjectExitUTF8.got("//csid")}</uri>
         </test>
         
+        <!--
+        <test ID="verifyObjectExitUTF8">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/objectexit/${importObjectExitUTF8.got("//csid")}</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>imports/res/import-objectexit-utf8.res.xml</filename>
+                <label>objectexit_common</label>
+            </response>
+        </test>
+        -->
+                
         <!--
             Import a single ObjectExit record, at least one of whose fields
             contains a set of special characters defined in the
             "Special Characters and Formatting - QA Test Plan"
             http://wiki.collectionspace.org/x/A4AjB
         -->
-        <test ID="import-objectexit-utf8">
+        <test ID="importObjectExitSpecialChars">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
@@ -51,7 +74,12 @@
             <response>
                 <expected level="TEXT" />
                 <filename>imports/res/import-objectexit.res.xml</filename>
-             </response>
+            </response>
+        </test>
+        <test ID="deleteObjectExitSpecialChars">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/objectexit/${importObjectExitSpecialChars.got("//csid")}</uri>
         </test>
         
         <!--
@@ -60,7 +88,7 @@
             (optional) namespace prefixes on its child elements, as an
             additional variation.)
         -->
-        <test ID="import-objectexit-media">
+        <test ID="importObjectExitMedia">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
@@ -68,9 +96,25 @@
             <response>
                 <expected level="TEXT" />
                 <filename>imports/res/import-objectexit-media.res.xml</filename>
-             </response>
+            </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">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/objectexit/${importObjectExitMedia.got("//importedRecords/importedRecord[1]/csid[0]")}</uri>
+        </test>
+        <test ID="deleteObjectExitSpecialCharsMedia">
+            <expectedCodes>200</expectedCodes>
+            <method>DELETE</method>
+            <uri>/cspace-services/media/${importObjectExitMedia.got("//importedRecords/importedRecord[2]/csid[0]")}</uri>
+        </test>
+        -->
         
         <!-- FIXME: Add test with special chars in request payloads -->
         <!-- (CSPACE-3923), via each imports path -->

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-utf8.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-utf8.res.xml
new file mode 100644 (file)
index 0000000..612ed1b
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit-utf8.res.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<document name="objectexit">\r
+<ns2:objectexit_common xmlns:ns2="http://collectionspace.org/services/objectexit" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+      <exitNote>This is an exit note written by Sebastián (a-acute accent) and Barnes,\r
+which includes a pleasant façade (c-cedilla) and this cast of additional characters:\r
+Δ : Greek capital letter Delta (U+0394)\r
+Ж : Cyrillic capital letter Zhe with breve (U+04C1)\r
+Ŵ : Latin capital letter W with circumflex (U+0174)\r
+Ω : Greek capital letter Omega (U+03A9)\r
+月 : Han (CJK) character 'moon; month' ((U+6708)</exitNote>\r
+      <exitNumber>OE-IMPORT-TEST-1999.2</exitNumber>\r
+</ns2:objectexit_common>\r
+</document>\r
+\r