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/08/22 01:53:09 UTC
svn commit: r687904 [2/2] - in
/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport:
./ jms/ mail/ nhttp/ testkit/client/ testkit/client/axis2/
testkit/listener/ testkit/server/ testkit/server/axis2/ testkit/tests/
testkit/...
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java Thu Aug 21 16:53:07 2008
@@ -24,7 +24,6 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.synapse.transport.testkit.client.ClientOptions;
import org.apache.synapse.transport.testkit.client.RequestResponseTestClient;
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
import org.apache.synapse.transport.testkit.listener.MessageTestData;
@@ -32,33 +31,18 @@
import org.apache.synapse.transport.testkit.message.XMLMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
import org.apache.synapse.transport.testkit.name.NameComponent;
-import org.apache.synapse.transport.testkit.server.Endpoint;
import org.apache.synapse.transport.testkit.server.EndpointFactory;
-import org.apache.synapse.transport.testkit.tests.TransportTestCase;
@DisplayName("EchoXML")
-public class XMLRequestResponseMessageTestCase extends TransportTestCase {
- private final RequestResponseTestClient<XMLMessage,XMLMessage> client;
- private final EndpointFactory endpointFactory;
+public class XMLRequestResponseMessageTestCase extends RequestResponseMessageTestCase<XMLMessage,XMLMessage> {
private final XMLMessage.Type xmlMessageType;
private final MessageTestData data;
// TODO: realign order of arguments with XMLAsyncMessageTestCase constructor
- // TODO: maybe we don't need an explicit RequestResponseChannel
public XMLRequestResponseMessageTestCase(RequestResponseChannel channel, RequestResponseTestClient<XMLMessage,XMLMessage> client, EndpointFactory endpointFactory, ContentTypeMode contentTypeMode, String contentType, XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) {
- super(contentTypeMode, contentType, resources);
- this.client = client;
- this.endpointFactory = endpointFactory;
+ super(channel, client, endpointFactory, contentTypeMode, contentType, data.getCharset(), resources);
this.xmlMessageType = xmlMessageType;
this.data = data;
- addResource(channel);
- addResource(client);
- addResource(endpointFactory);
- }
-
- @NameComponent("client")
- public RequestResponseTestClient<XMLMessage,XMLMessage> getClient() {
- return client;
}
@NameComponent("messageType")
@@ -72,18 +56,18 @@
}
@Override
- protected void runTest() throws Throwable {
- Endpoint endpoint = endpointFactory.createEchoEndpoint(contentTypeMode == ContentTypeMode.SERVICE ? contentType : null);
- try {
- OMFactory factory = OMAbstractFactory.getOMFactory();
- OMElement orgElement = factory.createOMElement(new QName("root"));
- orgElement.setText(data.getText());
- OMElement element = client.sendMessage(new ClientOptions(endpoint.getEPR(), data.getCharset()), new XMLMessage(contentType, orgElement, xmlMessageType)).getPayload();
- assertEquals(orgElement.getQName(), element.getQName());
- assertEquals(orgElement.getText(), element.getText());
- } finally {
- Thread.sleep(1000);
- endpoint.remove();
- }
+ protected XMLMessage prepareRequest() throws Exception {
+ OMFactory factory = OMAbstractFactory.getOMFactory();
+ OMElement orgElement = factory.createOMElement(new QName("root"));
+ orgElement.setText(data.getText());
+ return new XMLMessage(contentType, orgElement, xmlMessageType);
+ }
+
+ @Override
+ protected void checkResponse(XMLMessage request, XMLMessage response) throws Exception {
+ OMElement orgElement = request.getPayload();
+ OMElement element = response.getPayload();
+ assertEquals(orgElement.getQName(), element.getQName());
+ assertEquals(orgElement.getText(), element.getText());
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java Thu Aug 21 16:53:07 2008
@@ -21,21 +21,27 @@
import java.io.File;
+import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
public class VFSFileChannel extends AbstractChannel implements AsyncChannel {
- private final File requestFile;
+ private final String path;
+ private File requestFile;
- public VFSFileChannel(File requestFile) {
- this.requestFile = requestFile;
+ public VFSFileChannel(String path) {
+ this.path = path;
}
public File getRequestFile() {
return requestFile;
}
+ public EndpointReference getEndpointReference() throws Exception {
+ return new EndpointReference("vfs:" + requestFile.getAbsoluteFile().toURL());
+ }
+
@Override
public void setupService(AxisService service) throws Exception {
service.addParameter("transport.vfs.FileURI", "vfs:" + requestFile.toURL());
@@ -44,7 +50,8 @@
}
@SuppressWarnings("unused")
- private void setUp() throws Exception {
+ private void setUp(VFSTestEnvironment env) throws Exception {
+ requestFile = new File(env.getRootDir(), path);
requestFile.getParentFile().mkdirs();
requestFile.delete();
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSMockAsyncEndpoint.java Thu Aug 21 16:53:07 2008
@@ -39,10 +39,6 @@
this.contentType = contentType;
}
- public String getEPR() throws Exception {
- return "vfs:file:" + channel.getRequestFile().getAbsolutePath();
- }
-
public ByteArrayMessage waitForMessage(int timeout) throws Throwable {
long time = System.currentTimeMillis();
File file = channel.getRequestFile();
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java Thu Aug 21 16:53:07 2008
@@ -19,10 +19,27 @@
package org.apache.synapse.transport.vfs;
+import java.io.File;
+
import org.apache.axis2.description.AxisService;
import org.apache.synapse.transport.testkit.TestEnvironment;
public class VFSTestEnvironment extends TestEnvironment {
+ private final File rootDir;
+
+ public VFSTestEnvironment(File rootDir) {
+ this.rootDir = rootDir;
+ }
+
+ @SuppressWarnings("unused")
+ private void setUp() {
+ rootDir.mkdirs();
+ }
+
+ public File getRootDir() {
+ return rootDir;
+ }
+
@Override
public void setupContentType(AxisService service, String contentType) throws Exception {
service.addParameter("transport.vfs.ContentType", contentType);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java Thu Aug 21 16:53:07 2008
@@ -49,14 +49,14 @@
TransportDescriptionFactory tdf =
new SimpleTransportDescriptionFactory("vfs", VFSTransportListener.class,
VFSTransportSender.class);
- VFSTestEnvironment env = new VFSTestEnvironment();
+ VFSTestEnvironment env = new VFSTestEnvironment(new File("target/vfs3"));
AxisServer server = new AxisServer();
AxisAsyncEndpointFactory asyncEndpointFactory = new AxisAsyncEndpointFactory();
- VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile());
+ VFSFileChannel channel = new VFSFileChannel("req/in");
VFSClient vfsClient = new VFSClient();
List<AsyncTestClient<XMLMessage>> clients = new LinkedList<AsyncTestClient<XMLMessage>>();
clients.add(adapt(vfsClient, MessageConverter.XML_TO_BYTE));
- clients.add(adapt(new AxisAsyncTestClient(tdf), MessageConverter.XML_TO_AXIS));
+ clients.add(adapt(new AxisAsyncTestClient(), MessageConverter.XML_TO_AXIS));
for (AsyncTestClient<XMLMessage> client : clients) {
suite.addSOAPTests(channel, client, asyncEndpointFactory, ContentTypeMode.SERVICE, env, server, tdf);
suite.addPOXTests(channel, client, asyncEndpointFactory, ContentTypeMode.SERVICE, env, server, tdf);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java?rev=687904&r1=687903&r2=687904&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java Thu Aug 21 16:53:07 2008
@@ -42,7 +42,7 @@
public static TestSuite suite() {
TransportTestSuite suite = new TransportTestSuite(false);
- VFSTestEnvironment env = new VFSTestEnvironment();
+ VFSTestEnvironment env = new VFSTestEnvironment(new File("target/vfs4"));
TransportDescriptionFactory tdf =
new SimpleTransportDescriptionFactory("vfs", VFSTransportListener.class,
VFSTransportSender.class);
@@ -64,11 +64,11 @@
}
};
- VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile());
- AxisAsyncTestClient client = new AxisAsyncTestClient(tdf);
+ VFSFileChannel channel = new VFSFileChannel("req/in");
+ AxisAsyncTestClient client = new AxisAsyncTestClient();
- suite.addBinaryTest(channel, adapt(client, MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE, env);
- suite.addTextPlainTests(channel, adapt(client, MessageConverter.TEXT_WRAPPER), adapt(endpointFactory, MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE, env);
+ suite.addBinaryTest(channel, adapt(client, MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE, env, tdf);
+ suite.addTextPlainTests(channel, adapt(client, MessageConverter.TEXT_WRAPPER), adapt(endpointFactory, MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE, env, tdf);
return suite;
}