Fix last PR

Author: slandelle

client/src/test/java/org/asynchttpclient/handler/resumable/ResumableAsyncHandlerTest.java

@@ -14,29 +14,29 @@
  */
 
 import static org.asynchttpclient.Dsl.get;
+import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.*;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.testng.Assert.*;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.HttpHeaders;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHandler.State;
-import org.asynchttpclient.netty.NettyResponseHeaders;
 import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.HttpResponseHeaders;
 import org.asynchttpclient.HttpResponseStatus;
 import org.asynchttpclient.Request;
+import org.asynchttpclient.Response;
 import org.asynchttpclient.uri.Uri;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.Test;
 
-import io.netty.handler.codec.http.DefaultHttpHeaders;
-import io.netty.handler.codec.http.HttpHeaders;
-
 /**
  * @author Benjamin Hanzelmann
  */
@@ -88,7 +88,8 @@ public void testOnStatusReceivedOkStatusWithDecoratedAsyncHandler() throws Excep
         when(mockResponseStatus.getStatusCode()).thenReturn(200);
         when(mockResponseStatus.getUri()).thenReturn(mock(Uri.class));
 
-        AsyncHandler decoratedAsyncHandler = mock(AsyncHandler.class);
+        @SuppressWarnings("unchecked")
+        AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
         State mockState = mock(State.class);
         when(decoratedAsyncHandler.onStatusReceived(mockResponseStatus)).thenReturn(mockState);
 
@@ -142,7 +143,8 @@ public void testOnBodyPartReceivedWithDecoratedAsyncHandler() throws Exception {
         ByteBuffer buffer = ByteBuffer.allocate(0);
         when(bodyPart.getBodyByteBuffer()).thenReturn(buffer);
 
-        AsyncHandler decoratedAsyncHandler = mock(AsyncHandler.class);
+        @SuppressWarnings("unchecked")
+        AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
         State mockState = mock(State.class);
         when(decoratedAsyncHandler.onBodyPartReceived(bodyPart)).thenReturn(mockState);
 
@@ -165,17 +167,18 @@ public void testOnBodyPartReceivedWithDecoratedAsyncHandler() throws Exception {
     public void testOnHeadersReceived() throws Exception {
         ResumableAsyncHandler handler = new ResumableAsyncHandler();
         HttpHeaders responseHeaders = new DefaultHttpHeaders();
-        HttpResponseHeaders headers = new NettyResponseHeaders(responseHeaders);
+        HttpResponseHeaders headers = new HttpResponseHeaders(responseHeaders);
         State status = handler.onHeadersReceived(headers);
         assertEquals(status, AsyncHandler.State.CONTINUE, "State should be CONTINUE for a successful onHeadersReceived");
     }
 
     @Test
     public void testOnHeadersReceivedWithDecoratedAsyncHandler() throws Exception {
         HttpHeaders responseHeaders = new DefaultHttpHeaders();
-        HttpResponseHeaders headers = new NettyResponseHeaders(responseHeaders);
+        HttpResponseHeaders headers = new HttpResponseHeaders(responseHeaders);
 
-        AsyncHandler decoratedAsyncHandler = mock(AsyncHandler.class);
+        @SuppressWarnings("unchecked")
+        AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
         State mockState = mock(State.class);
         when(decoratedAsyncHandler.onHeadersReceived(headers)).thenReturn(mockState);
 
@@ -189,7 +192,7 @@ public void testOnHeadersReceivedContentLengthMinus() throws Exception {
         ResumableAsyncHandler handler = new ResumableAsyncHandler();
         HttpHeaders responseHeaders = new DefaultHttpHeaders();
         responseHeaders.add(HttpHeaders.Names.CONTENT_LENGTH, -1);
-        HttpResponseHeaders headers = new NettyResponseHeaders(responseHeaders);
+        HttpResponseHeaders headers = new HttpResponseHeaders(responseHeaders);
         State status = handler.onHeadersReceived(headers);
         assertEquals(status, AsyncHandler.State.ABORT, "State should be ABORT for content length -1");
     }

client/src/test/java/org/asynchttpclient/netty/util/ByteBufUtilsTest.java

@@ -1,16 +1,16 @@
 package org.asynchttpclient.netty.util;
 
 import static org.testng.Assert.assertEquals;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.asynchttpclient.util.ByteBufUtils;
 import org.testng.annotations.Test;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 public class ByteBufUtilsTest {
 
     @Test
@@ -32,7 +32,7 @@ public void testByteBuf2BytesNoBackingArray() {
 
     @Test
     public void testByteBufs2BytesEmptyList() {
-        byte[] output = ByteBufUtils.byteBufs2Bytes(Collections.EMPTY_LIST);
+        byte[] output = ByteBufUtils.byteBufs2Bytes(Collections.emptyList());
         assertEquals(output, ByteBufUtils.EMPTY_BYTE_ARRAY,
                 "When an empty list is passed to byteBufs2Bytes, an empty byte array should be returned");
     }

client/src/test/java/org/asynchttpclient/ntlm/NtlmTest.java

@@ -15,7 +15,8 @@
 
 import static org.asynchttpclient.Dsl.*;
 import static org.testng.Assert.*;
-import org.asynchttpclient.ntlm.NtlmEngine.Type2Message;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -30,15 +31,13 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Response;
-import org.asynchttpclient.netty.util.ByteBufUtils;
+import org.asynchttpclient.ntlm.NtlmEngine.Type2Message;
 import org.asynchttpclient.util.Base64;
+import org.asynchttpclient.util.ByteBufUtils;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-
 public class NtlmTest extends AbstractBasicTest {
 
     public static class NTLMHandler extends AbstractHandler {

client/src/test/java/org/asynchttpclient/util/HttpUtilsTest.java

@@ -116,31 +116,6 @@ public void testGetHostHeaderHasVirtualHost() {
         assertEquals(hostHeader, "example.com", "Incorrect hostHeader returned");
     }
 
-    @Test
-    public void testGetRequestTimeoutInRequest() {
-        Request request = Dsl.get("http://stackoverflow.com/questions/1057564").setRequestTimeout(1000).build();
-        DefaultAsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder().build();
-        int timeout = HttpUtils.requestTimeout(config, request);
-        assertEquals(timeout, 1000, "Timeout should be taken from request when specified in builder");
-    }
-
-    @Test
-    public void testGetRequestTimeoutInConfig() {
-        Request request = Dsl.get("http://stackoverflow.com/questions/1057564").build();
-        DefaultAsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder().setRequestTimeout(2000).build();
-        int timeout = HttpUtils.requestTimeout(config, request);
-        assertEquals(timeout, 2000, "Timeout should be taken from config when not specfied in request");
-    }
-
-    @Test
-    public void testGetRequestTimeoutPriortyGivenToRequest() {
-        Request request = Dsl.get("http://stackoverflow.com/questions/1057564").setRequestTimeout(2300).build();
-        DefaultAsyncHttpClientConfig config = new DefaultAsyncHttpClientConfig.Builder().setRequestTimeout(2000).build();
-        int timeout = HttpUtils.requestTimeout(config, request);
-        assertEquals(timeout, 2300,
-                "Timeout specified in request should be given priority and timeout value should be same as value set in request");
-    }
-
     @Test
     public void testDefaultFollowRedirect() {
         Request request = Dsl.get("http://stackoverflow.com/questions/1057564").setVirtualHost("example.com").build();