From 48972b5ef9024a6b64c2f3771e619275990b3063 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 19 Apr 2012 20:13:52 -0700
Subject: [PATCH] CSPACE-5024: First keyword search tests added and passing.

---
 .../xmlreplay/authority/authority.xml         | 28 ++++++++++++++-----
 .../xmlreplay/authority/personitem.xml        |  1 +
 .../res/keywordSearchAuthorityItems1.res.xml  | 14 ++++++++++
 .../res/keywordSearchAuthorityItems2.res.xml  | 11 ++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems1.res.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems2.res.xml

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
index 3481ec82b..9a0c5d204 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/authority.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/authority.xml
@@ -79,7 +79,7 @@
             <uri>/cspace-services/personauthorities/${createPersonAuthority2.CSID}/items</uri>
             <filename>authority/personitem.xml</filename>
             <vars>
-                <var ID="itemDisplayName">${createPersonAuthority1.identifier1}</var>
+                <var ID="itemDisplayName">${createPersonAuthority1.identifier1} ${createPersonAuthority1.identifier2}</var>
                 <var ID="itemShortIdentifier">${createPersonAuthority1.identifier1}3</var>
             </vars>
         </test>
@@ -102,17 +102,31 @@
         -->
         
         <!-- Keyword search -->
-        <!--
-        <test ID="keywordSearchAuthorityItems">
+        <test ID="keywordSearchAuthorityItems1">
             <expectedCodes>200</expectedCodes>
             <method>GET</method>
-            <uri>/cspace-services/authorities/_ALL_/items?kw=${createPersonAuthority1.name1}</uri>
+            <uri>/cspace-services/personauthorities/_ALL_/items?kw=${createPersonAuthority1.identifier1}</uri>
+            <vars>
+                <var ID="shortIdentifierBase">${createPersonAuthority1.identifier1}</var>
+            </vars>
             <response>
-                <expected level="ADDOK"/>
-                <filename>authority/res/keywordSearchAuthorityItems.res.xml</filename>
+                <expected level="TEXT"/>
+                <filename>authority/res/keywordSearchAuthorityItems1.res.xml</filename>
+            </response>
+        </test>
+ 
+         <test ID="keywordSearchAuthorityItems2">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/personauthorities/_ALL_/items?kw=${createPersonAuthority1.identifier2}</uri>
+            <vars>
+                <var ID="shortIdentifierBase">${createPersonAuthority1.identifier1}</var>
+            </vars>
+            <response>
+                <expected level="TEXT"/>
+                <filename>authority/res/keywordSearchAuthorityItems2.res.xml</filename>
             </response>
         </test>
-        -->
         
         <!-- Partial term search -->
         <!--
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
index ecf1a2272..633411f7d 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personitem.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/personitem.xml
@@ -4,5 +4,6 @@
         <displayName>${itemDisplayName}</displayName>
         <shortIdentifier>${itemShortIdentifier}</shortIdentifier>
         <bioNote>A bio note for this Person.</bioNote>
+        <foreName>${itemDisplayName}</foreName>
     </ns2:persons_common>
 </document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems1.res.xml
new file mode 100644
index 000000000..f3555df86
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems1.res.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+<totalItems>3</totalItems>
+<list-item>
+    <shortIdentifier>${createPersonAuthority1.identifier1}1</shortIdentifier>
+</list-item>
+<list-item>
+    <shortIdentifier>${createPersonAuthority1.identifier1}2</shortIdentifier>
+</list-item>
+<list-item>
+    <shortIdentifier>${createPersonAuthority1.identifier1}3</shortIdentifier>
+</list-item>
+</ns2:abstract-common-list>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems2.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems2.res.xml
new file mode 100644
index 000000000..b875b9484
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/keywordSearchAuthorityItems2.res.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+<totalItems>2</totalItems>
+<list-item>
+    <shortIdentifier>${createPersonAuthority1.identifier1}1</shortIdentifier>
+</list-item>
+<list-item>
+    <shortIdentifier>${createPersonAuthority1.identifier1}3</shortIdentifier>
+</list-item>
+</ns2:abstract-common-list>
+
-- 
2.47.3