Author: veithen
Date: Sun Sep 28 04:03:09 2008
New Revision: 699798
URL: http://svn.apache.org/viewvc?rev=699798&view=rev
Log:
Transport tests: renamed some classes to improve consistency (no functional
changes)
Added:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientConfigurator.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportListenerTest.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientConfigurator.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisServer.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/TestEndpoint.java
- copied, changed from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Endpoint.java
Removed:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportListenerTest.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientSetup.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisServer.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Endpoint.java
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailChannel.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEchoEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/AsyncEndpoint.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
Copied:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java?p2=webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java&p1=webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientSetup.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSAxisTestClientConfigurator.java
Sun Sep 28 04:03:09 2008
@@ -21,13 +21,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.name.Key;
-public class JMSAxisTestClientSetup implements AxisTestClientSetup {
+public class JMSAxisTestClientConfigurator implements
AxisTestClientConfigurator {
private final String jmsMessageType;
- public JMSAxisTestClientSetup(String jmsMessageType) {
+ public JMSAxisTestClientConfigurator(String jmsMessageType) {
this.jmsMessageType = jmsMessageType;
}
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSRequestResponseChannel.java
Sun Sep 28 04:03:09 2008
@@ -24,11 +24,11 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.name.Key;
-public class JMSRequestResponseChannel extends JMSChannel implements
RequestResponseChannel, AxisTestClientSetup {
+public class JMSRequestResponseChannel extends JMSChannel implements
RequestResponseChannel, AxisTestClientConfigurator {
private final String replyDestinationType;
private String replyDestinationName;
private String replyJndiName;
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.java
Sun Sep 28 04:03:09 2008
@@ -28,7 +28,7 @@
import org.apache.axis2.transport.testkit.TransportTestSuiteBuilder;
import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
import
org.apache.axis2.transport.testkit.axis2.client.AxisRequestResponseTestClient;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
@@ -68,8 +68,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
JMSAxisTestClientConfigurator(JMSConstants.JMS_BYTE_MESSAGE));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
JMSAxisTestClientConfigurator(JMSConstants.JMS_TEXT_MESSAGE));
builder.addByteArrayAsyncTestClient(new
JMSAsyncClient<byte[]>(JMSBytesMessageFactory.INSTANCE));
builder.addStringAsyncTestClient(new
JMSAsyncClient<String>(JMSTextMessageFactory.INSTANCE));
@@ -78,13 +78,13 @@
builder.addRequestResponseChannel(new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_QUEUE,
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT));
builder.addRequestResponseChannel(new
JMSRequestResponseChannel(JMSConstants.DESTINATION_TYPE_TOPIC,
JMSConstants.DESTINATION_TYPE_TOPIC, ContentTypeMode.TRANSPORT));
- AxisTestClientSetup timeoutSetup = new AxisTestClientSetup() {
+ AxisTestClientConfigurator timeoutConfigurator = new
AxisTestClientConfigurator() {
public void setupRequestMessageContext(MessageContext msgContext)
throws AxisFault {
msgContext.setProperty(JMSConstants.JMS_WAIT_REPLY, "5000");
}
};
- builder.addAxisRequestResponseTestClient(new
AxisRequestResponseTestClient(), timeoutSetup);
+ builder.addAxisRequestResponseTestClient(new
AxisRequestResponseTestClient(), timeoutConfigurator);
builder.addStringRequestResponseTestClient(new
JMSRequestResponseClient<String>(JMSTextMessageFactory.INSTANCE));
builder.addEchoEndpoint(new MockEchoEndpoint());
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/MockEchoEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -30,13 +30,13 @@
import javax.jms.TextMessage;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@Name("mock")
-public class MockEchoEndpoint implements Endpoint {
+public class MockEchoEndpoint implements TestEndpoint {
static Log log = LogFactory.getLog(MockEchoEndpoint.class);
private Connection connection;
Copied:
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientConfigurator.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientSetup.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientConfigurator.java?p2=webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientConfigurator.java&p1=webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientSetup.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientSetup.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailAxisTestClientConfigurator.java
Sun Sep 28 04:03:09 2008
@@ -21,13 +21,13 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.name.Key;
-public class MailAxisTestClientSetup implements AxisTestClientSetup {
+public class MailAxisTestClientConfigurator implements
AxisTestClientConfigurator {
private final String transportFormat;
- public MailAxisTestClientSetup(String transportFormat) {
+ public MailAxisTestClientConfigurator(String transportFormat) {
this.transportFormat = transportFormat;
}
Modified:
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailChannel.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailChannel.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailChannel.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailChannel.java
Sun Sep 28 04:03:09 2008
@@ -29,11 +29,11 @@
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
-public class MailChannel implements AsyncChannel, RequestResponseChannel,
AxisTestClientSetup, AxisServiceConfigurator {
+public class MailChannel implements AsyncChannel, RequestResponseChannel,
AxisTestClientConfigurator, AxisServiceConfigurator {
private MailTestEnvironment env;
private MailTestEnvironment.Account sender;
private MailTestEnvironment.Account recipient;
Copied:
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportListenerTest.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java?p2=webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java&p1=webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportListenerTest.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportListenerTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
Sun Sep 28 04:03:09 2008
@@ -29,9 +29,9 @@
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
-public class MailTransportListenerTest extends TestCase {
+public class MailTransportTest extends TestCase {
public static TestSuite suite() throws Exception {
- TransportTestSuite suite = new
TransportTestSuite(MailTransportListenerTest.class);
+ TransportTestSuite suite = new
TransportTestSuite(MailTransportTest.class);
// TODO: these test don't work; need more analysis why this is so
suite.addExclude("(&(messageType=SOAP12)(data=Latin1))");
@@ -54,8 +54,8 @@
builder.addAsyncChannel(channel);
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
MailAxisTestClientSetup(MailConstants.TRANSPORT_FORMAT_TEXT));
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
MailAxisTestClientSetup(MailConstants.TRANSPORT_FORMAT_MP));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
MailAxisTestClientConfigurator(MailConstants.TRANSPORT_FORMAT_TEXT));
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(), new
MailAxisTestClientConfigurator(MailConstants.TRANSPORT_FORMAT_MP));
builder.addByteArrayAsyncTestClient(new MailAsyncClient(new
FlatLayout()));
builder.addByteArrayAsyncTestClient(new MailAsyncClient(new
MultipartLayout()));
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/TransportTestSuiteBuilder.java
Sun Sep 28 04:03:09 2008
@@ -40,7 +40,7 @@
import org.apache.axis2.transport.testkit.message.XMLMessage;
import org.apache.axis2.transport.testkit.message.RESTMessage.Parameter;
import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
import org.apache.axis2.transport.testkit.tests.async.BinaryTestCase;
import
org.apache.axis2.transport.testkit.tests.async.LargeSOAPAsyncMessageTestCase;
import org.apache.axis2.transport.testkit.tests.async.RESTTestCase;
@@ -122,7 +122,7 @@
private final
ResourceList<RequestResponseTestClient<XMLMessage,XMLMessage>>
xmlRequestResponseClients = new
ResourceList<RequestResponseTestClient<XMLMessage,XMLMessage>>();
- private final ResourceList<Endpoint> echoEndpoints = new
ResourceList<Endpoint>();
+ private final ResourceList<TestEndpoint> echoEndpoints = new
ResourceList<TestEndpoint>();
public TransportTestSuiteBuilder(TransportTestSuite suite) {
this.suite = suite;
@@ -196,7 +196,7 @@
xmlRequestResponseClients.add(adapt(client,
MessageEncoder.XML_TO_STRING, MessageDecoder.STRING_TO_XML), relatedResources);
}
- public void addEchoEndpoint(Endpoint endpoint, Object... relatedResources)
{
+ public void addEchoEndpoint(TestEndpoint endpoint, Object...
relatedResources) {
echoEndpoints.add(endpoint, relatedResources);
}
@@ -251,7 +251,7 @@
}
for (ResourceRelation<RequestResponseChannel> channel :
requestResponseChannels) {
for
(ResourceRelation<RequestResponseTestClient<XMLMessage,XMLMessage>> client :
xmlRequestResponseClients) {
- for (ResourceRelation<Endpoint> endpoint : echoEndpoints) {
+ for (ResourceRelation<TestEndpoint> endpoint : echoEndpoints) {
Object[] resources = merge(env, channel, client, endpoint);
for (MessageTestData data : messageTestData) {
for (XMLMessage.Type type : XMLMessage.Type.values()) {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
Sun Sep 28 04:03:09 2008
@@ -37,13 +37,13 @@
@Name("axis")
public class AxisTestClient implements TestClient {
- private AxisTestClientSetup[] setups;
+ private AxisTestClientConfigurator[] configurators;
protected ServiceClient serviceClient;
protected Options axisOptions;
@SuppressWarnings("unused")
- private void setUp(AxisTestClientContext context, Channel channel,
AxisTestClientSetup[] setups) throws Exception {
- this.setups = setups;
+ private void setUp(AxisTestClientContext context, Channel channel,
AxisTestClientConfigurator[] configurators) throws Exception {
+ this.configurators = configurators;
serviceClient = new ServiceClient(context.getConfigurationContext(),
null);
axisOptions = new Options();
axisOptions.setTo(channel.getEndpointReference());
@@ -53,7 +53,7 @@
@SuppressWarnings("unused")
private void tearDown() throws Exception {
serviceClient.cleanup();
- setups = null;
+ configurators = null;
serviceClient = null;
axisOptions = null;
}
@@ -79,8 +79,8 @@
mc.setDoingSwA(true);
mc.setProperty(Constants.Configuration.ENABLE_SWA, true);
}
- for (AxisTestClientSetup setup : setups) {
- setup.setupRequestMessageContext(mc);
+ for (AxisTestClientConfigurator configurator : configurators) {
+ configurator.setupRequestMessageContext(mc);
}
mc.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
options.getCharset());
mc.setServiceContext(serviceClient.getServiceContext());
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientConfigurator.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientSetup.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientConfigurator.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientConfigurator.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientSetup.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientSetup.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientConfigurator.java
Sun Sep 28 04:03:09 2008
@@ -22,6 +22,6 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-public interface AxisTestClientSetup {
+public interface AxisTestClientConfigurator {
void setupRequestMessageContext(MessageContext msgContext) throws
AxisFault;
}
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisAsyncEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -37,7 +37,7 @@
import org.apache.axis2.transport.testkit.message.IncomingMessage;
import org.apache.axis2.transport.testkit.server.AsyncEndpoint;
-public class AxisAsyncEndpoint extends AxisEndpoint implements
AsyncEndpoint<AxisMessage>, MessageReceiver /*, TransportErrorListener*/ {
+public class AxisAsyncEndpoint extends AxisTestEndpoint implements
AsyncEndpoint<AxisMessage>, MessageReceiver /*, TransportErrorListener*/ {
private interface Event {
IncomingMessage<AxisMessage> process() throws Throwable;
}
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEchoEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEchoEndpoint.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEchoEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEchoEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -27,7 +27,7 @@
import org.apache.axis2.description.InOutAxisOperation;
import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
-public class AxisEchoEndpoint extends AxisEndpoint {
+public class AxisEchoEndpoint extends AxisTestEndpoint {
@Override
protected AxisOperation createOperation() {
AxisOperation operation = new InOutAxisOperation(new QName("echo"));
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEndpoint.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEndpoint.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -27,16 +27,16 @@
import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
import org.apache.axis2.transport.testkit.channel.Channel;
import org.apache.axis2.transport.testkit.name.Name;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
@Name("axis")
-public abstract class AxisEndpoint implements Endpoint {
- private AxisServer server;
+public abstract class AxisTestEndpoint implements TestEndpoint {
+ private AxisTestEndpointContext context;
private AxisService service;
@SuppressWarnings("unused")
- private void setUp(AxisServer server, Channel channel,
AxisServiceConfigurator[] configurators) throws Exception {
- this.server = server;
+ private void setUp(AxisTestEndpointContext context, Channel channel,
AxisServiceConfigurator[] configurators) throws Exception {
+ this.context = context;
String path = new
URI(channel.getEndpointReference().getAddress()).getPath();
String serviceName;
if (path != null && path.startsWith(Channel.CONTEXT_PATH + "/")) {
@@ -53,13 +53,13 @@
configurator.setupService(service, false);
}
}
- server.getAxisConfiguration().addService(service);
+ context.getAxisConfiguration().addService(service);
}
@SuppressWarnings("unused")
private void tearDown() throws Exception {
- server.getAxisConfiguration().removeService(service.getName());
- server = null;
+ context.getAxisConfiguration().removeService(service.getName());
+ context = null;
service = null;
}
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisServer.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisServer.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisServer.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/endpoint/AxisTestEndpointContext.java
Sun Sep 28 04:03:09 2008
@@ -30,13 +30,13 @@
import org.apache.axis2.transport.UtilsTransportServer;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
-public class AxisServer {
- public static final AxisServer INSTANCE = new AxisServer();
+public class AxisTestEndpointContext {
+ public static final AxisTestEndpointContext INSTANCE = new
AxisTestEndpointContext();
private TransportListener listener;
private UtilsTransportServer server;
- private AxisServer() {}
+ private AxisTestEndpointContext() {}
@SuppressWarnings("unused")
private void setUp(TransportDescriptionFactory tdf) throws Exception {
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTransportTestSuiteBuilder.java
Sun Sep 28 04:03:09 2008
@@ -27,7 +27,7 @@
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
import
org.apache.axis2.transport.testkit.axis2.client.AxisRequestResponseTestClient;
-import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
+import
org.apache.axis2.transport.testkit.axis2.client.AxisTestClientConfigurator;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
@@ -37,7 +37,7 @@
private final TransportTestSuite suite;
private final TransportDescriptionFactory tdf;
- private final List<AxisTestClientSetup> axisTestClientSetups = new
LinkedList<AxisTestClientSetup>();
+ private final List<AxisTestClientConfigurator> axisTestClientConfigurators
= new LinkedList<AxisTestClientConfigurator>();
public HttpTransportTestSuiteBuilder(TransportTestSuite suite,
TransportDescriptionFactory tdf) {
@@ -45,8 +45,8 @@
this.tdf = tdf;
}
- public void addAxisTestClientSetup(AxisTestClientSetup setup) {
- axisTestClientSetups.add(setup);
+ public void addAxisTestClientConfigurator(AxisTestClientConfigurator
configurator) {
+ axisTestClientConfigurators.add(configurator);
}
public void build() {
@@ -59,11 +59,11 @@
builder.addAsyncChannel(channel);
builder.addByteArrayAsyncTestClient(new JavaNetClient());
- if (axisTestClientSetups.isEmpty()) {
+ if (axisTestClientConfigurators.isEmpty()) {
builder.addAxisAsyncTestClient(new AxisAsyncTestClient());
} else {
- for (AxisTestClientSetup setup : axisTestClientSetups) {
- builder.addAxisAsyncTestClient(new AxisAsyncTestClient(),
setup);
+ for (AxisTestClientConfigurator configurator :
axisTestClientConfigurators) {
+ builder.addAxisAsyncTestClient(new AxisAsyncTestClient(),
configurator);
}
}
builder.addRESTAsyncTestClient(new JavaNetRESTClient());
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -21,14 +21,14 @@
import java.io.IOException;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
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;
-public abstract class JettyEndpoint implements Endpoint {
+public abstract class JettyEndpoint implements TestEndpoint {
private JettyServer server;
private HttpHandler handler;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/AsyncEndpoint.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/AsyncEndpoint.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/AsyncEndpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/AsyncEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -21,7 +21,7 @@
import org.apache.axis2.transport.testkit.message.IncomingMessage;
-public interface AsyncEndpoint<M> extends Endpoint {
+public interface AsyncEndpoint<M> extends TestEndpoint {
/**
* Discard any pending messages.
*/
Copied:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/TestEndpoint.java
(from r699787,
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Endpoint.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/TestEndpoint.java?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/TestEndpoint.java&p1=webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Endpoint.java&r1=699787&r2=699798&rev=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Endpoint.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/TestEndpoint.java
Sun Sep 28 04:03:09 2008
@@ -22,5 +22,5 @@
import org.apache.axis2.transport.testkit.name.Key;
@Key("endpoint")
-public interface Endpoint {
+public interface TestEndpoint {
}
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/RequestResponseMessageTestCase.java
Sun Sep 28 04:03:09 2008
@@ -23,14 +23,14 @@
import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
import org.apache.axis2.transport.testkit.client.RequestResponseTestClient;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
import org.apache.axis2.transport.testkit.tests.MessageTestCase;
public abstract class RequestResponseMessageTestCase<M,N> extends
MessageTestCase {
private final RequestResponseTestClient<M,N> client;
// TODO: maybe we don't need an explicit RequestResponseChannel
- public RequestResponseMessageTestCase(RequestResponseChannel channel,
RequestResponseTestClient<M,N> client, Endpoint endpoint, ContentType
contentType, String charset, Object... resources) {
+ public RequestResponseMessageTestCase(RequestResponseChannel channel,
RequestResponseTestClient<M,N> client, TestEndpoint endpoint, ContentType
contentType, String charset, Object... resources) {
super(contentType, charset, resources);
this.client = client;
addResource(channel);
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/echo/XMLRequestResponseMessageTestCase.java
Sun Sep 28 04:03:09 2008
@@ -31,14 +31,14 @@
import org.apache.axis2.transport.testkit.name.Key;
import org.apache.axis2.transport.testkit.name.Name;
import org.apache.axis2.transport.testkit.name.Named;
-import org.apache.axis2.transport.testkit.server.Endpoint;
+import org.apache.axis2.transport.testkit.server.TestEndpoint;
@Name("EchoXML")
public class XMLRequestResponseMessageTestCase extends
RequestResponseMessageTestCase<XMLMessage,XMLMessage> {
private final XMLMessage.Type xmlMessageType;
private final MessageTestData data;
- public XMLRequestResponseMessageTestCase(RequestResponseChannel channel,
RequestResponseTestClient<XMLMessage,XMLMessage> client, Endpoint endpoint,
XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) {
+ public XMLRequestResponseMessageTestCase(RequestResponseChannel channel,
RequestResponseTestClient<XMLMessage,XMLMessage> client, TestEndpoint endpoint,
XMLMessage.Type xmlMessageType, MessageTestData data, Object... resources) {
super(channel, client, endpoint, xmlMessageType.getContentType(),
data.getCharset(), resources);
this.xmlMessageType = xmlMessageType;
this.data = data;
Modified:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java?rev=699798&r1=699797&r2=699798&view=diff
==============================================================================
---
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
(original)
+++
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/misc/MinConcurrencyTest.java
Sun Sep 28 04:03:09 2008
@@ -36,8 +36,8 @@
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientContext;
-import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEndpoint;
-import org.apache.axis2.transport.testkit.axis2.endpoint.AxisServer;
+import org.apache.axis2.transport.testkit.axis2.endpoint.AxisTestEndpoint;
+import
org.apache.axis2.transport.testkit.axis2.endpoint.AxisTestEndpointContext;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.client.ClientOptions;
import org.apache.axis2.transport.testkit.message.AxisMessage;
@@ -65,8 +65,8 @@
public MinConcurrencyTest(AsyncChannel[] channels, int messages,
boolean preloadMessages, Object... resources) {
super(resources);
- addResource(AxisServer.INSTANCE);
addResource(AxisTestClientContext.INSTANCE);
+ addResource(AxisTestEndpointContext.INSTANCE);
this.channels = channels;
this.messages = messages;
this.preloadMessages = preloadMessages;
@@ -103,7 +103,7 @@
clientResourceSets[i] = clientResourceSet;
TestResourceSet endpointResourceSet = new
TestResourceSet(clientResourceSet);
- endpointResourceSet.addResource(new AxisEndpoint() {
+ endpointResourceSet.addResource(new AxisTestEndpoint() {
@Override
protected AxisOperation createOperation() {
AxisOperation operation = new InOnlyAxisOperation(new
QName("in"));
