Author: veithen
Date: Fri Sep 5 14:16:08 2008
New Revision: 692555
URL: http://svn.apache.org/viewvc?rev=692555&view=rev
Log:
JMS transport tests: set up the JMS reply timeout so that failing
request-response test cases don't hang for 30s (required some refactorings in
the test kit)
Removed:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java
Modified:
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/JMSRequestResponseChannel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.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/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/client/axis2/AxisAsyncTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/vfs/VFSFileChannel.java
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -30,11 +30,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.name.Key;
import
org.apache.synapse.transport.testkit.server.axis2.AxisServiceConfigurator;
-public abstract class JMSChannel extends AbstractChannel implements
AxisServiceConfigurator {
+public abstract class JMSChannel implements AxisServiceConfigurator {
private final String name;
private final String destinationType;
private final ContentTypeMode contentTypeMode;
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java?rev=692555&r1=692554&r2=692555&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
Fri Sep 5 14:16:08 2008
@@ -24,10 +24,11 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import org.apache.synapse.transport.testkit.name.Key;
-public class JMSRequestResponseChannel extends JMSChannel implements
RequestResponseChannel {
+public class JMSRequestResponseChannel extends JMSChannel implements
RequestResponseChannel, AxisTestClientSetup {
private final String replyDestinationType;
private String replyDestinationName;
private String replyJndiName;
@@ -65,9 +66,7 @@
service.addParameter(JMSConstants.REPLY_PARAM, replyJndiName);
}
- @Override
public void setupRequestMessageContext(MessageContext msgContext) {
- super.setupRequestMessageContext(msgContext);
// msgContext.setProperty(JMSConstants.JMS_REPLY_TO,
replyDestinationName);
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java?rev=692555&r1=692554&r2=692555&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSTransportTest.java
Fri Sep 5 14:16:08 2008
@@ -22,11 +22,14 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.axis2.AxisFault;
+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.TransportTestSuiteBuilder;
import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient;
import
org.apache.synapse.transport.testkit.client.axis2.AxisRequestResponseTestClient;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.server.axis2.AxisAsyncEndpoint;
import org.apache.synapse.transport.testkit.server.axis2.AxisEchoEndpoint;
@@ -55,8 +58,8 @@
builder.addAsyncChannel(new
JMSAsyncChannel(JMSConstants.DESTINATION_TYPE_TOPIC,
ContentTypeMode.TRANSPORT));
builder.addAxisAsyncTestClient(new AxisAsyncTestClient());
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(new
JMSAxisTestClientSetup(JMSConstants.JMS_BYTE_MESSAGE)));
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(new
JMSAxisTestClientSetup(JMSConstants.JMS_TEXT_MESSAGE)));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
JMSAxisTestClientSetup(JMSConstants.JMS_BYTE_MESSAGE));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
JMSAxisTestClientSetup(JMSConstants.JMS_TEXT_MESSAGE));
builder.addByteArrayAsyncTestClient(new JMSBytesMessageClient());
builder.addStringAsyncTestClient(new JMSTextMessageClient());
@@ -64,7 +67,13 @@
builder.addRequestResponseChannel(new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT));
- builder.addAxisRequestResponseTestClient(new
AxisRequestResponseTestClient());
+ AxisTestClientSetup timeoutSetup = new AxisTestClientSetup() {
+ public void setupRequestMessageContext(MessageContext msgContext)
throws AxisFault {
+ msgContext.setProperty(JMSConstants.JMS_WAIT_REPLY, "2000");
+ }
+ };
+
+ builder.addAxisRequestResponseTestClient(new
AxisRequestResponseTestClient(), timeoutSetup);
builder.addEchoEndpoint(new MockEchoEndpoint());
builder.addEchoEndpoint(new AxisEchoEndpoint());
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -28,12 +28,12 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.listener.AbstractChannel;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
import
org.apache.synapse.transport.testkit.server.axis2.AxisServiceConfigurator;
-public class MailChannel extends AbstractChannel implements AsyncChannel,
RequestResponseChannel, AxisServiceConfigurator {
+public class MailChannel implements AsyncChannel, RequestResponseChannel,
AxisTestClientSetup, AxisServiceConfigurator {
private MailTestEnvironment env;
private MailTestEnvironment.Account sender;
private MailTestEnvironment.Account recipient;
@@ -83,7 +83,6 @@
}
}
- @Override
public void setupRequestMessageContext(MessageContext msgContext) {
Map<String,String> trpHeaders = new HashMap<String,String>();
trpHeaders.put(MailConstants.MAIL_HEADER_FROM, sender.getAddress());
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -22,11 +22,10 @@
import java.util.UUID;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
-public class HttpChannel extends AbstractChannel implements AsyncChannel,
RequestResponseChannel {
+public class HttpChannel implements AsyncChannel, RequestResponseChannel {
private String serviceName;
@SuppressWarnings("unused")
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -72,8 +72,8 @@
builder.addAsyncChannel(channel);
builder.addByteArrayAsyncTestClient(new JavaNetClient());
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(new
HttpAxisTestClientSetup(false)));
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(new
HttpAxisTestClientSetup(true)));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
HttpAxisTestClientSetup(false));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
HttpAxisTestClientSetup(true));
builder.addRESTAsyncTestClient(new JavaNetRESTClient());
builder.addAxisAsyncEndpoint(new AxisAsyncEndpoint());
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java?rev=692555&r1=692554&r2=692555&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java
Fri Sep 5 14:16:08 2008
@@ -27,14 +27,6 @@
import org.apache.synapse.transport.testkit.message.AxisMessage;
public class AxisAsyncTestClient extends AxisTestClient implements
AsyncTestClient<AxisMessage> {
- public AxisAsyncTestClient(AxisTestClientSetup setup) {
- super(setup);
- }
-
- public AxisAsyncTestClient() {
- super();
- }
-
public void sendMessage(ClientOptions options, ContentType contentType,
AxisMessage message) throws Exception {
createClient(options, message,
ServiceClient.ANON_OUT_ONLY_OP).execute(false);
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java?rev=692555&r1=692554&r2=692555&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java
Fri Sep 5 14:16:08 2008
@@ -30,14 +30,6 @@
import org.apache.synapse.transport.testkit.message.IncomingMessage;
public class AxisRequestResponseTestClient extends AxisTestClient implements
RequestResponseTestClient<AxisMessage,AxisMessage> {
- public AxisRequestResponseTestClient(AxisTestClientSetup setup) {
- super(setup);
- }
-
- public AxisRequestResponseTestClient() {
- super();
- }
-
public IncomingMessage<AxisMessage> sendMessage(ClientOptions options,
ContentType contentType, AxisMessage message) throws Exception {
OperationClient mepClient = createClient(options, message,
ServiceClient.ANON_OUT_IN_OP);
mepClient.execute(true);
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java?rev=692555&r1=692554&r2=692555&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java
Fri Sep 5 14:16:08 2008
@@ -36,35 +36,21 @@
import org.apache.synapse.transport.testkit.listener.Channel;
import org.apache.synapse.transport.testkit.message.AxisMessage;
import org.apache.synapse.transport.testkit.name.Name;
-import org.apache.synapse.transport.testkit.name.Named;
import org.apache.synapse.transport.testkit.util.ContentTypeUtil;
@Name("axis")
public class AxisTestClient implements TestClient {
private static final Log log = LogFactory.getLog(AxisTestClient.class);
- private final AxisTestClientSetup setup;
-
private AxisTestClientContext context;
private Channel channel;
+ private AxisTestClientSetup[] setups;
- public AxisTestClient(AxisTestClientSetup setup) {
- this.setup = setup;
- }
-
- public AxisTestClient() {
- this(null);
- }
-
- @Named
- public AxisTestClientSetup getSetup() {
- return setup;
- }
-
@SuppressWarnings("unused")
- private void setUp(AxisTestClientContext context, Channel channel) throws
Exception {
+ private void setUp(AxisTestClientContext context, Channel channel,
AxisTestClientSetup[] setups) throws Exception {
this.context = context;
this.channel = channel;
+ this.setups = setups;
}
public ContentType getContentType(ClientOptions options, ContentType
contentType) {
@@ -97,8 +83,7 @@
mc.setDoingSwA(true);
mc.setProperty(Constants.Configuration.ENABLE_SWA, true);
}
- channel.setupRequestMessageContext(mc);
- if (setup != null) {
+ for (AxisTestClientSetup setup : setups) {
setup.setupRequestMessageContext(mc);
}
mc.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
options.getCharset());
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -20,12 +20,9 @@
package org.apache.synapse.transport.testkit.listener;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.context.MessageContext;
public interface Channel {
String CONTEXT_PATH = "/services";
- void setupRequestMessageContext(MessageContext msgContext);
-
EndpointReference getEndpointReference() throws Exception;
}
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=692555&r1=692554&r2=692555&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 Sep 5 14:16:08 2008
@@ -21,14 +21,12 @@
import java.io.File;
-
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.description.AxisService;
-import org.apache.synapse.transport.testkit.listener.AbstractChannel;
import org.apache.synapse.transport.testkit.listener.AsyncChannel;
import
org.apache.synapse.transport.testkit.server.axis2.AxisServiceConfigurator;
-public class VFSFileChannel extends AbstractChannel implements AsyncChannel,
AxisServiceConfigurator {
+public class VFSFileChannel implements AsyncChannel, AxisServiceConfigurator {
private final String path;
private File requestFile;
