Author: veithen
Date: Sun Sep 28 01:37:07 2008
New Revision: 699784
URL: http://svn.apache.org/viewvc?rev=699784&view=rev
Log:
Transport test kit:
* MinConcurrencyTest: AxisServer is a singleton -> no need to pass it to the
constructor.
* Removed the Server interface which is no longer used.
Removed:
webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/server/Server.java
Modified:
webservices/commons/trunk/modules/transport/modules/jms/src/test/java/org/apache/axis2/transport/jms/JMSTransportTest.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/endpoint/AxisServer.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/tests/misc/MinConcurrencyTest.java
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=699784&r1=699783&r2=699784&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 01:37:07 2008
@@ -31,7 +31,6 @@
import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
-import org.apache.axis2.transport.testkit.axis2.endpoint.AxisServer;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
@@ -92,7 +91,7 @@
builder.addEchoEndpoint(new AxisEchoEndpoint());
for (JMSTestEnvironment env : new JMSTestEnvironment[] { new
QpidTestEnvironment(), new ActiveMQTestEnvironment() }) {
- suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new
AsyncChannel[] {
+ suite.addTest(new MinConcurrencyTest(new AsyncChannel[] {
new JMSAsyncChannel("endpoint1",
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT),
new JMSAsyncChannel("endpoint2",
JMSConstants.DESTINATION_TYPE_QUEUE, ContentTypeMode.TRANSPORT) },
2, false, env, new JMSTransportDescriptionFactory(false,
false)));
Modified:
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/MailTransportListenerTest.java?rev=699784&r1=699783&r2=699784&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/MailTransportListenerTest.java
Sun Sep 28 01:37:07 2008
@@ -27,7 +27,6 @@
import org.apache.axis2.transport.testkit.axis2.client.AxisAsyncTestClient;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
-import org.apache.axis2.transport.testkit.axis2.endpoint.AxisServer;
import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
public class MailTransportListenerTest extends TestCase {
@@ -71,7 +70,7 @@
builder.build();
- suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new
MailChannel[] { new MailChannel(), new MailChannel() }, 2, true, new
GreenMailTestEnvironment("pop3")));
+ suite.addTest(new MinConcurrencyTest(new MailChannel[] { new
MailChannel(), new MailChannel() }, 2, true, new
GreenMailTestEnvironment("pop3")));
return suite;
}
}
Modified:
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/AxisServer.java?rev=699784&r1=699783&r2=699784&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/AxisServer.java
Sun Sep 28 01:37:07 2008
@@ -29,9 +29,8 @@
import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.UtilsTransportServer;
import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.axis2.transport.testkit.server.Server;
-public class AxisServer implements Server {
+public class AxisServer {
public static final AxisServer INSTANCE = new AxisServer();
private TransportListener listener;
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=699784&r1=699783&r2=699784&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 01:37:07 2008
@@ -30,7 +30,6 @@
import org.apache.axis2.transport.testkit.axis2.client.AxisTestClientSetup;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisAsyncEndpoint;
import org.apache.axis2.transport.testkit.axis2.endpoint.AxisEchoEndpoint;
-import org.apache.axis2.transport.testkit.axis2.endpoint.AxisServer;
import org.apache.axis2.transport.testkit.channel.AsyncChannel;
import org.apache.axis2.transport.testkit.tests.misc.MinConcurrencyTest;
@@ -82,6 +81,6 @@
builder.build();
- suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new
AsyncChannel[] { new HttpChannel(), new HttpChannel() }, 2, false, tdf));
+ suite.addTest(new MinConcurrencyTest(new AsyncChannel[] { new
HttpChannel(), new HttpChannel() }, 2, false, tdf));
}
}
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=699784&r1=699783&r2=699784&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 01:37:07 2008
@@ -62,10 +62,10 @@
private final int messages;
private final boolean preloadMessages;
- public MinConcurrencyTest(AxisServer server, AsyncChannel[] channels, int
messages,
+ public MinConcurrencyTest(AsyncChannel[] channels, int messages,
boolean preloadMessages, Object... resources) {
super(resources);
- addResource(server);
+ addResource(AxisServer.INSTANCE);
addResource(AxisTestClientContext.INSTANCE);
this.channels = channels;
this.messages = messages;
