CSPACE-338 dump inbound request payloads properly. They were not being logged previo...

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
index 36fb95602c77c70076db159cdce4f16a07228122..fae8764ec7f752bd879f81047e3debf9643f9fe0 100755 (executable)
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/ServiceResult.java
@@ -43,6 +43,7 @@ public class ServiceResult {
     public String location = "";\r
     public String CSID = "";\r
     public String subresourceCSID = "";\r
+    public String requestPayload = "";\r
     public String result = "";\r
     public int responseCode = 0;\r
     public String responseMessage = "";\r
@@ -171,7 +172,7 @@ public class ServiceResult {
 \r
     }\r
     public String detail(boolean includePayloads){\r
-        return "{"\r
+        String res =  "{"\r
                 + ( gotExpectedResult() ? "SUCCESS" : "FAILURE"  )\r
                 + failureReason\r
                 +"; "+method\r
@@ -187,9 +188,11 @@ public class ServiceResult {
                 + ( Tools.notEmpty(location) ? "; location.CSID:"+location : "" )\r
                 + ( Tools.notEmpty(error) ? "; ERROR:"+error : "" )\r
                 + "; gotExpected:"+gotExpectedResult()\r
+                + ( includePayloads && Tools.notEmpty(requestPayload) ? "; requestPayload:\r\n"+requestPayload+"\r\n" : "" )\r
                 + ( includePayloads && Tools.notEmpty(result) ? "; result:"+result : "" )\r
                 + ( partsSummary(true))\r
                 +"}";\r
+        return res;\r
     }\r
     public String minimal(){\r
         return "{"\r

diff --git a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
index 3592d11cbb241993aa770d24556c8dcb6aa24e7c..78a411e417ba42dffe1e2013fc5427e3f3c6939a 100755 (executable)
--- a/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
+++ b/services/IntegrationTests/src/main/java/org/collectionspace/services/IntegrationTests/xmlreplay/XmlReplayTransport.java
@@ -206,6 +206,7 @@ public class XmlReplayTransport {
 \r
         ServiceResult result = new ServiceResult();\r
         try {\r
+            result.requestPayload = content;\r
             result.responseCode = conn.getResponseCode();\r
             //System.out.println("responseCode: "+result.responseCode);\r
             if (400 <= result.responseCode && result.responseCode <= 499){\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
index d1d76f20792f5c5f88f59d66acd1c5c172d76433..8384db76a28fd47161686d1e658a4fcbc30502ca 100644 (file)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
@@ -6,7 +6,8 @@
         <auth ID="testAdministator">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
     </auths>\r
     \r
-    \r
+     <dump payloads="true" dumpServiceResult="minimal" />\r
+\r
     \r
     <testGroup ID="domwalk" autoDeletePOSTS="true">\r
          <test ID="oe1"  auth="test">\r
@@ -30,6 +31,9 @@
         </test>\r
     </testGroup>\r
 \r
+    <!-- ================================================================================ -->\r
+\r
+\r
     <testGroup ID="repeat" autoDeletePOSTS="true">\r
         <test ID="oeRepeat"  auth="admin@collectionspace.org">\r
             <method>POST</method>\r
@@ -41,8 +45,7 @@
         </test>\r
     </testGroup>\r
 \r
-   <!-- ================================================================================ -->\r
-    \r
+\r
      <testGroup ID="CRUDL" autoDeletePOSTS="true">\r
          <test ID="oe1"  auth="admin@collectionspace.org">\r
              <method>POST</method>\r

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index 921c1f4df62bd8d5f8e5802d82461363afabda60..896e3c0f3e7edd3c72afb2881861dce606c0d8a3 100755 (executable)
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -3,7 +3,7 @@
     <protoHostPort>http://localhost:8180</protoHostPort>\r
     \r
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->\r
-    <dump payloads="false" dumpServiceResult="full" />\r
+    <dump payloads="true" dumpServiceResult="full" />\r
     \r
     <auths default="admin@collectionspace.org">\r
        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>\r
@@ -23,7 +23,6 @@
     <run controlFile="./security.xml" testGroup="securityRemovingRoleperms" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="CRUDL" />\r
     <run controlFile="objectexit/object-exit.xml" testGroup="domwalk" />\r
-    <run controlFile="objectexit/object-exit.xml" testGroup="repeat" />\r
 \r
     <!--<run controlFile="./organization.xml" testGroup="organization" />-->\r
 \r