From 8dd7c2d021c1b2a71047519a0654e43b7e733e3d Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 7 Sep 2012 15:58:08 -0700
Subject: [PATCH] CSPACE-5120: Updated structured object tests.  All are now in
 a single test group, because variable values weren't being shared between
 some groups.  Tweaked payloads, including namespace prefixes.

---
 .../collectionobject-hierarchy.xml            | 94 +++++++++----------
 .../res/relations-as-object-top-level.res.xml |  2 +-
 .../res/relations-pagination-header.res.xml   |  2 +-
 .../res/show-all-relations-top-level.res.xml  |  2 +-
 .../res/show-relations-bottom-level.res.xml   |  2 +-
 .../res/show-relations-mid-level.res.xml      |  2 +-
 .../res/show-relations-top-level.res.xml      |  4 +-
 .../res/show-siblings-bottom-level.res.xml    |  2 +-
 .../res/show-siblings-mid-level.res.xml       |  2 +-
 .../res/show-siblings-top-level.res.xml       |  2 +-
 10 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
index 0f77af26c..23d9212da 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/collectionobject-hierarchy.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xmlReplay>
-    <testGroup ID="CreateCollectionObjects" autoDeletePOSTS="true">
+    
+    <testGroup ID="CreateCollectionObjects"> <!-- autoDeletePOSTS="true" -->
         
         <!-- Create a set of CollectionObjects -->
         
@@ -123,7 +124,7 @@
         </test>
         
         <!--
-        <test ID="CreateBlackRook">
+        <test ID="CreateBlackRookWithRelations">
             <method>POST</method>
             <uri>/cspace-services/collectionobjects</uri>
             <filename>collectionobject/hierarchy/1-collectionobject.xml</filename>
@@ -134,21 +135,14 @@
         </test>
         <test ID="ReadBlackRook" auth="admin@core.collectionspace.org">
             <method>GET</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}</uri>
             <expectedCodes>200</expectedCodes>
         </test>
         -->
-    </testGroup>
-    
-    <testGroup ID="CreateStructuredObjectsWithHierarchicalRelations" autoDeletePOSTS="true">
        
         <!-- Create a new chess piece, and include in the create payload -->
         <!-- a list of hierarchical relationships to be created between -->
         <!-- the various CollectionObjects previously created, in tests above -->
-    
-        <!-- This test is currently failing with a 400 status code -->
-        <!-- due to one or more Exceptions in RemoteDocumentModelHandlerImpl.updateRelations() -->
-        <!-- ADR 2012-09-06 -->
        
         <!-- Note also that it *might* not be necessary to set these variables; the original -->
         <!-- values of CSIDs saved from previous posts, e.g. {CreateChessSetBox.CSID} -->
