Author: veithen
Date: Tue Aug 26 15:39:50 2008
New Revision: 689273
URL: http://svn.apache.org/viewvc?rev=689273&view=rev
Log:
Transport tests:
* Fixed a glitch in the exclusion rule for HTTP NIO tests.
* Made JettyServer a singleton.
* Register formatters for text/plain and application/octet-stream in the Axis
test client.
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/PresenceExpression.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/HttpCoreNIOListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/FilterExpressionParser.java
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=689273&r1=689272&r2=689273&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
Tue Aug 26 15:39:50 2008
@@ -48,7 +48,7 @@
public static TestSuite suite() throws Exception {
TransportTestSuite suite = new TransportTestSuite();
- suite.addExclude("(!(|(client=axis)(endpoint=axis)))");
+
suite.addExclude("(&(client=*)(endpoint=*)(!(|(client=axis)(endpoint=axis))))");
TransportDescriptionFactory tdfNIO =
new SimpleTransportDescriptionFactory("http",
HttpCoreNIOListener.class,
@@ -69,7 +69,6 @@
TransportDescriptionFactory tdf = tdfNIO;
AxisAsyncEndpoint asyncEndpoint = new AxisAsyncEndpoint();
- JettyServer jettyServer = new JettyServer();
JettyAsyncEndpoint jettyAsyncEndpoint = new JettyAsyncEndpoint();
// AxisEchoEndpointFactory echoEndpointFactory = new
AxisEchoEndpointFactory();
HttpChannel channel = new HttpChannel();
@@ -81,8 +80,8 @@
for (AsyncTestClient<XMLMessage> client : clients) {
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.addSOAPTests(channel, client, adapt(jettyAsyncEndpoint,
MessageDecoder.BYTE_TO_XML), tdf);
+ suite.addPOXTests(channel, client, adapt(jettyAsyncEndpoint,
MessageDecoder.BYTE_TO_XML), 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);
Modified:
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=689273&r1=689272&r2=689273&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/nhttp/JettyServer.java
Tue Aug 26 15:39:50 2008
@@ -25,9 +25,13 @@
import org.mortbay.jetty.Server;
public class JettyServer {
+ public static final JettyServer INSTANCE = new JettyServer();
+
private Server server;
private HttpContext context;
+ private JettyServer() {}
+
@SuppressWarnings("unused")
private void setUp() throws Exception {
server = new Server();
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java?rev=689273&r1=689272&r2=689273&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/client/axis2/AxisTestClientContext.java
Tue Aug 26 15:39:50 2008
@@ -25,6 +25,8 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.synapse.format.BinaryFormatter;
+import org.apache.synapse.format.PlainTextFormatter;
import org.apache.synapse.transport.testkit.TransportDescriptionFactory;
public class AxisTestClientContext {
@@ -45,6 +47,9 @@
trpOutDesc = tdf.createTransportOutDescription();
axisCfg.addTransportOut(trpOutDesc);
trpOutDesc.getSender().init(cfgCtx, trpOutDesc);
+
+ axisCfg.addMessageFormatter("text/plain", new PlainTextFormatter());
+ axisCfg.addMessageFormatter("application/octet-stream", new
BinaryFormatter());
}
@SuppressWarnings("unused")
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=689273&r1=689272&r2=689273&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
Tue Aug 26 15:39:50 2008
@@ -28,6 +28,7 @@
import org.apache.directory.shared.ldap.filter.FilterParser;
import org.apache.directory.shared.ldap.filter.NotNode;
import org.apache.directory.shared.ldap.filter.OrNode;
+import org.apache.directory.shared.ldap.filter.PresenceNode;
public class FilterExpressionParser {
private FilterExpressionParser() {}
@@ -51,8 +52,10 @@
} else if (node instanceof EqualityNode) {
EqualityNode equalityNode = (EqualityNode)node;
return new EqualityExpression(equalityNode.getAttribute(),
equalityNode.getValue().toString());
+ } else if (node instanceof PresenceNode) {
+ return new PresenceExpression(((PresenceNode)node).getAttribute());
} else {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException("Node type " +
node.getClass().getSimpleName() + " not supported");
}
}
Added:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/PresenceExpression.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/PresenceExpression.java?rev=689273&view=auto
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/PresenceExpression.java
(added)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/filter/PresenceExpression.java
Tue Aug 26 15:39:50 2008
@@ -0,0 +1,34 @@
+/*
+ * 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.filter;
+
+import java.util.Map;
+
+public class PresenceExpression implements FilterExpression {
+ private final String key;
+
+ public PresenceExpression(String key) {
+ this.key = key;
+ }
+
+ public boolean matches(Map<String,String> map) {
+ return map.containsKey(key);
+ }
+}
