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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -20,9 +20,9 @@ package org.apache.synapse.transport.testkit.tests; import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.client.TestClient; import org.apache.synapse.transport.testkit.listener.Channel; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; -import org.apache.synapse.transport.testkit.listener.MessageSender; import org.apache.synapse.transport.testkit.listener.NameBuilder; import org.apache.synapse.transport.testkit.name.NameComponent; import org.apache.synapse.transport.testkit.name.NameUtils; @@ -30,20 +30,20 @@ import junit.framework.TestCase; -public abstract class TransportTestCase<E extends TestEnvironment,C extends Channel<? super E>,S extends MessageSender<? super E,? super C>> extends TestCase { +public abstract class TransportTestCase<E extends TestEnvironment,C extends Channel<? super E>,L extends TestClient<? super E,? super C>> extends TestCase { protected final E env; protected final C channel; - protected final S sender; + protected final L client; private final Server<? super E> server; protected final ContentTypeMode contentTypeMode; protected final String contentType; private boolean manageServer = true; - public TransportTestCase(E env, C channel, S sender, Server<? super E> server, ContentTypeMode contentTypeMode, String contentType) { + public TransportTestCase(E env, C channel, L client, Server<? super E> server, ContentTypeMode contentTypeMode, String contentType) { this.env = env; this.channel = channel; - this.sender = sender; + this.client = client; this.server = server; this.contentTypeMode = contentTypeMode; this.contentType = contentType; @@ -68,9 +68,9 @@ return channel; } - @NameComponent("sender") - public S getSender() { - return sender; + @NameComponent("client") + public L getClient() { + return client; } @NameComponent("env") @@ -92,12 +92,12 @@ if (server != null && manageServer) { server.start(env, channel); } - sender.setUp(env, channel); + client.setUp(env, channel); } @Override protected void tearDown() throws Exception { - sender.tearDown(); + client.tearDown(); if (server != null && manageServer) { server.stop(); }
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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -23,8 +23,8 @@ import java.util.Random; import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.client.AsyncTestClient; 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.message.ByteArrayMessage; @@ -35,8 +35,8 @@ 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(E env, C channel, AsyncMessageSender<? super E,? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) { - super(env, channel, sender, endpointFactory, contentTypeMode, "application/octet-stream", null); + public BinaryTestCase(E env, C channel, AsyncTestClient<? super E,? super C,ByteArrayMessage> client, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) { + super(env, channel, client, 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -26,8 +26,8 @@ import org.apache.axiom.om.OMElement; import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.client.AsyncTestClient; 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.message.MessageData; @@ -40,8 +40,8 @@ public class RESTTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,RESTMessage,MessageData> { private final RESTMessage message; - public RESTTestCase(E env, C channel, AsyncMessageSender<? super E,? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, RESTMessage message) { - super(env, channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); + public RESTTestCase(E env, C channel, AsyncTestClient<? super E,? super C,RESTMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, RESTMessage message) { + super(env, channel, client, endpointFactory, ContentTypeMode.TRANSPORT, null, null); this.message = message; } 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -39,8 +39,8 @@ 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.client.AsyncTestClient; 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.message.ByteArrayMessage; @@ -55,8 +55,8 @@ private byte[] attachmentContent; private String contentID; - public SwATestCase(E env, C channel, AsyncMessageSender<? super E,? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) { - super(env, channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null); + public SwATestCase(E env, C channel, AsyncTestClient<? super E,? super C,ByteArrayMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) { + super(env, channel, client, 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -20,8 +20,8 @@ package org.apache.synapse.transport.testkit.tests.async; import org.apache.synapse.transport.testkit.TestEnvironment; +import org.apache.synapse.transport.testkit.client.AsyncTestClient; 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; @@ -34,8 +34,8 @@ public class TextPlainTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,StringMessage,StringMessage> { private final MessageTestData data; - public TextPlainTestCase(E env, C channel, AsyncMessageSender<? super E,? 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()); + public TextPlainTestCase(E env, C channel, AsyncTestClient<? super E,? super C,StringMessage> client, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) { + super(env, channel, client, endpointFactory, contentTypeMode, "text/plain; charset=\"" + data.getCharset() + "\"", data.getCharset()); this.data = data; } Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/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?rev=686206&r1=686205&r2=686206&view=diff ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java (original) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java Fri Aug 15 05:36:06 2008 @@ -25,8 +25,8 @@ 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.client.AsyncTestClient; 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; @@ -42,8 +42,8 @@ private final XMLMessageType xmlMessageType; private final MessageTestData data; - public XMLAsyncMessageTestCase(E env, C channel, AsyncMessageSender<? super E,? 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()); + public XMLAsyncMessageTestCase(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, XMLMessageType xmlMessageType, ContentTypeMode contentTypeMode, String baseContentType, MessageTestData data) { + super(env, channel, client, endpointFactory, contentTypeMode, baseContentType + "; charset=\"" + data.getCharset() + "\"", data.getCharset()); this.xmlMessageType = xmlMessageType; this.data = data; } 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -24,10 +24,10 @@ 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.client.XMLRequestResponseTestClient; 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; @@ -36,14 +36,14 @@ import org.apache.synapse.transport.testkit.tests.TransportTestCase; @DisplayName("EchoXML") -public class XMLRequestResponseMessageTestCase<E extends TestEnvironment,C extends RequestResponseChannel<? super E>> extends TransportTestCase<E,C,XMLRequestResponseMessageSender<? super E,? super C>> { +public class XMLRequestResponseMessageTestCase<E extends TestEnvironment,C extends RequestResponseChannel<? super E>> extends TransportTestCase<E,C,XMLRequestResponseTestClient<? super E,? 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(E env, C channel, XMLRequestResponseMessageSender<? super E,? 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); + public XMLRequestResponseMessageTestCase(E env, C channel, XMLRequestResponseTestClient<? super E,? super C> client, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, String contentType, XMLMessageType xmlMessageType, MessageTestData data) { + super(env, channel, client, endpointFactory.getServer(), contentTypeMode, contentType); this.endpointFactory = endpointFactory; this.xmlMessageType = xmlMessageType; this.data = data; @@ -66,7 +66,7 @@ OMFactory factory = xmlMessageType.getOMFactory(); OMElement orgElement = factory.createOMElement(new QName("root")); orgElement.setText(data.getText()); - OMElement element = sender.sendMessage(channel, endpoint.getEPR(), contentType, data.getCharset(), xmlMessageType, orgElement); + OMElement element = client.sendMessage(channel, endpoint.getEPR(), contentType, data.getCharset(), xmlMessageType, orgElement); assertEquals(orgElement.getQName(), element.getQName()); assertEquals(orgElement.getText(), element.getText()); } finally { Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java?rev=686206&view=auto ============================================================================== --- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java (added) +++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java Fri Aug 15 05:36:06 2008 @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.synapse.transport.vfs; + +import java.io.FileOutputStream; +import java.io.OutputStream; + +import org.apache.synapse.transport.testkit.client.AbstractTestClient; +import org.apache.synapse.transport.testkit.client.AsyncTestClient; +import org.apache.synapse.transport.testkit.client.ClientOptions; +import org.apache.synapse.transport.testkit.message.ByteArrayMessage; + +public class VFSClient extends AbstractTestClient<VFSTestEnvironment,VFSFileChannel> implements AsyncTestClient<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage> { + public void sendMessage(VFSFileChannel channel, ClientOptions options, ByteArrayMessage message) throws Exception { + OutputStream out = new FileOutputStream(channel.getRequestFile()); + out.write(message.getContent()); + out.close(); + } +} \ No newline at end of file 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -22,8 +22,6 @@ import static org.apache.synapse.transport.testkit.AdapterUtils.adapt; import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; import java.util.LinkedList; import java.util.List; @@ -33,12 +31,9 @@ import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory; import org.apache.synapse.transport.testkit.TransportDescriptionFactory; 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.client.AsyncTestClient; +import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; -import org.apache.synapse.transport.testkit.listener.SenderOptions; -import org.apache.synapse.transport.testkit.message.ByteArrayMessage; import org.apache.synapse.transport.testkit.message.MessageConverter; import org.apache.synapse.transport.testkit.message.XMLMessage; import org.apache.synapse.transport.testkit.server.axis2.AxisServer; @@ -47,14 +42,6 @@ * TransportListenerTestTemplate implementation for the VFS transport. */ public class VFSTransportListenerTest extends TestCase { - private static class MessageSenderImpl extends AbstractMessageSender<VFSTestEnvironment,VFSFileChannel> implements AsyncMessageSender<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage> { - public void sendMessage(VFSFileChannel channel, SenderOptions options, ByteArrayMessage message) throws Exception { - OutputStream out = new FileOutputStream(channel.getRequestFile()); - out.write(message.getContent()); - out.close(); - } - } - public static TestSuite suite() { // TODO: the VFS listener doesn't like reuseServer == true... TransportTestSuite<VFSTestEnvironment> suite = new TransportTestSuite<VFSTestEnvironment>(false); @@ -64,17 +51,17 @@ VFSTestEnvironment env = new VFSTestEnvironment(); AxisServer<VFSTestEnvironment> server = new AxisServer<VFSTestEnvironment>(tdf); VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile()); - MessageSenderImpl vfsSender = new MessageSenderImpl(); - List<AsyncMessageSender<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage>>(); - senders.add(adapt(vfsSender, MessageConverter.XML_TO_BYTE)); - senders.add(new AxisAsyncMessageSender(tdf)); - for (AsyncMessageSender<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage> sender : senders) { - suite.addSOAPTests(env, channel, sender, server, ContentTypeMode.SERVICE); - suite.addPOXTests(env, channel, sender, server, ContentTypeMode.SERVICE); + VFSClient vfsClient = new VFSClient(); + List<AsyncTestClient<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage>> clients = new LinkedList<AsyncTestClient<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage>>(); + clients.add(adapt(vfsClient, MessageConverter.XML_TO_BYTE)); + clients.add(new AxisAsyncTestClient(tdf)); + for (AsyncTestClient<? super VFSTestEnvironment,? super VFSFileChannel,XMLMessage> client : clients) { + suite.addSOAPTests(env, channel, client, server, ContentTypeMode.SERVICE); + suite.addPOXTests(env, channel, client, server, ContentTypeMode.SERVICE); // Since VFS has no Content-Type header, SwA is not supported. } - 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); + suite.addTextPlainTests(env, channel, adapt(vfsClient, MessageConverter.STRING_TO_BYTE), adapt(server, MessageConverter.AXIS_TO_STRING), ContentTypeMode.SERVICE); + suite.addBinaryTest(env, channel, vfsClient, 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=686206&r1=686205&r2=686206&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 Fri Aug 15 05:36:06 2008 @@ -29,7 +29,7 @@ import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory; import org.apache.synapse.transport.testkit.TransportDescriptionFactory; import org.apache.synapse.transport.testkit.TransportTestSuite; -import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender; +import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient; import org.apache.synapse.transport.testkit.listener.ContentTypeMode; import org.apache.synapse.transport.testkit.message.ByteArrayMessage; import org.apache.synapse.transport.testkit.message.MessageConverter; @@ -62,10 +62,10 @@ }; VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile()); - AxisAsyncMessageSender sender = new AxisAsyncMessageSender(tdf); + AxisAsyncTestClient client = new AxisAsyncTestClient(tdf); - 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); + suite.addBinaryTest(env, channel, adapt(client, MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE); + suite.addTextPlainTests(env, channel, adapt(client, MessageConverter.TEXT_WRAPPER), adapt(endpointFactory, MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE); return suite; }
