CSPACE-5520: For structured objects XmlReplay tests, created new test groups, added...

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 da4720e78c4bd7d1e905a35d87aef0c95bbb63cd..0f77af26cf45b6b6121bd1f081faaa1b96a2ace7 100644 (file)
--- 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,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xmlReplay>
-    <testGroup ID="HierarchicCollectionObject" autoDeletePOSTS="true">
+    <testGroup ID="CreateCollectionObjects" autoDeletePOSTS="true">
         
         <!-- Create a set of CollectionObjects -->
         
@@ -15,10 +15,19 @@
             </vars>
             <expectedCodes>201</expectedCodes>
         </test>
+        <!-- Verify the contents of the first CollectionObject record created. -->
+        <!-- Other create requests, below, just check the result code.) -->
         <test ID="ReadChessSetBox" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
+            <response>
+                <expected level="TEXT" />
+                <filename>collectionobject/hierarchy/res/collectionobject.res.xml</filename>
+                <vars>
+                    <var ID="objectNumber">${CreateChessSetBox.objectNumber}</var>
+                </vars>
+            </response>
         </test>
         
         <!-- Chess board -->
@@ -129,9 +138,14 @@
             <expectedCodes>200</expectedCodes>
         </test>
         -->
-        
-        <!-- Create hierarchical relationships -->
+    </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 -->
@@ -156,19 +170,20 @@
             </vars>
             <expectedCodes>201</expectedCodes>
         </test>
-        <!--
         <test ID="ReadBlackRook" auth="admin@core.collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${CreateBlackRookWithRelations.CSID}</uri>
             <expectedCodes>200</expectedCodes>
         </test>
-        -->
         
-        <!-- Update one of the chess piece records, while including -->
-        <!-- a list of hierarchical relationships to be created between the -->
-        <!-- various CollectionObjects created in tests above -->
+    </testGroup>
+    
+    <testGroup ID="UpdateStructuredObjectsWithHierarchicalRelations" autoDeletePOSTS="true">
+        
+        <!-- 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>
@@ -180,33 +195,23 @@
             </vars>
             <expectedCodes>200</expectedCodes>
         </test>
-        -->
         
     </testGroup>
     
-    <!-- Additional tests that we can start moving into the test group above, -->
-    <!-- once create and update tests are succeeding. -->
+    <!-- Read hierarchical relations via the various query parameters now -->
+    <!-- supported for structured objects and procedures -->
     
-    <testGroup ID="HierarchicCollectionObjectMore" autoDeletePOSTS="true">
-        
-        <!-- Read hierarchical relationships -->
-        
-        <!-- Read hierarchical relationships via 'showRelations' -->
+    <testGroup ID="ReadRelationsOnStructuredObjects" autoDeletePOSTS="true">
+                
+        <!-- Read hierarchical relationships via 'showRelations', -->
+        <!-- which returns direct parent and child relations. -->
         
         <test ID="ReadHierarchyForTopLevelItem">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${CreateChessSetBox.CSID}?showRelations=true</uri>
-            <expectedCodes>200</expectedCodes>
-            <!-- Also need to test response payload here -->
-        </test>
-        
-        <test ID="GetRelationsAsObjectForTopLevelItem">
-            <method>GET</method>
-            <uri>/cspace-services/relations?obj=${CreateChessSetBox.CSID}</uri>
-            <expectedCodes>200</expectedCodes>
             <response>
-                <expected level="TEXT" />
-                <filename>collectionobject/hierarchy/res/read-as-object-top-level.res.xml</filename>
+                <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>
@@ -215,23 +220,43 @@
                 </vars>
                 <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
+            <expectedCodes>200</expectedCodes>
         </test>
         
         <test ID="ReadHierarchyForMidLevelItem">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${CreateBagOfBlackChessPieces.CSID}?showRelations=true</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>collectionobject/hierarchy/res/show-relations-mid-level.res.xml</filename>
