From 165783977702e525748ed8f880c42fc45823ef7c Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 20 Apr 2012 15:34:53 -0700
Subject: [PATCH] CSPACE-5024: Resolved issue with adding tests for a second
 authority (Storage Location); item payload needed to have displayNameComputed
 flag set to false, or displayName was set to null. Added maintenance clarity
 via revisions to comments in expected responses and filename changes.

---
 .../xmlreplay/authority/authority.xml         | 60 +++++++++++++------
 .../xmlreplay/authority/locationitem.xml      |  4 +-
 .../xmlreplay/authority/personitem.xml        |  1 +
 .../authority/res/locationItems.res.xml       |  7 +++
 ...l => locationItemsContainingWord1.res.xml} |  0
 .../authority/res/personItems.res.xml         |  7 +++
 .../res/personItemsContainingWord1.res.xml    | 27 +++++++++
 .../res/personItemsContainingWord2.res.xml    | 24 ++++++++
 .../res/personauthorityWord1.res.xml          | 19 ------
 .../res/personauthorityWord2.res.xml          | 16 -----
 10 files changed, 110 insertions(+), 55 deletions(-)
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItems.res.xml
 rename services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/{locationauthorityWord1.res.xml => locationItemsContainingWord1.res.xml} (100%)
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItems.res.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord1.res.xml
 create mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord2.res.xml
 delete mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord1.res.xml
 delete mode 100644 services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord2.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 a9ad6275d..ac58ac4e8 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
@@ -19,8 +19,8 @@
             <uri>/cspace-services/personauthorities</uri>
             <filename>authority/personauthority.xml</filename>
             <vars>
-                <!-- Nonsense words (terms, strings, tokens ...) to build short -->
-                <!-- identifiers and display names, and to populate text field(s). -->
+                <!-- Nonsense words to build short identifiers and display -->
+                <!-- names, and to populate text field(s). -->
                 <var ID="word1">jlmbsoq</var>
                 <var ID="word2">tqbfjotld</var>
                 <!-- Partial term searches using one or more of those words. -->
@@ -91,7 +91,7 @@
         </test>
                 
         <!-- Create one item in a vocabulary in the Location Authority -->
-        <test ID="createLocationItem1">
+        <test ID="createLocationItem">
             <expectedCodes>201</expectedCodes>
             <method>POST</method>
             <uri>/cspace-services/locationauthorities/${createLocationAuthority.CSID}/items</uri>
@@ -101,12 +101,29 @@
                 <var ID="itemShortIdentifier">${createPersonAuthority1.word1}item1</var>
             </vars>
         </test>
+        <test ID="verifyLocationItem">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/locationauthorities/${createLocationAuthority.CSID}/items/${createLocationItem.CSID}</uri>
+        </test>
         
         <!--
             Perform 'all vocabularies' searches and verify that the
             expected items were returned by each search.
         -->
         
+        <!-- List (without searching) -->
+        
+        <test ID="getPersonItems">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/personauthorities/_ALL_/items?pgSz=3&amp;pgNum=0</uri>
+            <response>
+                <expected level="TEXT"/>
+                <filename>authority/res/personItems.res.xml</filename>
+            </response>
+        </test>
+        
         <!-- Keyword searches -->
         
         <!-- On first word -->
@@ -116,7 +133,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?kw=${createPersonAuthority1.word1}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord1.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord1.res.xml</filename>
             </response>
         </test>
         <!-- On second word -->
@@ -126,7 +143,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?kw=${createPersonAuthority1.word2}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord2.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord2.res.xml</filename>
             </response>
         </test>
         
@@ -139,7 +156,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?pt=${createPersonAuthority1.word1PartialTermStem}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord1.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord1.res.xml</filename>
             </response>
         </test>
         <!-- Stem matching on second word -->
@@ -149,7 +166,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?pt=${createPersonAuthority1.word2PartialTermStem}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord2.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord2.res.xml</filename>
             </response>
         </test>
         <!-- Middle-of-term matching on second word -->
@@ -159,7 +176,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?pt=${createPersonAuthority1.word2PartialTermMid}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord2.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord2.res.xml</filename>
             </response>
         </test>
                 
@@ -172,7 +189,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?as=persons_common%3AdisplayName%20ILIKE%20%27%25${createPersonAuthority1.word1}%25%27</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord1.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord1.res.xml</filename>
             </response>
         </test>
         <!-- On second word -->
