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/15 00:15:00 UTC
svn commit: r686062 - in
/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport:
jms/ mail/ nhttp/ testkit/ testkit/listener/ testkit/tests/
testkit/tests/async/ testkit/tests/echo/ vfs/
Author: veithen
Date: Thu Aug 14 15:14:59 2008
New Revision: 686062
URL: http://svn.apache.org/viewvc?rev=686062&view=rev
Log:
JMS transport tests: Make sure that connections, sessions and producers are closed properly. This was not important when Mockrunner was used as JMS provider, but qpid generates lots of logging messages when resources are not properly closed.
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/AbstractJMSSender.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageSender.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/JMSListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailSender.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/HttpCoreNIOListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetSender.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/TransportTestSuite.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSenderAdapter.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/AxisAsyncMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisRequestResponseMessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/MessageSender.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageSender.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/VFSTransportListenerTest.java
Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/AbstractJMSSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/AbstractJMSSender.java?rev=686062&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/AbstractJMSSender.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/AbstractJMSSender.java Thu Aug 14 15:14:59 2008
@@ -0,0 +1,52 @@
+/*
+ * 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.jms;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
+
+public class AbstractJMSSender extends AbstractMessageSender<JMSTestEnvironment,JMSAsyncChannel> {
+ protected Connection connection;
+ protected Session session;
+ protected MessageProducer producer;
+
+ @Override
+ public void setUp(JMSTestEnvironment env, JMSAsyncChannel channel) throws Exception {
+ super.setUp(env, channel);
+ Destination destination = channel.getDestination();
+ ConnectionFactory connectionFactory = env.getConnectionFactory(destination);
+ connection = connectionFactory.createConnection();
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ producer = session.createProducer(destination);
+ }
+
+ @Override
+ public 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/JMSBytesMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSBytesMessageSender.java Thu Aug 14 15:14:59 2008
@@ -20,26 +20,23 @@
package org.apache.synapse.transport.jms;
import javax.jms.BytesMessage;
-import javax.jms.Session;
import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.SenderOptions;
import org.apache.synapse.transport.testkit.message.ByteArrayMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("BytesMessage")
-public class JMSBytesMessageSender extends AbstractMessageSender<JMSAsyncChannel> implements AsyncMessageSender<JMSAsyncChannel,ByteArrayMessage> {
+public class JMSBytesMessageSender extends AbstractJMSSender implements AsyncMessageSender<JMSTestEnvironment,JMSAsyncChannel,ByteArrayMessage> {
public void sendMessage(JMSAsyncChannel channel,
SenderOptions options,
ByteArrayMessage message) throws Exception {
- Session session = channel.createSession();
BytesMessage jmsMessage = session.createBytesMessage();
if (message.getContentType() != null) {
jmsMessage.setStringProperty(BaseConstants.CONTENT_TYPE, message.getContentType());
}
jmsMessage.writeBytes(message.getContent());
- channel.send(session, jmsMessage);
+ producer.send(jmsMessage);
}
}
\ No newline at end of file
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -20,14 +20,6 @@
package org.apache.synapse.transport.jms;
import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicSession;
import javax.naming.Context;
import javax.xml.namespace.QName;
@@ -129,22 +121,4 @@
service.addParameter(JMSConstants.DEST_PARAM_TYPE, destinationType);
service.addParameter(JMSConstants.DEST_PARAM, destinationName);
}
-
- public Session createSession() throws JMSException {
- if (destinationType.equals(JMSConstants.DESTINATION_TYPE_TOPIC)) {
- TopicConnection connection = env.getTopicConnectionFactory().createTopicConnection();
- return connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
- } else {
- QueueConnection connection = env.getQueueConnectionFactory().createQueueConnection();
- return connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- }
- }
-
- public void send(Session session, Message message) throws JMSException {
- if (destinationType.equals(JMSConstants.DESTINATION_TYPE_TOPIC)) {
- ((TopicSession)session).createPublisher((Topic)destination).send(message);
- } else {
- ((QueueSession)session).createProducer(destination).send(message);
- }
- }
}
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -45,7 +45,7 @@
AxisServer<JMSTestEnvironment> server = new AxisServer<JMSTestEnvironment>(env);
JMSBytesMessageSender bytesMessageSender = new JMSBytesMessageSender();
JMSTextMessageSender textMessageSender = new JMSTextMessageSender();
- List<AsyncMessageSender<? super JMSAsyncChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super JMSAsyncChannel,XMLMessage>>();
+ List<AsyncMessageSender<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage>>();
senders.add(adapt(bytesMessageSender, MessageConverter.XML_TO_BYTE));
senders.add(adapt(textMessageSender, MessageConverter.XML_TO_STRING));
senders.add(new AxisAsyncMessageSender());
@@ -56,7 +56,7 @@
for (String destinationType : new String[] { JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_TOPIC }) {
JMSAsyncChannel channel = new JMSAsyncChannel(destinationType);
for (ContentTypeMode contentTypeMode : ContentTypeMode.values()) {
- for (AsyncMessageSender<? super JMSAsyncChannel,XMLMessage> sender : senders) {
+ for (AsyncMessageSender<? super JMSTestEnvironment,? super JMSAsyncChannel,XMLMessage> sender : senders) {
if (contentTypeMode == ContentTypeMode.TRANSPORT) {
suite.addSOAPTests(env, channel, sender, server, contentTypeMode);
suite.addPOXTests(env, channel, sender, server, contentTypeMode);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTextMessageSender.java Thu Aug 14 15:14:59 2008
@@ -19,25 +19,22 @@
package org.apache.synapse.transport.jms;
-import javax.jms.Session;
import javax.jms.TextMessage;
import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.SenderOptions;
import org.apache.synapse.transport.testkit.message.StringMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("TextMessage")
-public class JMSTextMessageSender extends AbstractMessageSender<JMSAsyncChannel> implements AsyncMessageSender<JMSAsyncChannel,StringMessage> {
+public class JMSTextMessageSender extends AbstractJMSSender implements AsyncMessageSender<JMSTestEnvironment,JMSAsyncChannel,StringMessage> {
public void sendMessage(JMSAsyncChannel channel, SenderOptions options, StringMessage message) throws Exception {
- Session session = channel.createSession();
TextMessage jmsMessage = session.createTextMessage();
if (message.getContentType() != null) {
jmsMessage.setStringProperty(BaseConstants.CONTENT_TYPE, message.getContentType());
}
jmsMessage.setText(message.getContent());
- channel.send(session, jmsMessage);
+ producer.send(jmsMessage);
}
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailSender.java Thu Aug 14 15:14:59 2008
@@ -30,12 +30,13 @@
import javax.mail.internet.MimeMessage;
import javax.mail.util.ByteArrayDataSource;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.SenderOptions;
import org.apache.synapse.transport.testkit.message.ByteArrayMessage;
-public abstract class MailSender extends AbstractMessageSender<MailChannel> implements AsyncMessageSender<MailChannel,ByteArrayMessage> {
+public abstract class MailSender extends AbstractMessageSender<TestEnvironment,MailChannel> implements AsyncMessageSender<TestEnvironment,MailChannel,ByteArrayMessage> {
public void sendMessage(MailChannel channel, SenderOptions options, ByteArrayMessage message) throws Exception {
Properties props = new Properties();
props.put("mail.smtp.class", TestTransport.class.getName());
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -43,7 +43,7 @@
senders.add(new MimeSender());
senders.add(new MultipartSender());
for (MailSender sender : senders) {
- AsyncMessageSender<MailChannel,XMLMessage> xmlSender = adapt(sender, MessageConverter.XML_TO_BYTE);
+ AsyncMessageSender<TestEnvironment,MailChannel,XMLMessage> xmlSender = adapt(sender, MessageConverter.XML_TO_BYTE);
// TODO: SOAP 1.2 tests don't work yet for mail transport
suite.addSOAP11Test(null, channel, xmlSender, AxisServer.DEFAULT, ContentTypeMode.TRANSPORT, TransportTestSuite.ASCII_TEST_DATA);
suite.addSOAP11Test(null, channel, xmlSender, AxisServer.DEFAULT, ContentTypeMode.TRANSPORT, TransportTestSuite.UTF8_TEST_DATA);
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -41,10 +41,10 @@
TransportTestSuite<TestEnvironment> suite = new TransportTestSuite<TestEnvironment>();
HttpChannel channel = new HttpChannel();
JavaNetSender javaNetSender = new JavaNetSender();
- List<AsyncMessageSender<? super HttpChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super HttpChannel,XMLMessage>>();
+ List<AsyncMessageSender<TestEnvironment,? super HttpChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<TestEnvironment,? super HttpChannel,XMLMessage>>();
senders.add(adapt(javaNetSender, MessageConverter.XML_TO_BYTE));
senders.add(new AxisAsyncMessageSender());
- for (AsyncMessageSender<? super HttpChannel,XMLMessage> sender : senders) {
+ for (AsyncMessageSender<TestEnvironment,? super HttpChannel,XMLMessage> sender : senders) {
suite.addSOAPTests(null, channel, sender, AxisServer.DEFAULT, ContentTypeMode.TRANSPORT);
suite.addPOXTests(null, channel, sender, AxisServer.DEFAULT, ContentTypeMode.TRANSPORT);
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetRESTSender.java Thu Aug 14 15:14:59 2008
@@ -24,6 +24,7 @@
import java.net.URLConnection;
import org.apache.commons.io.IOUtils;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
@@ -33,7 +34,7 @@
import org.apache.synapse.transport.testkit.server.axis2.DefaultOperationDispatcher;
@DisplayName("java.net")
-public class JavaNetRESTSender extends AbstractMessageSender<AsyncChannel<?>> implements AsyncMessageSender<AsyncChannel<?>,RESTMessage> {
+public class JavaNetRESTSender extends AbstractMessageSender<TestEnvironment,AsyncChannel<?>> implements AsyncMessageSender<TestEnvironment,AsyncChannel<?>,RESTMessage> {
public void sendMessage(AsyncChannel<?> channel, SenderOptions options, RESTMessage message) throws Exception {
URLConnection connection = new URL(options.getEndpointReference() + "/" + DefaultOperationDispatcher.DEFAULT_OPERATION_NAME).openConnection();
connection.setDoInput(true);
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JavaNetSender.java Thu Aug 14 15:14:59 2008
@@ -25,6 +25,7 @@
import java.net.URLConnection;
import org.apache.commons.io.IOUtils;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
@@ -33,7 +34,7 @@
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("java.net")
-public class JavaNetSender extends AbstractMessageSender<AsyncChannel<?>> implements AsyncMessageSender<AsyncChannel<?>,ByteArrayMessage> {
+public class JavaNetSender extends AbstractMessageSender<TestEnvironment,AsyncChannel<?>> implements AsyncMessageSender<TestEnvironment,AsyncChannel<?>,ByteArrayMessage> {
public void sendMessage(AsyncChannel<?> channel, SenderOptions options, ByteArrayMessage message) throws Exception {
URLConnection connection = new URL(options.getEndpointReference()).openConnection();
connection.setDoOutput(true);
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -27,8 +27,8 @@
import org.apache.synapse.transport.testkit.server.AsyncEndpointFactoryAdapter;
public class AdapterUtils {
- public static <C extends AsyncChannel<?>,M,N> AsyncMessageSender<C,M> adapt(AsyncMessageSender<C,N> parent, MessageConverter<M,N> converter) {
- return new AsyncMessageSenderAdapter<C,M,N>(parent, converter);
+ public static <E extends TestEnvironment,C extends AsyncChannel<?>,M,N> AsyncMessageSender<E,C,M> adapt(AsyncMessageSender<E,C,N> parent, MessageConverter<M,N> converter) {
+ return new AsyncMessageSenderAdapter<E,C,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) {
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -67,15 +67,15 @@
this(true);
}
- public <C extends AsyncChannel<? super E>> void addSOAP11Test(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ public <C extends AsyncChannel<? super E>> void addSOAP11Test(E env, C channel, AsyncMessageSender<? super E,? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.SOAP11, contentTypeMode, SOAP11Constants.SOAP_11_CONTENT_TYPE, data));
}
- public <C extends AsyncChannel<? super E>> void addSOAP12Test(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ public <C extends AsyncChannel<? super E>> void addSOAP12Test(E env, C channel, AsyncMessageSender<? super E,? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.SOAP12, contentTypeMode, SOAP12Constants.SOAP_12_CONTENT_TYPE, data));
}
- public <C extends AsyncChannel<? super E>> void addSOAPTests(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
+ public <C extends AsyncChannel<? super E>> void addSOAPTests(E env, C channel, AsyncMessageSender<? super E,? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.SOAP11, contentTypeMode, SOAP11Constants.SOAP_11_CONTENT_TYPE, data));
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.SOAP12, contentTypeMode, SOAP12Constants.SOAP_12_CONTENT_TYPE, data));
@@ -84,22 +84,22 @@
}
}
- public <C extends AsyncChannel<? super E>> void addPOXTest(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ public <C extends AsyncChannel<? super E>> void addPOXTest(E env, C channel, AsyncMessageSender<? super E,? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.POX, contentTypeMode, "application/xml", data));
}
- public <C extends AsyncChannel<? super E>> void addPOXTests(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
+ public <C extends AsyncChannel<? super E>> void addPOXTests(E env, C channel, AsyncMessageSender<? super E,? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
addTest(new XMLAsyncMessageTestCase<E,C>(env, channel, sender, endpointFactory, XMLMessageType.POX, contentTypeMode, "application/xml", data));
// addPOXTest(channel, sender, endpointFactory, contentTypeMode, data);
}
}
- public <C extends RequestResponseChannel<? super E>> void addPOXTest(E env, C channel, XMLRequestResponseMessageSender<? super C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ public <C extends RequestResponseChannel<? super E>> void addPOXTest(E env, C channel, XMLRequestResponseMessageSender<? super E,? super C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
addTest(new XMLRequestResponseMessageTestCase<E,C>(env, channel, sender, endpointFactory, contentTypeMode, "application/xml", XMLMessageType.POX, data));
}
- public <C extends RequestResponseChannel<? super E>> void addPOXTests(E env, C channel, XMLRequestResponseMessageSender<? super C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode) {
+ public <C extends RequestResponseChannel<? super E>> void addPOXTests(E env, C channel, XMLRequestResponseMessageSender<? super E,? super C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
// addPOXTest(channel, sender, endpointFactory, contentTypeMode, data);
addTest(new XMLRequestResponseMessageTestCase<E,C>(env, channel, sender, endpointFactory, contentTypeMode, "application/xml", XMLMessageType.POX, data));
@@ -107,26 +107,26 @@
}
// 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, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
+ public <C extends AsyncChannel<? super E>> void addSwATests(E env, C channel, AsyncMessageSender<? super E,? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
addTest(new SwATestCase<E,C>(env, channel, sender, endpointFactory));
}
- public <C extends AsyncChannel<? super E>> void addTextPlainTest(E env, C channel, AsyncMessageSender<? super C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
+ public <C extends AsyncChannel<? super E>> void addTextPlainTest(E env, C channel, AsyncMessageSender<? super E,? super C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, MessageTestData data) {
addTest(new TextPlainTestCase<E,C>(env, channel, sender, endpointFactory, contentTypeMode, data));
}
- public <C extends AsyncChannel<? super E>> void addTextPlainTests(E env, C channel, AsyncMessageSender<? super C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode) {
+ public <C extends AsyncChannel<? super E>> void addTextPlainTests(E env, C channel, AsyncMessageSender<? super E,? super C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode) {
for (MessageTestData data : messageTestData) {
// addTextPlainTest(channel, sender, endpointFactory, contentTypeMode, data);
addTest(new TextPlainTestCase<E,C>(env, channel, sender, endpointFactory, contentTypeMode, data));
}
}
- public <C extends AsyncChannel<? super E>> void addBinaryTest(E env, C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) {
+ public <C extends AsyncChannel<? super E>> void addBinaryTest(E env, C channel, AsyncMessageSender<? super E,? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) {
addTest(new BinaryTestCase<E,C>(env, channel, sender, endpointFactory, contentTypeMode));
}
- public <C extends AsyncChannel<? super E>> void addRESTTests(E env, C channel, AsyncMessageSender<? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
+ public <C extends AsyncChannel<? super E>> void addRESTTests(E env, C channel, AsyncMessageSender<? super E,? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
addTest(new RESTTestCase<E,C>(env, channel, sender, endpointFactory));
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractMessageSender.java Thu Aug 14 15:14:59 2008
@@ -19,8 +19,10 @@
package org.apache.synapse.transport.testkit.listener;
-public abstract class AbstractMessageSender<C extends Channel<?>> implements MessageSender<C> {
- public void setUp(C channel) throws Exception {
+import org.apache.synapse.transport.testkit.TestEnvironment;
+
+public abstract class AbstractMessageSender<E extends TestEnvironment,C extends Channel<?>> implements MessageSender<E,C> {
+ public void setUp(E env, C channel) throws Exception {
}
public void tearDown() throws Exception {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSender.java Thu Aug 14 15:14:59 2008
@@ -19,6 +19,8 @@
package org.apache.synapse.transport.testkit.listener;
-public interface AsyncMessageSender<C extends AsyncChannel<?>,M> extends MessageSender<C> {
+import org.apache.synapse.transport.testkit.TestEnvironment;
+
+public interface AsyncMessageSender<E extends TestEnvironment,C extends AsyncChannel<?>,M> extends MessageSender<E,C> {
void sendMessage(C channel, SenderOptions options, M message) throws Exception;
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSenderAdapter.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSenderAdapter.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSenderAdapter.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AsyncMessageSenderAdapter.java Thu Aug 14 15:14:59 2008
@@ -20,18 +20,19 @@
package org.apache.synapse.transport.testkit.listener;
import org.apache.synapse.transport.testkit.Adapter;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.message.MessageConverter;
-public class AsyncMessageSenderAdapter<C extends AsyncChannel<?>,M,N> implements AsyncMessageSender<C,M>, Adapter {
- private final AsyncMessageSender<C,N> target;
+public class AsyncMessageSenderAdapter<E extends TestEnvironment,C extends AsyncChannel<?>,M,N> implements AsyncMessageSender<E,C,M>, Adapter {
+ private final AsyncMessageSender<E,C,N> target;
private final MessageConverter<M,N> converter;
- public AsyncMessageSenderAdapter(AsyncMessageSender<C,N> target, MessageConverter<M,N> converter) {
+ public AsyncMessageSenderAdapter(AsyncMessageSender<E,C,N> target, MessageConverter<M,N> converter) {
this.target = target;
this.converter = converter;
}
- public AsyncMessageSender<C,N> getTarget() {
+ public AsyncMessageSender<E,C,N> getTarget() {
return target;
}
@@ -39,8 +40,8 @@
target.sendMessage(channel, options, converter.convert(options, message));
}
- public void setUp(C channel) throws Exception {
- target.setUp(channel);
+ public void setUp(E env,C channel) throws Exception {
+ target.setUp(env, channel);
}
public void tearDown() throws Exception {
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -24,11 +24,11 @@
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,AsyncMessageSender<? super C,M>> {
+public abstract class AsyncMessageTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>,M,N> extends TransportTestCase<E,C,AsyncMessageSender<? super E,? super C,M>> {
private final String charset;
private final AsyncEndpointFactory<? super E,? super C,N> endpointFactory;
- public AsyncMessageTestCase(E env, C channel, AsyncMessageSender<? super C,M> sender, AsyncEndpointFactory<? super E,? super C,N> endpointFactory, ContentTypeMode contentTypeMode, String contentType, String charset) {
+ public AsyncMessageTestCase(E env, C channel, AsyncMessageSender<? super E,? super C,M> sender, AsyncEndpointFactory<? super E,? super C,N> endpointFactory, ContentTypeMode contentTypeMode, String contentType, String charset) {
super(env, channel, sender, endpointFactory.getServer(), contentTypeMode, contentType);
this.endpointFactory = endpointFactory;
this.charset = charset;
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisAsyncMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisAsyncMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisAsyncMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisAsyncMessageSender.java Thu Aug 14 15:14:59 2008
@@ -20,11 +20,12 @@
package org.apache.synapse.transport.testkit.listener;
import org.apache.axis2.client.ServiceClient;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.message.XMLMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
-public class AxisAsyncMessageSender extends AxisMessageSender<AsyncChannel<?>> implements AsyncMessageSender<AsyncChannel<?>,XMLMessage> {
+public class AxisAsyncMessageSender extends AxisMessageSender<AsyncChannel<?>> implements AsyncMessageSender<TestEnvironment,AsyncChannel<?>,XMLMessage> {
public void sendMessage(AsyncChannel<?> channel, SenderOptions 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/listener/AxisMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java Thu Aug 14 15:14:59 2008
@@ -36,9 +36,10 @@
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.message.XMLMessageType;
-public class AxisMessageSender<C extends Channel<?>> extends AbstractMessageSender<C> {
+public class AxisMessageSender<C extends Channel<?>> extends AbstractMessageSender<TestEnvironment,C> {
private static final Log log = LogFactory.getLog(AxisMessageSender.class);
private C channel;
@@ -46,8 +47,8 @@
private ConfigurationContext cfgCtx;
@Override
- public void setUp(C channel) throws Exception {
- super.setUp(channel);
+ public void setUp(TestEnvironment env, C channel) throws Exception {
+ super.setUp(env, channel);
this.channel = channel;
cfgCtx =
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisRequestResponseMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisRequestResponseMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisRequestResponseMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisRequestResponseMessageSender.java Thu Aug 14 15:14:59 2008
@@ -24,11 +24,12 @@
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.message.XMLMessageType;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
-public class AxisRequestResponseMessageSender extends AxisMessageSender<RequestResponseChannel<?>> implements XMLRequestResponseMessageSender<RequestResponseChannel<?>> {
+public class AxisRequestResponseMessageSender extends AxisMessageSender<RequestResponseChannel<?>> implements XMLRequestResponseMessageSender<TestEnvironment,RequestResponseChannel<?>> {
public OMElement sendMessage(RequestResponseChannel<?> channel,
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/listener/MessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/MessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/MessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/MessageSender.java Thu Aug 14 15:14:59 2008
@@ -19,7 +19,10 @@
package org.apache.synapse.transport.testkit.listener;
-public interface MessageSender<C extends Channel<?>> {
- void setUp(C channel) throws Exception;
+import org.apache.synapse.transport.testkit.TestEnvironment;
+
+// TODO: rename Sender to TestClient to avoid name collisions with transport implementation classes
+public interface MessageSender<E extends TestEnvironment,C extends Channel<?>> {
+ void setUp(E env, C channel) throws Exception;
void tearDown() throws Exception;
}
\ No newline at end of file
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageSender.java?rev=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/XMLRequestResponseMessageSender.java Thu Aug 14 15:14:59 2008
@@ -20,8 +20,9 @@
package org.apache.synapse.transport.testkit.listener;
import org.apache.axiom.om.OMElement;
+import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.message.XMLMessageType;
-public interface XMLRequestResponseMessageSender<C extends RequestResponseChannel<?>> extends MessageSender<C> {
+public interface XMLRequestResponseMessageSender<E extends TestEnvironment,C extends RequestResponseChannel<?>> extends MessageSender<E,C> {
OMElement sendMessage(C channel, 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/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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -30,7 +30,7 @@
import junit.framework.TestCase;
-public abstract class TransportTestCase<E extends TestEnvironment,C extends Channel<? super E>,S extends MessageSender<? super C>> extends TestCase {
+public abstract class TransportTestCase<E extends TestEnvironment,C extends Channel<? super E>,S extends MessageSender<? super E,? super C>> extends TestCase {
protected final E env;
protected final C channel;
protected final S sender;
@@ -73,8 +73,8 @@
return sender;
}
- @NameComponent("setup")
- public E getSetup() {
+ @NameComponent("env")
+ public E getEnvironment() {
return env;
}
@@ -92,7 +92,7 @@
if (server != null && manageServer) {
server.start(env, channel);
}
- sender.setUp(channel);
+ sender.setUp(env, channel);
}
@Override
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -35,7 +35,7 @@
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 C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,ByteArrayMessage> endpointFactory, ContentTypeMode contentTypeMode) {
+ 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);
}
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -31,7 +31,7 @@
@DisplayName("REST")
public class RESTTestCase<E extends TestEnvironment,C extends AsyncChannel<? super E>> extends AsyncMessageTestCase<E,C,RESTMessage,MessageData> {
- public RESTTestCase(E env, C channel, AsyncMessageSender<? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
+ public RESTTestCase(E env, C channel, AsyncMessageSender<? super E,? super C,RESTMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
super(env, channel, sender, endpointFactory, ContentTypeMode.TRANSPORT, null, null);
}
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -55,7 +55,7 @@
private byte[] attachmentContent;
private String contentID;
- public SwATestCase(E env, C channel, AsyncMessageSender<? super C,ByteArrayMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory) {
+ 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);
}
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -34,7 +34,7 @@
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 C,StringMessage> sender, AsyncEndpointFactory<? super E,? super C,StringMessage> endpointFactory, ContentTypeMode contentTypeMode, 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());
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=686062&r1=686061&r2=686062&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 Thu Aug 14 15:14:59 2008
@@ -42,7 +42,7 @@
private final XMLMessageType xmlMessageType;
private final MessageTestData data;
- public XMLAsyncMessageTestCase(E env, C channel, AsyncMessageSender<? super C,XMLMessage> sender, AsyncEndpointFactory<? super E,? super C,MessageData> endpointFactory, XMLMessageType xmlMessageType, ContentTypeMode contentTypeMode, String baseContentType, MessageTestData data) {
+ 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());
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=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java Thu Aug 14 15:14:59 2008
@@ -36,13 +36,13 @@
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 C>> {
+public class XMLRequestResponseMessageTestCase<E extends TestEnvironment,C extends RequestResponseChannel<? super E>> extends TransportTestCase<E,C,XMLRequestResponseMessageSender<? 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 C> sender, EndpointFactory<? super E,? super C> endpointFactory, ContentTypeMode contentTypeMode, String contentType, XMLMessageType xmlMessageType, MessageTestData data) {
+ 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);
this.endpointFactory = endpointFactory;
this.xmlMessageType = xmlMessageType;
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=686062&r1=686061&r2=686062&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java Thu Aug 14 15:14:59 2008
@@ -45,7 +45,7 @@
* TransportListenerTestTemplate implementation for the VFS transport.
*/
public class VFSTransportListenerTest extends TestCase {
- private static class MessageSenderImpl extends AbstractMessageSender<VFSFileChannel> implements AsyncMessageSender<VFSFileChannel,ByteArrayMessage> {
+ 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());
@@ -60,10 +60,10 @@
AxisServer<VFSTestEnvironment> server = new AxisServer<VFSTestEnvironment>(env);
VFSFileChannel channel = new VFSFileChannel(new File("target/vfs3/req/in").getAbsoluteFile());
MessageSenderImpl vfsSender = new MessageSenderImpl();
- List<AsyncMessageSender<? super VFSFileChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super VFSFileChannel,XMLMessage>>();
+ 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());
- for (AsyncMessageSender<? super VFSFileChannel,XMLMessage> sender : senders) {
+ 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);
// Since VFS has no Content-Type header, SwA is not supported.