From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Wed, 18 Apr 2012 22:27:40 +0000 (-0700)
Subject: CSPACE-3560: Added UTF-8, special characters, multiple records / record types XmlRepl... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0db79ef8a7f0240991fd404ac7bf688f9b3f7790;p=tmp%2Fjakarta-migration.git

CSPACE-3560: Added UTF-8, special characters, multiple records / record types XmlReplay-based tests for the Imports Service. Adding new test datafiles.
---

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 209ad37af..9507bc802 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
@@ -1,10 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <imports>
-  <import service="ObjectExit" type="ObjectExit">
-    <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
-      name="objectexit_common">
-      <exitNote>Sebastián &amp; Barnes</exitNote>
-      <exitNumber>OE2010.2</exitNumber>
-    </schema>
-  </import>
+    <import service="ObjectExit" type="ObjectExit">
+        <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
+                name="objectexit_common">
+            <exitNote>This is an exit note.</exitNote>
+            <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>
+                <media_common:dateGroup>
+                    <media_common:dateEarliestSingleQualifier/>
+                    <media_common:scalarValuesComputed>true</media_common:scalarValuesComputed>
+                    <media_common:dateLatestYear>1999</media_common:dateLatestYear>
+                    <media_common:dateLatestDay/>
+                    <media_common:dateAssociation/>
+                    <media_common:dateEarliestSingleEra/>
+                    <media_common:dateDisplayDate/>
+                    <media_common:dateEarliestSingleCertainty/>
+                    <media_common:dateLatestEra/>
+                    <media_common:dateEarliestSingleQualifierValue/>
+                    <media_common:dateLatestCertainty/>
+                    <media_common:dateEarliestSingleYear/>
+                    <media_common:dateLatestQualifier/>
+                    <media_common:dateLatestQualifierValue/>
+                    <media_common:dateEarliestSingleQualifierUnit/>
+                    <media_common:datePeriod/>
+                    <media_common:dateEarliestScalarValue/>
+                    <media_common:dateLatestMonth/>
+                    <media_common:dateNote/>
+                    <media_common:dateLatestScalarValue/>
+                    <media_common:dateLatestQualifierUnit/>
+                    <media_common:dateEarliestSingleDay/>
+                    <media_common:dateEarliestSingleMonth/>
+                </media_common:dateGroup>
+            </media_common:dateGroupList>
+            <media_common:languageList>
+                <media_common:language>eng</media_common:language>
+            </media_common:languageList>
+            <media_common:measuredPartGroupList>
+                <media_common:measuredPartGroup>
+                    <media_common:dimensionSummary/>
+                    <media_common:measuredPart/>
+                    <media_common:dimensionSubGroupList>
+                        <media_common:dimensionSubGroup>
+                            <media_common:dimension/>
+                            <media_common:measuredBy/>
+                            <media_common:valueDate/>
+                            <media_common:measurementUnit/>
+                            <media_common:value>42</media_common:value>
+                            <media_common:dimensionNote/>
+                            <media_common:valueQualifier/>
+                            <media_common:measurementMethod/>
+                        </media_common:dimensionSubGroup>
+                    </media_common:dimensionSubGroupList>
+                </media_common:measuredPartGroup>
+            </media_common:measuredPartGroupList>
+            <media_common:identificationNumber>MH-IMPORT-TEST-1999.1</media_common:identificationNumber>
+        </schema>
+    </import>
 </imports>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-specialchars.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-specialchars.xml
