From d109b4b907c247064e4baaa9666ee61fe9167990 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 2 Sep 2011 22:18:27 +0000
Subject: [PATCH] CSPACE-4335: XMLReplay test of advanced search within a
 single field in an extension schema is now working, after updating HTTP
 BasicAuth credentials for the lifesci admin user.  The relevant test groups
 in the advanced search control file have been added to the XMLReplay master
 file in IntegrationTests, so we'll have regression testing of advanced search
 in both the common and naturalhistory schemas for CollectionObject.

---
 .../collectionobject/collectionobject-adv-search.xml        | 6 ++----
 .../resources/test-data/xmlreplay/xml-replay-master.xml     | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
index 22e8f0f42..94a705528 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-adv-search.xml
@@ -3,7 +3,7 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AY29yZS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
+        <auth ID="admin@lifesci.collectionspace.org">YWRtaW5AbGlmZXNjaS5jb2xsZWN0aW9uc3BhY2Uub3JnOkFkbWluaXN0cmF0b3I=</auth>
     </auths>
     
     <testGroup ID="advSearchCommonSchema" autoDeletePOSTS="true">
@@ -28,7 +28,7 @@
    
     <testGroup ID="advSearchExtensionSchema" autoDeletePOSTS="true">
         <!-- Create a new CollectionObject record with an extension schema part -->
-       <test ID="co2"  auth="admin@lifesci.collectionspace.org">
+       <test ID="co2" auth="admin@lifesci.collectionspace.org">
              <method>POST</method>
              <uri>/cspace-services/collectionobjects/</uri>
              <filename>collectionobject/co2.xml</filename>
@@ -46,7 +46,6 @@
         </test>
         <!-- Advanced search for CollectionObject records matching the -->
         <!-- expected text within a single field in the extension schema part. -->
-        <!--
         <test ID="co2advsearch">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects?as=collectionobjects_naturalhistory%3AfieldLocVerbatim%3D'jlmbsoqjlmbsoq'</uri>
@@ -56,7 +55,6 @@
                 <filename>collectionobject/res/co2-adv-search-lifesci.res.xml</filename>
              </response>
          </test>
-         -->
     </testGroup>
 
 </xmlReplay>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 09c39d28e..65a1660e1 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -38,6 +38,7 @@
     <run controlFile="objectexit/object-exit.xml" testGroup="checkList" />
     <run controlFile="objectexit/object-exit-display.xml" testGroup="refNameDisplayNameOnly" />
     <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchCommonSchema" />
+    <run controlFile="collectionobject/collectionobject-adv-search.xml" testGroup="advSearchExtensionSchema" />
     <run controlFile="acquisitions/acquisitions.xml" testGroup="makeone" />
     <run controlFile="acquisitions/acquisitions.xml" testGroup="testList" />
     <run controlFile="relation/relation.xml" testGroup="makeRelations" />
-- 
2.47.3