You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2010/05/21 23:43:11 UTC
svn commit: r947192 - in
/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http:
./ mockup/ nio/protocol/
Author: sebb
Date: Fri May 21 21:43:10 2010
New Revision: 947192
URL: http://svn.apache.org/viewvc?rev=947192&view=rev
Log:
Rename TestHttpClient/Server so they don't clash with the same classes in httpcore
Added:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClientNio.java
- copied, changed from r947139, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServerNio.java
- copied, changed from r947139, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
Removed:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java?rev=947192&r1=947191&r2=947192&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java Fri May 21 21:43:10 2010
@@ -31,8 +31,8 @@ import java.io.IOException;
import junit.framework.TestCase;
-import org.apache.http.mockup.TestHttpClient;
-import org.apache.http.mockup.TestHttpServer;
+import org.apache.http.mockup.TestHttpClientNio;
+import org.apache.http.mockup.TestHttpServerNio;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
@@ -48,8 +48,8 @@ public class HttpCoreNIOTestBase extends
super(testName);
}
- protected TestHttpServer server;
- protected TestHttpClient client;
+ protected TestHttpServerNio server;
+ protected TestHttpClientNio client;
@Override
protected void setUp() throws Exception {
@@ -61,7 +61,7 @@ public class HttpCoreNIOTestBase extends
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
.setParameter(CoreProtocolPNames.ORIGIN_SERVER, "TEST-SERVER/1.1");
- this.server = new TestHttpServer(serverParams);
+ this.server = new TestHttpServerNio(serverParams);
this.server.setExceptionHandler(new SimpleIOReactorExceptionHandler());
HttpParams clientParams = new SyncBasicHttpParams();
@@ -73,7 +73,7 @@ public class HttpCoreNIOTestBase extends
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
.setParameter(CoreProtocolPNames.USER_AGENT, "TEST-CLIENT/1.1");
- this.client = new TestHttpClient(clientParams);
+ this.client = new TestHttpClientNio(clientParams);
this.client.setExceptionHandler(new SimpleIOReactorExceptionHandler());
}
Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClientNio.java (from r947139, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClientNio.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClientNio.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java&r1=947139&r2=947192&rev=947192&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpClientNio.java Fri May 21 21:43:10 2010
@@ -41,14 +41,14 @@ import org.apache.http.nio.reactor.IORea
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.HttpParams;
-public class TestHttpClient {
+public class TestHttpClientNio {
private final DefaultConnectingIOReactor ioReactor;
private final HttpParams params;
private volatile IOReactorThread thread;
- public TestHttpClient(final HttpParams params) throws IOException {
+ public TestHttpClientNio(final HttpParams params) throws IOException {
super();
this.ioReactor = new DefaultConnectingIOReactor(2, params);
this.params = params;
Copied: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServerNio.java (from r947139, httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServerNio.java?p2=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServerNio.java&p1=httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java&r1=947139&r2=947192&rev=947192&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/mockup/TestHttpServerNio.java Fri May 21 21:43:10 2010
@@ -45,7 +45,7 @@ import org.apache.http.params.HttpParams
* Trivial test server based on HttpCore NIO
*
*/
-public class TestHttpServer {
+public class TestHttpServerNio {
private final DefaultListeningIOReactor ioReactor;
private final HttpParams params;
@@ -53,7 +53,7 @@ public class TestHttpServer {
private volatile IOReactorThread thread;
private ListenerEndpoint endpoint;
- public TestHttpServer(final HttpParams params) throws IOException {
+ public TestHttpServerNio(final HttpParams params) throws IOException {
super();
this.ioReactor = new DefaultListeningIOReactor(2, params);
this.params = params;
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java?rev=947192&r1=947191&r2=947192&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestTruncatedChunks.java Fri May 21 21:43:10 2010
@@ -59,8 +59,8 @@ import org.apache.http.impl.nio.reactor.
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.mockup.SimpleEventListener;
import org.apache.http.mockup.SimpleNHttpRequestHandlerResolver;
-import org.apache.http.mockup.TestHttpClient;
-import org.apache.http.mockup.TestHttpServer;
+import org.apache.http.mockup.TestHttpClientNio;
+import org.apache.http.mockup.TestHttpServerNio;
import org.apache.http.nio.ContentDecoder;
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.IOControl;
@@ -185,7 +185,7 @@ public class TestTruncatedChunks extends
}
- static class CustomTestHttpServer extends TestHttpServer {
+ static class CustomTestHttpServer extends TestHttpServerNio {
public CustomTestHttpServer(final HttpParams params) throws IOException {
super(params);
@@ -200,7 +200,7 @@ public class TestTruncatedChunks extends
}
protected CustomTestHttpServer server;
- protected TestHttpClient client;
+ protected TestHttpClientNio client;
@Override
protected void setUp() throws Exception {
@@ -223,7 +223,7 @@ public class TestTruncatedChunks extends
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
.setParameter(CoreProtocolPNames.USER_AGENT, "TEST-CLIENT/1.1");
- this.client = new TestHttpClient(clientParams);
+ this.client = new TestHttpClientNio(clientParams);
}
@Override