@@ -176,17 +170,30 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-    </testGroup>
-    
-    <testGroup ID="UpdateStructuredObjectsWithHierarchicalRelations" autoDeletePOSTS="true">
-        
+        <test ID="ReadHierarchyForTopLevelItem">
+            <method>GET</method>
+            <uri>/cspace-services/collectionobjects/${CreateChessSetBox.CSID}?showRelations=true</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>collectionobject/hierarchy/res/show-relations-top-level.res.xml</filename>
+                <vars>
+                    <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
+                    <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
+                    <var ID="bagOfWhiteChessPiecesCSID">${CreateBagOfWhiteChessPieces.CSID}</var>
+                    <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
+                </vars>
+                <startElement>/document/*[local-name()='relations-common-list']</startElement>
+            </response>
+            <expectedCodes>200</expectedCodes>
+        </test>
+
         <!-- Update one of the existing chess pieces, and add yet one more -->
         <!-- hierarchical relationship, between that piece and another -->
         <!-- existing CollectionObject. -->
         
         <test ID="UpdateBlackRootWithRelations">
             <method>PUT</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}</uri>
             <filename>collectionobject/hierarchy/3-collectionobjects-with-relations-update.xml</filename>
             <vars>
                 <var ID="distinguishingFeatures">This rook has two light brown striations on part of its base.</var>
@@ -196,13 +203,10 @@
             <expectedCodes>200</expectedCodes>
         </test>
         
-    </testGroup>
     
-    <!-- Read hierarchical relations via the various query parameters now -->
-    <!-- supported for structured objects and procedures -->
-    
-    <testGroup ID="ReadRelationsOnStructuredObjects" autoDeletePOSTS="true">
-                
+        <!-- Read hierarchical relations via the various query parameters now -->
+        <!-- supported for structured objects and procedures -->
+                    
         <!-- Read hierarchical relationships via 'showRelations', -->
         <!-- which returns direct parent and child relations. -->
         
@@ -242,7 +246,7 @@
         
         <test ID="ReadHierarchyForBottomLevelItem">
             <method>GET</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}?showRelations=true</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}?showRelations=true</uri>
             <response>
                 <expected level="ADDOK" />
                 <filename>collectionobject/hierarchy/res/show-relations-bottom-level.res.xml</filename>
@@ -287,7 +291,7 @@
         
         <test ID="ReadSiblingsForBottomLevelItem">
             <method>GET</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}?showSiblings=true</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}?showSiblings=true</uri>
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="ADDOK" />
@@ -312,44 +316,40 @@
                 <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
         </test>
-        
-    </testGroup>
-    
-    <!-- Read hierarchical relationships via the relations service. -->
-    <!-- (This can also serve as a cross-check on the additional read mechanisms, above.) -->
-        
-    <testGroup ID="ReadRelations" autoDeletePOSTS="true">
-
-        <test ID="GetRelationsAsObjectForTopLevelItem">
+            
+        <!-- Read hierarchical relationships via the relations service. -->
+        <!-- (This can also serve as a cross-check on the additional read mechanisms, above.) -->
+                
+        <!-- Zero (0) total items are expected for the top-level item as a subject, -->
+        <!-- since the tests above created relation records with this top-level -->
+        <!-- solely as an object of those relations. -->
+        <test ID="GetRelationsAsSubjectForTopLevelItem">
             <method>GET</method>
-            <uri>/cspace-services/relations?obj=${CreateChessSetBox.CSID}</uri>
+            <uri>/cspace-services/relations?sbj=${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="TEXT" />
-                <filename>collectionobject/hierarchy/res/relations-as-object-top-level.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/relations-pagination-header.res.xml</filename>
                 <vars>
-                    <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
-                    <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
-                    <var ID="bagOfWhiteChessPiecesCSID">${CreateBagOfWhiteChessPieces.CSID}</var>
-                    <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
+                    <var ID="totalItems">0</var>
                 </vars>
-                <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
         </test>
         
-        <!-- Zero (0) total items are expected for the top-level item as a subject, -->
-        <!-- since the tests above created relation records with this top-level -->
-        <!-- solely as an object of those relations. -->
-        <test ID="GetRelationsAsSubjectForTopLevelItem">
+        <test ID="GetRelationsAsObjectForTopLevelItem">
             <method>GET</method>
-            <uri>/cspace-services/relations?sbj=${CreateChessSetBox.CSID}</uri>
+            <uri>/cspace-services/relations?obj=${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="TEXT" />
-                <filename>collectionobject/hierarchy/res/relations-pagination-header.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/relations-as-object-top-level.res.xml</filename>
                 <vars>
-                    <var ID="totalItems">0</var>
+                    <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
+                    <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
+                    <var ID="bagOfWhiteChessPiecesCSID">${CreateBagOfWhiteChessPieces.CSID}</var>
+                    <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
                 </vars>
+                <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
         </test>
         
@@ -370,7 +370,7 @@
         <!--
         <test ID="DeleteBlackRook" auth="admin@core.collectionspace.org">
             <method>DELETE</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}</uri>
         </test>
         <test ID="DeleteBlackQueen" auth="admin@core.collectionspace.org">
             <method>DELETE</method>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-as-object-top-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-as-object-top-level.res.xml
index 8f142791e..65906c5e6 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-as-object-top-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-as-object-top-level.res.xml
@@ -5,7 +5,7 @@
         1. chess board
         2. bag of white chess pieces
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>3</itemsInPage>
         <totalItems>3</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-pagination-header.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-pagination-header.res.xml
index f496f896f..d7b7ee8be 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-pagination-header.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-pagination-header.res.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns3:relations-common-list xmlns:ns2="http://collectionspace.org/services/jaxb" xmlns:ns3="http://collectionspace.org/services/relation">
+<ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
     <totalItems>${totalItems}</totalItems>
 </ns3:relations-common-list>
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
index d09a7189c..45a260de3 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
@@ -3,7 +3,7 @@
     <!-- Contents of the specified CollectionObject record itself are -->
     <!-- ignored here; we are interested only in the relations list below. -->
     
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <!-- Need to add expected pagination header elements, relation list items here -->
     </ns3:relations-common-list>
 </document>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-bottom-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-bottom-level.res.xml
index 5504221c6..c42a6efe3 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-bottom-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-bottom-level.res.xml
@@ -7,7 +7,7 @@
         Parent and child relations of the black rook:
         * bag of black chess pieces (parent)
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>1</itemsInPage>
         <totalItems>1</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-mid-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-mid-level.res.xml
index 8d145244d..685b5b043 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-mid-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-mid-level.res.xml
@@ -9,7 +9,7 @@
         * black queen (child)
         * black rook (child)
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>3</itemsInPage>
         <totalItems>3</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-top-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-top-level.res.xml
index 397dfed12..c88ddff93 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-top-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-top-level.res.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <document name="collectionobjects">
     <!-- Contents of the specified CollectionObject record itself are -->
     <!-- ignored here; we are interested only in the relations list below. -->
@@ -9,7 +9,7 @@
         * bag of white chess pieces (child)
         * bag of black chess pieces (child)
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>3</itemsInPage>
         <totalItems>3</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
index 1673c1661..1bcc3bdc6 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
@@ -7,7 +7,7 @@
         Siblings of the black rook
         1. black queen
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>1</itemsInPage>
         <totalItems>1</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
index 9b7e3ac5f..3e1f6c3e1 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
@@ -8,7 +8,7 @@
         1. chess board
         2. bag of white chess pieces
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>2</itemsInPage>
         <totalItems>2</totalItems>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
index 0120bcb09..037092af7 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
@@ -7,7 +7,7 @@
         Siblings of the chess board box:
         (none)
     -->
-    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns2="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>0</itemsInPage>
         <totalItems>0</totalItems>
-- 
2.47.3