@@ -182,7 +199,7 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?as=persons_common%3AdisplayName%20ILIKE%20%27%25${createPersonAuthority1.word2}%25%27</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord2.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord2.res.xml</filename>
             </response>
         </test>
         <!-- In a field other than display name -->
@@ -192,20 +209,28 @@
             <uri>/cspace-services/personauthorities/_ALL_/items?as=persons_common%3AforeName%20ILIKE%20%27%25${createPersonAuthority1.word2}%25%27</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/personauthorityWord2.res.xml</filename>
+                <filename>authority/res/personItemsContainingWord2.res.xml</filename>
             </response>
         </test>
         
         <!-- Verify that tests work in an authority other than Person Authority -->
         
-        <!--
+        <test ID="getPersonItems">
+            <expectedCodes>200</expectedCodes>
+            <method>GET</method>
+            <uri>/cspace-services/locationauthorities/_ALL_/items?pgSz=1&amp;pgNum=0</uri>
+            <response>
+                <expected level="TEXT"/>
+                <filename>authority/res/locationItems.res.xml</filename>
+            </response>
+        </test>
         <test ID="kwSearchLocationItems">
             <expectedCodes>200</expectedCodes>
             <method>GET</method>
             <uri>/cspace-services/locationauthorities/_ALL_/items?kw=${createPersonAuthority1.word1}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/locationauthorityWord1.res.xml</filename>
+                <filename>authority/res/locationItemsContainingWord1.res.xml</filename>
             </response>
         </test>
         <test ID="ptStemSearchLocationItems">
@@ -214,7 +239,7 @@
             <uri>/cspace-services/locationauthorities/_ALL_/items?pt=${createPersonAuthority1.word1PartialTermStem}</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/locationauthorityWord1.res.xml</filename>
+                <filename>authority/res/locationItemsContainingWord1.res.xml</filename>
             </response>
         </test>
          <test ID="advSearchLocationItems">
@@ -223,19 +248,18 @@
             <uri>/cspace-services/locationauthorities/_ALL_/items?as=locations_common%3AdisplayName%20ILIKE%20%27%25${createPersonAuthority1.word1}%25%27</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/locationauthorityWord1.res.xml</filename>
+                <filename>authority/res/locationItemsContainingWord1.res.xml</filename>
             </response>
         </test>   
         <test ID="advSearchLocationItems">
             <expectedCodes>200</expectedCodes>
             <method>GET</method>
-            <uri>/cspace-services/locationauthorities/_ALL_/items?as=locations_common%3Adescription%20ILIKE%20%27%25${createPersonAuthority1.word1}%25%27</uri>
+            <uri>/cspace-services/locationauthorities/_ALL_/items?as=locations_common%3AaccessNote%20ILIKE%20%27%25${createPersonAuthority1.word1}%25%27</uri>
             <response>
                 <expected level="TEXT"/>
-                <filename>authority/res/locationauthorityWord1.res.xml</filename>
+                <filename>authority/res/locationItemsContainingWord1.res.xml</filename>
             </response>
         </test>
-        -->
         
     </testGroup>
     
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
index c5a13e2fc..56e370a69 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationitem.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/locationitem.xml
@@ -2,8 +2,8 @@
 <document name="locations">
     <ns2:locations_common xmlns:ns2="http://collectionspace.org/services/location" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <displayName>${itemDisplayName}</displayName>
+        <displayNameComputed>false</displayNameComputed>
         <shortIdentifier>${itemShortIdentifier}</shortIdentifier>
-        <description>This is a test Location Authority item, whose description contains: ${itemDisplayName}</description>
+        <accessNote>This is a test Location Authority item, whose access note contains: ${itemDisplayName}</accessNote>
     </ns2:locations_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
index 633411f7d..87f820af0 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
@@ -2,6 +2,7 @@
 <document name="persons">
     <ns2:persons_common xmlns:ns2="http://collectionspace.org/services/person" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <displayName>${itemDisplayName}</displayName>
+        <displayNameComputed>false</displayNameComputed>
         <shortIdentifier>${itemShortIdentifier}</shortIdentifier>
         <bioNote>A bio note for this Person.</bioNote>
         <foreName>${itemDisplayName}</foreName>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItems.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItems.res.xml
