You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/12 10:18:06 UTC
svn commit: r667004 - in
/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport:
AbstractTransportTest.java mail/MailEchoRawXMLTest.java udp/UDPTest.java
vfs/VFSEchoRawXMLTest.java
Author: veithen
Date: Thu Jun 12 01:18:05 2008
New Revision: 667004
URL: http://svn.apache.org/viewvc?rev=667004&view=rev
Log:
Moved the method to check the echo response from MailEchoRawXMLTest to AbstractTransportTest and reuse it in UDPTest and VFSEchoRawXMLTest.
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailEchoRawXMLTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSEchoRawXMLTest.java
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java?rev=667004&r1=667003&r2=667004&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/AbstractTransportTest.java Thu Jun 12 01:18:05 2008
@@ -19,12 +19,16 @@
package org.apache.synapse.transport;
+import javax.xml.stream.XMLStreamReader;
+
import junit.framework.TestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.engine.AxisConfiguration;
@@ -58,6 +62,30 @@
return createPayload("omTextValue");
}
+ protected void assertEchoResponse(String textValue, OMElement element) {
+ assertEquals("echoOMElementResponse", element.getLocalName());
+ assertEquals("http://localhost/axis2/services/EchoXMLService",
+ element.getNamespace().getNamespaceURI());
+ OMElement valueElement = element.getFirstElement();
+ assertEquals("myValue", valueElement.getLocalName());
+ assertEquals("http://localhost/axis2/services/EchoXMLService",
+ valueElement.getNamespace().getNamespaceURI());
+ assertEquals(textValue, valueElement.getText());
+ }
+
+ protected void assertEchoResponse(OMElement element) {
+ assertEchoResponse("omTextValue", element);
+ }
+
+ protected void assertSOAPEchoResponse(String textValue, XMLStreamReader reader) {
+ SOAPEnvelope env = new StAXSOAPModelBuilder(reader).getSOAPEnvelope();
+ assertEchoResponse(textValue, env.getBody().getFirstElement());
+ }
+
+ protected void assertSOAPEchoResponse(XMLStreamReader reader) {
+ assertSOAPEchoResponse("omTextValue", reader);
+ }
+
/**
* Get the default axis2 configuration context for a client
* @return
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailEchoRawXMLTest.java?rev=667004&r1=667003&r2=667004&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailEchoRawXMLTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailEchoRawXMLTest.java Thu Jun 12 01:18:05 2008
@@ -89,17 +89,6 @@
props.put("mail.smtp.auth", "true");
}
- private void assertEchoResponse(String textValue, OMElement element) {
- assertEquals("echoOMElementResponse", element.getLocalName());
- assertEquals("http://localhost/axis2/services/EchoXMLService",
- element.getNamespace().getNamespaceURI());
- OMElement valueElement = element.getFirstElement();
- assertEquals("myValue", valueElement.getLocalName());
- assertEquals("http://localhost/axis2/services/EchoXMLService",
- valueElement.getNamespace().getNamespaceURI());
- assertEquals(textValue, valueElement.getText());
- }
-
private void assertPOXEchoResponse(String textValue, Object reply) throws Exception {
if (reply != null && reply instanceof String) {
log.debug("Result Body : " + reply);
@@ -115,8 +104,7 @@
if (reply != null && reply instanceof String) {
log.debug("Result Body : " + reply);
XMLStreamReader reader = StAXUtils.createXMLStreamReader(new StringReader((String) reply));
- SOAPEnvelope env = new StAXSOAPModelBuilder(reader).getSOAPEnvelope();
- assertEchoResponse(textValue, env.getBody().getFirstElement());
+ assertSOAPEchoResponse(textValue, reader);
} else {
fail("Did not receive the reply mail");
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java?rev=667004&r1=667003&r2=667004&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/udp/UDPTest.java Thu Jun 12 01:18:05 2008
@@ -56,7 +56,7 @@
clientService.addParameter(UDPConstants.CONTENT_TYPE_KEY, "text/xml+soap");
OMElement response = serviceClient.sendReceive(createPayload());
- assertEquals("echoOMElementResponse", response.getQName().getLocalPart());
+ assertEchoResponse(response);
}
public ConfigurationContext getClientCfgCtx() throws Exception {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSEchoRawXMLTest.java?rev=667004&r1=667003&r2=667004&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSEchoRawXMLTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSEchoRawXMLTest.java Thu Jun 12 01:18:05 2008
@@ -19,6 +19,7 @@
package org.apache.synapse.transport.vfs;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.Constants;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
@@ -32,6 +33,7 @@
import org.apache.commons.vfs.VFS;
import java.io.File;
+import java.io.FileInputStream;
public class VFSEchoRawXMLTest extends AbstractTransportTest {
@@ -62,6 +64,7 @@
if (!res.exists()) {
fail("Response file not created : " + res.getPath());
}
+ assertSOAPEchoResponse(StAXUtils.createXMLStreamReader(new FileInputStream(res)));
}
/*public void testXMLFilesInJAR() throws Exception {