Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/Server.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/Server.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/Server.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/Server.java Mon Aug 11 15:46:13 2008 @@ -19,10 +19,10 @@ package org.apache.synapse.transport.testkit.server; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.Channel; -import org.apache.synapse.transport.testkit.listener.ListenerTestSetup; -public abstract class Server<T extends ListenerTestSetup> { +public abstract class Server<T extends TestEnvironment> { private final T setup; public Server(T setup) { @@ -45,6 +45,6 @@ return setup; } - public abstract void start(Channel<?> channel) throws Exception; + public abstract void start(T env, Channel<?> channel) throws Exception; public abstract void stop() throws Exception; }
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java Mon Aug 11 15:46:13 2008 @@ -34,9 +34,9 @@ import org.apache.axis2.receivers.AbstractInOutMessageReceiver; import org.apache.axis2.transport.TransportListener; import org.apache.synapse.transport.UtilsTransportServer; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.AsyncChannel; import org.apache.synapse.transport.testkit.listener.Channel; -import org.apache.synapse.transport.testkit.listener.ListenerTestSetup; import org.apache.synapse.transport.testkit.listener.RequestResponseChannel; import org.apache.synapse.transport.testkit.message.MessageData; import org.apache.synapse.transport.testkit.server.AsyncEndpoint; @@ -45,8 +45,8 @@ import org.apache.synapse.transport.testkit.server.EndpointFactory; import org.apache.synapse.transport.testkit.server.Server; -public class AxisServer<T extends ListenerTestSetup> extends Server<T> implements AsyncEndpointFactory<AsyncChannel<?>,MessageData>, EndpointFactory<RequestResponseChannel<?>> { - public static final AxisServer<ListenerTestSetup> DEFAULT = new AxisServer<ListenerTestSetup>(ListenerTestSetup.DEFAULT); +public class AxisServer<E extends TestEnvironment> extends Server<E> implements AsyncEndpointFactory<E,AsyncChannel<? super E>,MessageData>, EndpointFactory<E,RequestResponseChannel<? super E>> { + public static final AxisServer<TestEnvironment> DEFAULT = new AxisServer<TestEnvironment>(TestEnvironment.DEFAULT); private static Server<?> activeServer; @@ -54,12 +54,12 @@ private TransportListener listener; UtilsTransportServer server; - public AxisServer(T setup) { + public AxisServer(E setup) { super(setup); } @Override - public void start(Channel<?> channel) throws Exception { + public void start(E env, Channel<?> channel) throws Exception { server = new UtilsTransportServer(); this.channel = channel; @@ -68,8 +68,6 @@ } activeServer = this; - channel.getSetup().setUp(); - TransportOutDescription trpOutDesc; if (channel instanceof RequestResponseChannel) { trpOutDesc = ((RequestResponseChannel<?>)channel).createTransportOutDescription(); @@ -96,15 +94,12 @@ dispatcher.initDispatcher(); dispatchPhase.addHandler(dispatcher); - channel.setUp(); server.start(); } @Override public void stop() throws Exception { server.stop(); - channel.tearDown(); - channel.getSetup().tearDown(); Thread.sleep(100); // TODO: this is required for the NIO transport; check whether this is a bug server = null; activeServer = null; @@ -121,11 +116,11 @@ ? endpointReferences[0].getAddress() : null; } - public Server<?> getServer() { + public Server<E> getServer() { return this; } - public AsyncEndpoint<MessageData> createAsyncEndpoint(AsyncChannel<?> channel, String contentType) throws Exception { + public AsyncEndpoint<MessageData> createAsyncEndpoint(E env, AsyncChannel<? super E> channel, String contentType) throws Exception { // Set up a test service with a default operation backed by a mock message // receiver. The service is configured using the parameters specified by the // implementation. @@ -136,7 +131,7 @@ service.addOperation(operation); channel.setupService(service); if (contentType != null) { - channel.getSetup().setupContentType(service, contentType); + env.setupContentType(service, contentType); } AxisConfiguration axisConfiguration = server.getAxisConfiguration(); axisConfiguration.addService(service); @@ -144,7 +139,7 @@ return new AsyncEndpointImpl(this, service, messageReceiver); } - public Endpoint createEchoEndpoint(RequestResponseChannel<?> channel, String contentType) throws Exception { + public Endpoint createEchoEndpoint(E env, RequestResponseChannel<? super E> channel, String contentType) throws Exception { AxisService service = new AxisService("EchoService"); AxisOperation operation = new InOutAxisOperation(DefaultOperationDispatcher.DEFAULT_OPERATION_NAME); operation.setMessageReceiver(new AbstractInOutMessageReceiver() { @@ -158,7 +153,7 @@ service.addOperation(operation); channel.setupService(service); if (contentType != null) { - channel.getSetup().setupContentType(service, contentType); + env.setupContentType(service, contentType); } AxisConfiguration axisConfiguration = server.getAxisConfiguration(); Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java Mon Aug 11 15:46:13 2008 @@ -19,9 +19,9 @@ package org.apache.synapse.transport.testkit.tests; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.Channel; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; -import org.apache.synapse.transport.testkit.listener.ListenerTestSetup; import org.apache.synapse.transport.testkit.listener.MessageSender; import org.apache.synapse.transport.testkit.listener.NameBuilder; import org.apache.synapse.transport.testkit.name.NameComponent; @@ -30,16 +30,18 @@ import junit.framework.TestCase; -public abstract class TransportTestCase<C extends Channel<?>,S extends MessageSender<? super C>> extends TestCase { +public abstract class TransportTestCase<E extends TestEnvironment,C extends Channel<? super E>,S extends MessageSender<? super C>> extends TestCase { + protected final E env; protected final C channel; protected final S sender; - private final Server<?> server; + private final Server<? super E> server; protected final ContentTypeMode contentTypeMode; protected final String contentType; private boolean manageServer = true; - public TransportTestCase(C channel, S sender, Server<?> server, ContentTypeMode contentTypeMode, String contentType) { + public TransportTestCase(E env, C channel, S sender, Server<? super E> server, ContentTypeMode contentTypeMode, String contentType) { + this.env = env; this.channel = channel; this.sender = sender; this.server = server; @@ -54,8 +56,6 @@ NameBuilder nameBuilder = new NameBuilder(); nameBuilder.addComponent("test", NameUtils.getName(this)); NameUtils.getNameComponents(nameBuilder, this); - channel.buildName(nameBuilder); - buildName(nameBuilder); nameBuilder.addComponent("contentTypeMode", contentTypeMode.toString().toLowerCase()); testName = nameBuilder.toString(); setName(testName); @@ -63,10 +63,6 @@ return testName; } - protected void buildName(NameBuilder name) { - sender.buildName(name); - } - @NameComponent("channel") public C getChannel() { return channel; @@ -77,8 +73,9 @@ return sender; } - public ListenerTestSetup getSetup() { - return channel.getSetup(); + @NameComponent("setup") + public E getSetup() { + return env; } // public void setServer(ListenerTestServer server){ @@ -88,8 +85,12 @@ @Override protected void setUp() throws Exception { + if (env != null) { + env.setUp(); + } + channel.setUp(env); if (server != null && manageServer) { - server.start(channel); + server.start(env, channel); } sender.setUp(channel); } @@ -100,5 +101,9 @@ if (server != null && manageServer) { server.stop(); } + channel.tearDown(); + if (env != null) { + env.tearDown(); + } } } \ No newline at end of file Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/BinaryTestCase.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/BinaryTestCase.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/BinaryTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/BinaryTestCase.java Mon Aug 11 15:46:13 2008 @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Random; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.AsyncChannel; import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; import org.apache.synapse.transport.testkit.listener.AsyncMessageTestCase; @@ -31,11 +32,11 @@ import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; @DisplayName("AsyncBinary") -public class BinaryTestCase<C extends AsyncChannel<?>> extends AsyncMessageTestCase<C,ByteArrayMessage,ByteArrayMessage> { +public class BinaryTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,ByteArrayMessage,ByteArrayMessage> { private static final Random random = new Random(); - public BinaryTestCase(C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) { - super(channel, sender, endpointFactory, contentTypeMode, "application/octet-stream", null); + public BinaryTestCase(E env, C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) { + super(env, channel, sender, endpointFactory, contentTypeMode, "application/octet-stream", null); } @Override Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/RESTTestCase.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/RESTTestCase.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/RESTTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/RESTTestCase.java Mon Aug 11 15:46:13 2008 @@ -19,6 +19,7 @@ package org.apache.synapse.transport.testkit.tests.async; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.AsyncChannel; import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; import org.apache.synapse.transport.testkit.listener.AsyncMessageTestCase; @@ -29,9 +30,9 @@ import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; @DisplayName("REST") -public class RESTTestCase<C extends AsyncChannel<?>> extends AsyncMessageTestCase<C,RESTMessage,MessageData> { - public RESTTestCase(C channel, AsyncMessageSender<? super C,RESTMessage> sender, AsyncEndpointFactory<? super C,MessageData> endpointFactory) { - super(channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); +public class RESTTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,RESTMessage,MessageData> { + public RESTTestCase(E env, C channel, AsyncMessageSender<? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) { + super(env, channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); } @Override Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/SwATestCase.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/SwATestCase.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/SwATestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/SwATestCase.java Mon Aug 11 15:46:13 2008 @@ -38,6 +38,7 @@ import org.apache.axiom.soap.SOAPBody; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.AsyncChannel; import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; import org.apache.synapse.transport.testkit.listener.AsyncMessageTestCase; @@ -48,14 +49,14 @@ import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; @DisplayName("AsyncSwA") -public class SwATestCase<C extends AsyncChannel<?>> extends AsyncMessageTestCase<C,ByteArrayMessage,MessageData> { +public class SwATestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,ByteArrayMessage,MessageData> { private static final Random random = new Random(); private byte[] attachmentContent; private String contentID; - public SwATestCase(C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super C,MessageData> endpointFactory) { - super(channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); + public SwATestCase(E env, C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) { + super(env, channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); } @Override Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/TextPlainTestCase.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/TextPlainTestCase.java?rev=684968&r1=684967&r2=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/TextPlainTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/TextPlainTestCase.java Mon Aug 11 15:46:13 2008 @@ -19,29 +19,29 @@ package org.apache.synapse.transport.testkit.tests.async; +import org.apache.synapse.transport.testkit.TestEnvironment; import org.apache.synapse.transport.testkit.listener.AsyncChannel; import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; import org.apache.synapse.transport.testkit.listener.AsyncMessageTestCase; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; import org.apache.synapse.transport.testkit.listener.MessageTestData; -import org.apache.synapse.transport.testkit.listener.NameBuilder; import org.apache.synapse.transport.testkit.message.StringMessage; import org.apache.synapse.transport.testkit.name.DisplayName; +import org.apache.synapse.transport.testkit.name.NameComponent; import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; @DisplayName("AsyncTextPlain") -public class TextPlainTestCase<C extends AsyncChannel<?>> extends AsyncMessageTestCase<C,StringMessage,StringMessage> { +public class TextPlainTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,StringMessage,StringMessage> { private final MessageTestData data; - public TextPlainTestCase(C channel, AsyncMessageSender<? super C,StringMessage> sender, AsyncEndpointFactory<? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) { - super(channel, sender, endpointFactory, contentTypeMode, "text/plain; charset=\"" + data.getCharset() + "\"", data.getCharset()); + public TextPlainTestCase(E env, C channel, AsyncMessageSender<? super C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) { + super(env, channel, sender, endpointFactory, contentTypeMode, "text/plain; charset=\"" + data.getCharset() + "\"", data.getCharset()); this.data = data; } - @Override - protected void buildName(NameBuilder name) { - super.buildName(name); - data.buildName(name); + @NameComponent("data") + public MessageTestData getData() { + return data; } @Override Copied: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java (from r684519, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLAsyncMessageTestCase.java) URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java?p2=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLAsyncMessageTestCase.java&r1=684519&r2=684968&rev=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLAsyncMessageTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java Mon Aug 11 15:46:13 2008 @@ -17,34 +17,45 @@ * under the License. */ -package org.apache.synapse.transport.testkit.listener; +package org.apache.synapse.transport.testkit.tests.async; import javax.xml.namespace.QName; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.listener.AsyncChannel; +import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; +import org.apache.synapse.transport.testkit.listener.AsyncMessageTestCase; +import org.apache.synapse.transport.testkit.listener.ContentTypeMode; +import org.apache.synapse.transport.testkit.listener.MessageTestData; import org.apache.synapse.transport.testkit.message.MessageData; import org.apache.synapse.transport.testkit.message.XMLMessage; import org.apache.synapse.transport.testkit.message.XMLMessageType; import org.apache.synapse.transport.testkit.name.DisplayName; +import org.apache.synapse.transport.testkit.name.NameComponent; import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; @DisplayName("AsyncXML") -public class XMLAsyncMessageTestCase<C extends AsyncChannel<?>> extends AsyncMessageTestCase<C,XMLMessage,MessageData> { +public class XMLAsyncMessageTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,XMLMessage,MessageData> { private final XMLMessageType xmlMessageType; private final MessageTestData data; - public XMLAsyncMessageTestCase(C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super C,MessageData> endpointFactory, XMLMessageType xmlMessageType, ContentTypeMode contentTypeMode, String baseContentType, MessageTestData data) { - super(channel, sender, endpointFactory, contentTypeMode, baseContentType + "; charset=\"" + data.getCharset() + "\"", data.getCharset()); + public XMLAsyncMessageTestCase(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, XMLMessageType xmlMessageType, ContentTypeMode contentTypeMode, String baseContentType, MessageTestData data) { + super(env, channel, sender, endpointFactory, contentTypeMode, baseContentType + "; charset=\"" + data.getCharset() + "\"", data.getCharset()); this.xmlMessageType = xmlMessageType; this.data = data; } - @Override - protected void buildName(NameBuilder name) { - super.buildName(name); - data.buildName(name); + @NameComponent("messageType") + public XMLMessageType getXmlMessageType() { + return xmlMessageType; + } + + @NameComponent("data") + public MessageTestData getData() { + return data; } @Override Copied: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java (from r684519, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/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?p2=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageTestCase.java&r1=684519&r2=684968&rev=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java Mon Aug 11 15:46:13 2008 @@ -17,35 +17,51 @@ * under the License. */ -package org.apache.synapse.transport.testkit.listener; +package org.apache.synapse.transport.testkit.tests.echo; import javax.xml.namespace.QName; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMFactory; +import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.listener.ContentTypeMode; +import org.apache.synapse.transport.testkit.listener.MessageTestData; +import org.apache.synapse.transport.testkit.listener.RequestResponseChannel; +import org.apache.synapse.transport.testkit.listener.XMLRequestResponseMessageSender; import org.apache.synapse.transport.testkit.message.XMLMessageType; 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<C extends RequestResponseChannel<?>> extends TransportTestCase<C,XMLRequestResponseMessageSender<? super C>> { - private final EndpointFactory<? super C> endpointFactory; +public class XMLRequestResponseMessageTestCase<E extends TestEnvironment,C extends RequestResponseChannel<? super E>> extends TransportTestCase<E,C,XMLRequestResponseMessageSender<? super C>> { + private final EndpointFactory<? super E,? super C> endpointFactory; private final XMLMessageType xmlMessageType; private final MessageTestData data; // TODO: realign order of arguments with XMLAsyncMessageTestCase constructor - public XMLRequestResponseMessageTestCase(C channel, XMLRequestResponseMessageSender<? super C> sender, EndpointFactory<? super C> endpointFactory, ContentTypeMode contentTypeMode, String contentType, XMLMessageType xmlMessageType, MessageTestData data) { - super(channel, sender, endpointFactory.getServer(), contentTypeMode, contentType); + public XMLRequestResponseMessageTestCase(E env, C channel, XMLRequestResponseMessageSender<? super C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, String contentType, XMLMessageType xmlMessageType, MessageTestData data) { + super(env, channel, sender, endpointFactory.getServer(), contentTypeMode, contentType); this.endpointFactory = endpointFactory; this.xmlMessageType = xmlMessageType; this.data = data; } + @NameComponent("messageType") + public XMLMessageType getXmlMessageType() { + return xmlMessageType; + } + + @NameComponent("data") + public MessageTestData getData() { + return data; + } + @Override protected void runTest() throws Throwable { - Endpoint endpoint = endpointFactory.createEchoEndpoint(channel, contentTypeMode == ContentTypeMode.SERVICE ? contentType : null); + Endpoint endpoint = endpointFactory.createEchoEndpoint(env, channel, contentTypeMode == ContentTypeMode.SERVICE ? contentType : null); try { OMFactory factory = xmlMessageType.getOMFactory(); OMElement orgElement = factory.createOMElement(new QName("root")); 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=684968&r1=684967&r2=684968&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 Mon Aug 11 15:46:13 2008 @@ -26,13 +26,11 @@ import org.apache.axis2.description.TransportOutDescription; import org.apache.synapse.transport.testkit.listener.AbstractChannel; import org.apache.synapse.transport.testkit.listener.AsyncChannel; -import org.apache.synapse.transport.testkit.server.Server; -public class VFSFileChannel extends AbstractChannel<VFSTestSetup> implements AsyncChannel<VFSTestSetup> { +public class VFSFileChannel extends AbstractChannel<VFSTestEnvironment> implements AsyncChannel<VFSTestEnvironment> { private final File requestFile; - public VFSFileChannel(Server<VFSTestSetup> server, File requestFile) { - super(server); + public VFSFileChannel(File requestFile) { this.requestFile = requestFile; } @@ -63,7 +61,7 @@ } @Override - public void setUp() throws Exception { + public void setUp(VFSTestEnvironment env) throws Exception { requestFile.getParentFile().mkdirs(); requestFile.delete(); } Copied: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java (from r684713, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestSetup.java) URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java?p2=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestSetup.java&r1=684713&r2=684968&rev=684968&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestSetup.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java Mon Aug 11 15:46:13 2008 @@ -20,9 +20,9 @@ package org.apache.synapse.transport.vfs; import org.apache.axis2.description.AxisService; -import org.apache.synapse.transport.testkit.listener.ListenerTestSetup; +import org.apache.synapse.transport.testkit.TestEnvironment; -public class VFSTestSetup extends ListenerTestSetup { +public class VFSTestEnvironment extends TestEnvironment { @Override public void setupContentType(AxisService service, String contentType) throws Exception { service.addParameter("transport.vfs.ContentType", contentType); Propchange: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTestEnvironment.java ------------------------------------------------------------------------------ svn:mergeinfo = 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=684968&r1=684967&r2=684968&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 Mon Aug 11 15:46:13 2008 @@ -30,11 +30,11 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.synapse.transport.testkit.TransportTestSuite; import org.apache.synapse.transport.testkit.listener.AbstractMessageSender; import org.apache.synapse.transport.testkit.listener.AsyncMessageSender; import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; -import org.apache.synapse.transport.testkit.listener.ListenerTestSuite; import org.apache.synapse.transport.testkit.listener.SenderOptions; import org.apache.synapse.transport.testkit.message.ByteArrayMessage; import org.apache.synapse.transport.testkit.message.MessageConverter; @@ -55,21 +55,21 @@ public static TestSuite suite() { // TODO: the VFS listener doesn't like reuseServer == true... - ListenerTestSuite suite = new ListenerTestSuite(false); - VFSTestSetup setup = new VFSTestSetup(); - AxisServer<VFSTestSetup> server = new AxisServer<VFSTestSetup>(setup); - VFSFileChannel channel = new VFSFileChannel(server, new File("target/vfs3/req/in").getAbsoluteFile()); + TransportTestSuite<VFSTestEnvironment> suite = new TransportTestSuite<VFSTestEnvironment>(false); + VFSTestEnvironment env = new VFSTestEnvironment(); + AxisServer<VFSTestEnvironment> server = new AxisServer<VFSTestEnvironment>(env); + VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile()); MessageSenderImpl vfsSender = new MessageSenderImpl(); List<AsyncMessageSender<? super VFSFileChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super VFSFileChannel,XMLMessage>>(); senders.add(adapt(vfsSender, MessageConverter.XML_TO_BYTE)); senders.add(new AxisAsyncMessageSender()); for (AsyncMessageSender<? super VFSFileChannel,XMLMessage> sender : senders) { - suite.addSOAPTests(channel, sender, server, ContentTypeMode.SERVICE); - suite.addPOXTests(channel, sender, server, ContentTypeMode.SERVICE); + suite.addSOAPTests(env, channel, sender, server, ContentTypeMode.SERVICE); + suite.addPOXTests(env, channel, sender, server, ContentTypeMode.SERVICE); // Since VFS has no Content-Type header, SwA is not supported. } - suite.addTextPlainTests(channel, adapt(vfsSender, MessageConverter.STRING_TO_BYTE), adapt(server, MessageConverter.AXIS_TO_STRING), ContentTypeMode.SERVICE); - suite.addBinaryTest(channel, vfsSender, adapt(server, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.SERVICE); + suite.addTextPlainTests(env, channel, adapt(vfsSender, MessageConverter.STRING_TO_BYTE), adapt(server, MessageConverter.AXIS_TO_STRING), ContentTypeMode.SERVICE); + suite.addBinaryTest(env, channel, vfsSender, adapt(server, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.SERVICE); return suite; } } 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=684968&r1=684967&r2=684968&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 Mon Aug 11 15:46:13 2008 @@ -26,45 +26,41 @@ import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.synapse.transport.testkit.TransportTestSuite; import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; -import org.apache.synapse.transport.testkit.listener.ListenerTestSuite; import org.apache.synapse.transport.testkit.message.ByteArrayMessage; import org.apache.synapse.transport.testkit.message.MessageConverter; import org.apache.synapse.transport.testkit.server.AsyncEndpoint; import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory; -import org.apache.synapse.transport.testkit.server.DummyServer; import org.apache.synapse.transport.testkit.server.Server; public class VFSTransportSenderTest extends TestCase { public static TestSuite suite() { - // TODO: ListenerTestSuite is inappropriate! - ListenerTestSuite suite = new ListenerTestSuite(); + TransportTestSuite<VFSTestEnvironment> suite = new TransportTestSuite<VFSTestEnvironment>(); - VFSTestSetup setup = new VFSTestSetup(); + VFSTestEnvironment env = new VFSTestEnvironment(); - final Server<VFSTestSetup> server = new DummyServer<VFSTestSetup>(setup); - - AsyncEndpointFactory<VFSFileChannel,ByteArrayMessage> endpointFactory = - new AsyncEndpointFactory<VFSFileChannel,ByteArrayMessage>() { + AsyncEndpointFactory<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage> endpointFactory = + new AsyncEndpointFactory<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage>() { - public Server<?> getServer() { - return server; + public Server<VFSTestEnvironment> getServer() { + return null; } public AsyncEndpoint<ByteArrayMessage> createAsyncEndpoint( - VFSFileChannel channel, String contentType) + VFSTestEnvironment env, VFSFileChannel channel, String contentType) throws Exception { return new VFSMockAsyncEndpoint(channel, contentType); } }; - VFSFileChannel channel = new VFSFileChannel(server, new File("target/vfs3/req/in").getAbsoluteFile()); + VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile()); AxisAsyncMessageSender sender = new AxisAsyncMessageSender(); - suite.addBinaryTest(channel, adapt(sender, MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE); - suite.addTextPlainTests(channel, adapt(sender, MessageConverter.TEXT_WRAPPER), adapt(endpointFactory, MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE); + suite.addBinaryTest(env, channel, adapt(sender, MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE); + suite.addTextPlainTests(env, channel, adapt(sender, MessageConverter.TEXT_WRAPPER), adapt(endpointFactory, MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE); return suite; }
