Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A640AE778 for ; Wed, 28 Nov 2012 13:45:56 +0000 (UTC) Received: (qmail 28438 invoked by uid 500); 28 Nov 2012 13:45:55 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 28283 invoked by uid 500); 28 Nov 2012 13:45:54 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 28201 invoked by uid 99); 28 Nov 2012 13:45:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 13:45:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 13:45:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8A6352388A39 for ; Wed, 28 Nov 2012 13:45:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1414680 [3/3] - in /httpcomponents/httpclient/trunk/httpclient/src: examples/org/apache/http/examples/client/ main/java/org/apache/http/auth/params/ main/java/org/apache/http/client/config/ main/java/org/apache/http/client/methods/ main/ja... Date: Wed, 28 Nov 2012 13:45:18 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121128134531.8A6352388A39@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java?rev=1414680&view=auto ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java (added) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java Wed Nov 28 13:45:06 2012 @@ -0,0 +1,126 @@ +/* + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.protocol; + +import org.apache.http.Header; +import org.apache.http.HttpVersion; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicHttpEntityEnclosingRequest; +import org.apache.http.message.BasicHttpRequest; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HTTP; +import org.apache.http.protocol.HttpContext; +import org.junit.Assert; +import org.junit.Test; + +public class TestRequestExpectContinue { + + @Test + public void testRequestExpectContinueGenerated() throws Exception { + HttpContext context = new BasicHttpContext(); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); + BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/"); + String s = "whatever"; + StringEntity entity = new StringEntity(s, "US-ASCII"); + request.setEntity(entity); + RequestExpectContinue interceptor = new RequestExpectContinue(); + interceptor.process(request, context); + Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE); + Assert.assertNotNull(header); + Assert.assertEquals(HTTP.EXPECT_CONTINUE, header.getValue()); + } + + @Test + public void testRequestExpectContinueNotGenerated() throws Exception { + HttpContext context = new BasicHttpContext(null); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(false).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); + BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/"); + String s = "whatever"; + StringEntity entity = new StringEntity(s, "US-ASCII"); + request.setEntity(entity); + RequestExpectContinue interceptor = new RequestExpectContinue(); + interceptor.process(request, context); + Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE); + Assert.assertNull(header); + } + + @Test + public void testRequestExpectContinueHTTP10() throws Exception { + HttpContext context = new BasicHttpContext(null); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); + BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest( + "POST", "/", HttpVersion.HTTP_1_0); + String s = "whatever"; + StringEntity entity = new StringEntity(s, "US-ASCII"); + request.setEntity(entity); + RequestExpectContinue interceptor = new RequestExpectContinue(); + interceptor.process(request, context); + Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE); + Assert.assertNull(header); + } + + @Test + public void testRequestExpectContinueZeroContent() throws Exception { + HttpContext context = new BasicHttpContext(null); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); + BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/"); + String s = ""; + StringEntity entity = new StringEntity(s, "US-ASCII"); + request.setEntity(entity); + RequestExpectContinue interceptor = new RequestExpectContinue(); + interceptor.process(request, context); + Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE); + Assert.assertNull(header); + } + + @Test + public void testRequestExpectContinueInvalidInput() throws Exception { + RequestExpectContinue interceptor = new RequestExpectContinue(); + try { + interceptor.process(null, null); + Assert.fail("IllegalArgumentException should have been thrown"); + } catch (IllegalArgumentException ex) { + // expected + } + } + + @Test + public void testRequestExpectContinueIgnoreNonenclosingRequests() throws Exception { + HttpContext context = new BasicHttpContext(null); + BasicHttpRequest request = new BasicHttpRequest("POST", "/"); + RequestExpectContinue interceptor = new RequestExpectContinue(); + interceptor.process(request, context); + Assert.assertEquals(0, request.getAllHeaders().length); + } + +} Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestBasicScheme.java Wed Nov 28 13:45:06 2012 @@ -27,6 +27,7 @@ package org.apache.http.impl.auth; import org.apache.commons.codec.binary.Base64; +import org.apache.http.Consts; import org.apache.http.Header; import org.apache.http.HttpRequest; import org.apache.http.auth.AuthScheme; @@ -62,8 +63,12 @@ public class TestBasicScheme { buffer.append((char)germanChar); } - UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("dh", buffer.toString()); - Header header = BasicScheme.authenticate(credentials, "ISO-8859-1", false); + UsernamePasswordCredentials creds = new UsernamePasswordCredentials("dh", buffer.toString()); + BasicScheme authscheme = new BasicScheme(Consts.ISO_8859_1); + + HttpRequest request = new BasicHttpRequest("GET", "/"); + HttpContext context = new BasicHttpContext(); + Header header = authscheme.authenticate(creds, request, context); Assert.assertEquals("Basic ZGg65C32Lfw=", header.getValue()); } Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAuthenticationStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAuthenticationStrategy.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAuthenticationStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAuthenticationStrategy.java Wed Nov 28 13:45:06 2012 @@ -41,10 +41,10 @@ import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.auth.params.AuthPNames; import org.apache.http.client.AuthCache; import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.params.AuthPolicy; +import org.apache.http.client.config.AuthSchemes; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.protocol.ClientContext; import org.apache.http.config.Registry; import org.apache.http.config.RegistryBuilder; @@ -274,8 +274,10 @@ public class TestAuthenticationStrategy public void testCustomAuthPreference() throws Exception { TargetAuthenticationStrategy authStrategy = new TargetAuthenticationStrategy(); HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_UNAUTHORIZED, "UNAUTHORIZED"); - response.getParams().setParameter(AuthPNames.TARGET_AUTH_PREF, - Arrays.asList(new String[] {AuthPolicy.BASIC } )); + RequestConfig config = RequestConfig.custom() + .setTargetPreferredAuthSchemes(Arrays.asList(AuthSchemes.BASIC)) + .build(); + HttpHost authhost = new HttpHost("somehost", 80); HttpContext context = new BasicHttpContext(); @@ -287,6 +289,7 @@ public class TestAuthenticationStrategy .register("basic", new BasicSchemeFactory()) .register("digest", new DigestSchemeFactory()).build(); context.setAttribute(ClientContext.AUTHSCHEME_REGISTRY, authSchemeRegistry); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); credentialsProvider.setCredentials(new AuthScope("somehost", 80), Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultRedirectStrategy.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultRedirectStrategy.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultRedirectStrategy.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDefaultRedirectStrategy.java Wed Nov 28 13:45:06 2012 @@ -35,6 +35,7 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; import org.apache.http.ProtocolException; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpHead; @@ -42,7 +43,7 @@ import org.apache.http.client.methods.Ht import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpTrace; import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.params.ClientPNames; +import org.apache.http.client.protocol.ClientContext; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.message.BasicHttpResponse; import org.apache.http.protocol.BasicHttpContext; @@ -254,8 +255,10 @@ public class TestDefaultRedirectStrategy DefaultRedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); HttpContext context = new BasicHttpContext(); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, new HttpHost("localhost")); + RequestConfig config = RequestConfig.custom().setRelativeRedirectsAllowed(false).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); + HttpGet httpget = new HttpGet("http://localhost/"); - httpget.getParams().setParameter(ClientPNames.REJECT_RELATIVE_REDIRECT, Boolean.TRUE); HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Redirect"); response.addHeader("Location", "/stuff"); @@ -268,7 +271,8 @@ public class TestDefaultRedirectStrategy HttpContext context = new BasicHttpContext(); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, new HttpHost("localhost")); HttpGet httpget = new HttpGet("http://localhost/"); - httpget.getParams().setParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS, Boolean.TRUE); + RequestConfig config = RequestConfig.custom().setCircularRedirectsAllowed(true).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Redirect"); response.addHeader("Location", "http://localhost/stuff"); @@ -295,7 +299,8 @@ public class TestDefaultRedirectStrategy HttpContext context = new BasicHttpContext(); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, new HttpHost("localhost")); HttpGet httpget = new HttpGet("http://localhost/"); - httpget.getParams().setParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS, Boolean.FALSE); + RequestConfig config = RequestConfig.custom().setCircularRedirectsAllowed(false).build(); + context.setAttribute(ClientContext.REQUEST_CONFIG, config); HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_MOVED_TEMPORARILY, "Redirect"); response.addHeader("Location", "http://localhost/stuff"); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestAbortHandling.java Wed Nov 28 13:45:06 2012 @@ -297,6 +297,7 @@ public class TestAbortHandling extends I Mockito.any(HttpClientConnection.class), Mockito.any(HttpHost.class), Mockito.any(InetAddress.class), + Mockito.anyInt(), Mockito.any(HttpContext.class)); Mockito.when(connmgr.requestConnection( @@ -457,6 +458,7 @@ public class TestAbortHandling extends I final HttpClientConnection conn, final HttpHost host, final InetAddress localAddress, + final int connectTimeout, final HttpContext context) throws IOException { throw new UnsupportedOperationException("just a mockup"); } Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientAuthentication.java Wed Nov 28 13:45:06 2012 @@ -43,6 +43,7 @@ import org.apache.http.client.AuthCache; import org.apache.http.client.ClientProtocolException; import org.apache.http.client.CredentialsProvider; import org.apache.http.client.NonRepeatableRequestException; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; @@ -58,7 +59,6 @@ import org.apache.http.localserver.Basic import org.apache.http.localserver.LocalTestServer; import org.apache.http.localserver.RequestBasicAuth; import org.apache.http.localserver.ResponseBasicUnauthorized; -import org.apache.http.params.CoreProtocolPNames; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpExpectationVerifier; @@ -240,12 +240,13 @@ public class TestClientAuthentication ex this.httpclient = HttpClients.custom().setCredentialsProvider(credsProvider).build(); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build(); HttpPut httpput = new HttpPut("/"); + httpput.setConfig(config); httpput.setEntity(new InputStreamEntity( new ByteArrayInputStream( new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 } ), -1)); - httpput.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, true); HttpResponse response = this.httpclient.execute(getServerHttp(), httpput); HttpEntity entity = response.getEntity(); @@ -262,12 +263,13 @@ public class TestClientAuthentication ex this.httpclient = HttpClients.custom().setCredentialsProvider(credsProvider).build(); + RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build(); HttpPut httpput = new HttpPut("/"); + httpput.setConfig(config); httpput.setEntity(new InputStreamEntity( new ByteArrayInputStream( new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9 } ), -1)); - httpput.getParams().setBooleanParameter(CoreProtocolPNames.USE_EXPECT_CONTINUE, false); try { this.httpclient.execute(getServerHttp(), httpput); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientReauthentication.java Wed Nov 28 13:45:06 2012 @@ -26,7 +26,7 @@ package org.apache.http.impl.client.integration; import java.io.IOException; -import java.util.Collections; +import java.util.Arrays; import java.util.concurrent.atomic.AtomicLong; import org.apache.http.Consts; @@ -41,8 +41,8 @@ import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.auth.params.AuthPNames; import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; import org.apache.http.entity.StringEntity; import org.apache.http.impl.auth.BasicScheme; @@ -51,7 +51,6 @@ import org.apache.http.impl.client.HttpC import org.apache.http.impl.client.TargetAuthenticationStrategy; import org.apache.http.localserver.LocalTestServer; import org.apache.http.localserver.RequestBasicAuth; -import org.apache.http.params.HttpParams; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpProcessor; @@ -178,18 +177,19 @@ public class TestClientReauthentication TestCredentialsProvider credsProvider = new TestCredentialsProvider( new UsernamePasswordCredentials("test", "test")); + RequestConfig config = RequestConfig.custom() + .setTargetPreferredAuthSchemes(Arrays.asList("MyBasic")) + .build(); this.httpclient = HttpClients.custom() .registerAuthScheme("MyBasic", myBasicAuthSchemeFactory) .setTargetAuthenticationStrategy(myAuthStrategy) .setCredentialsProvider(credsProvider) .build(); - this.httpclient.getParams().setParameter(AuthPNames.TARGET_AUTH_PREF, - Collections.singletonList("MyBasic")); - HttpContext context = new BasicHttpContext(); for (int i = 0; i < 10; i++) { HttpGet httpget = new HttpGet("/"); + httpget.setConfig(config); HttpResponse response = this.httpclient.execute(getServerHttp(), httpget, context); HttpEntity entity = response.getEntity(); Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestClientRequestExecution.java Wed Nov 28 13:45:06 2012 @@ -31,7 +31,6 @@ import java.io.IOException; import org.apache.http.Header; import org.apache.http.HttpClientConnection; import org.apache.http.HttpException; -import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.HttpResponse; @@ -41,7 +40,6 @@ import org.apache.http.client.HttpReques import org.apache.http.client.NonRepeatableRequestException; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.params.ClientPNames; import org.apache.http.entity.InputStreamEntity; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; @@ -81,156 +79,6 @@ public class TestClientRequestExecution } } - @Test - public void testDefaultHostAtClientLevel() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - this.localServer.register("*", new SimpleService()); - - HttpHost target = new HttpHost("localhost", port); - - this.httpclient = HttpClients.custom().build(); - this.httpclient.getParams().setParameter(ClientPNames.DEFAULT_HOST, target); - - String s = "/path"; - HttpGet httpget = new HttpGet(s); - - HttpResponse response = this.httpclient.execute(httpget); - EntityUtils.consume(response.getEntity()); - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - } - - @Test - public void testDefaultHostHeader() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - String hostname = getServerHttp().getHostName(); - this.localServer.register("*", new SimpleService()); - - HttpContext context = new BasicHttpContext(); - - String s = "http://localhost:" + port; - HttpGet httpget = new HttpGet(s); - - this.httpclient = HttpClients.custom().build(); - HttpResponse response = this.httpclient.execute(getServerHttp(), httpget, context); - EntityUtils.consume(response.getEntity()); - - HttpRequest reqWrapper = (HttpRequest) context.getAttribute( - ExecutionContext.HTTP_REQUEST); - - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - // Check that Host header is generated as expected - Header[] headers = reqWrapper.getHeaders("host"); - Assert.assertNotNull(headers); - Assert.assertEquals(1, headers.length); - Assert.assertEquals(hostname + ":" + port, headers[0].getValue()); - } - - @Test - // HTTPCLIENT-1092 - public void testVirtualHostHeader() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - this.localServer.register("*", new SimpleService()); - - HttpContext context = new BasicHttpContext(); - - String s = "http://localhost:" + port; - HttpGet httpget = new HttpGet(s); - - this.httpclient = HttpClients.custom().build(); - String virtHost = "virtual"; - httpget.getParams().setParameter(ClientPNames.VIRTUAL_HOST, new HttpHost(virtHost, port)); - HttpResponse response = this.httpclient.execute(getServerHttp(), httpget, context); - EntityUtils.consume(response.getEntity()); - - HttpRequest reqWrapper = (HttpRequest) context.getAttribute( - ExecutionContext.HTTP_REQUEST); - - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - // Check that Host header is generated as expected - Header[] headers = reqWrapper.getHeaders("host"); - Assert.assertNotNull(headers); - Assert.assertEquals(1, headers.length); - Assert.assertEquals(virtHost+":"+port,headers[0].getValue()); - } - - @Test - // Test that virtual port is propagated if provided - // This is not expected to be used much, if ever - // HTTPCLIENT-1092 - public void testVirtualHostPortHeader() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - this.localServer.register("*", new SimpleService()); - - HttpContext context = new BasicHttpContext(); - - String s = "http://localhost:" + port; - HttpGet httpget = new HttpGet(s); - - this.httpclient = HttpClients.custom().build(); - String virtHost = "virtual"; - int virtPort = 9876; - httpget.getParams().setParameter(ClientPNames.VIRTUAL_HOST, new HttpHost(virtHost, virtPort)); - HttpResponse response = this.httpclient.execute(getServerHttp(), httpget, context); - EntityUtils.consume(response.getEntity()); - - HttpRequest reqWrapper = (HttpRequest) context.getAttribute( - ExecutionContext.HTTP_REQUEST); - - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - // Check that Host header is generated as expected - Header[] headers = reqWrapper.getHeaders("host"); - Assert.assertNotNull(headers); - Assert.assertEquals(1, headers.length); - Assert.assertEquals(virtHost+":"+virtPort,headers[0].getValue()); - } - - @Test - public void testClientLevelVirtualHostHeader() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - this.localServer.register("*", new SimpleService()); - - HttpContext context = new BasicHttpContext(); - - String s = "http://localhost:" + port; - HttpGet httpget = new HttpGet(s); - - this.httpclient = HttpClients.custom().build(); - String virtHost = "virtual"; - this.httpclient.getParams().setParameter(ClientPNames.VIRTUAL_HOST, new HttpHost(virtHost, port)); - HttpResponse response = this.httpclient.execute(getServerHttp(), httpget, context); - EntityUtils.consume(response.getEntity()); - - HttpRequest reqWrapper = (HttpRequest) context.getAttribute( - ExecutionContext.HTTP_REQUEST); - - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - // Check that Host header is generated as expected - Header[] headers = reqWrapper.getHeaders("host"); - Assert.assertNotNull(headers); - Assert.assertEquals(1, headers.length); - Assert.assertEquals(virtHost+":"+port,headers[0].getValue()); - } - - @Test - public void testDefaultHostAtRequestLevel() throws Exception { - int port = this.localServer.getServiceAddress().getPort(); - this.localServer.register("*", new SimpleService()); - - HttpHost target1 = new HttpHost("whatever", 80); - HttpHost target2 = new HttpHost("localhost", port); - - this.httpclient = HttpClients.custom().build(); - this.httpclient.getParams().setParameter(ClientPNames.DEFAULT_HOST, target1); - - String s = "/path"; - HttpGet httpget = new HttpGet(s); - httpget.getParams().setParameter(ClientPNames.DEFAULT_HOST, target2); - - HttpResponse response = this.httpclient.execute(httpget); - EntityUtils.consume(response.getEntity()); - Assert.assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode()); - } - private static class FaultyHttpRequestExecutor extends HttpRequestExecutor { private static final String MARKER = "marker"; Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestConnectionManagement.java Wed Nov 28 13:45:06 2012 @@ -112,7 +112,7 @@ public class TestConnectionManagement ex HttpContext context = new BasicHttpContext(); HttpClientConnection conn = getConnection(mgr, route); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target); @@ -146,7 +146,7 @@ public class TestConnectionManagement ex conn = getConnection(mgr, route); Assert.assertFalse("connection should have been closed", conn.isOpen()); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); // repeat the communication, no need to prepare the request again context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); @@ -200,7 +200,7 @@ public class TestConnectionManagement ex HttpContext context = new BasicHttpContext(); HttpClientConnection conn = getConnection(mgr, route); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target); @@ -235,7 +235,7 @@ public class TestConnectionManagement ex Assert.assertFalse("connection should have been closed", conn.isOpen()); // repeat the communication, no need to prepare the request again - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); response = exec.execute(request, conn, context); @@ -270,7 +270,7 @@ public class TestConnectionManagement ex Assert.assertTrue("connection should have been closed", !conn.isOpen()); // repeat the communication, no need to prepare the request again - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); response = exec.execute(request, conn, context); @@ -297,7 +297,7 @@ public class TestConnectionManagement ex HttpContext context = new BasicHttpContext(); HttpClientConnection conn = getConnection(mgr, route); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); Assert.assertEquals(1, mgr.getTotalStats().getLeased()); Assert.assertEquals(1, mgr.getStats(route).getLeased()); @@ -337,7 +337,7 @@ public class TestConnectionManagement ex HttpContext context = new BasicHttpContext(); HttpClientConnection conn = getConnection(mgr, route); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); Assert.assertEquals(1, mgr.getTotalStats().getLeased()); Assert.assertEquals(1, mgr.getStats(route).getLeased()); @@ -385,7 +385,7 @@ public class TestConnectionManagement ex new BasicHttpRequest("GET", uri, HttpVersion.HTTP_1_1); HttpClientConnection conn = getConnection(mgr, route); - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); context.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target); @@ -457,7 +457,7 @@ public class TestConnectionManagement ex abortingThread.start(); try { - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); Assert.fail("expected SocketException"); } catch(SocketException expected) {} @@ -510,7 +510,7 @@ public class TestConnectionManagement ex abortingThread.start(); try { - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); Assert.fail("IOException expected"); } catch(IOException expected) { } @@ -564,7 +564,7 @@ public class TestConnectionManagement ex abortingThread.start(); try { - mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), context); + mgr.connect(conn, route.getTargetHost(), route.getLocalAddress(), 0, context); Assert.fail("IOException expected"); } catch(IOException expected) { } Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestCookie2Support.java Wed Nov 28 13:45:06 2012 @@ -37,8 +37,6 @@ import org.apache.http.HttpStatus; import org.apache.http.ProtocolVersion; import org.apache.http.client.CookieStore; import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.params.ClientPNames; -import org.apache.http.client.params.CookiePolicy; import org.apache.http.client.protocol.ClientContext; import org.apache.http.cookie.Cookie; import org.apache.http.cookie.SM; @@ -64,7 +62,7 @@ public class TestCookie2Support extends @Before public void setUp() throws Exception { startServer(); - this.httpclient = HttpClients.custom().build(); + this.httpclient = HttpClients.createDefault(); } private static class CookieVer0Service implements HttpRequestHandler { @@ -86,8 +84,6 @@ public class TestCookie2Support extends public void testCookieVersionSupportHeader1() throws Exception { this.localServer.register("*", new CookieVer0Service()); - this.httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); - CookieStore cookieStore = new BasicCookieStore(); HttpContext context = new BasicHttpContext(); context.setAttribute(ClientContext.COOKIE_STORE, cookieStore); @@ -133,8 +129,6 @@ public class TestCookie2Support extends public void testCookieVersionSupportHeader2() throws Exception { this.localServer.register("*", new CookieVer1Service()); - this.httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); - CookieStore cookieStore = new BasicCookieStore(); HttpContext context = new BasicHttpContext(); context.setAttribute(ClientContext.COOKIE_STORE, cookieStore); @@ -179,8 +173,6 @@ public class TestCookie2Support extends public void testCookieVersionSupportHeader3() throws Exception { this.localServer.register("*", new CookieVer2Service()); - this.httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); - CookieStore cookieStore = new BasicCookieStore(); HttpContext context = new BasicHttpContext(); context.setAttribute(ClientContext.COOKIE_STORE, cookieStore); @@ -226,8 +218,6 @@ public class TestCookie2Support extends public void testSetCookieVersionMix() throws Exception { this.localServer.register("*", new SetCookieVersionMixService()); - this.httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BEST_MATCH); - CookieStore cookieStore = new BasicCookieStore(); HttpContext context = new BasicHttpContext(); context.setAttribute(ClientContext.COOKIE_STORE, cookieStore); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestRedirects.java Wed Nov 28 13:45:06 2012 @@ -27,8 +27,7 @@ package org.apache.http.impl.client.integration; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import java.util.Arrays; import org.apache.http.Header; import org.apache.http.HttpException; @@ -43,9 +42,9 @@ import org.apache.http.client.CircularRe import org.apache.http.client.ClientProtocolException; import org.apache.http.client.CookieStore; import org.apache.http.client.RedirectException; +import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.params.ClientPNames; import org.apache.http.client.protocol.ClientContext; import org.apache.http.cookie.SM; import org.apache.http.entity.StringEntity; @@ -400,10 +399,13 @@ public class TestRedirects extends Integ HttpHost target = getServerHttp(); this.localServer.register("*", new CircularRedirectService()); - this.httpclient.getParams().setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS, true); - this.httpclient.getParams().setIntParameter(ClientPNames.MAX_REDIRECTS, 5); + RequestConfig config = RequestConfig.custom() + .setCircularRedirectsAllowed(true) + .setMaxRedirects(5) + .build(); HttpGet httpget = new HttpGet("/circular-oldlocation/"); + httpget.setConfig(config); try { this.httpclient.execute(target, httpget); } catch (ClientProtocolException e) { @@ -417,10 +419,12 @@ public class TestRedirects extends Integ HttpHost target = getServerHttp(); this.localServer.register("*", new CircularRedirectService()); - this.httpclient.getParams().setBooleanParameter(ClientPNames.ALLOW_CIRCULAR_REDIRECTS, false); + RequestConfig config = RequestConfig.custom() + .setCircularRedirectsAllowed(false) + .build(); HttpGet httpget = new HttpGet("/circular-oldlocation/"); - + httpget.setConfig(config); try { this.httpclient.execute(target, httpget); } catch (ClientProtocolException e) { @@ -478,9 +482,9 @@ public class TestRedirects extends Integ HttpContext context = new BasicHttpContext(); - this.httpclient.getParams().setBooleanParameter( - ClientPNames.REJECT_RELATIVE_REDIRECT, false); + RequestConfig config = RequestConfig.custom().setRelativeRedirectsAllowed(true).build(); HttpGet httpget = new HttpGet("/oldlocation/"); + httpget.setConfig(config); HttpResponse response = this.httpclient.execute(target, httpget, context); EntityUtils.consume(response.getEntity()); @@ -502,9 +506,9 @@ public class TestRedirects extends Integ HttpContext context = new BasicHttpContext(); - this.httpclient.getParams().setBooleanParameter( - ClientPNames.REJECT_RELATIVE_REDIRECT, false); + RequestConfig config = RequestConfig.custom().setRelativeRedirectsAllowed(true).build(); HttpGet httpget = new HttpGet("/test/oldlocation"); + httpget.setConfig(config); HttpResponse response = this.httpclient.execute(target, httpget, context); EntityUtils.consume(response.getEntity()); @@ -524,10 +528,9 @@ public class TestRedirects extends Integ HttpHost target = getServerHttp(); this.localServer.register("*", new RelativeRedirectService()); - this.httpclient.getParams().setBooleanParameter( - ClientPNames.REJECT_RELATIVE_REDIRECT, true); + RequestConfig config = RequestConfig.custom().setRelativeRedirectsAllowed(false).build(); HttpGet httpget = new HttpGet("/oldlocation/"); - + httpget.setConfig(config); try { this.httpclient.execute(target, httpget); } catch (ClientProtocolException e) { @@ -597,17 +600,15 @@ public class TestRedirects extends Integ @Test public void testDefaultHeadersRedirect() throws Exception { + this.httpclient = HttpClients.custom() + .setDefaultHeaders(Arrays.asList(new BasicHeader(HTTP.USER_AGENT, "my-test-client"))) + .build(); HttpHost target = getServerHttp(); this.localServer.register("*", new BasicRedirectService()); HttpContext context = new BasicHttpContext(); - List
defaultHeaders = new ArrayList
(1); - defaultHeaders.add(new BasicHeader(HTTP.USER_AGENT, "my-test-client")); - - this.httpclient.getParams().setParameter(ClientPNames.DEFAULT_HEADERS, defaultHeaders); - HttpGet httpget = new HttpGet("/oldlocation/"); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java Wed Nov 28 13:45:06 2012 @@ -35,19 +35,17 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.auth.AuthScheme; +import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.auth.AuthScope; import org.apache.http.auth.Credentials; import org.apache.http.client.CredentialsProvider; +import org.apache.http.client.config.AuthSchemes; import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.params.AuthPolicy; -import org.apache.http.client.params.ClientPNames; import org.apache.http.entity.StringEntity; import org.apache.http.impl.auth.SPNegoScheme; -import org.apache.http.impl.auth.SPNegoSchemeFactory; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; -import org.apache.http.params.HttpParams; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpRequestHandler; import org.apache.http.util.EntityUtils; @@ -132,16 +130,15 @@ public class TestSPNegoScheme extends In } - private static class NegotiateSchemeFactoryWithMockGssManager extends SPNegoSchemeFactory { + private static class NegotiateSchemeProviderWithMockGssManager implements AuthSchemeProvider { NegotiateSchemeWithMockGssManager scheme; - NegotiateSchemeFactoryWithMockGssManager() throws Exception { + NegotiateSchemeProviderWithMockGssManager() throws Exception { scheme = new NegotiateSchemeWithMockGssManager(); } - @Override - public AuthScheme newInstance(HttpParams params) { + public AuthScheme create(HttpContext context) { return scheme; } @@ -158,21 +155,19 @@ public class TestSPNegoScheme extends In HttpHost target = new HttpHost("localhost", port); - SPNegoSchemeFactory nsf = new NegotiateSchemeFactoryWithMockGssManager(); + AuthSchemeProvider nsf = new NegotiateSchemeProviderWithMockGssManager(); CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); Credentials use_jaas_creds = new UseJaasCredentials(); credentialsProvider.setCredentials(new AuthScope(null, -1, null), use_jaas_creds); this.httpclient = HttpClients.custom() - .registerAuthScheme(AuthPolicy.SPNEGO, nsf) + .registerAuthScheme(AuthSchemes.SPNEGO, nsf) .setCredentialsProvider(credentialsProvider) .build(); - this.httpclient.getParams().setParameter(ClientPNames.DEFAULT_HOST, target); - String s = "/path"; HttpGet httpget = new HttpGet(s); - HttpResponse response = this.httpclient.execute(httpget); + HttpResponse response = this.httpclient.execute(target, httpget); EntityUtils.consume(response.getEntity()); Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode()); @@ -189,21 +184,20 @@ public class TestSPNegoScheme extends In HttpHost target = new HttpHost("localhost", port); - NegotiateSchemeFactoryWithMockGssManager nsf = new NegotiateSchemeFactoryWithMockGssManager(); + AuthSchemeProvider nsf = new NegotiateSchemeProviderWithMockGssManager(); CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); Credentials use_jaas_creds = new UseJaasCredentials(); credentialsProvider.setCredentials(new AuthScope(null, -1, null), use_jaas_creds); this.httpclient = HttpClients.custom() - .registerAuthScheme(AuthPolicy.SPNEGO, nsf) + .registerAuthScheme(AuthSchemes.SPNEGO, nsf) .setCredentialsProvider(credentialsProvider) .build(); - this.httpclient.getParams().setParameter(ClientPNames.DEFAULT_HOST, target); String s = "/path"; HttpGet httpget = new HttpGet(s); - HttpResponse response = this.httpclient.execute(httpget); + HttpResponse response = this.httpclient.execute(target, httpget); EntityUtils.consume(response.getEntity()); Assert.assertEquals(HttpStatus.SC_UNAUTHORIZED, response.getStatusLine().getStatusCode()); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java Wed Nov 28 13:45:06 2012 @@ -39,9 +39,6 @@ import org.apache.http.client.methods.Ht import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpConnectionParams; -import org.apache.http.params.HttpParams; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.ExecutionContext; import org.apache.http.protocol.HttpContext; @@ -88,9 +85,6 @@ public class TestStatefulConnManagement HttpHost target = new HttpHost("localhost", port); - HttpParams params = new BasicHttpParams(); - HttpConnectionParams.setConnectionTimeout(params, 10); - PoolingHttpClientConnectionManager mgr = new PoolingHttpClientConnectionManager(); mgr.setMaxTotal(workerCount); mgr.setDefaultMaxPerRoute(workerCount); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultRoutePlanner.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultRoutePlanner.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestDefaultRoutePlanner.java Wed Nov 28 13:45:06 2012 @@ -33,6 +33,8 @@ import org.apache.http.HttpVersion; import org.apache.http.conn.SchemePortResolver; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.message.BasicHttpRequest; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -57,7 +59,8 @@ public class TestDefaultRoutePlanner { HttpHost target = new HttpHost("somehost", 80, "http"); HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); - HttpRoute route = routePlanner.determineRoute(target, request, null); + HttpContext context = new BasicHttpContext(); + HttpRoute route = routePlanner.determineRoute(target, request, context); Assert.assertEquals(target, route.getTargetHost()); Assert.assertEquals(1, route.getHopCount()); @@ -71,7 +74,8 @@ public class TestDefaultRoutePlanner { Mockito.when(schemePortResolver.resolve(target)).thenReturn(443); HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); - HttpRoute route = routePlanner.determineRoute(target, request, null); + HttpContext context = new BasicHttpContext(); + HttpRoute route = routePlanner.determineRoute(target, request, context); Assert.assertEquals(new HttpHost("somehost", 443, "https"), route.getTargetHost()); Assert.assertEquals(1, route.getHopCount()); Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestSystemDefaultRoutePlanner.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestSystemDefaultRoutePlanner.java?rev=1414680&r1=1414679&r2=1414680&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestSystemDefaultRoutePlanner.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/TestSystemDefaultRoutePlanner.java Wed Nov 28 13:45:06 2012 @@ -41,6 +41,8 @@ import org.apache.http.HttpVersion; import org.apache.http.conn.SchemePortResolver; import org.apache.http.conn.routing.HttpRoute; import org.apache.http.message.BasicHttpRequest; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.HttpContext; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -67,7 +69,8 @@ public class TestSystemDefaultRoutePlann HttpHost target = new HttpHost("somehost", 80, "http"); HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); - HttpRoute route = routePlanner.determineRoute(target, request, null); + HttpContext context = new BasicHttpContext(); + HttpRoute route = routePlanner.determineRoute(target, request, context); Assert.assertEquals(target, route.getTargetHost()); Assert.assertEquals(1, route.getHopCount()); @@ -81,7 +84,8 @@ public class TestSystemDefaultRoutePlann Mockito.when(schemePortResolver.resolve(target)).thenReturn(443); HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); - HttpRoute route = routePlanner.determineRoute(target, request, null); + HttpContext context = new BasicHttpContext(); + HttpRoute route = routePlanner.determineRoute(target, request, context); Assert.assertEquals(new HttpHost("somehost", 443, "https"), route.getTargetHost()); Assert.assertEquals(1, route.getHopCount()); @@ -107,7 +111,8 @@ public class TestSystemDefaultRoutePlann HttpRequest request = new BasicHttpRequest("GET", "/", HttpVersion.HTTP_1_1); - HttpRoute route = routePlanner.determineRoute(target, request, null); + HttpContext context = new BasicHttpContext(); + HttpRoute route = routePlanner.determineRoute(target, request, context); Assert.assertEquals(target, route.getTargetHost()); Assert.assertEquals(2, route.getHopCount());