new file mode 100644
index 000000000..245990926
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItems.res.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+    <pageNum>0</pageNum>
+    <pageSize>1</pageSize>
+    <itemsInPage>1</itemsInPage>
+</ns2:abstract-common-list>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationauthorityWord1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItemsContainingWord1.res.xml
similarity index 100%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationauthorityWord1.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/locationItemsContainingWord1.res.xml
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItems.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItems.res.xml
new file mode 100644
index 000000000..61a80fda2
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItems.res.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+    <pageNum>0</pageNum>
+    <pageSize>3</pageSize>
+    <itemsInPage>3</itemsInPage>
+</ns2:abstract-common-list>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord1.res.xml
new file mode 100644
index 000000000..45892e451
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord1.res.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+    <totalItems>3</totalItems>
+    <!--
+      Note that tests verifying this specific response may either fail, or
+      return a non-fatal NESTED_ERROR, if the order of the list items below
+      changes. (This response assumes that items are both returned in reverse
+      chronological order by update timestamp (collectionspace_core:updatedAt),
+      and that they are created in timestamp order by the order of tests in
+      the control file.)
+      
+      If the list items order changes, you can: reorder the following
+      list-items appropriately; remove those items entirely, relying solely
+      on the <totalItems> value and not on the actual items returned; or
+      rewrite the test and/or response using more sophisticated techniques.
+    -->
+    <list-item>
+        <shortIdentifier>${createPersonAuthority1.word1}item3</shortIdentifier>
+    </list-item>
+    <list-item>
+        <shortIdentifier>${createPersonAuthority1.word1}item2</shortIdentifier>
+    </list-item>
+    <list-item>
+        <shortIdentifier>${createPersonAuthority1.word1}item1</shortIdentifier>
+    </list-item>
+</ns2:abstract-common-list>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord2.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord2.res.xml
new file mode 100644
index 000000000..e0c43540b
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personItemsContainingWord2.res.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
+    <totalItems>2</totalItems>
+    <!--
+      Note that tests verifying this specific response may either fail, or
+      return a non-fatal NESTED_ERROR, if the order of the list items below
+      changes. (This response assumes that items are both returned in reverse
+      chronological order by update timestamp (collectionspace_core:updatedAt),
+      and that they are created in timestamp order by the order of tests in
+      the control file.)
+      
+      If the list items order changes, you can: reorder the following
+      list-items appropriately; remove those items entirely, relying solely
+      on the <totalItems> value and not on the actual items returned; or
+      rewrite the test and/or response using more sophisticated techniques.
+    -->
+    <list-item>
+        <shortIdentifier>${createPersonAuthority1.word1}item3</shortIdentifier>
+    </list-item>
+    <list-item>
+        <shortIdentifier>${createPersonAuthority1.word1}item1</shortIdentifier>
+    </list-item>
+</ns2:abstract-common-list>
+
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord1.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord1.res.xml
deleted file mode 100644
index 5a5e13d53..000000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord1.res.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
-    <totalItems>3</totalItems>
-    <!--
-      Note that tests verifying this specific response may fail if the order
-      of list items below - which assumes reverse chronological order by
-      update timestamp (collectionspace_core:updatedAt) - changes.
-    -->
-    <list-item>
-        <shortIdentifier>${createPersonAuthority1.word1}item3</shortIdentifier>
-    </list-item>
-    <list-item>
-        <shortIdentifier>${createPersonAuthority1.word1}item2</shortIdentifier>
-    </list-item>
-    <list-item>
-        <shortIdentifier>${createPersonAuthority1.word1}item1</shortIdentifier>
-    </list-item>
-</ns2:abstract-common-list>
-
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord2.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord2.res.xml
deleted file mode 100644
index ed45b3536..000000000
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/authority/res/personauthorityWord2.res.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns2:abstract-common-list xmlns:ns2="http://collectionspace.org/services/jaxb">
-    <totalItems>2</totalItems>
-    <!--
-      Note that tests verifying this specific response may fail if the order
-      of list items below - which assumes reverse chronological order by
-      update timestamp (collectionspace_core:updatedAt) - changes.
-    -->
-    <list-item>
-        <shortIdentifier>${createPersonAuthority1.word1}item3</shortIdentifier>
-    </list-item>
-    <list-item>
-        <shortIdentifier>${createPersonAuthority1.word1}item1</shortIdentifier>
-    </list-item>
-</ns2:abstract-common-list>
-
-- 
2.47.3