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 2e94209b034f5e4adb5f22d72e0c1a60ab9d81f1..f6f7c91646871db620dbd8b8f73e0c9ff6e69d57 100755 (executable)
--- 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);\r
                         }\r
                         if (parts.bDoingSinglePartPayload){\r
-                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML(parts.singlePartPayloadFilename, protoHostPort, uri, "POST", XmlReplayTransport.APPLICATION_XML, evalStruct, authForTest, testIDLabel);\r
+                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML(parts.singlePartPayloadFilename, protoHostPort, uri, method, XmlReplayTransport.APPLICATION_XML, evalStruct, authForTest, testIDLabel);\r
                         } else {\r
-                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML_Multipart(parts.filesList, parts.partsList, protoHostPort, uri, "POST", evalStruct, authForTest, testIDLabel);\r
+                            serviceResult = XmlReplayTransport.doPOST_PUTFromXML_Multipart(parts.filesList, parts.partsList, protoHostPort, uri, method, evalStruct, authForTest, testIDLabel);\r
                         }\r
                         results.add(serviceResult);\r
                         if (isPOST){\r

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 2c7daf4b2cdc2ec95beced1143cba34cc7f3c8e2..5f32f3f045bac7cc18cc6db9abe7170c9a9ba866 100755 (executable)
--- 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>\r
         </test>\r
 \r
-        <!--Next, set up permissions and roles, and test bigbird2010 and elmo2010. -->\r
+        <!--Next, set up permissions and roles, and test bigbird2010.-->\r
         <test ID="permBigbird" auth="test">\r
             <method>POST</method>\r
             <uri>/cspace-services/authorization/permissions</uri>\r
@@ -243,8 +243,9 @@
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>\r
             <filename>security/9-permissionroles-bigbird.xml</filename>\r
         </test>\r
-        \r
-        <!--  NOW TRY CRUDL BY BIGBIRD -->\r
+\r
+        <!--  bigbird2010 now has CRUD permissions, -->\r
+        <!--  so now try CRUDL by bigbird2010 -->\r
         \r
         <test ID="dimensionBigbird_POST"  auth="bigbird2010">\r
             <method>POST</method>\r
@@ -254,7 +255,7 @@
                 <filename>dimension/1.xml</filename>\r
             </part>\r
         </test>\r
-        <!-- TODO: FAILING, BUT SHOULD SUCCEED.  REMOVING TEST FOR NOW. \r
+        <!-- TODO: FAILING, BUT SHOULD SUCCEED.  REMOVING TEST FOR NOW. -->\r
         <test ID="dimensionBigbird_PUT">\r
             <method>PUT</method>\r
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST.CSID}</uri>\r
@@ -263,8 +264,10 @@
                 <filename>dimension/2-put.xml</filename>\r
             </part>\r
         </test>\r
-        -->\r
-        <test ID="dimensionBigbird_GET">\r
+\r
+\r
+\r
+       <test ID="dimensionBigbird_GET">\r
             <method>GET</method>\r
             <uri>/cspace-services/dimensions/</uri>\r
             <fromTestID>dimensionBigbird_POST</fromTestID>\r
@@ -295,7 +298,7 @@
             </part>\r
         </test>\r
         <test ID="dimensionBigbird_PUT_AfterPermrolesDeleted">\r
-            <expectedCodes>403, 404</expectedCodes>\r
+            <expectedCodes>403, 404,405</expectedCodes><!-- Expected failure because dimensionBigbird_POST_AfterPermrolesDeleted failed.-->\r
             <method>PUT</method>\r
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_AfterPermrolesDeleted.CSID}</uri>\r
             <part>\r
@@ -339,8 +342,6 @@
             </part>\r
         </test>\r
         <test ID="dimensionBigbird_PUT_CRU">\r
-            <!-- TODO: WE DIDN'T REALLY EXPECT THIS, BUT 405 IS WHAT THE SERVER SENDS. -->\r
-            <expectedCodes>405</expectedCodes>\r
             <method>PUT</method>\r
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_CRU.CSID}</uri>\r
             <part>\r
@@ -392,7 +393,7 @@
             </part>\r
         </test>\r
         <test ID="dimensionBigbird_PUT_R">\r
-            <expectedCodes>403,404</expectedCodes>\r
+            <expectedCodes>403,404,405</expectedCodes>\r
             <method>PUT</method>\r
             <uri>/cspace-services/dimensions/${dimensionBigbird_POST_R.CSID}</uri>\r
             <part>\r