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 2016/01/12 21:43:42 UTC
svn commit: r1724315 [11/14] - in /httpcomponents/httpclient/trunk: ./
fluent-hc/src/examples/org/apache/http/client/fluent/
fluent-hc/src/main/java/org/apache/http/client/fluent/
fluent-hc/src/test/java/org/apache/http/client/fluent/ httpclient-cache/...
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/entity/TestGZip.java Tue Jan 12 20:43:36 2016
@@ -30,13 +30,13 @@ package org.apache.http.client.entity;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
-import org.apache.http.Consts;
-import org.apache.http.HttpEntity;
-import org.apache.http.entity.ByteArrayEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.EntityUtils;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.entity.ByteArrayEntity;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.entity.StringEntity;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -52,7 +52,7 @@ public class TestGZip {
Assert.assertTrue(gzipe.isChunked());
Assert.assertEquals(-1, gzipe.getContentLength());
Assert.assertNotNull(gzipe.getContentEncoding());
- Assert.assertEquals("gzip", gzipe.getContentEncoding().getValue());
+ Assert.assertEquals("gzip", gzipe.getContentEncoding());
}
@Test
@@ -63,7 +63,7 @@ public class TestGZip {
gzipe.writeTo(buf);
final ByteArrayEntity out = new ByteArrayEntity(buf.toByteArray());
final GzipDecompressingEntity gunzipe = new GzipDecompressingEntity(out);
- Assert.assertEquals("some kind of text", EntityUtils.toString(gunzipe, Consts.ASCII));
+ Assert.assertEquals("some kind of text", EntityUtils.toString(gunzipe, StandardCharsets.US_ASCII));
}
@Test
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpOptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpOptions.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpOptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpOptions.java Tue Jan 12 20:43:36 2016
@@ -29,9 +29,9 @@ package org.apache.http.client.methods;
import java.util.Set;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.message.BasicStatusLine;
+import org.apache.hc.core5.http.ProtocolVersion;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.message.BasicStatusLine;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestHttpRequestBase.java Tue Jan 12 20:43:36 2016
@@ -27,13 +27,7 @@
package org.apache.http.client.methods;
-import java.io.ByteArrayInputStream;
-
-import org.apache.http.Header;
-import org.apache.http.HttpVersion;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.util.LangUtils;
+import org.apache.hc.core5.http.HttpVersion;
import org.junit.Assert;
import org.junit.Test;
@@ -53,55 +47,4 @@ public class TestHttpRequestBase {
Assert.assertEquals("/", httpget.getRequestLine().getUri());
}
- @Test
- public void testCloneBasicRequests() throws Exception {
- final HttpGet httpget = new HttpGet("http://host/path");
- httpget.addHeader("h1", "this header");
- httpget.addHeader("h2", "that header");
- httpget.addHeader("h3", "all sorts of headers");
- final HttpGet clone = (HttpGet) httpget.clone();
-
- Assert.assertEquals(httpget.getMethod(), clone.getMethod());
- Assert.assertEquals(httpget.getURI(), clone.getURI());
-
- final Header[] headers1 = httpget.getAllHeaders();
- final Header[] headers2 = clone.getAllHeaders();
-
- Assert.assertTrue(LangUtils.equals(headers1, headers2));
- }
-
- @Test
- public void testCloneEntityEnclosingRequests() throws Exception {
- final HttpPost httppost = new HttpPost("http://host/path");
- httppost.addHeader("h1", "this header");
- httppost.addHeader("h2", "that header");
- httppost.addHeader("h3", "all sorts of headers");
- HttpPost clone = (HttpPost) httppost.clone();
-
- Assert.assertEquals(httppost.getMethod(), clone.getMethod());
- Assert.assertEquals(httppost.getURI(), clone.getURI());
-
- final Header[] headers1 = httppost.getAllHeaders();
- final Header[] headers2 = clone.getAllHeaders();
-
- Assert.assertTrue(LangUtils.equals(headers1, headers2));
-
- Assert.assertNull(clone.getEntity());
-
- final StringEntity e1 = new StringEntity("stuff");
- httppost.setEntity(e1);
- clone = (HttpPost) httppost.clone();
- Assert.assertTrue(clone.getEntity() instanceof StringEntity);
- Assert.assertFalse(clone.getEntity().equals(e1));
- }
-
- @Test(expected=CloneNotSupportedException.class)
- public void testCloneStreamingEntityEnclosingRequests() throws Exception {
- final ByteArrayInputStream instream = new ByteArrayInputStream(new byte[] {});
- final InputStreamEntity e2 = new InputStreamEntity(instream, -1);
- final HttpPost httppost = new HttpPost("http://host/path");
- httppost.setEntity(e2);
- httppost.clone();
- }
-
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestRequestBuilder.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/methods/TestRequestBuilder.java Tue Jan 12 20:43:36 2016
@@ -30,19 +30,18 @@ package org.apache.http.client.methods;
import java.net.URI;
import java.util.List;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpVersion;
-import org.apache.http.NameValuePair;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.entity.BasicHttpEntity;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.entity.BasicHttpEntity;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -55,7 +54,6 @@ public class TestRequestBuilder {
Assert.assertEquals("GET", request.getMethod());
Assert.assertEquals(URI.create("/"), request.getURI());
Assert.assertEquals(HttpVersion.HTTP_1_1, request.getProtocolVersion());
- Assert.assertFalse(request instanceof HttpEntityEnclosingRequest);
}
@Test
@@ -75,8 +73,7 @@ public class TestRequestBuilder {
Assert.assertEquals("POST", request.getMethod());
Assert.assertEquals(URI.create("/"), request.getURI());
Assert.assertEquals(HttpVersion.HTTP_1_1, request.getProtocolVersion());
- Assert.assertTrue(request instanceof HttpEntityEnclosingRequest);
- Assert.assertSame(entity, ((HttpEntityEnclosingRequest) request).getEntity());
+ Assert.assertSame(entity, request.getEntity());
}
@Test
@@ -87,8 +84,7 @@ public class TestRequestBuilder {
Assert.assertEquals("GET", request.getMethod());
Assert.assertEquals(URI.create("/"), request.getURI());
Assert.assertEquals(HttpVersion.HTTP_1_1, request.getProtocolVersion());
- Assert.assertTrue(request instanceof HttpEntityEnclosingRequest);
- Assert.assertSame(entity, ((HttpEntityEnclosingRequest) request).getEntity());
+ Assert.assertSame(entity, request.getEntity());
}
@Test
@@ -97,7 +93,6 @@ public class TestRequestBuilder {
.addParameter("p1", "this")
.addParameter("p2", "that")
.build();
- Assert.assertFalse(request instanceof HttpEntityEnclosingRequest);
Assert.assertEquals(new URI("/?p1=this&p2=that"), request.getURI());
}
@@ -107,7 +102,6 @@ public class TestRequestBuilder {
.addParameter("p1", "this")
.addParameters(new BasicNameValuePair("p2", "that"))
.build();
- Assert.assertFalse(request instanceof HttpEntityEnclosingRequest);
Assert.assertEquals(new URI("/?p1=this&p2=that"), request.getURI());
}
@@ -117,8 +111,7 @@ public class TestRequestBuilder {
.addParameter("p1", "this")
.addParameter("p2", "that")
.build();
- Assert.assertTrue(request instanceof HttpEntityEnclosingRequest);
- final HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
+ final HttpEntity entity = request.getEntity();
Assert.assertNotNull(entity);
Assert.assertEquals(new URI("/"), request.getURI());
Assert.assertEquals("p1=this&p2=that", EntityUtils.toString(entity));
@@ -132,7 +125,6 @@ public class TestRequestBuilder {
.addParameter("p2", "that")
.setEntity(new StringEntity("blah"))
.build();
- Assert.assertTrue(request instanceof HttpEntityEnclosingRequest);
Assert.assertEquals(new URI("http://targethost/?blah&p1=this&p2=that"), request.getURI());
}
@@ -152,13 +144,11 @@ public class TestRequestBuilder {
Assert.assertEquals("PUT", request.getMethod());
Assert.assertEquals(URI.create("/stuff"), request.getURI());
Assert.assertEquals(HttpVersion.HTTP_1_0, request.getProtocolVersion());
- Assert.assertTrue(request instanceof HttpEntityEnclosingRequest);
final HttpUriRequest copy = RequestBuilder.copy(request).setUri("/other-stuff").build();
Assert.assertEquals("PUT", copy.getMethod());
Assert.assertEquals(URI.create("/other-stuff"), copy.getURI());
- Assert.assertTrue(copy instanceof HttpEntityEnclosingRequest);
- Assert.assertSame(entity, ((HttpEntityEnclosingRequest) copy).getEntity());
+ Assert.assertSame(entity, copy.getEntity());
Assert.assertTrue(copy instanceof Configurable);
Assert.assertSame(config, ((Configurable) copy).getConfig());
}
@@ -181,12 +171,20 @@ public class TestRequestBuilder {
final List<NameValuePair> parameters = builder.getParameters();
Assert.assertNotNull(parameters);
Assert.assertEquals(2, parameters.size());
- Assert.assertEquals(new BasicNameValuePair("p1", "this"), parameters.get(0));
- Assert.assertEquals(new BasicNameValuePair("p2", "that"), parameters.get(1));
+ assertNameValuePair(new BasicNameValuePair("p1", "this"), parameters.get(0));
+ assertNameValuePair(new BasicNameValuePair("p2", "that"), parameters.get(1));
Assert.assertEquals(new URI("/stuff?p1=wtf"), builder.getUri());
Assert.assertNull(builder.getEntity());
}
+ private static void assertNameValuePair (
+ final NameValuePair expected,
+ final NameValuePair result) {
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.getName(), result.getName());
+ Assert.assertEquals(expected.getValue(), result.getValue());
+ }
+
@Test
public void testCopyWithStringEntity() throws Exception {
final HttpPost post = new HttpPost("/stuff?p1=wtf");
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAcceptEncoding.java Tue Jan 12 20:43:36 2016
@@ -26,12 +26,12 @@
*/
package org.apache.http.client.protocol;
-import org.apache.http.Header;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAddCookies.java Tue Jan 12 20:43:36 2016
@@ -28,15 +28,17 @@ package org.apache.http.client.protocol;
import java.util.Date;
-import org.apache.http.Header;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.http.client.CookieStore;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.client.config.RequestConfig;
-import org.apache.http.config.Lookup;
-import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.RouteInfo.LayerType;
import org.apache.http.conn.routing.RouteInfo.TunnelType;
@@ -48,8 +50,6 @@ import org.apache.http.impl.cookie.Basic
import org.apache.http.impl.cookie.IgnoreSpecProvider;
import org.apache.http.impl.cookie.RFC6265CookieSpecProvider;
import org.apache.http.impl.cookie.RFC6265StrictSpec;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.HttpCoreContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestAuthCache.java Tue Jan 12 20:43:36 2016
@@ -26,9 +26,11 @@
*/
package org.apache.http.client.protocol;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.http.auth.AuthExchange;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
@@ -38,8 +40,6 @@ import org.apache.http.conn.routing.Http
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.HttpCoreContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestClientConnControl.java Tue Jan 12 20:43:36 2016
@@ -26,15 +26,16 @@
*/
package org.apache.http.client.protocol;
-import org.apache.http.Header;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.RouteInfo.LayerType;
import org.apache.http.conn.routing.RouteInfo.TunnelType;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.HTTP;
import org.junit.Assert;
import org.junit.Test;
@@ -56,8 +57,8 @@ public class TestRequestClientConnContro
interceptor.process(request, context);
final Header header1 = request.getFirstHeader("Proxy-Connection");
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_KEEP_ALIVE, header1.getValue());
- final Header header2 = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
+ Assert.assertEquals(HeaderElements.KEEP_ALIVE, header1.getValue());
+ final Header header2 = request.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNull(header2);
}
@@ -74,9 +75,9 @@ public class TestRequestClientConnContro
final HttpRequestInterceptor interceptor = new RequestClientConnControl();
interceptor.process(request, context);
- final Header header1 = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
+ final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_KEEP_ALIVE, header1.getValue());
+ Assert.assertEquals(HeaderElements.KEEP_ALIVE, header1.getValue());
final Header header2 = request.getFirstHeader("Proxy-Connection");
Assert.assertNull(header2);
}
@@ -96,9 +97,9 @@ public class TestRequestClientConnContro
final HttpRequestInterceptor interceptor = new RequestClientConnControl();
interceptor.process(request, context);
- final Header header1 = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
+ final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_KEEP_ALIVE, header1.getValue());
+ Assert.assertEquals(HeaderElements.KEEP_ALIVE, header1.getValue());
final Header header2 = request.getFirstHeader("Proxy-Connection");
Assert.assertNull(header2);
}
@@ -120,15 +121,15 @@ public class TestRequestClientConnContro
final Header header1 = request.getFirstHeader("Proxy-Connection");
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_KEEP_ALIVE, header1.getValue());
- final Header header2 = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
+ Assert.assertEquals(HeaderElements.KEEP_ALIVE, header1.getValue());
+ final Header header2 = request.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNull(header2);
}
@Test
public void testPreserveCustomConnectionHeader() throws Exception {
final HttpRequest request = new BasicHttpRequest("GET", "/");
- request.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE);
+ request.addHeader(HttpHeaders.CONNECTION, HeaderElements.CLOSE);
final HttpClientContext context = HttpClientContext.create();
final HttpHost target = new HttpHost("localhost", 443, "https");
@@ -141,9 +142,9 @@ public class TestRequestClientConnContro
final HttpRequestInterceptor interceptor = new RequestClientConnControl();
interceptor.process(request, context);
- final Header header1 = request.getFirstHeader(HTTP.CONN_DIRECTIVE);
+ final Header header1 = request.getFirstHeader(HttpHeaders.CONNECTION);
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_CLOSE, header1.getValue());
+ Assert.assertEquals(HeaderElements.CLOSE, header1.getValue());
final Header header2 = request.getFirstHeader("Proxy-Connection");
Assert.assertNull(header2);
}
@@ -151,7 +152,7 @@ public class TestRequestClientConnContro
@Test
public void testPreserveCustomProxyConnectionHeader() throws Exception {
final HttpRequest request = new BasicHttpRequest("GET", "/");
- request.addHeader("Proxy-Connection", HTTP.CONN_CLOSE);
+ request.addHeader("Proxy-Connection", HeaderElements.CLOSE);
final HttpClientContext context = HttpClientContext.create();
final HttpHost target = new HttpHost("localhost", 80, "http");
@@ -166,7 +167,7 @@ public class TestRequestClientConnContro
final Header header1 = request.getFirstHeader("Proxy-Connection");
Assert.assertNotNull(header1);
- Assert.assertEquals(HTTP.CONN_CLOSE, header1.getValue());
+ Assert.assertEquals(HeaderElements.CLOSE, header1.getValue());
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestDefaultHeaders.java Tue Jan 12 20:43:36 2016
@@ -29,13 +29,13 @@ package org.apache.http.client.protocol;
import java.util.ArrayList;
import java.util.List;
-import org.apache.http.Header;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequestInterceptor;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
import org.junit.Assert;
import org.junit.Test;
Modified: 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=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestRequestExpectContinue.java Tue Jan 12 20:43:36 2016
@@ -27,15 +27,17 @@
package org.apache.http.client.protocol;
-import org.apache.http.Header;
-import org.apache.http.HttpVersion;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HeaderElements;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
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;
@@ -46,15 +48,15 @@ public class TestRequestExpectContinue {
final HttpClientContext context = HttpClientContext.create();
final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
- final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
+ final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
final String s = "whatever";
- final StringEntity entity = new StringEntity(s, "US-ASCII");
+ final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, context);
- final Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE);
+ final Header header = request.getFirstHeader(HttpHeaders.EXPECT);
Assert.assertNotNull(header);
- Assert.assertEquals(HTTP.EXPECT_CONTINUE, header.getValue());
+ Assert.assertEquals(HeaderElements.CONTINUE, header.getValue());
}
@Test
@@ -62,13 +64,13 @@ public class TestRequestExpectContinue {
final HttpContext context = new BasicHttpContext(null);
final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(false).build();
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
- final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
+ final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
final String s = "whatever";
- final StringEntity entity = new StringEntity(s, "US-ASCII");
+ final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, context);
- final Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE);
+ final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
Assert.assertNull(header);
}
@@ -77,14 +79,14 @@ public class TestRequestExpectContinue {
final HttpContext context = new BasicHttpContext(null);
final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
- final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest(
+ final BasicHttpRequest request = new BasicHttpRequest(
"POST", "/", HttpVersion.HTTP_1_0);
final String s = "whatever";
- final StringEntity entity = new StringEntity(s, "US-ASCII");
+ final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, context);
- final Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE);
+ final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
Assert.assertNull(header);
}
@@ -93,13 +95,13 @@ public class TestRequestExpectContinue {
final HttpContext context = new BasicHttpContext(null);
final RequestConfig config = RequestConfig.custom().setExpectContinueEnabled(true).build();
context.setAttribute(HttpClientContext.REQUEST_CONFIG, config);
- final BasicHttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("POST", "/");
+ final BasicHttpRequest request = new BasicHttpRequest("POST", "/");
final String s = "";
- final StringEntity entity = new StringEntity(s, "US-ASCII");
+ final StringEntity entity = new StringEntity(s, StandardCharsets.US_ASCII);
request.setEntity(entity);
final RequestExpectContinue interceptor = new RequestExpectContinue();
interceptor.process(request, context);
- final Header header = request.getFirstHeader(HTTP.EXPECT_DIRECTIVE);
+ final Header header = request.getFirstHeader(HeaderElements.CONTINUE);
Assert.assertNull(header);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseContentEncoding.java Tue Jan 12 20:43:36 2016
@@ -26,18 +26,18 @@
*/
package org.apache.http.client.protocol;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.HttpVersion;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.DecompressingEntity;
import org.apache.http.client.entity.GzipDecompressingEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseProcessCookies.java Tue Jan 12 20:43:36 2016
@@ -28,16 +28,16 @@ package org.apache.http.client.protocol;
import java.util.List;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpResponseInterceptor;
-import org.apache.http.HttpVersion;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpResponseInterceptor;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
import org.apache.http.client.CookieStore;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieOrigin;
import org.apache.http.cookie.CookieSpec;
import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.cookie.RFC6265LaxSpec;
-import org.apache.http.message.BasicHttpResponse;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestHttpClientUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestHttpClientUtils.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestHttpClientUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestHttpClientUtils.java Tue Jan 12 20:43:36 2016
@@ -29,8 +29,8 @@ package org.apache.http.client.utils;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestRequestBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestRequestBuilder.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestRequestBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestRequestBuilder.java Tue Jan 12 20:43:36 2016
@@ -27,27 +27,27 @@
package org.apache.http.client.utils;
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.message.BasicNameValuePair;
import org.junit.Assert;
import org.junit.Test;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-
public class TestRequestBuilder {
@Test
public void testBuildGETwithUTF8() throws Exception {
- assertBuild(Consts.UTF_8);
+ assertBuild(StandardCharsets.UTF_8);
}
@Test
public void testBuildGETwithISO88591() throws Exception {
- assertBuild(Consts.ISO_8859_1);
+ assertBuild(StandardCharsets.ISO_8859_1);
}
private void assertBuild(final Charset charset) throws Exception {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java Tue Jan 12 20:43:36 2016
@@ -29,12 +29,12 @@ package org.apache.http.client.utils;
import java.net.URI;
import java.net.URLEncoder;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.junit.Assert;
import org.junit.Test;
@@ -241,12 +241,12 @@ public class TestURIBuilder {
@Test
public void testBuildAddParametersUTF8() throws Exception {
- assertAddParameters(Consts.UTF_8);
+ assertAddParameters(StandardCharsets.UTF_8);
}
@Test
public void testBuildAddParametersISO88591() throws Exception {
- assertAddParameters(Consts.ISO_8859_1);
+ assertAddParameters(StandardCharsets.ISO_8859_1);
}
public void assertAddParameters(final Charset charset) throws Exception {
@@ -259,12 +259,12 @@ public class TestURIBuilder {
@Test
public void testBuildSetParametersUTF8() throws Exception {
- assertSetParameters(Consts.UTF_8);
+ assertSetParameters(StandardCharsets.UTF_8);
}
@Test
public void testBuildSetParametersISO88591() throws Exception {
- assertSetParameters(Consts.ISO_8859_1);
+ assertSetParameters(StandardCharsets.ISO_8859_1);
}
public void assertSetParameters(final Charset charset) throws Exception {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIUtils.java Tue Jan 12 20:43:36 2016
@@ -29,7 +29,7 @@ package org.apache.http.client.utils;
import java.net.URI;
import java.util.Arrays;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.conn.routing.HttpRoute;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURLEncodedUtils.java Tue Jan 12 20:43:36 2016
@@ -28,15 +28,14 @@
package org.apache.http.client.utils;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
-import org.apache.http.Consts;
-import org.apache.http.NameValuePair;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.HTTP;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.entity.ContentType;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.junit.Assert;
import org.junit.Test;
@@ -209,13 +208,13 @@ public class TestURLEncodedUtils {
parameters.add(new BasicNameValuePair("russian", ru_hello));
parameters.add(new BasicNameValuePair("swiss", ch_hello));
- final String s = URLEncodedUtils.format(parameters, Consts.UTF_8);
+ final String s = URLEncodedUtils.format(parameters, StandardCharsets.UTF_8);
Assert.assertEquals("russian=%D0%92%D1%81%D0%B5%D0%BC_%D0%BF%D1%80%D0%B8%D0%B2%D0%B5%D1%82" +
"&swiss=Gr%C3%BCezi_z%C3%A4m%C3%A4", s);
final StringEntity entity = new StringEntity(s, ContentType.create(
- URLEncodedUtils.CONTENT_TYPE, Consts.UTF_8));
+ URLEncodedUtils.CONTENT_TYPE, StandardCharsets.UTF_8));
final List <NameValuePair> result = URLEncodedUtils.parse(entity);
Assert.assertEquals(2, result.size());
assertNameValuePair(result.get(0), "russian", ru_hello);
@@ -230,9 +229,9 @@ public class TestURLEncodedUtils {
parameters.add(new BasicNameValuePair("russian", ru_hello));
parameters.add(new BasicNameValuePair("swiss", ch_hello));
- final String s = URLEncodedUtils.format(parameters, Consts.UTF_8);
+ final String s = URLEncodedUtils.format(parameters, StandardCharsets.UTF_8);
- final List <NameValuePair> result = URLEncodedUtils.parse(s, Consts.UTF_8);
+ final List <NameValuePair> result = URLEncodedUtils.parse(s, StandardCharsets.UTF_8);
Assert.assertEquals(2, result.size());
assertNameValuePair(result.get(0), "russian", ru_hello);
assertNameValuePair(result.get(1), "swiss", ch_hello);
@@ -255,15 +254,17 @@ public class TestURLEncodedUtils {
parameters.add(new BasicNameValuePair("russian", ru_hello));
parameters.add(new BasicNameValuePair("swiss", ch_hello));
- final String s = URLEncodedUtils.format(parameters, parameterSeparator, Consts.UTF_8);
+ final String s = URLEncodedUtils.format(parameters, parameterSeparator, StandardCharsets.UTF_8);
- final List <NameValuePair> result1 = URLEncodedUtils.parse(s, Consts.UTF_8);
+ final List<NameValuePair> result1 = URLEncodedUtils.parse(s, StandardCharsets.UTF_8);
Assert.assertEquals(2, result1.size());
assertNameValuePair(result1.get(0), "russian", ru_hello);
assertNameValuePair(result1.get(1), "swiss", ch_hello);
- final List <NameValuePair> result2 = URLEncodedUtils.parse(s, Consts.UTF_8, parameterSeparator);
- Assert.assertEquals(result1, result2);
+ final List<NameValuePair> result2 = URLEncodedUtils.parse(s, StandardCharsets.UTF_8, parameterSeparator);
+ Assert.assertEquals(2, result2.size());
+ assertNameValuePair(result2.get(0), "russian", ru_hello);
+ assertNameValuePair(result2.get(1), "swiss", ch_hello);
}
@Test
@@ -274,12 +275,12 @@ public class TestURLEncodedUtils {
parameters.add(new BasicNameValuePair("english", us_hello));
parameters.add(new BasicNameValuePair("swiss", ch_hello));
- final String s = URLEncodedUtils.format(parameters, HTTP.DEF_CONTENT_CHARSET);
+ final String s = URLEncodedUtils.format(parameters, StandardCharsets.ISO_8859_1);
Assert.assertEquals("english=hi+there&swiss=Gr%FCezi_z%E4m%E4", s);
final StringEntity entity = new StringEntity(s, ContentType.create(
- URLEncodedUtils.CONTENT_TYPE, HTTP.DEF_CONTENT_CHARSET));
+ URLEncodedUtils.CONTENT_TYPE, StandardCharsets.ISO_8859_1));
final List <NameValuePair> result = URLEncodedUtils.parse(entity);
Assert.assertEquals(2, result.size());
assertNameValuePair(result.get(0), "english", us_hello);
@@ -303,48 +304,48 @@ public class TestURLEncodedUtils {
@Test
public void testFormat() throws Exception {
final List <NameValuePair> params = new ArrayList<>();
- Assert.assertEquals(0, URLEncodedUtils.format(params, Consts.ASCII).length());
+ Assert.assertEquals(0, URLEncodedUtils.format(params, StandardCharsets.US_ASCII).length());
params.clear();
params.add(new BasicNameValuePair("Name0", null));
- Assert.assertEquals("Name0", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name0", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name1", "Value1"));
- Assert.assertEquals("Name1=Value1", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name1=Value1", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name2", ""));
- Assert.assertEquals("Name2=", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name2=", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name4", "Value 4&"));
- Assert.assertEquals("Name4=Value+4%26", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name4=Value+4%26", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name4", "Value+4&"));
- Assert.assertEquals("Name4=Value%2B4%26", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name4=Value%2B4%26", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name4", "Value 4& =4"));
- Assert.assertEquals("Name4=Value+4%26+%3D4", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name4=Value+4%26+%3D4", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name5", "aaa"));
params.add(new BasicNameValuePair("Name6", "bbb"));
- Assert.assertEquals("Name5=aaa&Name6=bbb", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name5=aaa&Name6=bbb", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name7", "aaa"));
params.add(new BasicNameValuePair("Name7", "b,b"));
params.add(new BasicNameValuePair("Name7", "ccc"));
- Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, Consts.ASCII));
- Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, '&', Consts.ASCII));
- Assert.assertEquals("Name7=aaa;Name7=b%2Cb;Name7=ccc", URLEncodedUtils.format(params, ';', Consts.ASCII));
+ Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
+ Assert.assertEquals("Name7=aaa&Name7=b%2Cb&Name7=ccc", URLEncodedUtils.format(params, '&', StandardCharsets.US_ASCII));
+ Assert.assertEquals("Name7=aaa;Name7=b%2Cb;Name7=ccc", URLEncodedUtils.format(params, ';', StandardCharsets.US_ASCII));
params.clear();
params.add(new BasicNameValuePair("Name8", "xx, yy ,zz"));
- Assert.assertEquals("Name8=xx%2C++yy++%2Czz", URLEncodedUtils.format(params, Consts.ASCII));
+ Assert.assertEquals("Name8=xx%2C++yy++%2Czz", URLEncodedUtils.format(params, StandardCharsets.US_ASCII));
}
@Test
@@ -393,7 +394,7 @@ public class TestURLEncodedUtils {
}
private List <NameValuePair> parse (final String params) {
- return URLEncodedUtils.parse(params, Consts.UTF_8);
+ return URLEncodedUtils.parse(params, StandardCharsets.UTF_8);
}
private List <NameValuePair> parseString (final String uri) throws Exception {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestExceptions.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestExceptions.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestExceptions.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/TestExceptions.java Tue Jan 12 20:43:36 2016
@@ -27,13 +27,13 @@
package org.apache.http.conn;
-import org.apache.http.HttpHost;
-import org.junit.Assert;
-import org.junit.Test;
-
import java.io.IOException;
import java.net.InetAddress;
+import org.apache.hc.core5.http.HttpHost;
+import org.junit.Assert;
+import org.junit.Test;
+
/**
* Unit tests for exceptions.
* Trivial, but it looks better in the Clover reports.
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestHttpRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestHttpRoute.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestHttpRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestHttpRoute.java Tue Jan 12 20:43:36 2016
@@ -32,7 +32,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.conn.routing.RouteInfo.LayerType;
import org.apache.http.conn.routing.RouteInfo.TunnelType;
import org.junit.Assert;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteDirector.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteDirector.java Tue Jan 12 20:43:36 2016
@@ -29,7 +29,7 @@ package org.apache.http.conn.routing;
import java.net.InetAddress;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.conn.routing.RouteInfo.LayerType;
import org.apache.http.conn.routing.RouteInfo.TunnelType;
import org.junit.Assert;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/routing/TestRouteTracker.java Tue Jan 12 20:43:36 2016
@@ -31,7 +31,7 @@ import java.net.InetAddress;
import java.util.HashSet;
import java.util.Set;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.conn.routing.RouteInfo.LayerType;
import org.apache.http.conn.routing.RouteInfo.TunnelType;
import org.junit.Assert;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Tue Jan 12 20:43:36 2016
@@ -41,15 +41,16 @@ import javax.net.ssl.SSLServerSocket;
import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
-import org.apache.http.HttpHost;
-import org.apache.http.impl.bootstrap.HttpServer;
-import org.apache.http.impl.bootstrap.SSLServerSetupHandler;
-import org.apache.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.bootstrap.io.HttpServer;
+import org.apache.hc.core5.http.bootstrap.io.SSLServerSetupHandler;
+import org.apache.hc.core5.http.bootstrap.io.ServerBootstrap;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.ssl.SSLContexts;
+import org.apache.hc.core5.ssl.TrustStrategy;
import org.apache.http.localserver.LocalServerTestBase;
import org.apache.http.localserver.SSLTestContexts;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.ssl.SSLContexts;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixListParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixListParser.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixListParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixListParser.java Tue Jan 12 20:43:36 2016
@@ -29,11 +29,11 @@ package org.apache.http.conn.util;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.http.Consts;
import org.junit.Assert;
import org.junit.Test;
@@ -47,7 +47,7 @@ public class TestPublicSuffixListParser
final PublicSuffixList suffixList;
try {
final PublicSuffixListParser parser = new PublicSuffixListParser();
- suffixList = parser.parse(new InputStreamReader(in, Consts.UTF_8));
+ suffixList = parser.parse(new InputStreamReader(in, StandardCharsets.UTF_8));
} finally {
in.close();
}
@@ -64,7 +64,7 @@ public class TestPublicSuffixListParser
final List<PublicSuffixList> suffixLists;
try {
final PublicSuffixListParser parser = new PublicSuffixListParser();
- suffixLists = parser.parseByType(new InputStreamReader(in, Consts.UTF_8));
+ suffixLists = parser.parseByType(new InputStreamReader(in, StandardCharsets.UTF_8));
} finally {
in.close();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixMatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixMatcher.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixMatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/util/TestPublicSuffixMatcher.java Tue Jan 12 20:43:36 2016
@@ -29,8 +29,8 @@ package org.apache.http.conn.util;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
-import org.apache.http.Consts;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +49,7 @@ public class TestPublicSuffixMatcher {
final PublicSuffixList suffixList;
try {
final PublicSuffixListParser parser = new PublicSuffixListParser();
- suffixList = parser.parse(new InputStreamReader(in, Consts.UTF_8));
+ suffixList = parser.parse(new InputStreamReader(in, StandardCharsets.UTF_8));
} finally {
in.close();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestAuthChallengeParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestAuthChallengeParser.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestAuthChallengeParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestAuthChallengeParser.java Tue Jan 12 20:43:36 2016
@@ -28,12 +28,12 @@ package org.apache.http.impl.auth;
import java.util.List;
-import org.apache.http.NameValuePair;
-import org.apache.http.ParseException;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.apache.hc.core5.http.message.ParserCursor;
+import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.http.auth.AuthChallenge;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.message.ParserCursor;
-import org.apache.http.util.CharArrayBuffer;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -160,7 +160,7 @@ public class TestAuthChallengeParser {
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
Assert.assertEquals(1, params.size());
- Assert.assertEquals(new BasicNameValuePair("realm", "blah"), params.get(0));
+ assertNameValuePair(new BasicNameValuePair("realm", "blah"), params.get(0));
}
@Test
@@ -177,7 +177,7 @@ public class TestAuthChallengeParser {
final List<NameValuePair> params = challenge1.getParams();
Assert.assertNotNull(params);
Assert.assertEquals(1, params.size());
- Assert.assertEquals(new BasicNameValuePair("realm", "blah"), params.get(0));
+ assertNameValuePair(new BasicNameValuePair("realm", "blah"), params.get(0));
}
@Test
@@ -217,9 +217,9 @@ public class TestAuthChallengeParser {
final List<NameValuePair> params1 = challenge1.getParams();
Assert.assertNotNull(params1);
Assert.assertEquals(3, params1.size());
- Assert.assertEquals(new BasicNameValuePair("realm", "blah"), params1.get(0));
- Assert.assertEquals(new BasicNameValuePair("param1", "this"), params1.get(1));
- Assert.assertEquals(new BasicNameValuePair("param2", "that"), params1.get(2));
+ assertNameValuePair(new BasicNameValuePair("realm", "blah"), params1.get(0));
+ assertNameValuePair(new BasicNameValuePair("param1", "this"), params1.get(1));
+ assertNameValuePair(new BasicNameValuePair("param2", "that"), params1.get(2));
final AuthChallenge challenge2 = challenges.get(1);
Assert.assertEquals("Basic", challenge2.getScheme());
@@ -227,10 +227,10 @@ public class TestAuthChallengeParser {
final List<NameValuePair> params2 = challenge2.getParams();
Assert.assertNotNull(params2);
Assert.assertEquals(4, params2.size());
- Assert.assertEquals(new BasicNameValuePair("realm", "\"yada\""), params2.get(0));
- Assert.assertEquals(new BasicNameValuePair("this", null), params2.get(1));
- Assert.assertEquals(new BasicNameValuePair("that", ""), params2.get(2));
- Assert.assertEquals(new BasicNameValuePair("this-and-that", null), params2.get(3));
+ assertNameValuePair(new BasicNameValuePair("realm", "\"yada\""), params2.get(0));
+ assertNameValuePair(new BasicNameValuePair("this", null), params2.get(1));
+ assertNameValuePair(new BasicNameValuePair("that", ""), params2.get(2));
+ assertNameValuePair(new BasicNameValuePair("this-and-that", null), params2.get(3));
}
@Test
@@ -302,8 +302,16 @@ public class TestAuthChallengeParser {
final List<NameValuePair> params1 = challenge1.getParams();
Assert.assertNotNull(params1);
Assert.assertEquals(2, params1.size());
- Assert.assertEquals(new BasicNameValuePair("blah", null), params1.get(0));
- Assert.assertEquals(new BasicNameValuePair("blah", null), params1.get(1));
+ assertNameValuePair(new BasicNameValuePair("blah", null), params1.get(0));
+ assertNameValuePair(new BasicNameValuePair("blah", null), params1.get(1));
+ }
+
+ private static void assertNameValuePair (
+ final NameValuePair expected,
+ final NameValuePair result) {
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.getName(), result.getName());
+ Assert.assertEquals(expected.getValue(), result.getValue());
}
}
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=1724315&r1=1724314&r2=1724315&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 Tue Jan 12 20:43:36 2016
@@ -30,21 +30,21 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.commons.codec.binary.Base64;
-import org.apache.http.Consts;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.ParserCursor;
+import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.http.auth.AuthChallenge;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.ParserCursor;
-import org.apache.http.util.CharArrayBuffer;
-import org.apache.http.util.EncodingUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -53,7 +53,7 @@ import org.junit.Test;
*/
public class TestBasicScheme {
- private static AuthChallenge parse(final String s) {
+ private static AuthChallenge parse(final String s) throws ParseException {
final CharArrayBuffer buffer = new CharArrayBuffer(s.length());
buffer.append(s);
final ParserCursor cursor = new ParserCursor(0, buffer.length());
@@ -84,7 +84,7 @@ public class TestBasicScheme {
final UsernamePasswordCredentials creds = new UsernamePasswordCredentials("dh", buffer.toString().toCharArray());
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
credentialsProvider.setCredentials(authScope, creds);
- final BasicScheme authscheme = new BasicScheme(Consts.ISO_8859_1);
+ final BasicScheme authscheme = new BasicScheme(StandardCharsets.ISO_8859_1);
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final HttpRequest request = new BasicHttpRequest("GET", "/");
@@ -109,8 +109,9 @@ public class TestBasicScheme {
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final String authResponse = authscheme.generateAuthResponse(host, request, null);
- final String expected = "Basic " + EncodingUtils.getAsciiString(
- Base64.encodeBase64(EncodingUtils.getAsciiBytes("testuser:testpass")));
+ final String expected = "Basic " + new String(
+ Base64.encodeBase64("testuser:testpass".getBytes(StandardCharsets.US_ASCII)),
+ StandardCharsets.US_ASCII);
Assert.assertEquals(expected, authResponse);
Assert.assertEquals("test", authscheme.getRealm());
Assert.assertTrue(authscheme.isChallengeComplete());
@@ -134,8 +135,9 @@ public class TestBasicScheme {
Assert.assertTrue(authscheme.isResponseReady(host, credentialsProvider, null));
final String authResponse = authscheme.generateAuthResponse(host, request, null);
- final String expected = "Basic " + EncodingUtils.getAsciiString(
- Base64.encodeBase64(EncodingUtils.getAsciiBytes("testuser:testpass")));
+ final String expected = "Basic " + new String(
+ Base64.encodeBase64("testuser:testpass".getBytes(StandardCharsets.US_ASCII)),
+ StandardCharsets.US_ASCII);
Assert.assertEquals(expected, authResponse);
Assert.assertEquals("test", authscheme.getRealm());
Assert.assertTrue(authscheme.isChallengeComplete());
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java Tue Jan 12 20:43:36 2016
@@ -31,15 +31,22 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.http.HeaderElement;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.entity.InputStreamEntity;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicHeaderValueParser;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.ParserCursor;
+import org.apache.hc.core5.util.CharArrayBuffer;
import org.apache.http.auth.AuthChallenge;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthScope;
@@ -47,15 +54,7 @@ import org.apache.http.auth.Authenticati
import org.apache.http.auth.Credentials;
import org.apache.http.auth.MalformedChallengeException;
import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.message.BasicHeaderValueParser;
-import org.apache.http.message.BasicHttpEntityEnclosingRequest;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.ParserCursor;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.CharArrayBuffer;
import org.junit.Assert;
import org.junit.Test;
@@ -64,7 +63,7 @@ import org.junit.Test;
*/
public class TestDigestScheme {
- private static AuthChallenge parse(final String s) {
+ private static AuthChallenge parse(final String s) throws ParseException {
final CharArrayBuffer buffer = new CharArrayBuffer(s.length());
buffer.append(s);
final ParserCursor cursor = new ParserCursor(0, buffer.length());
@@ -434,11 +433,13 @@ public class TestDigestScheme {
Assert.assertFalse(authscheme.isChallengeComplete());
}
- private static Map<String, String> parseAuthResponse(final String authResponse) {
+ private static Map<String, String> parseAuthResponse(final String authResponse) throws ParseException {
if (!authResponse.startsWith("Digest ")) {
return null;
}
- final HeaderElement[] elements = BasicHeaderValueParser.parseElements(authResponse.substring(7), null);
+ final String s = authResponse.substring(7);
+ final ParserCursor cursor = new ParserCursor(0, s.length());
+ final HeaderElement[] elements = BasicHeaderValueParser.INSTANCE.parseElements(s, cursor);
final Map<String, String> map = new HashMap<>(elements.length);
for (final HeaderElement element : elements) {
map.put(element.getName(), element.getValue());
@@ -582,8 +583,8 @@ public class TestDigestScheme {
@Test
public void testDigestAuthenticationQopAuthInt() throws Exception {
- final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("Post", "/");
- request.setEntity(new StringEntity("abc\u00e4\u00f6\u00fcabc", HTTP.DEF_CONTENT_CHARSET));
+ final HttpRequest request = new BasicHttpRequest("Post", "/");
+ request.setEntity(new StringEntity("abc\u00e4\u00f6\u00fcabc", StandardCharsets.ISO_8859_1));
final HttpHost host = new HttpHost("somehost", 80);
final AuthScope authScope = new AuthScope(host, "realm1", null);
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
@@ -610,7 +611,7 @@ public class TestDigestScheme {
@Test
public void testDigestAuthenticationQopAuthIntNullEntity() throws Exception {
- final HttpRequest request = new BasicHttpEntityEnclosingRequest("Post", "/");
+ final HttpRequest request = new BasicHttpRequest("Post", "/");
final HttpHost host = new HttpHost("somehost", 80);
final AuthScope authScope = new AuthScope(host, "realm1", null);
final BasicCredentialsProvider credentialsProvider = new BasicCredentialsProvider();
@@ -618,7 +619,7 @@ public class TestDigestScheme {
credentialsProvider.setCredentials(authScope, creds);
final String challenge = "Digest realm=\"realm1\", nonce=\"f2a3f18799759d4f1a1c068b92b573cb\", " +
- "qop=\"auth,auth-int\"";
+ "qop=\"auth-int\"";
final AuthChallenge authChallenge = parse(challenge);
final DigestScheme authscheme = new DigestScheme();
authscheme.processChallenge(authChallenge, null);
@@ -637,7 +638,7 @@ public class TestDigestScheme {
@Test
public void testDigestAuthenticationQopAuthOrAuthIntNonRepeatableEntity() throws Exception {
- final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("Post", "/");
+ final HttpRequest request = new BasicHttpRequest("Post", "/");
request.setEntity(new InputStreamEntity(new ByteArrayInputStream(new byte[] {'a'}), -1));
final HttpHost host = new HttpHost("somehost", 80);
final AuthScope authScope = new AuthScope(host, "realm1", null);
@@ -686,7 +687,7 @@ public class TestDigestScheme {
@Test(expected=AuthenticationException.class)
public void testDigestAuthenticationQopIntOnlyNonRepeatableEntity() throws Exception {
- final HttpEntityEnclosingRequest request = new BasicHttpEntityEnclosingRequest("Post", "/");
+ final HttpRequest request = new BasicHttpRequest("Post", "/");
request.setEntity(new InputStreamEntity(new ByteArrayInputStream(new byte[] {'a'}), -1));
final HttpHost host = new HttpHost("somehost", 80);
final AuthScope authScope = new AuthScope(host, "realm1", null);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestHttpAuthenticator.java Tue Jan 12 20:43:36 2016
@@ -29,16 +29,24 @@ package org.apache.http.impl.auth;
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.HttpVersion;
+import org.apache.hc.core5.http.HttpHeaders;
+import org.apache.hc.core5.http.HttpHost;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpStatus;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.config.Lookup;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.message.BasicHeader;
+import org.apache.hc.core5.http.message.BasicHttpRequest;
+import org.apache.hc.core5.http.message.BasicHttpResponse;
+import org.apache.hc.core5.http.protocol.BasicHttpContext;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
+import org.apache.http.auth.AuthExchange;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.AuthExchange;
import org.apache.http.auth.AuthenticationException;
import org.apache.http.auth.ChallengeType;
import org.apache.http.auth.Credentials;
@@ -46,15 +54,7 @@ import org.apache.http.auth.CredentialsP
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.AuthCache;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Lookup;
-import org.apache.http.config.RegistryBuilder;
import org.apache.http.impl.client.DefaultAuthenticationStrategy;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicHttpRequest;
-import org.apache.http.message.BasicHttpResponse;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.protocol.HttpCoreContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java Tue Jan 12 20:43:36 2016
@@ -26,7 +26,8 @@
*/
package org.apache.http.impl.auth;
-import org.apache.http.Consts;
+import java.nio.charset.StandardCharsets;
+
import org.junit.Assert;
import org.junit.Test;
@@ -70,7 +71,7 @@ public class TestNTLMEngineImpl {
static void checkMD4(final String input, final String hexOutput) throws Exception {
NTLMEngineImpl.MD4 md4;
md4 = new NTLMEngineImpl.MD4();
- md4.update(input.getBytes(Consts.ASCII));
+ md4.update(input.getBytes(StandardCharsets.US_ASCII));
final byte[] answer = md4.getOutput();
final byte[] correctAnswer = toBytes(hexOutput);
if (answer.length != correctAnswer.length) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/MockConnPoolControl.java Tue Jan 12 20:43:36 2016
@@ -29,9 +29,9 @@ package org.apache.http.impl.client;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.hc.core5.pool.ConnPoolControl;
+import org.apache.hc.core5.pool.PoolStats;
import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.pool.ConnPoolControl;
-import org.apache.http.pool.PoolStats;
public final class MockConnPoolControl implements ConnPoolControl<HttpRoute> {
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAIMDBackoffManager.java Tue Jan 12 20:43:36 2016
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertTru
import java.util.Random;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.client.BackoffManager;
import org.apache.http.conn.routing.HttpRoute;
import org.junit.Before;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAbstractResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAbstractResponseHandler.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAbstractResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestAbstractResponseHandler.java Tue Jan 12 20:43:36 2016
@@ -30,14 +30,14 @@ package org.apache.http.impl.client;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.StatusLine;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.entity.EntityUtils;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicStatusLine;
import org.apache.http.client.HttpResponseException;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicStatusLine;
-import org.apache.http.util.EntityUtils;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -59,7 +59,7 @@ public class TestAbstractResponseHandler
@Override
public Integer handleEntity(final HttpEntity entity) throws IOException {
- return Integer.valueOf(EntityUtils.toString(entity));
+ return Integer.valueOf(new String(EntityUtils.toByteArray(entity)));
}
};
final Integer number = handler.handleResponse(response);
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=1724315&r1=1724314&r2=1724315&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 Tue Jan 12 20:43:36 2016
@@ -32,6 +32,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.hc.core5.http.config.Registry;
+import org.apache.hc.core5.http.config.RegistryBuilder;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
import org.apache.http.auth.AuthChallenge;
import org.apache.http.auth.AuthScheme;
import org.apache.http.auth.AuthSchemeProvider;
@@ -41,13 +44,10 @@ import org.apache.http.auth.UsernamePass
import org.apache.http.client.config.AuthSchemes;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
import org.apache.http.impl.auth.BasicScheme;
import org.apache.http.impl.auth.BasicSchemeFactory;
import org.apache.http.impl.auth.DigestScheme;
import org.apache.http.impl.auth.DigestSchemeFactory;
-import org.apache.http.message.BasicNameValuePair;
import org.junit.Assert;
import org.junit.Test;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicAuthCache.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicAuthCache.java Tue Jan 12 20:43:36 2016
@@ -27,7 +27,7 @@
package org.apache.http.impl.client;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.auth.AuthScheme;
import org.apache.http.conn.SchemePortResolver;
import org.apache.http.impl.auth.BasicScheme;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java Tue Jan 12 20:43:36 2016
@@ -26,7 +26,7 @@
*/
package org.apache.http.impl.client;
-import org.apache.http.HttpHost;
+import org.apache.hc.core5.http.HttpHost;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.UsernamePasswordCredentials;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java?rev=1724315&r1=1724314&r2=1724315&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestBasicResponseHandler.java Tue Jan 12 20:43:36 2016
@@ -29,13 +29,13 @@ package org.apache.http.impl.client;
import java.io.InputStream;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpVersion;
-import org.apache.http.StatusLine;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpResponse;
+import org.apache.hc.core5.http.HttpVersion;
+import org.apache.hc.core5.http.StatusLine;
+import org.apache.hc.core5.http.entity.StringEntity;
+import org.apache.hc.core5.http.message.BasicStatusLine;
import org.apache.http.client.HttpResponseException;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicStatusLine;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;