From: Laramie Crocker <laramie@berkeley.edu>
Date: Tue, 16 Nov 2010 22:17:43 +0000 (+0000)
Subject: CSPACE-3078
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=7fd94bfe5b8c4719b1f7ddd77a262c49dba27823;p=tmp%2Fjakarta-migration.git

CSPACE-3078
---

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
index 2e94209b0..f6f7c9164 100755
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplay.java
@@ -482,9 +482,9 @@ public class XmlReplay {
                             uri = fromTestID(uri, testNode, serviceResultsMap);
                         }
                         if (parts.bDoingSinglePartPayload){
-                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML(parts.singlePartPayloadFilename, protoHostPort, uri, "POST", XmlReplayTransport.APPLICATION_XML, evalStruct, authForTest, testIDLabel);
+                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML(parts.singlePartPayloadFilename, protoHostPort, uri, method, XmlReplayTransport.APPLICATION_XML, evalStruct, authForTest, testIDLabel);
                         } else {
-                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML_Multipart(parts.filesList, parts.partsList, protoHostPort, uri, "POST", evalStruct, authForTest, testIDLabel);
+                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML_Multipart(parts.filesList, parts.partsList, protoHostPort, uri, method, evalStruct, authForTest, testIDLabel);
                         }
                         results.add(serviceResult);
                         if (isPOST){
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
index 2c7daf4b2..5f32f3f04 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
@@ -217,7 +217,7 @@
             </part>
         </test>
 
-        <!--Next, set up permissions and roles, and test bigbird2010 and elmo2010. -->
+        <!--Next, set up permissions and roles, and test bigbird2010.-->
         <test ID="permBigbird" auth="test">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions</uri>
@@ -243,8 +243,9 @@
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>
             <filename>security/9-permissionroles-bigbird.xml</filename>
         </test>
-        
-        <!--  NOW TRY CRUDL BY BIGBIRD -->
+
+        <!--  bigbird2010 now has CRUD permissions, -->
+        <!--  so now try CRUDL by bigbird2010 -->
         
         <test ID="dimensionBigbird_POST"  auth="bigbird2010">
             <method>POST</method>
@@ -254,7 +255,7 @@
                 <filename>dimension/1.xml</filename>
             </part>
         </test>
-        <!-- TODO: FAILING, BUT SHOULD SUCCEED.  REMOVING TEST FOR NOW. 
+        <!-- TODO: FAILING, BUT SHOULD SUCCEED.  REMOVING TEST FOR NOW. -->
         <test ID="dimensionBigbird_PUT">
             <method>PUT</method>
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST.CSID}</uri>
@@ -263,8 +264,10 @@
                 <filename>dimension/2-put.xml</filename>
             </part>
         </test>
-        -->
-        <test ID="dimensionBigbird_GET">
+
+
+
+       <test ID="dimensionBigbird_GET">
             <method>GET</method>
             <uri>/cspace-services/dimensions/</uri>
             <fromTestID>dimensionBigbird_POST</fromTestID>
@@ -295,7 +298,7 @@
             </part>
         </test>
         <test ID="dimensionBigbird_PUT_AfterPermrolesDeleted">
-            <expectedCodes>403, 404</expectedCodes>
+            <expectedCodes>403, 404,405</expectedCodes><!-- Expected failure because dimensionBigbird_POST_AfterPermrolesDeleted failed.-->
             <method>PUT</method>
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_AfterPermrolesDeleted.CSID}</uri>
             <part>
@@ -339,8 +342,6 @@
             </part>
         </test>
         <test ID="dimensionBigbird_PUT_CRU">
-            <!-- TODO: WE DIDN'T REALLY EXPECT THIS, BUT 405 IS WHAT THE SERVER SENDS. -->
-            <expectedCodes>405</expectedCodes>
             <method>PUT</method>
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_CRU.CSID}</uri>
             <part>
@@ -392,7 +393,7 @@
             </part>
         </test>
         <test ID="dimensionBigbird_PUT_R">
-            <expectedCodes>403,404</expectedCodes>
+            <expectedCodes>403,404,405</expectedCodes>
             <method>PUT</method>
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_R.CSID}</uri>
             <part>