Author: veithen
Date: Fri Aug 15 02:34:59 2008
New Revision: 686184
URL: http://svn.apache.org/viewvc?rev=686184&view=rev
Log:
HttpCoreNIOListenerTest: Allow to easily switch between NIO and Axis' blocking
HTTP transport, so that we can compare the behavior of the two implementations.
(+ necessary refactorings in the test kit)
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/SimpleTransportDescriptionFactory.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportDescriptionFactory.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncMessageSender.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/mail/MailChannel.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/testkit/TestEnvironment.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/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/Channel.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/AxisServer.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/JMSAxisAsyncMessageSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncMessageSender.java?rev=686184&r1=686183&r2=686184&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncMessageSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncMessageSender.java
Fri Aug 15 02:34:59 2008
@@ -21,6 +21,7 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender;
import org.apache.synapse.transport.testkit.name.DisplayName;
import org.apache.synapse.transport.testkit.name.NameComponent;
@@ -29,7 +30,8 @@
public class JMSAxisAsyncMessageSender extends AxisAsyncMessageSender {
private final String jmsMessageType;
- public JMSAxisAsyncMessageSender(String jmsMessageType) {
+ public JMSAxisAsyncMessageSender(TransportDescriptionFactory tdf, String
jmsMessageType) {
+ super(tdf);
this.jmsMessageType = jmsMessageType;
}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -20,25 +20,12 @@
package org.apache.synapse.transport.jms;
import javax.jms.Destination;
-import javax.naming.Context;
-import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.ParameterInclude;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.name.NameComponent;
-import org.mockejb.jndi.MockContextFactory;
public abstract class JMSChannel extends AbstractChannel<JMSTestEnvironment> {
- private static final OMFactory factory = OMAbstractFactory.getOMFactory();
-
private final String destinationType;
protected JMSTestEnvironment env;
private String destinationName;
@@ -76,45 +63,6 @@
return destination;
}
- private OMElement createParameterElement(String name, String value) {
- OMElement element = factory.createOMElement(new QName("parameter"));
- element.addAttribute("name", name, null);
- if (value != null) {
- element.setText(value);
- }
- return element;
- }
-
- private void setupConnectionFactoryConfig(ParameterInclude trpDesc, String
name, String connFactName, String type) throws AxisFault {
- OMElement element =
createParameterElement(JMSConstants.DEFAULT_CONFAC_NAME, null);
-
element.addChild(createParameterElement(Context.INITIAL_CONTEXT_FACTORY,
- MockContextFactory.class.getName()));
-
element.addChild(createParameterElement(JMSConstants.CONFAC_JNDI_NAME_PARAM,
- connFactName));
- element.addChild(createParameterElement(JMSConstants.CONFAC_TYPE,
type));
- trpDesc.addParameter(new Parameter(name, element));
- }
-
- private void setupTransport(ParameterInclude trpDesc) throws AxisFault {
- setupConnectionFactoryConfig(trpDesc, "queue",
JMSTestEnvironment.QUEUE_CONNECTION_FACTORY, "queue");
- setupConnectionFactoryConfig(trpDesc, "topic",
JMSTestEnvironment.TOPIC_CONNECTION_FACTORY, "topic");
- }
-
- public TransportInDescription createTransportInDescription() throws
Exception {
- TransportInDescription trpInDesc = new
TransportInDescription(JMSListener.TRANSPORT_NAME);
- setupTransport(trpInDesc);
- trpInDesc.setReceiver(new JMSListener());
- return trpInDesc;
- }
-
- @Override
- public TransportOutDescription createTransportOutDescription() throws
Exception {
- TransportOutDescription trpOutDesc = new
TransportOutDescription(JMSSender.TRANSPORT_NAME);
-// setupTransport(trpOutDesc);
- trpOutDesc.setSender(new JMSSender());
- return trpOutDesc;
- }
-
@Override
public void setupService(AxisService service) throws Exception {
service.addParameter(JMSConstants.CONFAC_PARAM, destinationType);
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -28,6 +28,7 @@
import junit.framework.TestSuite;
import org.apache.axis2.context.MessageContext;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender;
@@ -42,17 +43,18 @@
public static TestSuite suite() {
TransportTestSuite<JMSTestEnvironment> suite = new
TransportTestSuite<JMSTestEnvironment>();
JMSTestEnvironment env = new QpidTestEnvironment();
- AxisServer<JMSTestEnvironment> server = new
AxisServer<JMSTestEnvironment>(env);
+ TransportDescriptionFactory tdf = new JMSTransportDescriptionFactory();
+ AxisServer<JMSTestEnvironment> server = new
AxisServer<JMSTestEnvironment>(tdf);
JMSBytesMessageSender bytesMessageSender = new JMSBytesMessageSender();
JMSTextMessageSender textMessageSender = new JMSTextMessageSender();
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());
- senders.add(new
JMSAxisAsyncMessageSender(JMSConstants.JMS_BYTE_MESSAGE));
- senders.add(new
JMSAxisAsyncMessageSender(JMSConstants.JMS_TEXT_MESSAGE));
- suite.addPOXTests(env, new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseMessageSender(),
server, ContentTypeMode.TRANSPORT);
- suite.addPOXTests(env, new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseMessageSender(),
new MockEchoEndpointFactory(), ContentTypeMode.TRANSPORT);
+ senders.add(new AxisAsyncMessageSender(tdf));
+ senders.add(new JMSAxisAsyncMessageSender(tdf,
JMSConstants.JMS_BYTE_MESSAGE));
+ senders.add(new JMSAxisAsyncMessageSender(tdf,
JMSConstants.JMS_TEXT_MESSAGE));
+ suite.addPOXTests(env, new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE), new
AxisRequestResponseMessageSender(tdf), server, ContentTypeMode.TRANSPORT);
+ suite.addPOXTests(env, new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE), new
AxisRequestResponseMessageSender(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()) {
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java?rev=686184&view=auto
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
(added)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportDescriptionFactory.java
Fri Aug 15 02:34:59 2008
@@ -0,0 +1,76 @@
+/*
+ * 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.naming.Context;
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.ParameterInclude;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
+import org.mockejb.jndi.MockContextFactory;
+
+public class JMSTransportDescriptionFactory implements
TransportDescriptionFactory {
+ private static final OMFactory factory = OMAbstractFactory.getOMFactory();
+
+ private OMElement createParameterElement(String name, String value) {
+ OMElement element = factory.createOMElement(new QName("parameter"));
+ element.addAttribute("name", name, null);
+ if (value != null) {
+ element.setText(value);
+ }
+ return element;
+ }
+
+ private void setupConnectionFactoryConfig(ParameterInclude trpDesc, String
name, String connFactName, String type) throws AxisFault {
+ OMElement element =
createParameterElement(JMSConstants.DEFAULT_CONFAC_NAME, null);
+
element.addChild(createParameterElement(Context.INITIAL_CONTEXT_FACTORY,
+ MockContextFactory.class.getName()));
+
element.addChild(createParameterElement(JMSConstants.CONFAC_JNDI_NAME_PARAM,
+ connFactName));
+ element.addChild(createParameterElement(JMSConstants.CONFAC_TYPE,
type));
+ trpDesc.addParameter(new Parameter(name, element));
+ }
+
+ private void setupTransport(ParameterInclude trpDesc) throws AxisFault {
+ setupConnectionFactoryConfig(trpDesc, "queue",
JMSTestEnvironment.QUEUE_CONNECTION_FACTORY, "queue");
+ setupConnectionFactoryConfig(trpDesc, "topic",
JMSTestEnvironment.TOPIC_CONNECTION_FACTORY, "topic");
+ }
+
+ public TransportInDescription createTransportInDescription() throws
Exception {
+ TransportInDescription trpInDesc = new
TransportInDescription(JMSListener.TRANSPORT_NAME);
+ setupTransport(trpInDesc);
+ trpInDesc.setReceiver(new JMSListener());
+ return trpInDesc;
+ }
+
+ public TransportOutDescription createTransportOutDescription() throws
Exception {
+ TransportOutDescription trpOutDesc = new
TransportOutDescription(JMSSender.TRANSPORT_NAME);
+// setupTransport(trpOutDesc);
+ trpOutDesc.setSender(new JMSSender());
+ return trpOutDesc;
+ }
+}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -20,7 +20,6 @@
package org.apache.synapse.transport.mail;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.TransportInDescription;
import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
@@ -36,13 +35,6 @@
return address;
}
- public TransportInDescription createTransportInDescription() {
- TransportInDescription trpInDesc
- = new TransportInDescription(MailConstants.TRANSPORT_NAME);
- trpInDesc.setReceiver(new MailTransportListener());
- return trpInDesc;
- }
-
@Override
public void setupService(AxisService service) throws Exception {
service.addParameter("transport.mail.Protocol", "test-store");
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -27,7 +27,9 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TestEnvironment;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
@@ -38,6 +40,10 @@
public class MailTransportListenerTest extends TestCase {
public static TestSuite suite() {
TransportTestSuite<TestEnvironment> suite = new
TransportTestSuite<TestEnvironment>();
+ TransportDescriptionFactory tdf =
+ new SimpleTransportDescriptionFactory(MailConstants.TRANSPORT_NAME,
+ MailTransportListener.class, MailTransportSender.class);
+ AxisServer<TestEnvironment> axisServer = new
AxisServer<TestEnvironment>(tdf);
MailChannel channel = new MailChannel("[EMAIL PROTECTED]");
List<MailSender> senders = new LinkedList<MailSender>();
senders.add(new MimeSender());
@@ -45,11 +51,11 @@
for (MailSender sender : senders) {
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);
+ suite.addSOAP11Test(null, channel, xmlSender, axisServer,
ContentTypeMode.TRANSPORT, TransportTestSuite.ASCII_TEST_DATA);
+ suite.addSOAP11Test(null, channel, xmlSender, axisServer,
ContentTypeMode.TRANSPORT, TransportTestSuite.UTF8_TEST_DATA);
// TODO: this test fails when using multipart
if (sender instanceof MimeSender) {
- suite.addSOAP11Test(null, channel, xmlSender,
AxisServer.DEFAULT, ContentTypeMode.TRANSPORT,
TransportTestSuite.LATIN1_TEST_DATA);
+ suite.addSOAP11Test(null, channel, xmlSender, axisServer,
ContentTypeMode.TRANSPORT, TransportTestSuite.LATIN1_TEST_DATA);
}
// addSOAPTests(strategy, suite);
// TODO: POX tests don't work yet for mail transport
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -19,24 +19,11 @@
package org.apache.synapse.transport.nhttp;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
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 TransportInDescription createTransportInDescription() {
- TransportInDescription trpInDesc = new TransportInDescription("http");
- trpInDesc.setReceiver(new HttpCoreNIOListener());
- return trpInDesc;
- }
-
- @Override
- public TransportOutDescription createTransportOutDescription() throws
Exception {
- TransportOutDescription trpOutDesc = new
TransportOutDescription("http");
- trpOutDesc.setSender(new HttpCoreNIOSender());
- return trpOutDesc;
- }
}
\ 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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -27,7 +27,13 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.transport.http.CommonsHTTPTransportSender;
+import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TestEnvironment;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender;
@@ -39,20 +45,40 @@
public class HttpCoreNIOListenerTest extends TestCase {
public static TestSuite suite() {
TransportTestSuite<TestEnvironment> suite = new
TransportTestSuite<TestEnvironment>();
+
+ TransportDescriptionFactory tdfNIO =
+ new SimpleTransportDescriptionFactory("http",
HttpCoreNIOListener.class,
+ HttpCoreNIOSender.class);
+ TransportDescriptionFactory tdfSimple =
+ new SimpleTransportDescriptionFactory("http",
SimpleHTTPServer.class,
+
CommonsHTTPTransportSender.class) {
+
+ @Override
+ public TransportInDescription createTransportInDescription()
throws Exception {
+ TransportInDescription desc =
super.createTransportInDescription();
+ desc.addParameter(new Parameter(SimpleHTTPServer.PARAM_PORT,
"8888"));
+ return desc;
+ }
+ };
+
+ // 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);
HttpChannel channel = new HttpChannel();
JavaNetSender javaNetSender = new JavaNetSender();
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());
+ senders.add(new AxisAsyncMessageSender(tdf));
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);
+ suite.addSOAPTests(null, channel, sender, axisServer,
ContentTypeMode.TRANSPORT);
+ suite.addPOXTests(null, channel, sender, axisServer,
ContentTypeMode.TRANSPORT);
}
// suite.addPOXTests(channel, new AxisRequestResponseMessageSender(),
ContentTypeMode.TRANSPORT);
- suite.addSwATests(null, channel, javaNetSender, AxisServer.DEFAULT);
- suite.addTextPlainTests(null, channel, adapt(javaNetSender,
MessageConverter.STRING_TO_BYTE), adapt(AxisServer.DEFAULT,
MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
- suite.addBinaryTest(null, channel, javaNetSender,
adapt(AxisServer.DEFAULT, MessageConverter.AXIS_TO_BYTE),
ContentTypeMode.TRANSPORT);
- suite.addRESTTests(null, channel, new JavaNetRESTSender(),
AxisServer.DEFAULT);
+ suite.addSwATests(null, channel, javaNetSender, axisServer);
+ suite.addTextPlainTests(null, channel, adapt(javaNetSender,
MessageConverter.STRING_TO_BYTE), adapt(axisServer,
MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT);
+ suite.addBinaryTest(null, channel, javaNetSender, adapt(axisServer,
MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT);
+ suite.addRESTTests(null, channel, new JavaNetRESTSender(), axisServer);
return suite;
}
}
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/SimpleTransportDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/SimpleTransportDescriptionFactory.java?rev=686184&view=auto
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/SimpleTransportDescriptionFactory.java
(added)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/SimpleTransportDescriptionFactory.java
Fri Aug 15 02:34:59 2008
@@ -0,0 +1,51 @@
+/*
+ * 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.testkit;
+
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
+import org.apache.axis2.transport.TransportListener;
+import org.apache.axis2.transport.TransportSender;
+
+public class SimpleTransportDescriptionFactory implements
TransportDescriptionFactory {
+ private final String name;
+ private final Class<? extends TransportListener> listenerClass;
+ private final Class<? extends TransportSender> senderClass;
+
+ public SimpleTransportDescriptionFactory(String name,
+ Class<? extends
TransportListener> listenerClass,
+ Class<? extends TransportSender>
senderClass) {
+ this.name = name;
+ this.listenerClass = listenerClass;
+ this.senderClass = senderClass;
+ }
+
+ public TransportInDescription createTransportInDescription() throws
Exception {
+ TransportInDescription trpInDesc = new TransportInDescription(name);
+ trpInDesc.setReceiver(listenerClass.newInstance());
+ return trpInDesc;
+ }
+
+ public TransportOutDescription createTransportOutDescription() throws
Exception {
+ TransportOutDescription trpOutDesc = new TransportOutDescription(name);
+ trpOutDesc.setSender(senderClass.newInstance());
+ return trpOutDesc;
+ }
+}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -23,8 +23,6 @@
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
public abstract class TestEnvironment {
- public static final TestEnvironment DEFAULT = new TestEnvironment() {};
-
/**
* Carry out initialization before server startup. This method is called
* immediately before the test server is started and can be used by
subclasses
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportDescriptionFactory.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportDescriptionFactory.java?rev=686184&view=auto
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportDescriptionFactory.java
(added)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/TransportDescriptionFactory.java
Fri Aug 15 02:34:59 2008
@@ -0,0 +1,35 @@
+/*
+ * 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.testkit;
+
+import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.TransportOutDescription;
+
+public interface TransportDescriptionFactory {
+ TransportOutDescription createTransportOutDescription() throws Exception;
+
+ /**
+ * Create a TransportInDescription for the transport under test.
+ *
+ * @return the transport description
+ * @throws Exception
+ */
+ TransportInDescription createTransportInDescription() throws Exception;
+}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -22,14 +22,9 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.synapse.transport.testkit.TestEnvironment;
public abstract class AbstractChannel<E extends TestEnvironment> implements
Channel<E> {
- public TransportOutDescription createTransportOutDescription() throws
Exception {
- throw new UnsupportedOperationException();
- }
-
public void setupService(AxisService service) throws Exception {
}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -21,11 +21,16 @@
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.message.XMLMessage;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
public class AxisAsyncMessageSender extends AxisMessageSender<AsyncChannel<?>>
implements AsyncMessageSender<TestEnvironment,AsyncChannel<?>,XMLMessage> {
+ public AxisAsyncMessageSender(TransportDescriptionFactory tdf) {
+ super(tdf);
+ }
+
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -37,15 +37,22 @@
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.message.XMLMessageType;
public class AxisMessageSender<C extends Channel<?>> extends
AbstractMessageSender<TestEnvironment,C> {
private static final Log log = LogFactory.getLog(AxisMessageSender.class);
+ private final TransportDescriptionFactory tdf;
+
private C channel;
private TransportOutDescription trpOutDesc;
private ConfigurationContext cfgCtx;
+ public AxisMessageSender(TransportDescriptionFactory tdf) {
+ this.tdf = tdf;
+ }
+
@Override
public void setUp(TestEnvironment env, C channel) throws Exception {
super.setUp(env, channel);
@@ -56,7 +63,7 @@
new File("target/test_rep").getAbsolutePath());
AxisConfiguration axisCfg = cfgCtx.getAxisConfiguration();
- trpOutDesc = channel.createTransportOutDescription();
+ trpOutDesc = tdf.createTransportOutDescription();
axisCfg.addTransportOut(trpOutDesc);
trpOutDesc.getSender().init(cfgCtx, trpOutDesc);
}
@@ -87,6 +94,6 @@
return mepClient;
}
- protected void setupRequestMessageContext(MessageContext msgContext)
throws AxisFault {
+ protected void setupRequestMessageContext(@SuppressWarnings("unused")
MessageContext msgContext) throws AxisFault {
}
}
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -25,11 +25,16 @@
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.message.XMLMessageType;
import org.apache.synapse.transport.testkit.name.DisplayName;
@DisplayName("axis")
public class AxisRequestResponseMessageSender extends
AxisMessageSender<RequestResponseChannel<?>> implements
XMLRequestResponseMessageSender<TestEnvironment,RequestResponseChannel<?>> {
+ public AxisRequestResponseMessageSender(TransportDescriptionFactory tdf) {
+ super(tdf);
+ }
+
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/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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -23,21 +23,9 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.synapse.transport.testkit.TestEnvironment;
public interface Channel<E extends TestEnvironment> {
- TransportOutDescription createTransportOutDescription() throws Exception;
-
- /**
- * Create a TransportInDescription for the transport under test.
- *
- * @return the transport description
- * @throws Exception
- */
- TransportInDescription createTransportInDescription() throws Exception;
-
/**
* Set up the service so that it can receive messages through the
transport under test.
* Implementations will typically call [EMAIL PROTECTED]
AxisService#addParameter(Parameter)} to
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=686184&r1=686183&r2=686184&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
Fri Aug 15 02:34:59 2008
@@ -22,13 +22,7 @@
import org.apache.synapse.transport.testkit.TestEnvironment;
import org.apache.synapse.transport.testkit.listener.Channel;
-public abstract class Server<T extends TestEnvironment> {
- private final T setup;
-
- public Server(T setup) {
- this.setup = setup;
- }
-
+public interface Server<T extends TestEnvironment> {
// public void addErrorListener(TransportErrorListener listener) {
// if (listener instanceof TransportErrorSource) {
// ((TransportErrorSource)listener).addErrorListener(listener);
@@ -41,10 +35,6 @@
// }
// }
- public T getSetup() {
- return setup;
- }
-
- public abstract void start(T env, Channel<?> channel) throws Exception;
- public abstract void stop() throws Exception;
+ void start(T env, Channel<?> channel) throws Exception;
+ void stop() throws Exception;
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java?rev=686184&r1=686183&r2=686184&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/server/axis2/AxisServer.java
Fri Aug 15 02:34:59 2008
@@ -35,6 +35,7 @@
import org.apache.axis2.transport.TransportListener;
import org.apache.synapse.transport.UtilsTransportServer;
import org.apache.synapse.transport.testkit.TestEnvironment;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.Channel;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
@@ -45,20 +46,19 @@
import org.apache.synapse.transport.testkit.server.EndpointFactory;
import org.apache.synapse.transport.testkit.server.Server;
-public class AxisServer<E extends TestEnvironment> extends Server<E>
implements AsyncEndpointFactory<E,AsyncChannel<? super E>,MessageData>,
EndpointFactory<E,RequestResponseChannel<? super E>> {
- public static final AxisServer<TestEnvironment> DEFAULT = new
AxisServer<TestEnvironment>(TestEnvironment.DEFAULT);
-
+public class AxisServer<E extends TestEnvironment> implements Server<E>,
AsyncEndpointFactory<E,AsyncChannel<? super E>,MessageData>,
EndpointFactory<E,RequestResponseChannel<? super E>> {
private static Server<?> activeServer;
+ private final TransportDescriptionFactory tdf;
+
private Channel<?> channel;
private TransportListener listener;
UtilsTransportServer server;
- public AxisServer(E setup) {
- super(setup);
+ public AxisServer(TransportDescriptionFactory tdf) {
+ this.tdf = tdf;
}
- @Override
public void start(E env, Channel<?> channel) throws Exception {
server = new UtilsTransportServer();
this.channel = channel;
@@ -70,12 +70,12 @@
TransportOutDescription trpOutDesc;
if (channel instanceof RequestResponseChannel) {
- trpOutDesc =
((RequestResponseChannel<?>)channel).createTransportOutDescription();
+ trpOutDesc = tdf.createTransportOutDescription();
} else {
trpOutDesc = null;
}
- TransportInDescription trpInDesc =
channel.createTransportInDescription();
+ TransportInDescription trpInDesc = tdf.createTransportInDescription();
listener = trpInDesc.getReceiver();
server.addTransport(trpInDesc, trpOutDesc);
@@ -97,7 +97,6 @@
server.start();
}
- @Override
public void stop() throws Exception {
server.stop();
Thread.sleep(100); // TODO: this is required for the NIO transport;
check whether this is a bug
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java?rev=686184&r1=686183&r2=686184&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
Fri Aug 15 02:34:59 2008
@@ -22,8 +22,6 @@
import java.io.File;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.description.TransportOutDescription;
import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
@@ -38,21 +36,6 @@
return requestFile;
}
- public TransportInDescription createTransportInDescription() {
- TransportInDescription trpInDesc =
- new TransportInDescription(VFSTransportListener.TRANSPORT_NAME);
- trpInDesc.setReceiver(new VFSTransportListener());
- return trpInDesc;
- }
-
- @Override
- public TransportOutDescription createTransportOutDescription() throws
Exception {
- TransportOutDescription trpOutDesc =
- new TransportOutDescription(VFSTransportSender.TRANSPORT_NAME);
- trpOutDesc.setSender(new VFSTransportSender());
- return trpOutDesc;
- }
-
@Override
public void setupService(AxisService service) throws Exception {
service.addParameter("transport.vfs.FileURI", "vfs:" +
requestFile.toURL());
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=686184&r1=686183&r2=686184&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportListenerTest.java
Fri Aug 15 02:34:59 2008
@@ -30,6 +30,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.listener.AbstractMessageSender;
import org.apache.synapse.transport.testkit.listener.AsyncMessageSender;
@@ -56,13 +58,16 @@
public static TestSuite suite() {
// TODO: the VFS listener doesn't like reuseServer == true...
TransportTestSuite<VFSTestEnvironment> suite = new
TransportTestSuite<VFSTestEnvironment>(false);
+ TransportDescriptionFactory tdf =
+ new SimpleTransportDescriptionFactory("vfs",
VFSTransportListener.class,
+ VFSTransportSender.class);
VFSTestEnvironment env = new VFSTestEnvironment();
- AxisServer<VFSTestEnvironment> server = new
AxisServer<VFSTestEnvironment>(env);
+ AxisServer<VFSTestEnvironment> server = new
AxisServer<VFSTestEnvironment>(tdf);
VFSFileChannel channel = new VFSFileChannel(new
File("target/vfs3/req/in").getAbsoluteFile());
MessageSenderImpl vfsSender = new MessageSenderImpl();
List<AsyncMessageSender<? super VFSTestEnvironment,? super
VFSFileChannel,XMLMessage>> senders = new LinkedList<AsyncMessageSender<? super
VFSTestEnvironment,? super VFSFileChannel,XMLMessage>>();
senders.add(adapt(vfsSender, MessageConverter.XML_TO_BYTE));
- senders.add(new AxisAsyncMessageSender());
+ senders.add(new AxisAsyncMessageSender(tdf));
for (AsyncMessageSender<? super VFSTestEnvironment,? super
VFSFileChannel,XMLMessage> sender : senders) {
suite.addSOAPTests(env, channel, sender, server,
ContentTypeMode.SERVICE);
suite.addPOXTests(env, channel, sender, server,
ContentTypeMode.SERVICE);
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java?rev=686184&r1=686183&r2=686184&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSTransportSenderTest.java
Fri Aug 15 02:34:59 2008
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.synapse.transport.testkit.SimpleTransportDescriptionFactory;
+import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
import org.apache.synapse.transport.testkit.TransportTestSuite;
import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender;
import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
@@ -40,6 +42,9 @@
TransportTestSuite<VFSTestEnvironment> suite = new
TransportTestSuite<VFSTestEnvironment>();
VFSTestEnvironment env = new VFSTestEnvironment();
+ TransportDescriptionFactory tdf =
+ new SimpleTransportDescriptionFactory("vfs",
VFSTransportListener.class,
+ VFSTransportSender.class);
AsyncEndpointFactory<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage>
endpointFactory =
new
AsyncEndpointFactory<VFSTestEnvironment,VFSFileChannel,ByteArrayMessage>() {
@@ -57,7 +62,7 @@
};
VFSFileChannel channel = new VFSFileChannel(new
File("target/vfs3/req/in").getAbsoluteFile());
- AxisAsyncMessageSender sender = new AxisAsyncMessageSender();
+ AxisAsyncMessageSender sender = new AxisAsyncMessageSender(tdf);
suite.addBinaryTest(env, channel, adapt(sender,
MessageConverter.BINARY_WRAPPER), endpointFactory, ContentTypeMode.SERVICE);
suite.addTextPlainTests(env, channel, adapt(sender,
MessageConverter.TEXT_WRAPPER), adapt(endpointFactory,
MessageConverter.BYTE_TO_STRING), ContentTypeMode.SERVICE);
