You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/09/03 18:37:35 UTC
svn commit: r1164885 - in
/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http:
./ impl/nio/reactor/ nio/protocol/
Author: olegk
Date: Sat Sep 3 16:37:34 2011
New Revision: 1164885
URL: http://svn.apache.org/viewvc?rev=1164885&view=rev
Log:
Removed repetitive initialization code from test cases
Modified:
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java
httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.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=1164885&r1=1164884&r2=1164885&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 Sat Sep 3 16:37:34 2011
@@ -27,29 +27,46 @@
package org.apache.http;
-import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
-import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
import org.apache.http.params.SyncBasicHttpParams;
+import org.apache.http.protocol.HttpProcessor;
+import org.apache.http.protocol.ImmutableHttpProcessor;
+import org.apache.http.protocol.RequestConnControl;
+import org.apache.http.protocol.RequestContent;
+import org.apache.http.protocol.RequestExpectContinue;
+import org.apache.http.protocol.RequestTargetHost;
+import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.protocol.ResponseConnControl;
+import org.apache.http.protocol.ResponseContent;
+import org.apache.http.protocol.ResponseDate;
+import org.apache.http.protocol.ResponseServer;
import org.apache.http.testserver.HttpClientNio;
import org.apache.http.testserver.HttpServerNio;
-import org.junit.After;
-import org.junit.Before;
/**
* Base class for all HttpCore NIO tests
*
*/
-public class HttpCoreNIOTestBase {
+public abstract class HttpCoreNIOTestBase {
protected HttpParams serverParams;
protected HttpParams clientParams;
protected HttpServerNio server;
protected HttpClientNio client;
+ protected HttpProcessor serverHttpProc;
+ protected HttpProcessor clientHttpProc;
+
+ protected abstract NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ HttpParams params) throws Exception;
+
+ protected abstract NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ HttpParams params) throws Exception;
- @Before
public void initServer() throws Exception {
this.serverParams = new SyncBasicHttpParams();
this.serverParams
@@ -58,11 +75,16 @@ public class HttpCoreNIOTestBase {
.setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
.setParameter(CoreProtocolPNames.ORIGIN_SERVER, "TEST-SERVER/1.1");
- this.server = new HttpServerNio(new DefaultNHttpServerConnectionFactory(this.serverParams));
+ this.server = new HttpServerNio(createServerConnectionFactory(this.serverParams));
this.server.setExceptionHandler(new SimpleIOReactorExceptionHandler());
+ this.serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
+ new ResponseDate(),
+ new ResponseServer(),
+ new ResponseContent(),
+ new ResponseConnControl()
+ });
}
- @Before
public void initClient() throws Exception {
this.clientParams = new SyncBasicHttpParams();
this.clientParams
@@ -73,18 +95,22 @@ public class HttpCoreNIOTestBase {
.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
.setParameter(CoreProtocolPNames.USER_AGENT, "TEST-CLIENT/1.1");
- this.client = new HttpClientNio(new DefaultNHttpClientConnectionFactory(this.clientParams));
+ this.client = new HttpClientNio(createClientConnectionFactory(this.clientParams));
this.client.setExceptionHandler(new SimpleIOReactorExceptionHandler());
+ this.clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
+ new RequestContent(),
+ new RequestTargetHost(),
+ new RequestConnControl(),
+ new RequestUserAgent(),
+ new RequestExpectContinue()});
}
- @After
public void shutDownClient() throws Exception {
if (this.client != null) {
this.client.shutdown();
}
}
- @After
public void shutDownServer() throws Exception {
if (this.server != null) {
this.server.shutdown();
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java Sat Sep 3 16:37:34 2011
@@ -39,31 +39,25 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
+import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.NHttpServiceHandler;
import org.apache.http.nio.protocol.BufferingHttpServiceHandler;
import org.apache.http.nio.protocol.EventListener;
import org.apache.http.nio.reactor.ListenerEndpoint;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.SyncBasicHttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExpectationVerifier;
-import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
-import org.apache.http.testserver.HttpServerNio;
import org.apache.http.testserver.SSLTestContexts;
import org.apache.http.testserver.SimpleHttpRequestHandlerResolver;
import org.junit.After;
@@ -71,43 +65,38 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class TestBaseIOReactorSSL {
-
- private HttpParams serverParams;
- private HttpServerNio server;
+public class TestBaseIOReactorSSL extends HttpCoreNIOTestBase {
@Before
+ @Override
public void initServer() throws Exception {
- this.serverParams = new SyncBasicHttpParams();
- this.serverParams
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 10)
- .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
- .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "TEST-SERVER/1.1");
- this.server = new HttpServerNio(new SSLNHttpServerConnectionFactory(
- SSLTestContexts.createServerSSLContext(), null, this.serverParams));
+ super.initServer();
}
@After
+ @Override
public void shutDownServer() throws Exception {
- if (this.server != null) {
- this.server.shutdown();
- }
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params);
}
private NHttpServiceHandler createHttpServiceHandler(
final HttpRequestHandler requestHandler,
final HttpExpectationVerifier expectationVerifier,
final EventListener eventListener) {
- HttpProcessor httpproc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
BufferingHttpServiceHandler serviceHandler = new BufferingHttpServiceHandler(
- httpproc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java Sat Sep 3 16:37:34 2011
@@ -44,8 +44,13 @@ import org.apache.http.HttpResponseInter
import org.apache.http.OoopsieRuntimeException;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
import org.apache.http.nio.NHttpConnection;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.protocol.BufferingHttpClientHandler;
import org.apache.http.nio.protocol.BufferingHttpServiceHandler;
import org.apache.http.nio.protocol.EventListener;
@@ -55,6 +60,7 @@ import org.apache.http.nio.reactor.IORea
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestHandler;
@@ -70,7 +76,9 @@ import org.apache.http.protocol.Response
import org.apache.http.protocol.ResponseServer;
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleHttpRequestHandlerResolver;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -78,6 +86,42 @@ import org.junit.Test;
*/
public class TestDefaultIOReactors extends HttpCoreNIOTestBase {
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
+
@Test
public void testGracefulShutdown() throws Exception {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java Sat Sep 3 16:37:34 2011
@@ -34,7 +34,7 @@ import java.util.Queue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.http.HttpCoreNIOSSLTestBase;
+import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
@@ -42,8 +42,13 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseInterceptor;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
import org.apache.http.nio.NHttpConnection;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.protocol.BufferingHttpClientHandler;
import org.apache.http.nio.protocol.BufferingHttpServiceHandler;
import org.apache.http.nio.protocol.EventListener;
@@ -51,6 +56,7 @@ import org.apache.http.nio.protocol.Http
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestHandler;
@@ -64,16 +70,55 @@ import org.apache.http.protocol.Response
import org.apache.http.protocol.ResponseContent;
import org.apache.http.protocol.ResponseDate;
import org.apache.http.protocol.ResponseServer;
+import org.apache.http.testserver.SSLTestContexts;
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleHttpRequestHandlerResolver;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
* Basic functionality tests for SSL I/O reactors.
*
*/
-public class TestDefaultIOReactorsSSL extends HttpCoreNIOSSLTestBase {
+public class TestDefaultIOReactorsSSL extends HttpCoreNIOTestBase {
+
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params);
+ }
@Test
public void testGracefulShutdown() throws Exception {
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestAsyncNHttpHandlers.java Sat Sep 3 16:37:34 2011
@@ -45,8 +45,13 @@ import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.ConsumingNHttpEntity;
import org.apache.http.nio.entity.NByteArrayEntity;
import org.apache.http.nio.entity.NStringEntity;
@@ -54,6 +59,7 @@ import org.apache.http.nio.reactor.IORea
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExpectationVerifier;
import org.apache.http.protocol.HttpProcessor;
@@ -70,7 +76,9 @@ import org.apache.http.protocol.Response
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleNHttpRequestHandlerResolver;
import org.apache.http.util.EncodingUtils;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -78,6 +86,42 @@ import org.junit.Test;
*/
public class TestAsyncNHttpHandlers extends HttpCoreNIOTestBase {
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
+
private void executeStandardTest(
final NHttpRequestHandler requestHandler,
final NHttpRequestExecutionHandler requestExecutionHandler) throws Exception {
@@ -92,15 +136,8 @@ public class TestAsyncNHttpHandlers exte
queue.add(jobs[i]);
}
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
AsyncNHttpServiceHandler serviceHandler = new AsyncNHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
@@ -110,15 +147,8 @@ public class TestAsyncNHttpHandlers exte
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
AsyncNHttpClientHandler clientHandler = new AsyncNHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestBufferingNHttpHandlers.java Sat Sep 3 16:37:34 2011
@@ -36,34 +36,29 @@ import java.util.concurrent.ConcurrentLi
import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponseInterceptor;
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.protocol.HttpProcessor;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpRequestHandler;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleHttpRequestHandlerResolver;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -72,6 +67,42 @@ import org.junit.Test;
*/
public class TestBufferingNHttpHandlers extends HttpCoreNIOTestBase {
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
+
private void executeStandardTest(
final HttpRequestHandler requestHandler,
final HttpRequestExecutionHandler requestExecutionHandler) throws Exception {
@@ -86,15 +117,8 @@ public class TestBufferingNHttpHandlers
queue.add(jobs[i]);
}
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
BufferingHttpServiceHandler serviceHandler = new BufferingHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
@@ -104,15 +128,8 @@ public class TestBufferingNHttpHandlers
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
BufferingHttpClientHandler clientHandler = new BufferingHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestHttpAsyncHandlers.java Sat Sep 3 16:37:34 2011
@@ -36,31 +36,26 @@ import java.util.concurrent.ConcurrentLi
import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponseInterceptor;
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
+import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
+import org.apache.http.params.HttpParams;
import org.apache.http.testserver.SimpleEventListener;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -68,6 +63,42 @@ import org.junit.Test;
*/
public class TestHttpAsyncHandlers extends HttpCoreNIOTestBase {
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
+
static class BasicHttpAsyncRequestHandlerResolver implements HttpAsyncRequestHandlerResolver {
private final HttpAsyncRequestHandler<?> handler;
@@ -97,28 +128,14 @@ public class TestHttpAsyncHandlers exten
queue.add(jobs[i]);
}
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
HttpAsyncServiceHandler serviceHandler = new HttpAsyncServiceHandler(
new BasicHttpAsyncRequestHandlerResolver(requestHandler),
- serverHttpProc,
+ this.serverHttpProc,
new DefaultConnectionReuseStrategy(),
this.serverParams);
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
AsyncNHttpClientHandler clientHandler = new AsyncNHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestNIOSSLHttp.java Sat Sep 3 16:37:34 2011
@@ -33,42 +33,74 @@ import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import org.apache.http.HttpCoreNIOSSLTestBase;
+import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.HttpResponseInterceptor;
import org.apache.http.HttpStatus;
import org.apache.http.HttpVersion;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.SSLNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.SSLNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.CoreProtocolPNames;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
+import org.apache.http.params.HttpParams;
+import org.apache.http.testserver.SSLTestContexts;
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleNHttpRequestHandlerResolver;
+import org.junit.After;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
/**
* HttpCore NIO SSL tests.
*/
-public class TestNIOSSLHttp extends HttpCoreNIOSSLTestBase {
+public class TestNIOSSLHttp extends HttpCoreNIOTestBase {
+
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpServerConnectionFactory(SSLTestContexts.createServerSSLContext(), null, params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ HttpParams params) throws Exception {
+ return new SSLNHttpClientConnectionFactory(SSLTestContexts.createClientSSLContext(), null, params);
+ }
private void executeStandardTest(
final NHttpRequestHandler requestHandler,
@@ -84,15 +116,8 @@ public class TestNIOSSLHttp extends Http
queue.add(jobs[i]);
}
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
AsyncNHttpServiceHandler serviceHandler = new AsyncNHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
@@ -102,15 +127,8 @@ public class TestNIOSSLHttp extends Http
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
AsyncNHttpClientHandler clientHandler = new AsyncNHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);
Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java?rev=1164885&r1=1164884&r2=1164885&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java (original)
+++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/nio/protocol/TestThrottlingNHttpHandlers.java Sat Sep 3 16:37:34 2011
@@ -52,14 +52,20 @@ import org.apache.http.entity.ContentTyp
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.nio.DefaultNHttpClientConnectionFactory;
+import org.apache.http.impl.nio.DefaultNHttpServerConnectionFactory;
import org.apache.http.message.BasicHttpEntityEnclosingRequest;
import org.apache.http.message.BasicHttpRequest;
+import org.apache.http.nio.NHttpClientIOTarget;
+import org.apache.http.nio.NHttpConnectionFactory;
+import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.NByteArrayEntity;
import org.apache.http.nio.entity.NStringEntity;
import org.apache.http.nio.reactor.IOReactorStatus;
import org.apache.http.nio.reactor.ListenerEndpoint;
import org.apache.http.nio.reactor.SessionRequest;
import org.apache.http.params.CoreProtocolPNames;
+import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpExpectationVerifier;
@@ -90,6 +96,42 @@ import org.junit.Test;
@Deprecated
public class TestThrottlingNHttpHandlers extends HttpCoreNIOTestBase {
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
+
private ExecutorService execService;
@Before
@@ -116,15 +158,8 @@ public class TestThrottlingNHttpHandlers
queue.add(jobs[i]);
}
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
ThrottlingHttpServiceHandler serviceHandler = new ThrottlingHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.execService,
@@ -135,15 +170,8 @@ public class TestThrottlingNHttpHandlers
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
ThrottlingHttpClientHandler clientHandler = new ThrottlingHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.execService,
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=1164885&r1=1164884&r2=1164885&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 Sat Sep 3 16:37:34 2011
@@ -36,12 +36,11 @@ import java.nio.channels.WritableByteCha
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.apache.http.HttpCoreNIOTestBase;
import org.apache.http.HttpEntity;
import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestFactory;
-import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
import org.apache.http.HttpStatus;
import org.apache.http.MalformedChunkCodingException;
import org.apache.http.TruncatedChunkException;
@@ -58,7 +57,9 @@ import org.apache.http.message.BasicHttp
import org.apache.http.nio.ContentDecoder;
import org.apache.http.nio.ContentEncoder;
import org.apache.http.nio.IOControl;
+import org.apache.http.nio.NHttpClientIOTarget;
import org.apache.http.nio.NHttpConnection;
+import org.apache.http.nio.NHttpConnectionFactory;
import org.apache.http.nio.NHttpServerIOTarget;
import org.apache.http.nio.entity.ConsumingNHttpEntity;
import org.apache.http.nio.entity.ContentInputStream;
@@ -68,24 +69,8 @@ import org.apache.http.nio.reactor.Sessi
import org.apache.http.nio.util.ByteBufferAllocator;
import org.apache.http.nio.util.HeapByteBufferAllocator;
import org.apache.http.nio.util.SimpleInputBuffer;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
import org.apache.http.params.HttpParams;
-import org.apache.http.params.SyncBasicHttpParams;
import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpProcessor;
-import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestConnControl;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestExpectContinue;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
-import org.apache.http.protocol.ResponseConnControl;
-import org.apache.http.protocol.ResponseContent;
-import org.apache.http.protocol.ResponseDate;
-import org.apache.http.protocol.ResponseServer;
-import org.apache.http.testserver.HttpClientNio;
-import org.apache.http.testserver.HttpServerNio;
import org.apache.http.testserver.SimpleEventListener;
import org.apache.http.testserver.SimpleNHttpRequestHandlerResolver;
import org.apache.http.util.CharArrayBuffer;
@@ -97,7 +82,43 @@ import org.junit.Test;
/**
* Tests for handling truncated chunks.
*/
-public class TestTruncatedChunks {
+public class TestTruncatedChunks extends HttpCoreNIOTestBase {
+
+ @Before
+ @Override
+ public void initServer() throws Exception {
+ super.initServer();
+ }
+
+ @Before
+ @Override
+ public void initClient() throws Exception {
+ super.initClient();
+ }
+
+ @After
+ @Override
+ public void shutDownClient() throws Exception {
+ super.shutDownClient();
+ }
+
+ @After
+ @Override
+ public void shutDownServer() throws Exception {
+ super.shutDownServer();
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpServerIOTarget> createServerConnectionFactory(
+ final HttpParams params) {
+ return new CustomServerConnectionFactory(params);
+ }
+
+ @Override
+ protected NHttpConnectionFactory<NHttpClientIOTarget> createClientConnectionFactory(
+ final HttpParams params) {
+ return new DefaultNHttpClientConnectionFactory(params);
+ }
private static final byte[] GARBAGE = new byte[] {'1', '2', '3', '4', '5' };
@@ -176,50 +197,6 @@ public class TestTruncatedChunks {
}
- protected HttpParams serverParams;
- protected HttpParams clientParams;
- protected HttpServerNio server;
- protected HttpClientNio client;
-
- @Before
- public void initServer() throws Exception {
- this.serverParams = new SyncBasicHttpParams();
- this.serverParams
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 60000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
- .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
- .setParameter(CoreProtocolPNames.ORIGIN_SERVER, "TEST-SERVER/1.1");
- this.server = new HttpServerNio(new CustomServerConnectionFactory(this.serverParams));
- }
-
- @Before
- public void initClient() throws Exception {
- this.clientParams = new SyncBasicHttpParams();
- this.clientParams
- .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 60000)
- .setIntParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 30000)
- .setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 8 * 1024)
- .setBooleanParameter(CoreConnectionPNames.STALE_CONNECTION_CHECK, false)
- .setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, true)
- .setParameter(CoreProtocolPNames.USER_AGENT, "TEST-CLIENT/1.1");
- this.client = new HttpClientNio(new DefaultNHttpClientConnectionFactory(this.clientParams));
- }
-
- @After
- public void shutDownClient() throws Exception {
- if (this.client != null) {
- this.client.shutdown();
- }
- }
-
- @After
- public void shutDownServer() throws Exception {
- if (this.server != null) {
- this.server.shutdown();
- }
- }
-
@Test
public void testTruncatedChunkException() throws Exception {
@@ -237,15 +214,8 @@ public class TestTruncatedChunks {
Queue<Job> queue = new ConcurrentLinkedQueue<Job>();
queue.add(testjob);
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
AsyncNHttpServiceHandler serviceHandler = new AsyncNHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
@@ -255,15 +225,8 @@ public class TestTruncatedChunks {
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
AsyncNHttpClientHandler clientHandler = new AsyncNHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);
@@ -399,15 +362,8 @@ public class TestTruncatedChunks {
Queue<Job> queue = new ConcurrentLinkedQueue<Job>();
queue.add(testjob);
- HttpProcessor serverHttpProc = new ImmutableHttpProcessor(new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
-
AsyncNHttpServiceHandler serviceHandler = new AsyncNHttpServiceHandler(
- serverHttpProc,
+ this.serverHttpProc,
new DefaultHttpResponseFactory(),
new DefaultConnectionReuseStrategy(),
this.serverParams);
@@ -417,15 +373,8 @@ public class TestTruncatedChunks {
serviceHandler.setEventListener(
new SimpleEventListener());
- HttpProcessor clientHttpProc = new ImmutableHttpProcessor(new HttpRequestInterceptor[] {
- new RequestContent(),
- new RequestTargetHost(),
- new RequestConnControl(),
- new RequestUserAgent(),
- new RequestExpectContinue()});
-
AsyncNHttpClientHandler clientHandler = new AsyncNHttpClientHandler(
- clientHttpProc,
+ this.clientHttpProc,
requestExecutionHandler,
new DefaultConnectionReuseStrategy(),
this.clientParams);