+                <vars>
+                    <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
+                    <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
+                    <var ID="blackQueenCSID">${CreateBlackQueen.CSID}</var>
+                    <var ID="blackRookCSID">${CreateBlackRookWithRelations.CSID}</var>
+                </vars>
+                <startElement>/document/*[local-name()='relations-common-list']</startElement>
+            </response>
             <expectedCodes>200</expectedCodes>
-            <!-- Also need to test response payload here -->
         </test>
         
         <test ID="ReadHierarchyForBottomLevelItem">
             <method>GET</method>
             <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}?showRelations=true</uri>
+            <response>
+                <expected level="ADDOK" />
+                <filename>collectionobject/hierarchy/res/show-relations-bottom-level.res.xml</filename>
+                <vars>
+                    <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
+                    <var ID="blackRookCSID">${CreateBlackRookWithRelations.CSID}</var>
+                </vars>
+                <startElement>/document/*[local-name()='relations-common-list']</startElement>
+            </response>
             <expectedCodes>200</expectedCodes>
-            <!-- Also need to test response payload here -->
         </test>
         
-        <!-- Read hierarchical relationships via 'showSiblings' -->
+        <!-- Read hierarchical relationships via 'showSiblings', -->
+        <!-- which shows sibling relations. -->
 
         <test ID="ReadSiblingsForTopLevelItem">
             <method>GET</method>
@@ -239,7 +264,7 @@
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="ADDOK" />
-                <filename>collectionobject/hierarchy/res/read-siblings-top-level.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/show-siblings-top-level.res.xml</filename>
                 <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
         </test>
@@ -250,7 +275,7 @@
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="ADDOK" />
-                <filename>collectionobject/hierarchy/res/read-siblings-mid-level.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/show-siblings-mid-level.res.xml</filename>
                 <vars>
                     <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
                     <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
@@ -262,14 +287,14 @@
         
         <test ID="ReadSiblingsForBottomLevelItem">
             <method>GET</method>
-            <uri>/cspace-services/collectionobjects/${CreateBlackQueen.CSID}?showSiblings=true</uri>
+            <uri>/cspace-services/collectionobjects/${CreateBlackRook.CSID}?showSiblings=true</uri>
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="ADDOK" />
-                <filename>collectionobject/hierarchy/res/read-siblings-bottom-level.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml</filename>
                 <vars>
                     <var ID="bagOfBlackChessPiecesCSID">${CreateBagOfBlackChessPieces.CSID}</var>
-                    <var ID="blackRookCSID">${CreateBlackRook.CSID}</var>
+                    <var ID="blackQueenCSID">${CreateBlackQueen.CSID}</var>
                 </vars>
                 <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
@@ -283,27 +308,25 @@
             <expectedCodes>200</expectedCodes>
             <response>
                 <expected level="ADDOK" />
-                <filename>collectionobject/hierarchy/res/read-all-relations.res.xml</filename>
+                <filename>collectionobject/hierarchy/res/show-all-relations-top-level.res.xml</filename>
                 <startElement>/document/*[local-name()='relations-common-list']</startElement>
             </response>
         </test>
         
-        <!-- Read hierarchical relationships via the relations service -->
+    </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="GetRelationsAsSubjectForTopLevelItem">
-            <method>GET</method>
-            <uri>/cspace-services/relations?sbj=${CreateChessSetBox.CSID}</uri>
-            <expectedCodes>200</expectedCodes>
-            <!-- Also need to test response payload here -->
-        </test>
-         
         <test ID="GetRelationsAsObjectForTopLevelItem">
             <method>GET</method>
             <uri>/cspace-services/relations?obj=${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
             <response>
-                <expected level="ADDOK" />
-                <filename>collectionobject/hierarchy/res/read-as-object-top-level.res.xml</filename>
+                <expected level="TEXT" />
+                <filename>collectionobject/hierarchy/res/relations-as-object-top-level.res.xml</filename>
                 <vars>
                     <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
                     <var ID="chessBoardCSID">${CreateChessBoard.CSID}</var>
@@ -313,8 +336,29 @@
                 <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">
+            <method>GET</method>
+            <uri>/cspace-services/relations?sbj=${CreateChessSetBox.CSID}</uri>
+            <expectedCodes>200</expectedCodes>
+            <response>
+                <expected level="TEXT" />
+                <filename>collectionobject/hierarchy/res/relations-pagination-header.res.xml</filename>
+                <vars>
+                    <var ID="totalItems">0</var>
+                </vars>
+            </response>
+        </test>
+        
+    </testGroup>
+    
+    <!-- Clean up any records that were not automatically deleted by autoDeletePOSTS -->
+       
+    <testGroup ID="Cleanup">
+
         <!-- Cleanup-->
         
         <!--
@@ -359,4 +403,5 @@
         -->
         
     </testGroup>
+    
 </xmlReplay>

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/collectionobject.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/collectionobject.res.xml
new file mode 100644 (file)
index 0000000..02b95fd
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/collectionobject.res.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="collectionobjects">
+
+  <ns2:collectionobjects_common
+    xmlns:ns2="http://collectionspace.org/services/collectionobject">
+    <objectNumber>${objectNumber}</objectNumber>
+  </ns2:collectionobjects_common>
+
+</document>
\ No newline at end of file

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-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
similarity index 94%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-as-object-top-level.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-as-object-top-level.res.xml
index dea17357e61ce16ecd6664d2921eb3cf7145a2ce..8f142791ee85fcd2dba77b27f73da7fb770e29f4 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-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
     -->
-    <ns2:relations-common-list xmlns:ns2="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>3</itemsInPage>
         <totalItems>3</totalItems>
@@ -42,6 +42,6 @@
                 <csid>${chessSetBoxCSID}</csid>
             </object>
         </relation-list-item>
-    </ns2:relations-common-list>
+    </ns3:relations-common-list>
 </document>
 

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
new file mode 100644 (file)
index 0000000..f496f89
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/relations-pagination-header.res.xml
@@ -0,0 +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">
+    <totalItems>${totalItems}</totalItems>
+</ns3:relations-common-list>
+

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-all-relations.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
similarity index 51%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-all-relations.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
index 17f06f6749a3c36324eba1117d9ba0cd2b0eedc9..d09a7189cdf4568afa32d94d005d4e7f70bd8057 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-all-relations.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-all-relations-top-level.res.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="collectionobjects">  
-    <ns2:relations-common-list xmlns:ns2="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+    <!-- 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">
         <!-- Need to add expected pagination header elements, relation list items here -->
-    </ns2:relations-common-list>
+    </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
new file mode 100644 (file)
index 0000000..5504221
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-bottom-level.res.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+
+    <!--
+        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">
+        <pageNum>0</pageNum>
+        <itemsInPage>1</itemsInPage>
+        <totalItems>1</totalItems>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${blackRookCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${bagOfBlackChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+        
+    </ns3:relations-common-list>
+
+</document>
+

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
new file mode 100644 (file)
index 0000000..8d14524
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-mid-level.res.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+    
+    <!--
+        Parent and child relations of the bag of black chess pieces:
+        * chess set box (parent)
+        * black queen (child)
+        * black rook (child)
+    -->
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
+        <pageNum>0</pageNum>
+        <itemsInPage>3</itemsInPage>
+        <totalItems>3</totalItems>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${bagOfBlackChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${chessSetBoxCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${blackQueenCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${bagOfBlackChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${blackRookCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${bagOfBlackChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+        
+    </ns3:relations-common-list>
+
+</document>
+

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
new file mode 100644 (file)
index 0000000..397dfed
--- /dev/null
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-relations-top-level.res.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+    
+    <!--
+        Parent and child relations of the chess set box:
+        * chess board (child)
+        * 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">
+        <pageNum>0</pageNum>
+        <itemsInPage>3</itemsInPage>
+        <totalItems>3</totalItems>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${chessBoardCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${chessSetBoxCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${bagOfWhiteChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+           </subject>
+            <object>
+                <csid>${chessSetBoxCSID}</csid>
+                <documentType>CollectionObject</documentType>
+           </object>
+        </relation-list-item>
+        
+        <relation-list-item>
+            <predicate>hasBroader</predicate>
+            <subject>
+                <csid>${bagOfBlackChessPiecesCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </subject>
+            <object>
+                <csid>${chessSetBoxCSID}</csid>
+                <documentType>CollectionObject</documentType>
+            </object>
+        </relation-list-item>
+    </ns3:relations-common-list>
+</document>
+

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-bottom-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
similarity index 59%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-bottom-level.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
index 70d7217a3ca094d2a5eeb00acdedd34a91499599..1673c1661aeefecbad4bc9524b6a9b23e8a30c2f 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-bottom-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-bottom-level.res.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+
     <!--
-        Siblings of the black queen:
-        1. black rook
+        Siblings of the black rook
+        1. black queen
     -->
-    <ns2:relations-common-list xmlns:ns2="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
-        <!--
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>1</itemsInPage>
         <totalItems>1</totalItems>
         <relation-list-item>
-            <subjectCsid>${blackRookCSID}</subjectCsid>
+            <subjectCsid>${blackQueenCSID}</subjectCsid>
             <objectCsid>${bagOfBlackChessPiecesCSID}</objectCsid>
             <predicate>hasBroader</predicate>
             <subject>
-                <csid>${blackRookCSID}</csid>
+                <csid>${blackQueenCSID}</csid>
             </subject>
             <object>
                 <csid>${bagOfBlackChessPiecesCSID}</csid>
             </object>
         </relation-list-item>
-        -->
-    </ns2:relations-common-list>
+    </ns3:relations-common-list>
 </document>
 

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-mid-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
similarity index 82%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-mid-level.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
index ec997fd8af5e0880e934d7aa032917cca3326cdc..9b7e3ac5fdb7039df65d7aa392071c5daaf6261b 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-mid-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-mid-level.res.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+    
     <!--
         Siblings of the bag of black chess pieces:
         1. chess board
         2. bag of white chess pieces
     -->
-    <ns2:relations-common-list xmlns:ns2="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
-        <!--
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>2</itemsInPage>
         <totalItems>2</totalItems>
@@ -32,7 +34,6 @@
                 <csid>${chessSetBoxCSID}</csid>
             </object>
         </relation-list-item>
-        -->
-    </ns2:relations-common-list>
+    </ns3:relations-common-list>
 </document>
 

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-top-level.res.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
similarity index 58%
rename from services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-top-level.res.xml
rename to services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
index 9a724a693a0fa99864786208c173df0729ac5ba8..0120bcb0999b30759a5ddf05d32fddbe00d26178 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/read-siblings-top-level.res.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/hierarchy/res/show-siblings-top-level.res.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <document name="collectionobjects">
+    <!-- Contents of the specified CollectionObject record itself are -->
+    <!-- ignored here; we are interested only in the relations list below. -->
+    
     <!--
         Siblings of the chess board box:
         (none)
     -->
-    <ns2:relations-common-list xmlns:ns2="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
-        <!--
+    <ns3:relations-common-list xmlns:ns3="http://collectionspace.org/services/relation" xmlns:ns3="http://collectionspace.org/services/jaxb">
         <pageNum>0</pageNum>
         <itemsInPage>0</itemsInPage>
         <totalItems>0</totalItems>
-        -->
-    </ns2:relations-common-list>
+    </ns3:relations-common-list>
 </document>