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/26 00:39:04 UTC
svn commit: r688909 - in /synapse/trunk/java/modules/transports: ./
src/test/java/org/apache/synapse/transport/jms/
src/test/java/org/apache/synapse/transport/mail/
src/test/java/org/apache/synapse/transport/nhttp/
src/test/java/org/apache/synapse/tran...
Author: veithen
Date: Mon Aug 25 15:39:03 2008
New Revision: 688909
URL: http://svn.apache.org/viewvc?rev=688909&view=rev
Log:
HTTP NIO transport tests: Added test cases with Jetty as endpoint.
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java
Modified:
synapse/trunk/java/modules/transports/pom.xml
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/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/TransportTestSuite.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/OrExpression.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/vfs/VFSTransportListenerTest.java
Modified: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=688909&r1=688908&r2=688909&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Mon Aug 25 15:39:03 2008
@@ -224,6 +224,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>5.1.10</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- Workaround for SYNAPSE-400 -->
<dependency>
<groupId>org.apache.woden</groupId>
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -67,16 +67,16 @@
JMSAsyncChannel channel = new JMSAsyncChannel(destinationType, contentTypeMode);
for (AsyncTestClient<XMLMessage> client : clients) {
if (contentTypeMode == ContentTypeMode.TRANSPORT) {
- suite.addSOAPTests(channel, client, asyncEndpoint, env, tdf);
- suite.addPOXTests(channel, client, asyncEndpoint, env, tdf);
+ suite.addSOAPTests(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env, tdf);
+ suite.addPOXTests(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env, tdf);
} else {
// If no content type header is used, SwA can't be used and the JMS transport
// always uses the default charset encoding
- suite.addSOAP11Test(channel, client, asyncEndpoint, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addSOAP11Test(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING), env, tdf, cfgtr);
- suite.addSOAP12Test(channel, client, asyncEndpoint, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addSOAP12Test(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING), env, tdf, cfgtr);
- suite.addPOXTest(channel, client, asyncEndpoint, new MessageTestData(null, TransportTestSuite.testString,
+ suite.addPOXTest(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), new MessageTestData(null, TransportTestSuite.testString,
MessageContext.DEFAULT_CHAR_SET_ENCODING), env, tdf, cfgtr);
}
}
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -64,15 +64,15 @@
clients.add(new MailAsyncClient(new MultipartLayout()));
for (MailAsyncClient client : clients) {
AsyncTestClient<XMLMessage> xmlClient = adapt(client, MessageEncoder.XML_TO_BYTE);
- suite.addSOAPTests(channel, xmlClient, asyncEndpoint, env);
- suite.addPOXTests(channel, xmlClient, asyncEndpoint, env);
+ suite.addSOAPTests(channel, xmlClient, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env);
+ suite.addPOXTests(channel, xmlClient, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env);
suite.addSwATests(channel, client, asyncEndpoint, env);
suite.addTextPlainTests(channel, adapt(client, MessageEncoder.STRING_TO_BYTE), AdapterUtils.adapt(asyncEndpoint, MessageDecoder.AXIS_TO_STRING), env);
suite.addBinaryTest(channel, client, adapt(asyncEndpoint, MessageDecoder.AXIS_TO_BYTE), env);
}
AxisAsyncTestClient axisClient = new AxisAsyncTestClient();
- suite.addSOAPTests(channel, adapt(axisClient, MessageEncoder.XML_TO_AXIS), asyncEndpoint, env);
- suite.addPOXTests(channel, adapt(axisClient, MessageEncoder.XML_TO_AXIS), asyncEndpoint, env);
+ suite.addSOAPTests(channel, adapt(axisClient, MessageEncoder.XML_TO_AXIS), adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env);
+ suite.addPOXTests(channel, adapt(axisClient, MessageEncoder.XML_TO_AXIS), adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env);
suite.addTextPlainTests(channel, adapt(axisClient, MessageEncoder.TEXT_WRAPPER), AdapterUtils.adapt(asyncEndpoint, MessageDecoder.AXIS_TO_STRING), env);
suite.addBinaryTest(channel, adapt(axisClient, MessageEncoder.BINARY_WRAPPER), adapt(asyncEndpoint, MessageDecoder.AXIS_TO_BYTE), env);
suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new MailChannel[] { new MailChannel(), new MailChannel() }, 2, true, env));
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -34,6 +34,10 @@
serviceName = "TestService-" + UUID.randomUUID();
}
+ public String getServiceName() {
+ return serviceName;
+ }
+
public EndpointReference getEndpointReference() throws Exception {
return new EndpointReference("http://localhost:8280" + CONTEXT_PATH + "/" + serviceName);
}
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -45,9 +45,11 @@
import org.apache.synapse.transport.testkit.tests.misc.MinConcurrencyTest;
public class HttpCoreNIOListenerTest extends TestCase {
- public static TestSuite suite() {
+ public static TestSuite suite() throws Exception {
TransportTestSuite suite = new TransportTestSuite();
+ suite.addExclude("(!(|(client=axis)(endpoint=axis)))");
+
TransportDescriptionFactory tdfNIO =
new SimpleTransportDescriptionFactory("http", HttpCoreNIOListener.class,
HttpCoreNIOSender.class);
@@ -67,6 +69,8 @@
TransportDescriptionFactory tdf = tdfNIO;
AxisAsyncEndpoint asyncEndpoint = new AxisAsyncEndpoint();
+ JettyServer jettyServer = new JettyServer();
+ JettyAsyncEndpoint jettyAsyncEndpoint = new JettyAsyncEndpoint();
// AxisEchoEndpointFactory echoEndpointFactory = new AxisEchoEndpointFactory();
HttpChannel channel = new HttpChannel();
JavaNetClient javaNetClient = new JavaNetClient();
@@ -75,8 +79,10 @@
clients.add(adapt(new AxisAsyncTestClient(new HttpAxisTestClientSetup(false)), MessageEncoder.XML_TO_AXIS));
clients.add(adapt(new AxisAsyncTestClient(new HttpAxisTestClientSetup(true)), MessageEncoder.XML_TO_AXIS));
for (AsyncTestClient<XMLMessage> client : clients) {
- suite.addSOAPTests(channel, client, asyncEndpoint, tdf);
- suite.addPOXTests(channel, client, asyncEndpoint, tdf);
+ suite.addSOAPTests(channel, client, adapt(asyncEndpoint, MessageDecoder.AXIS_TO_XML), tdf);
+ suite.addPOXTests(channel, client, adapt(asyncEndpoint, MessageDecoder.AXIS_TO_XML), tdf);
+ suite.addSOAPTests(channel, client, adapt(jettyAsyncEndpoint, MessageDecoder.BYTE_TO_XML), jettyServer, tdf);
+ suite.addPOXTests(channel, client, adapt(jettyAsyncEndpoint, MessageDecoder.BYTE_TO_XML), jettyServer, tdf);
}
// suite.addPOXTests(channel, adapt(new AxisRequestResponseTestClient(), MessageConverter.XML_TO_AXIS, MessageConverter.AXIS_TO_XML), echoEndpointFactory, env, axisServer, tdf);
suite.addSwATests(channel, javaNetClient, asyncEndpoint, tdf);
Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java?rev=688909&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyAsyncEndpoint.java Mon Aug 25 15:39:03 2008
@@ -0,0 +1,85 @@
+/*
+ * 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 java.io.IOException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.synapse.transport.testkit.message.IncomingMessage;
+import org.apache.synapse.transport.testkit.name.Name;
+import org.apache.synapse.transport.testkit.server.AsyncEndpoint;
+import org.mortbay.http.HttpException;
+import org.mortbay.http.HttpHandler;
+import org.mortbay.http.HttpRequest;
+import org.mortbay.http.HttpResponse;
+import org.mortbay.http.handler.AbstractHttpHandler;
+
+@Name("jetty")
+@SuppressWarnings("serial")
+public class JettyAsyncEndpoint implements AsyncEndpoint<byte[]> {
+ private JettyServer server;
+ private HttpHandler handler;
+ BlockingQueue<IncomingMessage<byte[]>> queue;
+
+ @SuppressWarnings("unused")
+ private void setUp(JettyServer server, HttpChannel channel) throws Exception {
+ this.server = server;
+ final String path = "/" + channel.getServiceName();
+ queue = new LinkedBlockingQueue<IncomingMessage<byte[]>>();
+ handler = new AbstractHttpHandler() {
+ public void handle(String pathInContext, String pathParams,
+ HttpRequest request, HttpResponse response) throws HttpException,
+ IOException {
+
+ if (pathInContext.equals(path)) {
+ ContentType contentType;
+ try {
+ contentType = new ContentType(request.getContentType());
+ } catch (ParseException ex) {
+ throw new HttpException(500, "Unparsable Content-Type");
+ }
+ byte[] data = IOUtils.toByteArray(request.getInputStream());
+ queue.add(new IncomingMessage<byte[]>(contentType, data));
+ request.setHandled(true);
+ }
+ }
+ };
+ server.getContext().addHandler(handler);
+ handler.start();
+ }
+
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
+ handler.stop();
+ server.getContext().removeHandler(handler);
+ server = null;
+ queue = null;
+ }
+
+ public IncomingMessage<byte[]> waitForMessage(int timeout) throws Throwable {
+ return queue.poll(timeout, TimeUnit.MILLISECONDS);
+ }
+}
Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java?rev=688909&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java Mon Aug 25 15:39:03 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.nhttp;
+
+import org.apache.synapse.transport.testkit.listener.Channel;
+import org.mortbay.http.HttpContext;
+import org.mortbay.http.SocketListener;
+import org.mortbay.jetty.Server;
+
+public class JettyServer {
+ private Server server;
+ private HttpContext context;
+
+ @SuppressWarnings("unused")
+ private void setUp() throws Exception {
+ server = new Server();
+ SocketListener listener = new SocketListener();
+ listener.setPort(8280);
+ server.addListener(listener);
+ context = new HttpContext(server, Channel.CONTEXT_PATH + "/*");
+ server.start();
+ }
+
+ public HttpContext getContext() {
+ return context;
+ }
+
+ @SuppressWarnings("unused")
+ private void tearDown() throws Exception {
+ server.stop();
+ server = null;
+ context = null;
+ }
+}
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -93,26 +93,26 @@
this.invertExcludes = invertExcludes;
}
- public void addSOAP11Test(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, MessageTestData data, Object... resources) {
+ public void addSOAP11Test(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, MessageTestData data, Object... resources) {
addTest(new XMLAsyncMessageTestCase(channel, client, endpoint, XMLMessage.Type.SOAP11, data, resources));
}
- public void addSOAP12Test(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, MessageTestData data, Object... resources) {
+ public void addSOAP12Test(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, MessageTestData data, Object... resources) {
addTest(new XMLAsyncMessageTestCase(channel, client, endpoint, XMLMessage.Type.SOAP12, data, resources));
}
- public void addSOAPTests(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, Object... resources) {
+ public void addSOAPTests(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, Object... resources) {
for (MessageTestData data : messageTestData) {
addSOAP11Test(channel, client, endpoint, data, resources);
addSOAP12Test(channel, client, endpoint, data, resources);
}
}
- public void addPOXTest(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, MessageTestData data, Object... resources) {
+ public void addPOXTest(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, MessageTestData data, Object... resources) {
addTest(new XMLAsyncMessageTestCase(channel, client, endpoint, XMLMessage.Type.POX, data, resources));
}
- public void addPOXTests(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, Object... resources) {
+ public void addPOXTests(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, Object... resources) {
for (MessageTestData data : messageTestData) {
addPOXTest(channel, client, endpoint, data, resources);
}
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java?rev=688909&r1=688908&r2=688909&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java Mon Aug 25 15:39:03 2008
@@ -45,7 +45,7 @@
if (node instanceof AndNode) {
return new AndExpression(buildExpressions(((AndNode)node).getChildren()));
} else if (node instanceof OrNode) {
- return new OrExpression(buildExpressions(((AndNode)node).getChildren()));
+ return new OrExpression(buildExpressions(((OrNode)node).getChildren()));
} else if (node instanceof NotNode) {
return new NotExpression(buildExpression(((NotNode)node).getFirstChild()));
} else if (node instanceof EqualityNode) {
Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/OrExpression.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/OrExpression.java?rev=688909&r1=688908&r2=688909&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/OrExpression.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/OrExpression.java Mon Aug 25 15:39:03 2008
@@ -30,7 +30,7 @@
public boolean matches(Map<String,String> map) {
for (FilterExpression operand : operands) {
- if (!operand.matches(map)) {
+ if (operand.matches(map)) {
return true;
}
}
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -36,11 +36,11 @@
import org.apache.synapse.transport.testkit.server.AsyncEndpoint;
@Name("AsyncXML")
-public class XMLAsyncMessageTestCase extends AsyncMessageTestCase<XMLMessage,AxisMessage> {
+public class XMLAsyncMessageTestCase extends AsyncMessageTestCase<XMLMessage,XMLMessage> {
private final XMLMessage.Type xmlMessageType;
private final MessageTestData data;
- public XMLAsyncMessageTestCase(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<AxisMessage> endpoint, XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) {
+ public XMLAsyncMessageTestCase(AsyncChannel channel, AsyncTestClient<XMLMessage> client, AsyncEndpoint<XMLMessage> endpoint, XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) {
super(channel, client, endpoint, xmlMessageType.getContentType(), data.getCharset(), resources);
this.xmlMessageType = xmlMessageType;
this.data = data;
@@ -65,9 +65,8 @@
}
@Override
- protected void checkMessageData(XMLMessage message, AxisMessage messageData) throws Exception {
- SOAPEnvelope envelope = messageData.getEnvelope();
- OMElement element = envelope.getBody().getFirstElement();
+ protected void checkMessageData(XMLMessage message, XMLMessage messageData) throws Exception {
+ OMElement element = messageData.getPayload();
OMElement orgElement = message.getPayload();
assertEquals(orgElement.getQName(), element.getQName());
assertEquals(data.getText(), element.getText());
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=688909&r1=688908&r2=688909&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 Mon Aug 25 15:39:03 2008
@@ -58,8 +58,8 @@
clients.add(adapt(new AxisAsyncTestClient(), MessageEncoder.XML_TO_AXIS));
ContentTypeServiceConfigurator cfgtr = new ContentTypeServiceConfigurator("transport.vfs.ContentType");
for (AsyncTestClient<XMLMessage> client : clients) {
- suite.addSOAPTests(channel, client, asyncEndpoint, env, tdf, cfgtr);
- suite.addPOXTests(channel, client, asyncEndpoint, env, tdf, cfgtr);
+ suite.addSOAPTests(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env, tdf, cfgtr);
+ suite.addPOXTests(channel, client, adapt(new AxisAsyncEndpoint(), MessageDecoder.AXIS_TO_XML), env, tdf, cfgtr);
// Since VFS has no Content-Type header, SwA is not supported.
}
suite.addTextPlainTests(channel, adapt(vfsClient, MessageEncoder.STRING_TO_BYTE), adapt(asyncEndpoint, MessageDecoder.AXIS_TO_STRING), env, tdf, cfgtr);