Repository: camel Updated Branches: refs/heads/master 3c4b97f03 -> bd881496e
CAMEL-8869 Upgrade httpcore and httpclient to version 4.4.1 and start refactoring tests Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2da8f198 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2da8f198 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2da8f198 Branch: refs/heads/master Commit: 2da8f198b0f4ad303f2a4984403581b26a489ffc Parents: 3c4b97f Author: Andrea Cosentino <anco...@gmail.com> Authored: Sun Jun 14 15:33:00 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Sun Jun 14 23:51:24 2015 +0200 ---------------------------------------------------------------------- .../camel/component/http4/BaseHttpTest.java | 1 + .../component/http4/HttpAuthenticationTest.java | 45 +++++++++++---- .../component/http4/HttpServerTestSupport.java | 59 -------------------- parent/pom.xml | 4 +- 4 files changed, 38 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java index 1fd8d1c..ab9840a 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java @@ -20,6 +20,7 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Message; +import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.HttpStatus; /** http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java index 5ca499c..3a29ef7 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java @@ -27,12 +27,15 @@ import org.apache.camel.component.http4.handler.AuthenticationValidationHandler; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponseInterceptor; import org.apache.http.HttpStatus; -import org.apache.http.localserver.LocalTestServer; +import org.apache.http.impl.bootstrap.HttpServer; +import org.apache.http.impl.bootstrap.ServerBootstrap; import org.apache.http.localserver.RequestBasicAuth; import org.apache.http.localserver.ResponseBasicUnauthorized; import org.apache.http.protocol.HttpProcessor; import org.apache.http.protocol.ImmutableHttpProcessor; import org.apache.http.protocol.ResponseContent; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** @@ -43,10 +46,37 @@ public class HttpAuthenticationTest extends BaseHttpTest { private String user = "camel"; private String password = "password"; + + protected HttpServer localServer; + + @Before + @Override + public void setUp() throws Exception { + localServer = ServerBootstrap.bootstrap(). + setHttpProcessor(getBasicHttpProcessor()). + setConnectionReuseStrategy(getConnectionReuseStrategy()). + setResponseFactory(getHttpResponseFactory()). + setExpectationVerifier(getHttpExpectationVerifier()). + setSslContext(getSSLContext()). + registerHandler("/search", new AuthenticationValidationHandler("GET", null, null, getExpectedContent(), user, password)).create(); + localServer.start(); + + super.setUp(); + } + + @After + @Override + public void tearDown() throws Exception { + super.tearDown(); + if (localServer != null) { + localServer.stop(); + } + } + @Test public void basicAuthenticationShouldSuccess() throws Exception { - Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/search?authUsername=" + user + "&authPassword=" + password, new Processor() { + Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword=" + password, new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -56,7 +86,7 @@ public class HttpAuthenticationTest extends BaseHttpTest { @Test public void basicAuthenticationPreemptiveShouldSuccess() throws Exception { - Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/search?authUsername=" + user + "&authPassword=" + Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?authUsername=" + user + "&authPassword=" + password + "&authenticationPreemptive=true", new Processor() { public void process(Exchange exchange) throws Exception { } @@ -67,7 +97,7 @@ public class HttpAuthenticationTest extends BaseHttpTest { @Test public void basicAuthenticationShouldFailWithoutCreds() throws Exception { - Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/search?throwExceptionOnFailure=false", new Processor() { + Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?throwExceptionOnFailure=false", new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -77,7 +107,7 @@ public class HttpAuthenticationTest extends BaseHttpTest { @Test public void basicAuthenticationShouldFailWithWrongCreds() throws Exception { - Exchange exchange = template.request("http4://" + getHostName() + ":" + getPort() + "/search?throwExceptionOnFailure=false&authUsername=camel&authPassword=wrong", new Processor() { + Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/search?throwExceptionOnFailure=false&authUsername=camel&authPassword=wrong", new Processor() { public void process(Exchange exchange) throws Exception { } }); @@ -96,11 +126,6 @@ public class HttpAuthenticationTest extends BaseHttpTest { return httpproc; } - @Override - protected void registerHandler(LocalTestServer server) { - server.register("/search", new AuthenticationValidationHandler("GET", null, null, getExpectedContent(), user, password)); - } - protected void assertExchangeFailed(Exchange exchange) { assertNotNull(exchange); http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java index eb73537..7fc1cc8 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java @@ -21,11 +21,8 @@ import javax.net.ssl.SSLContext; import org.apache.camel.test.junit4.CamelTestSupport; import org.apache.http.ConnectionReuseStrategy; import org.apache.http.HttpResponseFactory; -import org.apache.http.localserver.LocalTestServer; import org.apache.http.protocol.HttpExpectationVerifier; import org.apache.http.protocol.HttpProcessor; -import org.junit.After; -import org.junit.Before; /** * Abstract base class for unit testing using a http server. @@ -36,35 +33,6 @@ import org.junit.Before; */ public abstract class HttpServerTestSupport extends CamelTestSupport { - protected LocalTestServer localServer; - - @Before - @Override - public void setUp() throws Exception { - localServer = new LocalTestServer( - getBasicHttpProcessor(), - getConnectionReuseStrategy(), - getHttpResponseFactory(), - getHttpExpectationVerifier(), - getSSLContext(), - false, - new String[]{"TLSv1.2"}); - registerHandler(localServer); - localServer.start(); - - super.setUp(); - } - - @After - @Override - public void tearDown() throws Exception { - super.tearDown(); - - if (localServer != null) { - localServer.stop(); - } - } - /** * Returns the org.apache.http.protocol.BasicHttpProcessor which should be * used by the server. @@ -114,31 +82,4 @@ public abstract class HttpServerTestSupport extends CamelTestSupport { protected SSLContext getSSLContext() throws Exception { return null; } - - /** - * Register the org.apache.http.protocol.HttpRequestHandler which handles - * the request and set the proper response (headers and content). - * - * @param server - */ - protected void registerHandler(LocalTestServer server) { - } - - /** - * Obtains the host name of the local test server. - * - * @return hostName - */ - protected String getHostName() { - return localServer.getServiceAddress().getHostName(); - } - - /** - * Obtains the port of the local test server. - * - * @return port - */ - protected int getPort() { - return localServer.getServiceAddress().getPort(); - } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ce2a7e7..34d0f34 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,8 +217,8 @@ <htmlunit.version>2.15</htmlunit.version> <htmlunit-bundle-version>2.15_1</htmlunit-bundle-version> <httpunit-version>1.7</httpunit-version> - <httpcore4-version>4.3.3</httpcore4-version> - <httpclient4-version>4.3.6</httpclient4-version> + <httpcore4-version>4.4.1</httpcore4-version> + <httpclient4-version>4.4.1</httpclient4-version> <httpasyncclient-version>4.0.2</httpasyncclient-version> <httpclient-version>3.1</httpclient-version> <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
