From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 10 Sep 2012 19:46:42 +0000 (-0700)
Subject: CSPACE-5520: Redid changes from commit 98a38422024f6ddfd02a8adbd7e9524a21358779,... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9de9cfb98e2b42ba60d8b7c66f619ab3c37c61be;p=tmp%2Fjakarta-migration.git

CSPACE-5520: Redid changes from commit 98a38422024f6ddfd02a8adbd7e9524a21358779, again with correct commit comment: Added expected payload for a relations obj= test of structured objects.
---

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 23d9212da..c68322b37 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,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xmlReplay>
     
-    <testGroup ID="CreateCollectionObjects"> <!-- autoDeletePOSTS="true" -->
+    <testGroup ID="CreateUpdateReadStructuredObjects" autoDeletePOSTS="false">
         
         <!-- Create a set of CollectionObjects -->
         
@@ -328,7 +328,7 @@
             <uri>/cspace-services/relations?sbj=${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
             <response>
-                <expected level="TEXT" />
+                <expected level="ADDOK" />
                 <filename>collectionobject/hierarchy/res/relations-pagination-header.res.xml</filename>
                 <vars>
                     <var ID="totalItems">0</var>
@@ -341,7 +341,7 @@
             <uri>/cspace-services/relations?obj=${CreateChessSetBox.CSID}</uri>
             <expectedCodes>200</expectedCodes>
             <response>
-                <expected level="TEXT" />
+                <expected level="ADDOK" />
                 <filename>collectionobject/hierarchy/res/relations-as-object-top-level.res.xml</filename>
                 <vars>
                     <var ID="chessSetBoxCSID">${CreateChessSetBox.CSID}</var>
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 45a260de3..ff05e1748 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
@@ -4,6 +4,44 @@
     <!-- ignored here; we are interested only in the relations list below. -->
     
     <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 -->
+        <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>