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/17 20:06:13 UTC
svn commit: r686626 [1/2] - in
/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport:
jms/ mail/ nhttp/ testkit/ testkit/client/ testkit/client/axis2/
testkit/listener/ testkit/server/ testkit/server/axis2/ testkit/tests/ te...
Author: veithen
Date: Sun Aug 17 11:06:11 2008
New Revision: 686626
URL: http://svn.apache.org/viewvc?rev=686626&view=rev
Log:
Transport test kit: Implemented a smarter way to manage resources used by test cases. This allows to reduce the usage of generic type parameters.
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisAsyncEndpointFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisEchoEndpointFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TestResource.java
Removed:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AbstractTestClient.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAsyncChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpointFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/AdapterUtils.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClientAdapter.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/TestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/XMLRequestResponseTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/RequestResponseChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactoryAdapter.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/EndpointFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/Server.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AsyncEndpointImpl.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/EndpointImpl.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/TransportTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/BinaryTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/RESTTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/SwATestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/TextPlainTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/async/XMLAsyncMessageTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAsyncChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAsyncChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAsyncChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAsyncChannel.java Sun Aug 17 11:06:11 2008
@@ -21,7 +21,7 @@
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
-public class JMSAsyncChannel extends JMSChannel implements AsyncChannel<JMSTestEnvironment> {
+public class JMSAsyncChannel extends JMSChannel implements AsyncChannel {
public JMSAsyncChannel(String destinationType) {
super(destinationType);
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageClient.java Sun Aug 17 11:06:11 2008
@@ -28,9 +28,8 @@
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("BytesMessage")
-public class JMSBytesMessageClient extends JMSClient implements AsyncTestClient<JMSTestEnvironment,JMSAsyncChannel,ByteArrayMessage> {
- public void sendMessage(JMSAsyncChannel channel,
- ClientOptions options,
+public class JMSBytesMessageClient extends JMSClient implements AsyncTestClient<ByteArrayMessage> {
+ public void sendMessage(ClientOptions options,
ByteArrayMessage message) throws Exception {
BytesMessage jmsMessage = session.createBytesMessage();
if (message.getContentType() != null) {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java Sun Aug 17 11:06:11 2008
@@ -25,7 +25,7 @@
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.name.NameComponent;
-public abstract class JMSChannel extends AbstractChannel<JMSTestEnvironment> {
+public abstract class JMSChannel extends AbstractChannel {
private final String destinationType;
protected JMSTestEnvironment env;
private String destinationName;
@@ -35,16 +35,16 @@
this.destinationType = destinationType;
}
- @Override
- public void setUp(JMSTestEnvironment env) throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp(JMSTestEnvironment env) throws Exception {
this.env = env;
destinationName = "request" + destinationType;
destination = env.createDestination(destinationType, destinationName);
env.getContext().bind(destinationName, destination);
}
- @Override
- public void tearDown() throws Exception {
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
env.getContext().unbind(destinationName);
destinationName = null;
destination = null;
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSClient.java Sun Aug 17 11:06:11 2008
@@ -25,16 +25,13 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
-import org.apache.synapse.transport.testkit.client.AbstractTestClient;
-
-public class JMSClient extends AbstractTestClient<JMSTestEnvironment,JMSAsyncChannel> {
+public class JMSClient {
protected Connection connection;
protected Session session;
protected MessageProducer producer;
- @Override
- public void setUp(JMSTestEnvironment env, JMSAsyncChannel channel) throws Exception {
- super.setUp(env, channel);
+ @SuppressWarnings("unused")
+ private void setUp(JMSTestEnvironment env, JMSAsyncChannel channel) throws Exception {
Destination destination = channel.getDestination();
ConnectionFactory connectionFactory = env.getConnectionFactory(destination);
connection = connectionFactory.createConnection();
@@ -42,11 +39,10 @@
producer = session.createProducer(destination);
}
- @Override
- public void tearDown() throws Exception {
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
producer.close();
session.close();
connection.close();
- super.tearDown();
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java Sun Aug 17 11:06:11 2008
@@ -37,48 +37,52 @@
import org.apache.synapse.transport.testkit.listener.MessageTestData;
import org.apache.synapse.transport.testkit.message.MessageConverter;
import org.apache.synapse.transport.testkit.message.XMLMessage;
+import org.apache.synapse.transport.testkit.server.axis2.AxisAsyncEndpointFactory;
+import org.apache.synapse.transport.testkit.server.axis2.AxisEchoEndpointFactory;
import org.apache.synapse.transport.testkit.server.axis2.AxisServer;
public class JMSListenerTest extends TestCase {
public static TestSuite suite() {
- TransportTestSuite<JMSTestEnvironment> suite = new TransportTestSuite<JMSTestEnvironment>();
+ TransportTestSuite suite = new TransportTestSuite();
JMSTestEnvironment env = new QpidTestEnvironment();
TransportDescriptionFactory tdf = new JMSTransportDescriptionFactory();
- AxisServer<JMSTestEnvironment> server = new AxisServer<JMSTestEnvironment>(tdf);
+ AxisServer server = new AxisServer(tdf);
+ AxisAsyncEndpointFactory asyncEndpointFactory = new AxisAsyncEndpointFactory(server);
+ AxisEchoEndpointFactory echoEndpointFactory = new AxisEchoEndpointFactory(server);
JMSBytesMessageClient bytesMessageClient = new JMSBytesMessageClient();
JMSTextMessageClient textMessageClient = new JMSTextMessageClient();
- List<AsyncTestClient<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage>> clients = new LinkedList<AsyncTestClient<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage>>();
+ List<AsyncTestClient<XMLMessage>> clients = new LinkedList<AsyncTestClient<XMLMessage>>();
clients.add(adapt(bytesMessageClient, MessageConverter.XML_TO_BYTE));
clients.add(adapt(textMessageClient, MessageConverter.XML_TO_STRING));
clients.add(new AxisAsyncTestClient(tdf));
clients.add(new JMSAxisAsyncClient(tdf, JMSConstants.JMS_BYTE_MESSAGE));
clients.add(new JMSAxisAsyncClient(tdf, JMSConstants.JMS_TEXT_MESSAGE));
- suite.addPOXTests(env, new JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseTestClient(tdf), server, ContentTypeMode.TRANSPORT);
+ suite.addPOXTests(env, new JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseTestClient(tdf), echoEndpointFactory, ContentTypeMode.TRANSPORT);
suite.addPOXTests(env, new JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseTestClient(tdf), new MockEchoEndpointFactory(), ContentTypeMode.TRANSPORT);
for (String destinationType : new String[] { JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_TOPIC }) {
JMSAsyncChannel channel = new JMSAsyncChannel(destinationType);
for (ContentTypeMode contentTypeMode : ContentTypeMode.values()) {
- for (AsyncTestClient<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage> client : clients) {
+ for (AsyncTestClient<XMLMessage> client : clients) {
if (contentTypeMode == ContentTypeMode.TRANSPORT) {
- suite.addSOAPTests(env, channel, client, server, contentTypeMode);
- suite.addPOXTests(env, channel, client, server, contentTypeMode);
+ suite.addSOAPTests(env, channel, client, asyncEndpointFactory, contentTypeMode);
+ suite.addPOXTests(env, channel, client, asyncEndpointFactory, contentTypeMode);
} else {
// If no content type header is used, SwA can't be used and the JMS transport
// always uses the default charset encoding
- suite.addSOAP11Test(env, channel, client, server, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addSOAP11Test(env, channel, client, asyncEndpointFactory, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING));
- suite.addSOAP12Test(env, channel, client, server, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addSOAP12Test(env, channel, client, asyncEndpointFactory, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING));
- suite.addPOXTest(env, channel, client, server, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addPOXTest(env, channel, client, asyncEndpointFactory, contentTypeMode, new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING));
}
}
if (contentTypeMode == ContentTypeMode.TRANSPORT) {
- suite.addSwATests(env, channel, bytesMessageClient, server);
+ suite.addSwATests(env, channel, bytesMessageClient, asyncEndpointFactory);
}
// TODO: these tests are temporarily disabled because of SYNAPSE-304
// addTextPlainTests(strategy, suite);
- suite.addBinaryTest(env, channel, bytesMessageClient, adapt(server, MessageConverter.AXIS_TO_BYTE), contentTypeMode);
+ suite.addBinaryTest(env, channel, bytesMessageClient, adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_BYTE), contentTypeMode);
}
}
return suite;
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java Sun Aug 17 11:06:11 2008
@@ -27,7 +27,7 @@
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import org.apache.synapse.transport.testkit.name.NameComponent;
-public class JMSRequestResponseChannel extends JMSChannel implements RequestResponseChannel<JMSTestEnvironment> {
+public class JMSRequestResponseChannel extends JMSChannel implements RequestResponseChannel {
private final String replyDestinationType;
private String replyDestinationName;
private Destination replyDestination;
@@ -37,17 +37,15 @@
this.replyDestinationType = replyDestinationType;
}
- @Override
- public void setUp(JMSTestEnvironment env) throws Exception {
- super.setUp(env);
+ @SuppressWarnings("unused")
+ private void setUp(JMSTestEnvironment env) throws Exception {
replyDestinationName = "response" + replyDestinationType;
replyDestination = env.createDestination(replyDestinationType, replyDestinationName);
env.getContext().bind(replyDestinationName, replyDestination);
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
env.getContext().unbind(replyDestinationName);
replyDestinationName = null;
replyDestination = null;
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTestEnvironment.java Sun Aug 17 11:06:11 2008
@@ -40,8 +40,8 @@
private QueueConnectionFactory queueConnectionFactory;
private TopicConnectionFactory topicConnectionFactory;
- @Override
- public void setUp() throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp() throws Exception {
MockContextFactory.setAsInitial();
context = new InitialContext();
queueConnectionFactory = createQueueConnectionFactory();
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageClient.java Sun Aug 17 11:06:11 2008
@@ -28,8 +28,8 @@
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("TextMessage")
-public class JMSTextMessageClient extends JMSClient implements AsyncTestClient<JMSTestEnvironment,JMSAsyncChannel,StringMessage> {
- public void sendMessage(JMSAsyncChannel channel, ClientOptions options, StringMessage message) throws Exception {
+public class JMSTextMessageClient extends JMSClient implements AsyncTestClient<StringMessage> {
+ public void sendMessage(ClientOptions options, StringMessage message) throws Exception {
TextMessage jmsMessage = session.createTextMessage();
if (message.getContentType() != null) {
jmsMessage.setStringProperty(BaseConstants.CONTENT_TYPE, message.getContentType());
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpointFactory.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpointFactory.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockEchoEndpointFactory.java Sun Aug 17 11:06:11 2008
@@ -36,14 +36,23 @@
import org.apache.synapse.transport.testkit.server.EndpointFactory;
import org.apache.synapse.transport.testkit.server.Server;
-public class MockEchoEndpointFactory implements EndpointFactory<JMSTestEnvironment,JMSRequestResponseChannel> {
+public class MockEchoEndpointFactory implements EndpointFactory {
static Log log = LogFactory.getLog(MockEchoEndpointFactory.class);
- public Server<JMSTestEnvironment> getServer() {
+ private JMSTestEnvironment env;
+ JMSRequestResponseChannel channel;
+
+ @SuppressWarnings("unused")
+ private void setUp(JMSTestEnvironment env, JMSRequestResponseChannel channel) {
+ this.env = env;
+ this.channel = channel;
+ }
+
+ public Server getServer() {
return null;
}
- public Endpoint createEchoEndpoint(JMSTestEnvironment env, final JMSRequestResponseChannel channel, String contentType) throws Exception {
+ public Endpoint createEchoEndpoint(String contentType) throws Exception {
Destination destination = channel.getDestination();
Destination replyDestination = channel.getReplyDestination();
final Connection connection = env.getConnectionFactory(destination).createConnection();
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestEnvironment.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestEnvironment.java Sun Aug 17 11:06:11 2008
@@ -36,11 +36,10 @@
private DestinationManager destinationManager;
private ConfigurationManager configurationManager;
- @Override
- public void setUp() throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp() throws Exception {
destinationManager = new DestinationManager();
configurationManager = new ConfigurationManager();
- super.setUp();
}
@Override
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestEnvironment.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestEnvironment.java Sun Aug 17 11:06:11 2008
@@ -33,15 +33,13 @@
@DisplayName("qpid")
public class QpidTestEnvironment extends JMSTestEnvironment {
- @Override
- public void setUp() throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp() throws Exception {
TransportConnection.createVMBroker(1);
- super.setUp();
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
TransportConnection.killVMBroker(1);
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailChannel.java Sun Aug 17 11:06:11 2008
@@ -25,13 +25,13 @@
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
-public class MailChannel extends AbstractChannel<MailTestEnvironment> implements AsyncChannel<MailTestEnvironment> {
+public class MailChannel extends AbstractChannel implements AsyncChannel {
private String address;
private String protocol;
private Map<String,String> inProperties;
- @Override
- public void setUp(MailTestEnvironment env) throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp(MailTestEnvironment env) throws Exception {
protocol = env.getProtocol();
inProperties = env.getInProperties();
address = env.getAddress();
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailClient.java Sun Aug 17 11:06:11 2008
@@ -31,20 +31,21 @@
import javax.mail.internet.MimeMessage;
import javax.mail.util.ByteArrayDataSource;
-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 abstract class MailClient extends AbstractTestClient<MailTestEnvironment,MailChannel> implements AsyncTestClient<MailTestEnvironment,MailChannel,ByteArrayMessage> {
+public abstract class MailClient implements AsyncTestClient<ByteArrayMessage> {
private Map<String,String> outProperties;
+ private MailChannel channel;
- @Override
- public void setUp(MailTestEnvironment env, MailChannel channel) throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp(MailTestEnvironment env, MailChannel channel) throws Exception {
outProperties = env.getOutProperties();
+ this.channel = channel;
}
- public void sendMessage(MailChannel channel, ClientOptions options, ByteArrayMessage message) throws Exception {
+ public void sendMessage(ClientOptions options, ByteArrayMessage message) throws Exception {
Properties props = new Properties();
props.putAll(outProperties);
Session session = Session.getInstance(props);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTestEnvironment.java Sun Aug 17 11:06:11 2008
@@ -39,15 +39,15 @@
private GreenMail greenMail;
- @Override
- public void setUp() throws Exception {
+ @SuppressWarnings("unused")
+ private void setUp() throws Exception {
greenMail = new GreenMail(new ServerSetup[] { SMTP, POP3 });
greenMail.setUser(ADDRESS, PASSWORD);
greenMail.start();
}
- @Override
- public void tearDown() throws Exception {
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
greenMail.stop();
greenMail = null;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java Sun Aug 17 11:06:11 2008
@@ -35,11 +35,12 @@
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
import org.apache.synapse.transport.testkit.message.MessageConverter;
import org.apache.synapse.transport.testkit.message.XMLMessage;
+import org.apache.synapse.transport.testkit.server.axis2.AxisAsyncEndpointFactory;
import org.apache.synapse.transport.testkit.server.axis2.AxisServer;
public class MailTransportListenerTest extends TestCase {
public static TestSuite suite() throws Exception {
- TransportTestSuite<MailTestEnvironment> suite = new TransportTestSuite<MailTestEnvironment>();
+ TransportTestSuite suite = new TransportTestSuite();
// TODO: these test don't work; need more analysis why this is so
suite.addExclude("(&(messageType=SOAP12)(data=Latin1))");
@@ -55,18 +56,19 @@
TransportDescriptionFactory tdf =
new SimpleTransportDescriptionFactory(MailConstants.TRANSPORT_NAME,
MailTransportListener.class, MailTransportSender.class);
- AxisServer<MailTestEnvironment> axisServer = new AxisServer<MailTestEnvironment>(tdf);
+ AxisServer axisServer = new AxisServer(tdf);
+ AxisAsyncEndpointFactory asyncEndpointFactory = new AxisAsyncEndpointFactory(axisServer);
MailChannel channel = new MailChannel();
List<MailClient> clients = new LinkedList<MailClient>();
clients.add(new MimeClient());
clients.add(new MultipartClient());
for (MailClient client : clients) {
- AsyncTestClient<MailTestEnvironment,MailChannel,XMLMessage> xmlClient = adapt(client, MessageConverter.XML_TO_BYTE);
- suite.addSOAPTests(env, channel, xmlClient, axisServer, ContentTypeMode.TRANSPORT);
- suite.addPOXTests(env, channel, xmlClient, axisServer, ContentTypeMode.TRANSPORT);
- suite.addSwATests(env, channel, client, axisServer);
- suite.addTextPlainTests(env, channel, AdapterUtils.adapt(client, MessageConverter.STRING_TO_BYTE), AdapterUtils.adapt(axisServer, MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
- suite.addBinaryTest(env, channel, client, AdapterUtils.adapt(axisServer, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT);
+ AsyncTestClient<XMLMessage> xmlClient = adapt(client, MessageConverter.XML_TO_BYTE);
+ suite.addSOAPTests(env, channel, xmlClient, asyncEndpointFactory, ContentTypeMode.TRANSPORT);
+ suite.addPOXTests(env, channel, xmlClient, asyncEndpointFactory, ContentTypeMode.TRANSPORT);
+ suite.addSwATests(env, channel, client, asyncEndpointFactory);
+ suite.addTextPlainTests(env, channel, AdapterUtils.adapt(client, MessageConverter.STRING_TO_BYTE), AdapterUtils.adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
+ suite.addBinaryTest(env, channel, client, AdapterUtils.adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT);
}
return suite;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpChannel.java Sun Aug 17 11:06:11 2008
@@ -19,11 +19,10 @@
package org.apache.synapse.transport.nhttp;
-import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
// TODO: if this class remains empty, we should eliminate it
-public class HttpChannel extends AbstractChannel<TestEnvironment> implements AsyncChannel<TestEnvironment>, RequestResponseChannel<TestEnvironment> {
+public class HttpChannel extends AbstractChannel implements AsyncChannel, RequestResponseChannel {
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java Sun Aug 17 11:06:11 2008
@@ -40,11 +40,15 @@
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
import org.apache.synapse.transport.testkit.message.MessageConverter;
import org.apache.synapse.transport.testkit.message.XMLMessage;
+import org.apache.synapse.transport.testkit.server.axis2.AxisAsyncEndpointFactory;
import org.apache.synapse.transport.testkit.server.axis2.AxisServer;
public class HttpCoreNIOListenerTest extends TestCase {
public static TestSuite suite() {
- TransportTestSuite<TestEnvironment> suite = new TransportTestSuite<TestEnvironment>();
+ // TODO: temporary hack, remove later
+ TestEnvironment env = new TestEnvironment() {};
+
+ TransportTestSuite suite = new TransportTestSuite();
TransportDescriptionFactory tdfNIO =
new SimpleTransportDescriptionFactory("http", HttpCoreNIOListener.class,
@@ -64,21 +68,22 @@
// Change to tdfSimple if you want to check the behavior of Axis' blocking HTTP transport
TransportDescriptionFactory tdf = tdfNIO;
- AxisServer<TestEnvironment> axisServer = new AxisServer<TestEnvironment>(tdf);
+ AxisServer axisServer = new AxisServer(tdf);
+ AxisAsyncEndpointFactory asyncEndpointFactory = new AxisAsyncEndpointFactory(axisServer);
HttpChannel channel = new HttpChannel();
JavaNetClient javaNetClient = new JavaNetClient();
- List<AsyncTestClient<TestEnvironment,? super HttpChannel,XMLMessage>> clients = new LinkedList<AsyncTestClient<TestEnvironment,? super HttpChannel,XMLMessage>>();
+ List<AsyncTestClient<XMLMessage>> clients = new LinkedList<AsyncTestClient<XMLMessage>>();
clients.add(adapt(javaNetClient, MessageConverter.XML_TO_BYTE));
clients.add(new AxisAsyncTestClient(tdf));
- for (AsyncTestClient<TestEnvironment,? super HttpChannel,XMLMessage> client : clients) {
- suite.addSOAPTests(null, channel, client, axisServer, ContentTypeMode.TRANSPORT);
- suite.addPOXTests(null, channel, client, axisServer, ContentTypeMode.TRANSPORT);
+ for (AsyncTestClient<XMLMessage> client : clients) {
+ suite.addSOAPTests(env, channel, client, asyncEndpointFactory, ContentTypeMode.TRANSPORT);
+ suite.addPOXTests(env, channel, client, asyncEndpointFactory, ContentTypeMode.TRANSPORT);
}
// suite.addPOXTests(channel, new AxisRequestResponseMessageSender(), ContentTypeMode.TRANSPORT);
- suite.addSwATests(null, channel, javaNetClient, axisServer);
- suite.addTextPlainTests(null, channel, adapt(javaNetClient, MessageConverter.STRING_TO_BYTE), adapt(axisServer, MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
- suite.addBinaryTest(null, channel, javaNetClient, adapt(axisServer, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT);
- suite.addRESTTests(null, channel, new JavaNetRESTClient(), axisServer);
+ suite.addSwATests(env, channel, javaNetClient, asyncEndpointFactory);
+ suite.addTextPlainTests(env, channel, adapt(javaNetClient, MessageConverter.STRING_TO_BYTE), adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
+ suite.addBinaryTest(env, channel, javaNetClient, adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT);
+ suite.addRESTTests(env, channel, new JavaNetRESTClient(), asyncEndpointFactory);
return suite;
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetClient.java Sun Aug 17 11:06:11 2008
@@ -25,17 +25,14 @@
import java.net.URLConnection;
import org.apache.commons.io.IOUtils;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-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.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.ByteArrayMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("java.net")
-public class JavaNetClient extends AbstractTestClient<TestEnvironment,AsyncChannel<?>> implements AsyncTestClient<TestEnvironment,AsyncChannel<?>,ByteArrayMessage> {
- public void sendMessage(AsyncChannel<?> channel, ClientOptions options, ByteArrayMessage message) throws Exception {
+public class JavaNetClient implements AsyncTestClient<ByteArrayMessage> {
+ public void sendMessage(ClientOptions options, ByteArrayMessage message) throws Exception {
URLConnection connection = new URL(options.getEndpointReference()).openConnection();
connection.setDoOutput(true);
connection.setDoInput(true);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTClient.java Sun Aug 17 11:06:11 2008
@@ -24,18 +24,15 @@
import java.net.URLConnection;
import org.apache.commons.io.IOUtils;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-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.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.RESTMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
import org.apache.synapse.transport.testkit.server.axis2.DefaultOperationDispatcher;
@DisplayName("java.net")
-public class JavaNetRESTClient extends AbstractTestClient<TestEnvironment,AsyncChannel<?>> implements AsyncTestClient<TestEnvironment,AsyncChannel<?>,RESTMessage> {
- public void sendMessage(AsyncChannel<?> channel, ClientOptions options, RESTMessage message) throws Exception {
+public class JavaNetRESTClient implements AsyncTestClient<RESTMessage> {
+ public void sendMessage(ClientOptions options, RESTMessage message) throws Exception {
StringBuilder url = new StringBuilder();
url.append(options.getEndpointReference());
url.append('/');
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/AdapterUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/AdapterUtils.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/AdapterUtils.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/AdapterUtils.java Sun Aug 17 11:06:11 2008
@@ -21,17 +21,16 @@
import org.apache.synapse.transport.testkit.client.AsyncTestClient;
import org.apache.synapse.transport.testkit.client.AsyncTestClientAdapter;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.MessageConverter;
import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory;
import org.apache.synapse.transport.testkit.server.AsyncEndpointFactoryAdapter;
public class AdapterUtils {
- public static <E extends TestEnvironment,C extends AsyncChannel<?>,M,N> AsyncTestClient<E,C,M> adapt(AsyncTestClient<E,C,N> parent, MessageConverter<M,N> converter) {
- return new AsyncTestClientAdapter<E,C,M,N>(parent, converter);
+ public static <M,N> AsyncTestClient<M> adapt(AsyncTestClient<N> parent, MessageConverter<M,N> converter) {
+ return new AsyncTestClientAdapter<M,N>(parent, converter);
}
- public static <E extends TestEnvironment,C extends AsyncChannel<? super E>,M,N> AsyncEndpointFactory<E,C,M> adapt(AsyncEndpointFactory<E,C,N> targetFactory, MessageConverter<N,M> converter) {
- return new AsyncEndpointFactoryAdapter<E,C,M,N>(targetFactory, converter);
+ public static <M,N> AsyncEndpointFactory<M> adapt(AsyncEndpointFactory<N> targetFactory, MessageConverter<N,M> converter) {
+ return new AsyncEndpointFactoryAdapter<M,N>(targetFactory, converter);
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TestEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TestEnvironment.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TestEnvironment.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TestEnvironment.java Sun Aug 17 11:06:11 2008
@@ -24,19 +24,6 @@
public abstract class TestEnvironment {
/**
- * Carry out initialization before server startup. This method is called
- * immediately before the test server is started and can be used by subclasses
- * to set up the test environment.
- *
- * @throws Exception
- */
- public void setUp() throws Exception {
- }
-
- public void tearDown() throws Exception {
- }
-
- /**
* Set up the expected content type on the given service. This method should only be
* implemented for transports that support {@link ContentTypeMode#SERVICE}.
* The default implementation throws an {@link UnsupportedOperationException}.
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportTestSuite.java Sun Aug 17 11:06:11 2008
@@ -54,7 +54,7 @@
import org.apache.synapse.transport.testkit.tests.async.XMLAsyncMessageTestCase;
import org.apache.synapse.transport.testkit.tests.echo.XMLRequestResponseMessageTestCase;
-public class TransportTestSuite<E extends TestEnvironment> extends TestSuite {
+public class TransportTestSuite extends TestSuite {
public static final String testString = "\u00e0 peine arriv\u00e9s nous entr\u00e2mes dans sa chambre";
public static final MessageTestData ASCII_TEST_DATA = new MessageTestData("ASCII", "test string", "us-ascii");
@@ -92,75 +92,70 @@
excludes.add(FilterExpressionParser.parse(filter));
}
- public <C extends AsyncChannel<? super E>> void addSOAP11Test(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.SOAP11, contentTypeMode, SOAP11Constants.SOAP_11_CONTENT_TYPE, data));
+ public void addSOAP11Test(TestEnvironment env, AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpointFactory<MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ addTest(new XMLAsyncMessageTestCase(env, channel, client, endpointFactory, XMLMessageType.SOAP11, contentTypeMode, SOAP11Constants.SOAP_11_CONTENT_TYPE, data));
}
- public <C extends AsyncChannel<? super E>> void addSOAP12Test(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.SOAP12, contentTypeMode, SOAP12Constants.SOAP_12_CONTENT_TYPE, data));
+ public void addSOAP12Test(TestEnvironment env, AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpointFactory<MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ addTest(new XMLAsyncMessageTestCase(env, channel, client, endpointFactory, XMLMessageType.SOAP12, contentTypeMode, SOAP12Constants.SOAP_12_CONTENT_TYPE, data));
}
- public <C extends AsyncChannel<? super E>> void addSOAPTests(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
+ public void addSOAPTests(TestEnvironment env, AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpointFactory<MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.SOAP11, contentTypeMode, SOAP11Constants.SOAP_11_CONTENT_TYPE, data));
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.SOAP12, contentTypeMode, SOAP12Constants.SOAP_12_CONTENT_TYPE, data));
-// addSOAP11Test(channel, client, endpointFactory, contentTypeMode, data);
-// addSOAP12Test(channel, client, endpointFactory, contentTypeMode, data);
+ addSOAP11Test(env, channel, client, endpointFactory, contentTypeMode, data);
+ addSOAP12Test(env, channel, client, endpointFactory, contentTypeMode, data);
}
}
- public <C extends AsyncChannel<? super E>> void addPOXTest(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.POX, contentTypeMode, "application/xml", data));
+ public void addPOXTest(TestEnvironment env, AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpointFactory<MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ addTest(new XMLAsyncMessageTestCase(env, channel, client, endpointFactory, XMLMessageType.POX, contentTypeMode, "application/xml", data));
}
- public <C extends AsyncChannel<? super E>> void addPOXTests(E env, C channel, AsyncTestClient<? super E,? super C,XMLMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
+ public void addPOXTests(TestEnvironment env, AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpointFactory<MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
- addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, client, endpointFactory, XMLMessageType.POX, contentTypeMode, "application/xml", data));
-// addPOXTest(channel, client, endpointFactory, contentTypeMode, data);
+ addPOXTest(env, channel, client, endpointFactory, contentTypeMode, data);
}
}
- public <C extends RequestResponseChannel<? super E>> void addPOXTest(E env, C channel, XMLRequestResponseTestClient<? super E,? super C> client, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
- addTest(new XMLRequestResponseMessageTestCase<E,C>(env, channel, client, endpointFactory, contentTypeMode, "application/xml", XMLMessageType.POX, data));
+ public void addPOXTest(TestEnvironment env, RequestResponseChannel channel, XMLRequestResponseTestClient client, EndpointFactory endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ addTest(new XMLRequestResponseMessageTestCase(env, channel, client, endpointFactory, contentTypeMode, "application/xml", XMLMessageType.POX, data));
}
- public <C extends RequestResponseChannel<? super E>> void addPOXTests(E env, C channel, XMLRequestResponseTestClient<? super E,? super C> client, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode) {
+ public void addPOXTests(TestEnvironment env, RequestResponseChannel channel, XMLRequestResponseTestClient client, EndpointFactory endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
-// addPOXTest(channel, client, endpointFactory, contentTypeMode, data);
- addTest(new XMLRequestResponseMessageTestCase<E,C>(env, channel, client, endpointFactory, contentTypeMode, "application/xml", XMLMessageType.POX, data));
+ addPOXTest(env, channel, client, endpointFactory, contentTypeMode, data);
}
}
// TODO: this test actually only makes sense if the transport supports a Content-Type header
- public <C extends AsyncChannel<? super E>> void addSwATests(E env, C channel, AsyncTestClient<? super E,? super C,ByteArrayMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
- addTest(new SwATestCase<E,C>(env, channel, client, endpointFactory));
+ public void addSwATests(TestEnvironment env, AsyncChannel channel, AsyncTestClient<ByteArrayMessage> client, AsyncEndpointFactory<MessageData> endpointFactory) {
+ addTest(new SwATestCase(env, channel, client, endpointFactory));
}
- public <C extends AsyncChannel<? super E>> void addTextPlainTest(E env, C channel, AsyncTestClient<? super E,? super C,StringMessage> client, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
- addTest(new TextPlainTestCase<E,C>(env, channel, client, endpointFactory, contentTypeMode, data));
+ public void addTextPlainTest(TestEnvironment env, AsyncChannel channel, AsyncTestClient<StringMessage> client, AsyncEndpointFactory<StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ addTest(new TextPlainTestCase(env, channel, client, endpointFactory, contentTypeMode, data));
}
- public <C extends AsyncChannel<? super E>> void addTextPlainTests(E env, C channel, AsyncTestClient<? super E,? super C,StringMessage> client, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode) {
+ public void addTextPlainTests(TestEnvironment env, AsyncChannel channel, AsyncTestClient<StringMessage> client, AsyncEndpointFactory<StringMessage> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
-// addTextPlainTest(channel, client, endpointFactory, contentTypeMode, data);
- addTest(new TextPlainTestCase<E,C>(env, channel, client, endpointFactory, contentTypeMode, data));
+ addTextPlainTest(env, channel, client, endpointFactory, contentTypeMode, data);
}
}
- public <C extends AsyncChannel<? super E>> void addBinaryTest(E env, C channel, AsyncTestClient<? super E,? super C,ByteArrayMessage> client, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) {
- addTest(new BinaryTestCase<E,C>(env, channel, client, endpointFactory, contentTypeMode));
+ public void addBinaryTest(TestEnvironment env, AsyncChannel channel, AsyncTestClient<ByteArrayMessage> client, AsyncEndpointFactory<ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) {
+ addTest(new BinaryTestCase(env, channel, client, endpointFactory, contentTypeMode));
}
- public <C extends AsyncChannel<? super E>> void addRESTTests(E env, C channel, AsyncTestClient<? super E,? super C,RESTMessage> client, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
- addTest(new RESTTestCase<E,C>(env, channel, client, endpointFactory, restTestMessage1));
+ public void addRESTTests(TestEnvironment env, AsyncChannel channel, AsyncTestClient<RESTMessage> client, AsyncEndpointFactory<MessageData> endpointFactory) {
+ addTest(new RESTTestCase(env, channel, client, endpointFactory, restTestMessage1));
// TODO: regression test for SYNAPSE-431
-// addTest(new RESTTestCase<E,C>(env, channel, client, endpointFactory, restTestMessage2));
+// addTest(new RESTTestCase(env, channel, client, endpointFactory, restTestMessage2));
}
@Override
public void addTest(Test test) {
if (test instanceof TransportTestCase) {
- TransportTestCase<?,?,?> ttest = (TransportTestCase<?,?,?>)test;
+ TransportTestCase ttest = (TransportTestCase)test;
Map<String,String> map = ttest.getNameComponents();
for (FilterExpression exclude : excludes) {
if (exclude.matches(map)) {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClient.java Sun Aug 17 11:06:11 2008
@@ -19,9 +19,6 @@
package org.apache.synapse.transport.testkit.client;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
-
-public interface AsyncTestClient<E extends TestEnvironment,C extends AsyncChannel<?>,M> extends TestClient<E,C> {
- void sendMessage(C channel, ClientOptions options, M message) throws Exception;
+public interface AsyncTestClient<M> extends TestClient {
+ void sendMessage(ClientOptions options, M message) throws Exception;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClientAdapter.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClientAdapter.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClientAdapter.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/AsyncTestClientAdapter.java Sun Aug 17 11:06:11 2008
@@ -20,32 +20,22 @@
package org.apache.synapse.transport.testkit.client;
import org.apache.synapse.transport.testkit.Adapter;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.MessageConverter;
-public class AsyncTestClientAdapter<E extends TestEnvironment,C extends AsyncChannel<?>,M,N> implements AsyncTestClient<E,C,M>, Adapter {
- private final AsyncTestClient<E,C,N> target;
+public class AsyncTestClientAdapter<M,N> implements AsyncTestClient<M>, Adapter {
+ private final AsyncTestClient<N> target;
private final MessageConverter<M,N> converter;
- public AsyncTestClientAdapter(AsyncTestClient<E,C,N> target, MessageConverter<M,N> converter) {
+ public AsyncTestClientAdapter(AsyncTestClient<N> target, MessageConverter<M,N> converter) {
this.target = target;
this.converter = converter;
}
- public AsyncTestClient<E,C,N> getTarget() {
+ public AsyncTestClient<N> getTarget() {
return target;
}
- public void sendMessage(C channel, ClientOptions options, M message) throws Exception {
- target.sendMessage(channel, options, converter.convert(options, message));
- }
-
- public void setUp(E env,C channel) throws Exception {
- target.setUp(env, channel);
- }
-
- public void tearDown() throws Exception {
- target.tearDown();
+ public void sendMessage(ClientOptions options, M message) throws Exception {
+ target.sendMessage(options, converter.convert(options, message));
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/TestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/TestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/TestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/TestClient.java Sun Aug 17 11:06:11 2008
@@ -19,10 +19,5 @@
package org.apache.synapse.transport.testkit.client;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.Channel;
-
-public interface TestClient<E extends TestEnvironment,C extends Channel<?>> {
- void setUp(E env, C channel) throws Exception;
- void tearDown() throws Exception;
+public interface TestClient {
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/XMLRequestResponseTestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/XMLRequestResponseTestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/XMLRequestResponseTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/XMLRequestResponseTestClient.java Sun Aug 17 11:06:11 2008
@@ -20,10 +20,8 @@
package org.apache.synapse.transport.testkit.client;
import org.apache.axiom.om.OMElement;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import org.apache.synapse.transport.testkit.message.XMLMessageType;
-public interface XMLRequestResponseTestClient<E extends TestEnvironment,C extends RequestResponseChannel<?>> extends TestClient<E,C> {
- OMElement sendMessage(C channel, String endpointReference, String contentType, String charset, XMLMessageType xmlMessageType, OMElement payload) throws Exception;
+public interface XMLRequestResponseTestClient extends TestClient {
+ OMElement sendMessage(String endpointReference, String contentType, String charset, XMLMessageType xmlMessageType, OMElement payload) throws Exception;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java Sun Aug 17 11:06:11 2008
@@ -20,21 +20,19 @@
package org.apache.synapse.transport.testkit.client.axis2;
import org.apache.axis2.client.ServiceClient;
-import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.client.AsyncTestClient;
import org.apache.synapse.transport.testkit.client.ClientOptions;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.XMLMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
-public class AxisAsyncTestClient extends AxisTestClient<AsyncChannel<?>> implements AsyncTestClient<TestEnvironment,AsyncChannel<?>,XMLMessage> {
+public class AxisAsyncTestClient extends AxisTestClient implements AsyncTestClient<XMLMessage> {
public AxisAsyncTestClient(TransportDescriptionFactory tdf) {
super(tdf);
}
- public void sendMessage(AsyncChannel<?> channel, ClientOptions options, XMLMessage message) throws Exception {
+ public void sendMessage(ClientOptions options, XMLMessage message) throws Exception {
createClient(options.getEndpointReference(), ServiceClient.ANON_OUT_ONLY_OP, message.getXmlMessageType(), message.getPayload(), options.getCharset()).execute(false);
}
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java Sun Aug 17 11:06:11 2008
@@ -24,21 +24,18 @@
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.client.XMLRequestResponseTestClient;
-import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import org.apache.synapse.transport.testkit.message.XMLMessageType;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
-public class AxisRequestResponseTestClient extends AxisTestClient<RequestResponseChannel<?>> implements XMLRequestResponseTestClient<TestEnvironment,RequestResponseChannel<?>> {
+public class AxisRequestResponseTestClient extends AxisTestClient implements XMLRequestResponseTestClient {
public AxisRequestResponseTestClient(TransportDescriptionFactory tdf) {
super(tdf);
}
- public OMElement sendMessage(RequestResponseChannel<?> channel,
- String endpointReference, String contentType, String charset,
+ public OMElement sendMessage(String endpointReference, String contentType, String charset,
XMLMessageType xmlMessageType, OMElement payload) throws Exception {
OperationClient mepClient = createClient(endpointReference, ServiceClient.ANON_OUT_IN_OP, xmlMessageType, payload, charset);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java Sun Aug 17 11:06:11 2008
@@ -36,18 +36,17 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.client.AbstractTestClient;
+import org.apache.synapse.transport.testkit.client.TestClient;
import org.apache.synapse.transport.testkit.listener.Channel;
import org.apache.synapse.transport.testkit.message.XMLMessageType;
-public class AxisTestClient<C extends Channel<?>> extends AbstractTestClient<TestEnvironment,C> {
+public class AxisTestClient implements TestClient {
private static final Log log = LogFactory.getLog(AxisTestClient.class);
private final TransportDescriptionFactory tdf;
- private C channel;
+ private Channel channel;
private TransportOutDescription trpOutDesc;
private ConfigurationContext cfgCtx;
@@ -55,9 +54,8 @@
this.tdf = tdf;
}
- @Override
- public void setUp(TestEnvironment env, C channel) throws Exception {
- super.setUp(env, channel);
+ @SuppressWarnings("unused")
+ private void setUp(Channel channel) throws Exception {
this.channel = channel;
cfgCtx =
@@ -70,9 +68,8 @@
trpOutDesc.getSender().init(cfgCtx, trpOutDesc);
}
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
trpOutDesc.getSender().stop();
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java Sun Aug 17 11:06:11 2008
@@ -22,9 +22,8 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-public abstract class AbstractChannel<E extends TestEnvironment> implements Channel<E> {
+public abstract class AbstractChannel implements Channel {
public void setupService(AxisService service) throws Exception {
}
@@ -34,10 +33,4 @@
public EndpointReference createEndpointReference(String address) {
return new EndpointReference(address);
}
-
- public void setUp(E env) throws Exception {
- }
-
- public void tearDown() throws Exception {
- }
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncChannel.java Sun Aug 17 11:06:11 2008
@@ -19,7 +19,5 @@
package org.apache.synapse.transport.testkit.listener;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-
-public interface AsyncChannel<T extends TestEnvironment> extends Channel<T> {
+public interface AsyncChannel extends Channel {
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageTestCase.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageTestCase.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageTestCase.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageTestCase.java Sun Aug 17 11:06:11 2008
@@ -22,23 +22,33 @@
import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.client.AsyncTestClient;
import org.apache.synapse.transport.testkit.client.ClientOptions;
+import org.apache.synapse.transport.testkit.name.NameComponent;
import org.apache.synapse.transport.testkit.server.AsyncEndpoint;
import org.apache.synapse.transport.testkit.server.AsyncEndpointFactory;
import org.apache.synapse.transport.testkit.tests.TransportTestCase;
-public abstract class AsyncMessageTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>,M,N> extends TransportTestCase<E,C,AsyncTestClient<? super E,? super C,M>> {
+public abstract class AsyncMessageTestCase<M,N> extends TransportTestCase {
+ private final AsyncTestClient<M> client;
private final String charset;
- private final AsyncEndpointFactory<? super E,? super C,N> endpointFactory;
+ private final AsyncEndpointFactory<N> endpointFactory;
- public AsyncMessageTestCase(E env, C channel, AsyncTestClient<? super E,? super C,M> client, AsyncEndpointFactory<? super E,? super C,N> endpointFactory, ContentTypeMode contentTypeMode, String contentType, String charset) {
- super(env, channel, client, endpointFactory.getServer(), contentTypeMode, contentType);
+ public AsyncMessageTestCase(TestEnvironment env, AsyncChannel channel, AsyncTestClient<M> client, AsyncEndpointFactory<N> endpointFactory, ContentTypeMode contentTypeMode, String contentType, String charset) {
+ super(env, channel, endpointFactory.getServer(), contentTypeMode, contentType);
+ this.client = client;
this.endpointFactory = endpointFactory;
this.charset = charset;
+ addResource(client);
+ addResource(endpointFactory);
+ }
+
+ @NameComponent("client")
+ public AsyncTestClient<M> getClient() {
+ return client;
}
@Override
protected void runTest() throws Throwable {
- AsyncEndpoint<N> endpoint = endpointFactory.createAsyncEndpoint(env, channel, contentTypeMode == ContentTypeMode.SERVICE ? contentType : null);
+ AsyncEndpoint<N> endpoint = endpointFactory.createAsyncEndpoint(contentTypeMode == ContentTypeMode.SERVICE ? contentType : null);
M message = prepareMessage();
@@ -47,7 +57,7 @@
try {
ClientOptions options = new ClientOptions(endpoint.getEPR(), charset);
// contentTypeMode == ContentTypeMode.TRANSPORT ? contentType : null);
- client.sendMessage(channel, options, message);
+ client.sendMessage(options, message);
messageData = endpoint.waitForMessage(8000);
if (messageData == null) {
fail("Failed to get message");
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java Sun Aug 17 11:06:11 2008
@@ -23,9 +23,8 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-public interface Channel<E extends TestEnvironment> {
+public interface Channel {
/**
* Set up the service so that it can receive messages through the transport under test.
* Implementations will typically call {@link AxisService#addParameter(Parameter)} to
@@ -40,7 +39,4 @@
void setupRequestMessageContext(MessageContext msgContext);
EndpointReference createEndpointReference(String address);
-
- void setUp(E env) throws Exception;
- void tearDown() throws Exception;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/RequestResponseChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/RequestResponseChannel.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/RequestResponseChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/RequestResponseChannel.java Sun Aug 17 11:06:11 2008
@@ -19,7 +19,5 @@
package org.apache.synapse.transport.testkit.listener;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-
-public interface RequestResponseChannel<T extends TestEnvironment> extends Channel<T> {
+public interface RequestResponseChannel extends Channel {
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactory.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactory.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactory.java Sun Aug 17 11:06:11 2008
@@ -19,10 +19,7 @@
package org.apache.synapse.transport.testkit.server;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
-
-public interface AsyncEndpointFactory<E extends TestEnvironment,C extends AsyncChannel<?>,M> {
- Server<? super E> getServer();
- AsyncEndpoint<M> createAsyncEndpoint(E env, C channel, String contentType) throws Exception;
+public interface AsyncEndpointFactory<M> {
+ Server getServer();
+ AsyncEndpoint<M> createAsyncEndpoint(String contentType) throws Exception;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactoryAdapter.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactoryAdapter.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactoryAdapter.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/AsyncEndpointFactoryAdapter.java Sun Aug 17 11:06:11 2008
@@ -20,29 +20,27 @@
package org.apache.synapse.transport.testkit.server;
import org.apache.synapse.transport.testkit.Adapter;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.message.MessageConverter;
-public class AsyncEndpointFactoryAdapter<E extends TestEnvironment,C extends AsyncChannel<? super E>,M,N> implements AsyncEndpointFactory<E,C,M>, Adapter {
- private final AsyncEndpointFactory<E,C,N> targetFactory;
+public class AsyncEndpointFactoryAdapter<M,N> implements AsyncEndpointFactory<M>, Adapter {
+ private final AsyncEndpointFactory<N> targetFactory;
private final MessageConverter<N,M> converter;
- public AsyncEndpointFactoryAdapter(AsyncEndpointFactory<E,C,N> targetFactory, MessageConverter<N,M> converter) {
+ public AsyncEndpointFactoryAdapter(AsyncEndpointFactory<N> targetFactory, MessageConverter<N,M> converter) {
this.targetFactory = targetFactory;
this.converter = converter;
}
- public AsyncEndpointFactory<E,C,N> getTarget() {
+ public AsyncEndpointFactory<N> getTarget() {
return targetFactory;
}
- public Server<? super E> getServer() {
+ public Server getServer() {
return targetFactory.getServer();
}
- public AsyncEndpoint<M> createAsyncEndpoint(E env, C channel, String contentType) throws Exception {
- final AsyncEndpoint<N> targetEndpoint = targetFactory.createAsyncEndpoint(env, channel, contentType);
+ public AsyncEndpoint<M> createAsyncEndpoint(String contentType) throws Exception {
+ final AsyncEndpoint<N> targetEndpoint = targetFactory.createAsyncEndpoint(contentType);
final MessageConverter<N,M> converter = this.converter;
return new AsyncEndpoint<M>() {
public String getEPR() throws Exception {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/EndpointFactory.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/EndpointFactory.java?rev=686626&r1=686625&r2=686626&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/EndpointFactory.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/EndpointFactory.java Sun Aug 17 11:06:11 2008
@@ -19,10 +19,7 @@
package org.apache.synapse.transport.testkit.server;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
-
-public interface EndpointFactory<E extends TestEnvironment,C extends RequestResponseChannel<?>> {
- Server<? super E> getServer();
- Endpoint createEchoEndpoint(E env, C channel, String contentType) throws Exception;
+public interface EndpointFactory {
+ Server getServer();
+ Endpoint createEchoEndpoint(String contentType) throws Exception;
}
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=686626&r1=686625&r2=686626&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 Sun Aug 17 11:06:11 2008
@@ -19,10 +19,7 @@
package org.apache.synapse.transport.testkit.server;
-import org.apache.synapse.transport.testkit.TestEnvironment;
-import org.apache.synapse.transport.testkit.listener.Channel;
-
-public interface Server<T extends TestEnvironment> {
+public interface Server {
// public void addErrorListener(TransportErrorListener listener) {
// if (listener instanceof TransportErrorSource) {
// ((TransportErrorSource)listener).addErrorListener(listener);
@@ -34,7 +31,4 @@
// ((TransportErrorSource)listener).removeErrorListener(listener);
// }
// }
-
- void start(T env, Channel<?> channel) throws Exception;
- void stop() throws Exception;
}