svn commit: r947447 - in /axis/axis2/java/transports/trunk/modules: mail/src/test/java/org/apache/axis2/transport/mail/ testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/ testkit/src/main/java/org/apache/axis2/transport/testkit/mess...

[ve...@apache.org]

Author: veithen
Date: Sun May 23 17:21:24 2010
New Revision: 947447

URL: http://svn.apache.org/viewvc?rev=947447&view=rev
Log:
Added a regression test for the issue fixed in r947440 and temporarily disabled the test cases that reproduce the issue described in WSCOMMONS-544.

Modified:
    axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
    axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
    axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java

Modified: axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java?rev=947447&r1=947446&r2=947447&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java (original)
+++ axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java Sun May 23 17:21:24 2010
@@ -61,7 +61,8 @@ public class MailTransportTest extends T
         
         builder.addRequestResponseChannel(channel);
         
-        builder.addAxisRequestResponseTestClient(new AxisRequestResponseTestClient(), new ResponseListenerConfigurator());
+        // TODO: this doesn't work because of WSCOMMONS-544
+//        builder.addAxisRequestResponseTestClient(new AxisRequestResponseTestClient(), new ResponseListenerConfigurator());
         builder.addByteArrayRequestResponseTestClient(new MailRequestResponseClient(new FlatLayout()));
         builder.addByteArrayRequestResponseTestClient(new MailRequestResponseClient(new MultipartLayout()));
         

Modified: axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=947447&r1=947446&r2=947447&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java (original)
+++ axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java Sun May 23 17:21:24 2010
@@ -119,7 +119,7 @@ public class AxisTestClient implements T
         }
         mepClient.addMessageContext(mc);
         mepClient.execute(block);
-        mepClient.complete(mc);
+//        mepClient.complete(mc);
         return resultMessageLabel == null ? null : mepClient.getMessageContext(resultMessageLabel);
     }
 

Modified: axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java?rev=947447&r1=947446&r2=947447&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java (original)
+++ axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java Sun May 23 17:21:24 2010
@@ -20,6 +20,7 @@
 package org.apache.axis2.transport.testkit.message;
 
 import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -41,7 +42,15 @@ public class AxisMessage {
     
     public AxisMessage(MessageContext msgContext) throws Exception {
         envelope = msgContext.getEnvelope();
-        envelope.build();
+        // If possible, build the parent (i.e. the OMDocument) to make sure that the entire message is read.
+        // If the transport doesn't handle the end of the message properly, then this problem
+        // will show up here.
+        OMDocument document = (OMDocument)envelope.getParent();
+        if (document != null) {
+            document.build();
+        } else {
+            envelope.build();
+        }
         
         // TODO: quick & dirty hack to force expansion of OMSourceElement payloads
         OMElement content = envelope.getBody().getFirstElement();