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 2017/01/07 11:15:38 UTC
svn commit: r1777760 [2/2] - in /httpcomponents/httpcore/trunk:
httpcore5-h2/src/examples/org/apache/hc/core5/http/examples/
httpcore5-h2/src/main/java/org/apache/hc/core5/http2/impl/nio/
httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/...
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java?rev=1777760&r1=1777759&r2=1777760&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpClientConnection.java Sat Jan 7 11:15:38 2017
@@ -83,13 +83,13 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = conn.receiveResponseHeader();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
Assert.assertTrue(response.containsHeader("User-Agent"));
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
}
@Test
@@ -100,21 +100,21 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = conn.receiveResponseHeader();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
Assert.assertTrue(response.containsHeader("Server"));
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
conn.receiveResponseEntity(response);
final HttpEntity entity = response.getEntity();
Assert.assertNotNull(entity);
Assert.assertEquals(3, entity.getContentLength());
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final InputStream content = entity.getContent();
Assert.assertNotNull(content);
Assert.assertTrue(content instanceof ContentLengthInputStream);
@@ -129,14 +129,14 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = conn.receiveResponseHeader();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
Assert.assertTrue(response.containsHeader("Server"));
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
conn.receiveResponseEntity(response);
@@ -144,7 +144,7 @@ public class TestDefaultBHttpClientConne
Assert.assertNotNull(entity);
Assert.assertEquals(-1, entity.getContentLength());
Assert.assertEquals(true, entity.isChunked());
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final InputStream content = entity.getContent();
Assert.assertNotNull(content);
Assert.assertTrue(content instanceof ChunkedInputStream);
@@ -158,14 +158,14 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = conn.receiveResponseHeader();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
Assert.assertTrue(response.containsHeader("Server"));
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
conn.receiveResponseEntity(response);
}
@@ -178,14 +178,14 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = conn.receiveResponseHeader();
Assert.assertNotNull(response);
Assert.assertEquals(200, response.getCode());
Assert.assertTrue(response.containsHeader("Server"));
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
conn.receiveResponseEntity(response);
@@ -200,7 +200,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/stuff");
request.addHeader("User-Agent", "test");
@@ -208,7 +208,7 @@ public class TestDefaultBHttpClientConne
conn.sendRequestHeader(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("GET /stuff HTTP/1.1\r\nUser-Agent: test\r\n\r\n", s);
}
@@ -220,7 +220,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -231,7 +231,7 @@ public class TestDefaultBHttpClientConne
conn.sendRequestEntity(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\nContent-Length: 3\r\n\r\n123", s);
}
@@ -243,7 +243,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -254,7 +254,7 @@ public class TestDefaultBHttpClientConne
conn.sendRequestEntity(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\nTransfer-Encoding: " +
"chunked\r\n\r\n3\r\n123\r\n0\r\n\r\n", s);
@@ -267,7 +267,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -284,7 +284,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -293,7 +293,7 @@ public class TestDefaultBHttpClientConne
conn.sendRequestEntity(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\n\r\n", s);
}
@@ -305,7 +305,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -318,7 +318,7 @@ public class TestDefaultBHttpClientConne
conn.terminateRequest(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\nTransfer-Encoding: " +
"chunked\r\n\r\n0\r\n\r\n", s);
@@ -332,7 +332,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -345,7 +345,7 @@ public class TestDefaultBHttpClientConne
conn.terminateRequest(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\nContent-Length: " +
"3\r\n\r\n123", s);
@@ -359,7 +359,7 @@ public class TestDefaultBHttpClientConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = new BasicClassicHttpRequest("POST", "/stuff");
request.addHeader("User-Agent", "test");
@@ -372,7 +372,7 @@ public class TestDefaultBHttpClientConne
conn.terminateRequest(request);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("POST /stuff HTTP/1.1\r\nUser-Agent: test\r\nContent-Length: " +
"3000\r\n\r\n", s);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java?rev=1777760&r1=1777759&r2=1777760&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestDefaultBHttpServerConnection.java Sat Jan 7 11:15:38 2017
@@ -82,14 +82,14 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = conn.receiveRequestHeader();
Assert.assertNotNull(request);
Assert.assertEquals("/", request.getPath());
Assert.assertEquals("GET", request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
}
@Test
@@ -100,7 +100,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = conn.receiveRequestHeader();
@@ -109,14 +109,14 @@ public class TestDefaultBHttpServerConne
Assert.assertEquals("POST", request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
conn.receiveRequestEntity(request);
final HttpEntity entity = request.getEntity();
Assert.assertNotNull(entity);
Assert.assertEquals(3, entity.getContentLength());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final InputStream content = entity.getContent();
Assert.assertNotNull(content);
Assert.assertTrue(content instanceof ContentLengthInputStream);
@@ -131,7 +131,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = conn.receiveRequestHeader();
@@ -140,7 +140,7 @@ public class TestDefaultBHttpServerConne
Assert.assertEquals("POST", request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
conn.receiveRequestEntity(request);
@@ -148,7 +148,7 @@ public class TestDefaultBHttpServerConne
Assert.assertNotNull(entity);
Assert.assertEquals(-1, entity.getContentLength());
Assert.assertEquals(true, entity.isChunked());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
final InputStream content = entity.getContent();
Assert.assertNotNull(content);
Assert.assertTrue(content instanceof ChunkedInputStream);
@@ -163,7 +163,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = conn.receiveRequestHeader();
@@ -172,7 +172,7 @@ public class TestDefaultBHttpServerConne
Assert.assertEquals("POST", request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
conn.receiveRequestEntity(request);
}
@@ -185,7 +185,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getRequestCount());
final ClassicHttpRequest request = conn.receiveRequestHeader();
@@ -194,7 +194,7 @@ public class TestDefaultBHttpServerConne
Assert.assertEquals("POST", request.getMethod());
Assert.assertTrue(request.containsHeader("User-Agent"));
Assert.assertNull(request.getEntity());
- Assert.assertEquals(1, conn.getMetrics().getRequestCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getRequestCount());
conn.receiveRequestEntity(request);
@@ -209,7 +209,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader("User-Agent", "test");
@@ -217,7 +217,7 @@ public class TestDefaultBHttpServerConne
conn.sendResponseHeader(response);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("HTTP/1.1 200 OK\r\nUser-Agent: test\r\n\r\n", s);
}
@@ -229,14 +229,14 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(100, "Go on");
conn.sendResponseHeader(response);
conn.flush();
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("HTTP/1.1 100 Go on\r\n\r\n", s);
}
@@ -248,7 +248,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader("Server", "test");
@@ -259,7 +259,7 @@ public class TestDefaultBHttpServerConne
conn.sendResponseEntity(response);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("HTTP/1.1 200 OK\r\nServer: test\r\nContent-Length: 3\r\n\r\n123", s);
}
@@ -271,7 +271,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader("Server", "test");
@@ -282,7 +282,7 @@ public class TestDefaultBHttpServerConne
conn.sendResponseEntity(response);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("HTTP/1.1 200 OK\r\nServer: test\r\nTransfer-Encoding: " +
"chunked\r\n\r\n3\r\n123\r\n0\r\n\r\n", s);
@@ -295,7 +295,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader("Server", "test");
@@ -314,7 +314,7 @@ public class TestDefaultBHttpServerConne
conn.bind(socket);
- Assert.assertEquals(0, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(0, conn.getEndpointDetails().getResponseCount());
final ClassicHttpResponse response = new BasicClassicHttpResponse(200, "OK");
response.addHeader("Server", "test");
@@ -323,7 +323,7 @@ public class TestDefaultBHttpServerConne
conn.sendResponseEntity(response);
conn.flush();
- Assert.assertEquals(1, conn.getMetrics().getResponseCount());
+ Assert.assertEquals(1, conn.getEndpointDetails().getResponseCount());
final String s = new String(outstream.toByteArray(), "ASCII");
Assert.assertEquals("HTTP/1.1 200 OK\r\nServer: test\r\n\r\n", s);
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java?rev=1777760&r1=1777759&r2=1777760&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpRequestExecutor.java Sat Jan 7 11:15:38 2017
@@ -29,11 +29,11 @@ package org.apache.hc.core5.http.impl.io
import java.io.IOException;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.HeaderElements;
import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.http.ClassicHttpRequest;
-import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.http.message.BasicClassicHttpRequest;
@@ -135,7 +135,6 @@ public class TestHttpRequestExecutor {
executor.postProcess(response, httprocessor, context);
Mockito.verify(httprocessor).process(response, response.getEntity(), context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
}
@@ -167,7 +166,6 @@ public class TestHttpRequestExecutor {
executor.postProcess(response, httprocessor, context);
Mockito.verify(httprocessor).process(response, response.getEntity(), context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java?rev=1777760&r1=1777759&r2=1777760&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/impl/io/TestHttpService.java Sat Jan 7 11:15:38 2017
@@ -110,7 +110,6 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -139,7 +138,6 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -173,7 +171,6 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_NOT_IMPLEMENTED, response.getCode());
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -223,7 +220,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -264,7 +260,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -295,7 +290,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(error, context.getResponse());
@@ -326,7 +320,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(error, context.getResponse());
@@ -357,7 +350,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(error, context.getResponse());
@@ -385,7 +377,6 @@ public class TestHttpService {
Assert.assertEquals(HttpStatus.SC_OK, response.getCode());
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Assert.assertSame(response, context.getResponse());
@@ -410,7 +401,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Mockito.verify(httprocessor).process(response, response.getEntity(), context);
@@ -435,7 +425,6 @@ public class TestHttpService {
httpservice.handleRequest(conn, context);
- Assert.assertSame(conn, context.getConnection());
Assert.assertSame(request, context.getRequest());
Mockito.verify(httprocessor).process(response, response.getEntity(), context);
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java?rev=1777760&r1=1777759&r2=1777760&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/http/protocol/TestStandardInterceptors.java Sat Jan 7 11:15:38 2017
@@ -27,14 +27,11 @@
package org.apache.hc.core5.http.protocol;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HeaderElements;
-import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.HttpHeaders;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpVersion;
@@ -48,7 +45,6 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.net.URIAuthority;
import org.junit.Assert;
import org.junit.Test;
-import org.mockito.Mockito;
public class TestStandardInterceptors {
@@ -405,33 +401,6 @@ public class TestStandardInterceptors {
}
@Test
- public void testRequestTargetHostFallback() throws Exception {
- final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
- final InetAddress address = Mockito.mock(InetAddress.class);
- Mockito.when(address.getHostName()).thenReturn("somehost");
- final HttpConnection conn = Mockito.mock(HttpConnection.class);
- Mockito.when(conn.getRemoteAddress()).thenReturn(new InetSocketAddress(address, 1234));
- context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
- final RequestTargetHost interceptor = new RequestTargetHost();
- interceptor.process(request, request.getEntity(), context);
- final Header header = request.getFirstHeader(HttpHeaders.HOST);
- Assert.assertNotNull(header);
- Assert.assertEquals("somehost:1234", header.getValue());
- }
-
- @Test(expected=ProtocolException.class)
- public void testRequestTargetHostFallbackFailure() throws Exception {
- final HttpContext context = new BasicHttpContext(null);
- final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");
- final HttpConnection conn = Mockito.mock(HttpConnection.class);
- Mockito.when(conn.getRemoteAddress()).thenReturn(null);
- context.setAttribute(HttpCoreContext.HTTP_CONNECTION, conn);
- final RequestTargetHost interceptor = new RequestTargetHost();
- interceptor.process(request, request.getEntity(), context);
- }
-
- @Test
public void testRequestTargetHostNotGenerated() throws Exception {
final HttpContext context = new BasicHttpContext(null);
final BasicClassicHttpRequest request = new BasicClassicHttpRequest("GET", "/");