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/24 12:54:19 UTC
svn commit: r688492 - in
/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport:
jms/ nhttp/ testkit/client/axis2/
Author: veithen
Date: Sun Aug 24 03:54:18 2008
New Revision: 688492
URL: http://svn.apache.org/viewvc?rev=688492&view=rev
Log:
HTTP NIO transport tests: added test cases with HTTP 1.0
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java
- copied, changed from r688412, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncClient.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientSetup.java
Removed:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncClient.java
Modified:
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/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
Copied: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java (from r688412, synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncClient.java)
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java?p2=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java&p1=synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncClient.java&r1=688412&r2=688492&rev=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisAsyncClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSAxisTestClientSetup.java Sun Aug 24 03:54:18 2008
@@ -21,13 +21,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.synapse.transport.testkit.client.axis2.AxisAsyncTestClient;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
import org.apache.synapse.transport.testkit.name.Key;
-public class JMSAxisAsyncClient extends AxisAsyncTestClient {
+public class JMSAxisTestClientSetup implements AxisTestClientSetup {
private final String jmsMessageType;
- public JMSAxisAsyncClient(String jmsMessageType) {
+ public JMSAxisTestClientSetup(String jmsMessageType) {
this.jmsMessageType = jmsMessageType;
}
@@ -36,9 +36,7 @@
return jmsMessageType;
}
- @Override
- protected void setupRequestMessageContext(MessageContext msgContext) throws AxisFault {
- super.setupRequestMessageContext(msgContext);
+ public void setupRequestMessageContext(MessageContext msgContext) throws AxisFault {
msgContext.setProperty(JMSConstants.JMS_MESSAGE_TYPE, jmsMessageType);
}
}
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=688492&r1=688491&r2=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java Sun Aug 24 03:54:18 2008
@@ -56,8 +56,8 @@
clients.add(adapt(bytesMessageClient, MessageConverter.XML_TO_BYTE));
clients.add(adapt(textMessageClient, MessageConverter.XML_TO_STRING));
clients.add(adapt(new AxisAsyncTestClient(), MessageConverter.XML_TO_AXIS));
- clients.add(adapt(new JMSAxisAsyncClient(JMSConstants.JMS_BYTE_MESSAGE), MessageConverter.XML_TO_AXIS));
- clients.add(adapt(new JMSAxisAsyncClient(JMSConstants.JMS_TEXT_MESSAGE), MessageConverter.XML_TO_AXIS));
+ clients.add(adapt(new AxisAsyncTestClient(new JMSAxisTestClientSetup(JMSConstants.JMS_BYTE_MESSAGE)), MessageConverter.XML_TO_AXIS));
+ clients.add(adapt(new AxisAsyncTestClient(new JMSAxisTestClientSetup(JMSConstants.JMS_TEXT_MESSAGE)), MessageConverter.XML_TO_AXIS));
for (JMSTestEnvironment env : new JMSTestEnvironment[] { new QpidTestEnvironment(), new ActiveMQTestEnvironment() }) {
suite.addPOXTests(new JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), adapt(new AxisRequestResponseTestClient(), MessageConverter.XML_TO_AXIS, MessageConverter.AXIS_TO_XML), echoEndpointFactory, ContentTypeMode.TRANSPORT, env, server, tdf);
suite.addPOXTests(new JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), adapt(new AxisRequestResponseTestClient(), MessageConverter.XML_TO_AXIS, MessageConverter.AXIS_TO_XML), new MockEchoEndpointFactory(), ContentTypeMode.TRANSPORT, env, tdf);
Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java?rev=688492&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpAxisTestClientSetup.java Sun Aug 24 03:54:18 2008
@@ -0,0 +1,42 @@
+/*
+ * 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.nhttp;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.synapse.transport.testkit.client.axis2.AxisTestClientSetup;
+import org.apache.synapse.transport.testkit.name.Key;
+
+public class HttpAxisTestClientSetup implements AxisTestClientSetup {
+ private final boolean forceHTTP10;
+
+ public HttpAxisTestClientSetup(boolean forceHTTP10) {
+ this.forceHTTP10 = forceHTTP10;
+ }
+
+ @Key("forceHTTP10")
+ public boolean isForceHTTP10() {
+ return forceHTTP10;
+ }
+
+ public void setupRequestMessageContext(MessageContext msgContext) throws AxisFault {
+ msgContext.setProperty(NhttpConstants.FORCE_HTTP_1_0, forceHTTP10);
+ }
+}
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=688492&r1=688491&r2=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java Sun Aug 24 03:54:18 2008
@@ -72,16 +72,18 @@
AxisServer axisServer = new AxisServer();
AxisAsyncEndpointFactory asyncEndpointFactory = new AxisAsyncEndpointFactory();
+// AxisEchoEndpointFactory echoEndpointFactory = new AxisEchoEndpointFactory();
HttpChannel channel = new HttpChannel();
JavaNetClient javaNetClient = new JavaNetClient();
List<AsyncTestClient<XMLMessage>> clients = new LinkedList<AsyncTestClient<XMLMessage>>();
clients.add(adapt(javaNetClient, MessageConverter.XML_TO_BYTE));
- clients.add(adapt(new AxisAsyncTestClient(), MessageConverter.XML_TO_AXIS));
+ clients.add(adapt(new AxisAsyncTestClient(new HttpAxisTestClientSetup(false)), MessageConverter.XML_TO_AXIS));
+ clients.add(adapt(new AxisAsyncTestClient(new HttpAxisTestClientSetup(true)), MessageConverter.XML_TO_AXIS));
for (AsyncTestClient<XMLMessage> client : clients) {
suite.addSOAPTests(channel, client, asyncEndpointFactory, ContentTypeMode.TRANSPORT, env, axisServer, tdf);
suite.addPOXTests(channel, client, asyncEndpointFactory, ContentTypeMode.TRANSPORT, env, axisServer, tdf);
}
-// suite.addPOXTests(channel, new AxisRequestResponseMessageSender(), ContentTypeMode.TRANSPORT);
+// suite.addPOXTests(channel, adapt(new AxisRequestResponseTestClient(), MessageConverter.XML_TO_AXIS, MessageConverter.AXIS_TO_XML), echoEndpointFactory, ContentTypeMode.TRANSPORT, env, axisServer, tdf);
suite.addSwATests(channel, javaNetClient, asyncEndpointFactory, env, axisServer, tdf);
suite.addTextPlainTests(channel, adapt(javaNetClient, MessageConverter.STRING_TO_BYTE), adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_STRING), ContentTypeMode.TRANSPORT, env, axisServer, tdf);
suite.addBinaryTest(channel, javaNetClient, adapt(asyncEndpointFactory, MessageConverter.AXIS_TO_BYTE), ContentTypeMode.TRANSPORT, env, axisServer, tdf);
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=688492&r1=688491&r2=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisAsyncTestClient.java Sun Aug 24 03:54:18 2008
@@ -25,6 +25,14 @@
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, 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=688492&r1=688491&r2=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisRequestResponseTestClient.java Sun Aug 24 03:54:18 2008
@@ -27,6 +27,14 @@
import org.apache.synapse.transport.testkit.message.AxisMessage;
public class AxisRequestResponseTestClient extends AxisTestClient implements RequestResponseTestClient<AxisMessage,AxisMessage> {
+ public AxisRequestResponseTestClient(AxisTestClientSetup setup) {
+ super(setup);
+ }
+
+ public AxisRequestResponseTestClient() {
+ super();
+ }
+
public AxisMessage sendMessage(ClientOptions options, 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=688492&r1=688491&r2=688492&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClient.java Sun Aug 24 03:54:18 2008
@@ -23,7 +23,6 @@
import javax.xml.namespace.QName;
-import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.OperationClient;
@@ -42,15 +41,31 @@
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;
@Name("axis")
public class AxisTestClient implements TestClient {
private static final Log log = LogFactory.getLog(AxisTestClient.class);
+ private final AxisTestClientSetup setup;
+
private Channel channel;
private TransportOutDescription trpOutDesc;
private ConfigurationContext cfgCtx;
+ public AxisTestClient(AxisTestClientSetup setup) {
+ this.setup = setup;
+ }
+
+ public AxisTestClient() {
+ this(null);
+ }
+
+ @Named
+ public AxisTestClientSetup getSetup() {
+ return setup;
+ }
+
@SuppressWarnings("unused")
private void setUp(TransportDescriptionFactory tdf, Channel channel) throws Exception {
this.channel = channel;
@@ -86,14 +101,13 @@
mc.setEnvelope(message.getEnvelope());
mc.setAttachmentMap(message.getAttachments());
channel.setupRequestMessageContext(mc);
- setupRequestMessageContext(mc);
+ if (setup != null) {
+ setup.setupRequestMessageContext(mc);
+ }
mc.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, options.getCharset());
mc.setServiceContext(serviceClient.getServiceContext());
mepClient.addMessageContext(mc);
return mepClient;
}
-
- protected void setupRequestMessageContext(@SuppressWarnings("unused") MessageContext msgContext) throws AxisFault {
- }
}
Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientSetup.java?rev=688492&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientSetup.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientSetup.java Sun Aug 24 03:54:18 2008
@@ -0,0 +1,27 @@
+/*
+ * 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.client.axis2;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+
+public interface AxisTestClientSetup {
+ void setupRequestMessageContext(MessageContext msgContext) throws AxisFault;
+}