index 209ad37af..497daff02 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-specialchars.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-specialchars.xml
@@ -1,10 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <imports>
-  <import service="ObjectExit" type="ObjectExit">
-    <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
-      name="objectexit_common">
-      <exitNote>Sebastián &amp; Barnes</exitNote>
-      <exitNumber>OE2010.2</exitNumber>
-    </schema>
-  </import>
+    <import service="ObjectExit" type="ObjectExit">
+        <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
+            name="objectexit_common">
+            <exitNote>
+                "This sentence is wrapped in quotation marks (double quotes)."
+                &quot;This sentence is wrapped in quotation marks (double quotes) as XML entities.&quot;
+	        'This sentence is wrapped in apostrophes (single quotes).'
+	        &apos;This sentence is wrapped in apostrophes (single quotes) as XML entities.&apos;
+	        This sentence has a "quoted" segment &amp; an ampersand (as an XML entity).
+	        "This sentence has a "quoted" segment; &amp; an ampersand (as an XML entity), and is wrapped in quotation marks."
+                &lt;There are angle brackets around me, as XML entities.&gt;
+
+                An XML comment follows on the next line:
+                <!-- This is an XML comment -->
+
+                [there are square brackets around me]
+	        {there are curly braces around me}	
+                
+	        The text which follows a backquote: Hawai`i
+	        The text which follows contains a number sign (aka hash mark, pound sign): #20
+	        The text which follows contains reverse solidus (aka backslash) characters and a colon: c:\mydocs\
+                The text which follows contains doubled reverse solidus (backslash) characters: \\mydocs
+	        The text which follows contains a reverse solidus (backslash) followed by a solidus (aka forward slash): \/
+            </exitNote>
+            <exitNumber>OE-IMPORT-TEST-1999.5</exitNumber>
+        </schema>
+    </import>
 </imports>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-utf8.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-utf8.xml
index 209ad37af..0ddfa6e80 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-utf8.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/import-objectexit-utf8.xml
@@ -3,8 +3,14 @@
   <import service="ObjectExit" type="ObjectExit">
     <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
       name="objectexit_common">
-      <exitNote>Sebastián &amp; Barnes</exitNote>
-      <exitNumber>OE2010.2</exitNumber>
+      <exitNote>This is an exit note written by Sebastián (a-acute accent) and Barnes,
+which includes a pleasant façade (c-cedilla) and this cast of additional characters:
+Δ : Greek capital letter Delta (U+0394)
+Ж : Cyrillic capital letter Zhe with breve (U+04C1)
+Å´ : Latin capital letter W with circumflex (U+0174)
+Ω : Greek capital letter Omega (U+03A9)
+月 : Han (CJK) character 'moon; month' ((U+6708)</exitNote>
+      <exitNumber>OE-IMPORT-TEST-1999.2</exitNumber>
     </schema>
   </import>
 </imports>
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 209ad37af..ef3d137cc 100644
--- 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,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <imports>
-  <import service="ObjectExit" type="ObjectExit">
-    <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
-      name="objectexit_common">
-      <exitNote>Sebastián &amp; Barnes</exitNote>
-      <exitNumber>OE2010.2</exitNumber>
-    </schema>
-  </import>
+    <import service="ObjectExit" type="ObjectExit">
+        <schema xmlns:objectexit_common="http://collectionspace.org/services/objectexit" 
+            name="objectexit_common">
+            <exitNote>This is an exit note.</exitNote>
+            <exitNumber>OE-IMPORT-TEST-1999.1</exitNumber>
+        </schema>
+    </import>
 </imports>
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 ab98efa30..521c2d8d5 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
@@ -9,17 +9,74 @@
     
    <testGroup ID="importsTestGroup" autoDeletePOSTS="true">
 
-        <test ID="import-post">
+        <!-- Import a single ObjectExit record -->
+        <test ID="import-objectexit">
             <expectedCodes>200</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/imports</uri>
-            <filename>imports/import-1objectexit-post.xml</filename>
+            <filename>imports/import-objectexit.xml</filename>
             <response>
                 <expected level="TEXT" />
-                <filename>imports/res/import-1objectexit-post.res.xml</filename>
+                <filename>imports/res/import-objectexit.res.xml</filename>
+             </response>
+        </test>
+        
+        <!--
+            Import a single ObjectExit record, at least one of whose fields
+            contains a set of UTF-8 characters outside the USASCII range.
+            (See CSPACE-3923 and CSPACE-4866.)
+        -->
+        <test ID="import-objectexit-utf8">
+            <expectedCodes>200</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/imports</uri>
+            <filename>imports/import-objectexit-utf8.xml</filename>
+            <response>
+                <expected level="TEXT" />
+                <filename>imports/res/import-objectexit.res.xml</filename>
              </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">
+            <expectedCodes>200</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/imports</uri>
+            <filename>imports/import-objectexit-specialchars.xml</filename>
+            <response>
+                <expected level="TEXT" />
+                <filename>imports/res/import-objectexit.res.xml</filename>
+             </response>
+        </test>
+        
+        <!--
+            Import a mixed set of records, containing of two (2) Object Exit
+            records and one (1) Media record.  (The latter also includes
+            (optional) namespace prefixes on its child elements, as an
+            additional variation.)
+        -->
+        <test ID="import-objectexit-media">
+            <expectedCodes>200</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/imports</uri>
+            <filename>imports/import-objectexit-media.xml</filename>
+            <response>
+                <expected level="TEXT" />
+                <filename>imports/res/import-objectexit-media.res.xml</filename>
+             </response>
+        </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">
@@ -34,14 +91,6 @@
         </test>
         -->
         
-        <!-- FIXME: Add tests with non-UTF-8 chars in request payloads -->
-        <!-- (CSPACE-3923 and see also CSPACE-4866), via each imports path -->
-
-        <!-- 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 -->
-        
     </testGroup>
 </xmlReplay>
         
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 47bc54dca..1e1fba581 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,5 +1,13 @@
 <?xml version="1.0"?>
 <import>
-    <totalRecordsImported>1</totalRecordsImported>
+    <totalRecordsImported>3</totalRecordsImported>
+    <numRecordsImported>
+        <docType>ObjectExit</docType>
+        <numRecords>2</numRecords>
+    </numRecordsImported>
+    <numRecordsImported>
+        <docType>Media</docType>
+        <numRecords>1</numRecords>
+    </numRecordsImported>
 </import>
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit.res.xml
index 47bc54dca..0b4d64b43 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/imports/res/import-objectexit.res.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
 <import>
     <totalRecordsImported>1</totalRecordsImported>
+    <numRecordsImported>
+        <docType>ObjectExit</docType>
+        <numRecords>1</numRecords>
+    </numRecordsImported>
 </import>