You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by se...@apache.org on 2012/11/08 02:35:22 UTC
svn commit: r1406889 - in
/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http:
impl/pool/TestBasicConnPool.java protocol/TestHttpRequestExecutor.java
protocol/TestHttpService.java
Author: sebb
Date: Thu Nov 8 01:35:21 2012
New Revision: 1406889
URL: http://svn.apache.org/viewvc?rev=1406889&view=rev
Log:
Fix some obvious boxing in test classes
Modified:
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/pool/TestBasicConnPool.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/pool/TestBasicConnPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/pool/TestBasicConnPool.java?rev=1406889&r1=1406888&r2=1406889&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/pool/TestBasicConnPool.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/impl/pool/TestBasicConnPool.java Thu Nov 8 01:35:21 2012
@@ -27,6 +27,7 @@
package org.apache.http.impl.pool;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.net.ServerSocket;
@@ -88,7 +89,7 @@ public class TestBasicConnPool {
host = new HttpHost("localhost", serverPort, "http");
conn = connFactory.create(host);
- assertEquals(true, conn.isOpen());
+ assertTrue(conn.isOpen());
assertEquals(100, conn.getSocketTimeout());
}
@@ -100,7 +101,7 @@ public class TestBasicConnPool {
host = new HttpHost("localhost", sslServerPort, "https");
conn = connFactory.create(host);
- assertEquals(true, conn.isOpen());
+ assertTrue(conn.isOpen());
assertEquals(100, conn.getSocketTimeout());
}
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java?rev=1406889&r1=1406888&r2=1406889&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpRequestExecutor.java Thu Nov 8 01:35:21 2012
@@ -307,7 +307,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 100, "Continue"),
new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(true);
+ Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -340,7 +340,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 402, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(true);
+ Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
@@ -371,7 +371,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 101, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(true);
+ Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.TRUE);
try {
executor.execute(request, conn, context);
@@ -399,7 +399,7 @@ public class TestHttpRequestExecutor {
Mockito.when(conn.receiveResponseHeader()).thenReturn(
new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK"));
- Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(false);
+ Mockito.when(conn.isResponseAvailable(Mockito.anyInt())).thenReturn(Boolean.FALSE);
HttpResponse response = executor.execute(request, conn, context);
Mockito.verify(conn).sendRequestHeader(request);
Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java?rev=1406889&r1=1406888&r2=1406889&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/protocol/TestHttpService.java Thu Nov 8 01:35:21 2012
@@ -85,7 +85,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -121,7 +121,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -146,7 +146,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -175,7 +175,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -220,7 +220,7 @@ public class TestHttpService {
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 100, context)).thenReturn(resp100);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -276,7 +276,7 @@ public class TestHttpService {
Mockito.when(conn.receiveRequestHeader()).thenReturn(request);
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 100, "Continue");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 100, context)).thenReturn(response);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -323,7 +323,7 @@ public class TestHttpService {
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, 500, "Oppsie");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_0, 500, context)).thenReturn(response);
Mockito.doThrow(new HttpException("Oopsie")).when(expectationVerifier).verify(request, resp100, context);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -367,7 +367,7 @@ public class TestHttpService {
Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new MethodNotSupportedException("whatever")).when(
requestHandler).handle(request, response, context);
- Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -410,7 +410,7 @@ public class TestHttpService {
Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new UnsupportedHttpVersionException()).when(
requestHandler).handle(request, response, context);
- Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -453,7 +453,7 @@ public class TestHttpService {
Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
Mockito.doThrow(new ProtocolException("oh, this world is wrong")).when(
requestHandler).handle(request, response, context);
- Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(false);
+ Mockito.when(connReuseStrategy.keepAlive(error, context)).thenReturn(Boolean.FALSE);
httpservice.handleRequest(conn, context);
@@ -491,7 +491,7 @@ public class TestHttpService {
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
Mockito.when(responseFactory.newHttpResponse(HttpVersion.HTTP_1_1, 200, context)).thenReturn(response);
Mockito.when(handlerResolver.lookup(request)).thenReturn(requestHandler);
- Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(true);
+ Mockito.when(connReuseStrategy.keepAlive(response, context)).thenReturn(Boolean.TRUE);
httpservice.handleRequest(conn, context);