Author: veithen
Date: Sat May 15 17:48:27 2010
New Revision: 944687
URL: http://svn.apache.org/viewvc?rev=944687&view=rev
Log:
Reenabled the connection monitoring in the HTTP tests (revert of r778520).
Modified:
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
Modified:
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java?rev=944687&r1=944686&r2=944687&view=diff
==============================================================================
---
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
(original)
+++
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
Sat May 15 17:48:27 2010
@@ -19,6 +19,7 @@
package org.apache.axis2.transport.testkit.http;
+import java.net.InetSocketAddress;
import java.util.UUID;
import org.apache.axis2.addressing.EndpointReference;
@@ -27,23 +28,22 @@ import org.apache.axis2.transport.testki
import org.apache.axis2.transport.testkit.tests.Setup;
import org.apache.axis2.transport.testkit.tests.TearDown;
import org.apache.axis2.transport.testkit.tests.Transient;
+import org.apache.axis2.transport.testkit.util.tcpmon.Tunnel;
public class HttpChannel implements AsyncChannel, RequestResponseChannel {
- private int serverPort;
private @Transient String serviceName;
-// private @Transient Tunnel tunnel;
+ private @Transient Tunnel tunnel;
@Setup @SuppressWarnings("unused")
private void setUp(HttpTestEnvironment env) throws Exception {
- serverPort = env.getServerPort();
serviceName = "TestService-" + UUID.randomUUID();
-// tunnel = new Tunnel(new InetSocketAddress("127.0.0.1", 8280));
-// tunnel.start();
+ tunnel = new Tunnel(new InetSocketAddress("127.0.0.1",
env.getServerPort()));
+ tunnel.start();
}
@TearDown @SuppressWarnings("unused")
private void tearDown() throws Exception {
-// tunnel.stop();
+ tunnel.stop();
}
public String getServiceName() {
@@ -51,6 +51,6 @@ public class HttpChannel implements Asyn
}
public EndpointReference getEndpointReference() throws Exception {
- return new EndpointReference("http://localhost:"; + /* tunnel.getPort()
*/ serverPort + CONTEXT_PATH + "/" + serviceName);
+ return new EndpointReference("http://localhost:"; + tunnel.getPort() +
CONTEXT_PATH + "/" + serviceName);
}
}
\ No newline at end of file
