From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 20 Apr 2012 02:45:32 +0000 (-0700)
Subject: CSPACE-5024: Initiated XmlReplay-based tests of searching across all vocabularies... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7ad95119059f2742612d049d5b6a11ce6de4a80b;p=tmp%2Fjakarta-migration.git

CSPACE-5024: Initiated XmlReplay-based tests of searching across all vocabularies within a given authority. Current tests simply create authorities and items in preparation for searching; search tests are commented out.
---

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/authority.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/authority.xml
new file mode 100644
index 000000000..3481ec82b
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/authority.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+    </auths>
+        
+    <testGroup ID="TestAuthoritiesMultiVocabSearch" autoDeletePOSTS="true">
+        
+        <!--
+            Create three new vocabularies: two in the Person Authority,
+            and one in the Storage Location Authority.
+        -->
+        <test ID="createPersonAuthority1">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/personauthorities</uri>
+            <filename>authority/personauthority.xml</filename>
+            <vars>
+                <var ID="identifier1">jlmbsoq</var>
+                <var ID="identifier2">tqbfjotld</var>
+                <var ID="authDisplayName">${identifier1}</var>
+                <var ID="authShortIdentifier">${identifier1}</var>
+           </vars>
+        </test>
+
+        <test ID="createPersonAuthority2">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/personauthorities</uri>
+            <filename>authority/personauthority.xml</filename>
+            <vars>
+                <var ID="authDisplayName">${createPersonAuthority1.identifier2}</var>
+                <var ID="authShortIdentifier">${createPersonAuthority1.identifier2}</var>
+            </vars>
+        </test>
+                
+        <test ID="createLocationAuthority">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/locationauthorities</uri>
+            <filename>authority/locationauthority.xml</filename>
+            <vars>
+                <var ID="authDisplayName">${createPersonAuthority1.identifier1}</var>
+                <var ID="authShortIdentifier">${createPersonAuthority1.identifier1}</var>
+            </vars>
+        </test>
+        
+        <!-- Create at least one item in each of those vocabularies. -->
+        
+        <!-- Create two items in the first Person Authority -->
+        
+        <test ID="createPersonItem1" auth="test">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/personauthorities/${createPersonAuthority1.CSID}/items</uri>
+            <filename>authority/personitem.xml</filename>
+            <vars>
+                <var ID="itemDisplayName">${createPersonAuthority1.identifier1} ${createPersonAuthority1.identifier2}</var>
+                <var ID="itemShortIdentifier">${createPersonAuthority1.identifier1}1</var>
+            </vars>
+        </test>
+        <test ID="createPersonItem2" auth="test">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/personauthorities/${createPersonAuthority1.CSID}/items</uri>
+            <filename>authority/personitem.xml</filename>
+            <vars>
+                <var ID="itemDisplayName">${createPersonAuthority1.identifier1}</var>
+                <var ID="itemShortIdentifier">${createPersonAuthority1.identifier1}2</var>
+            </vars>
+        </test>
+        
+        <!-- Create one item in the second Person Authority -->
+        <test ID="createPersonItem3" auth="test">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/personauthorities/${createPersonAuthority2.CSID}/items</uri>
+            <filename>authority/personitem.xml</filename>
+            <vars>
+                <var ID="itemDisplayName">${createPersonAuthority1.identifier1}</var>
+                <var ID="itemShortIdentifier">${createPersonAuthority1.identifier1}3</var>
+            </vars>
+        </test>
+                
+        <!-- Create one item in the Location Authority -->
+        <test ID="createLocationItem" auth="test">
+            <expectedCodes>201</expectedCodes>
+            <method>POST</method>
+            <uri>/cspace-services/locationauthorities/${createLocationAuthority.CSID}/items</uri>
+            <filename>authority/locationitem.xml</filename>
+            <vars>
+                <var ID="itemDisplayName">${createPersonAuthority1.identifier1} ${createPersonAuthority1.identifier2}</var>
+                <var ID="itemShortIdentifier">${createPersonAuthority1.identifier1}</var>
+            </vars>
+        </test>
+        
+        <!--
+            Perform 'all vocabularies' searches and verify that the
+            expected items were returned by each search.
+        -->
+        
+        <!-- Keyword search -->
+        <!--
+        <test ID="keywordSearchAuthorityItems">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/authorities/_ALL_/items?kw=${createPersonAuthority1.name1}</uri>
+            <response>
+                <expected level="ADDOK"/>
+                <filename>authority/res/keywordSearchAuthorityItems.res.xml</filename>
+            </response>
+        </test>
+        -->
+        
+        <!-- Partial term search -->
+        <!--
+        <test ID="partialTermSearchAuthorityItems">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/authorities/_ALL_/items?pt=${createPersonAuthority1.name1}</uri>
+            <response>
+                <expected level="ADDOK"/>
+                <filename>authority/res/partialTermSearchAuthorityItems.res.xml</filename>
+            </response>
+        </test>
+        -->
+                
+        <!-- Advanced search -->
+        <!--
+        <test ID="advancedTermSearchAuthorityItems">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/authorities/_ALL_/items?as=persons_common%3AdisplayName%20ILIKE%20%27%25${createPersonAuthority1.name1}%25%27</uri>
+            <response>
+                <expected level="ADDOK"/>
+                <filename>authority/res/advancedSearchAuthorityItems.res.xml</filename>
+            </response>
+        </test>
+        -->
+        
+    </testGroup>
+    
+</xmlReplay>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationauthority.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationauthority.xml
new file mode 100644
index 000000000..e825b92bc
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationauthority.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="locationauthorities">
+    <ns2:locationauthorities_common xmlns:ns2="http://collectionspace.org/services/location" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <displayName>${authDisplayName}</displayName>
+        <shortIdentifier>${authShortIdentifier}</shortIdentifier>
+        <vocabType>LocationAuthority</vocabType>
+        <description>This is a test Location Authority.</description>
+    </ns2:locationauthorities_common>
+</document>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationitem.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationitem.xml
new file mode 100644
index 000000000..a26181039
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationitem.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="locations">
+    <ns2:locations_common xmlns:ns2="http://collectionspace.org/services/location" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <displayName>${itemDisplayName}</displayName>
+        <shortIdentifier>${itemShortIdentifier}</shortIdentifier>
+        <description>This is a test Location Authority item.</description>
+    </ns2:locations_common>
+</document>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personauthority.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personauthority.xml
new file mode 100644
index 000000000..7f8e5c9ec
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personauthority.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document name="personauthorities">
+    <ns2:personauthorities_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <displayName>${authDisplayName}</displayName>
+        <shortIdentifier>${authShortIdentifier}</shortIdentifier>
+        <vocabType>PersonAuthority</vocabType>
+        <description>This is a test Person Authority.</description>
+    </ns2:personauthorities_common>
+</document>
+
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personitem.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personitem.xml
new file mode 100644
index 000000000..ecf1a2272
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personitem.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="persons">
+    <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <displayName>${itemDisplayName}</displayName>
+        <shortIdentifier>${itemShortIdentifier}</shortIdentifier>
+        <bioNote>A bio note for this Person.</bioNote>
+    </ns2:persons_common>
+</document>