Drop powermock, upgrade mockito 2.18.3

Author: slandelle

client/src/main/java/org/asynchttpclient/HttpResponseStatus.java

@@ -36,7 +36,7 @@ public HttpResponseStatus(Uri uri) {
    *
    * @return the request {@link Uri}
    */
-  public final Uri getUri() {
+  public Uri getUri() {
     return uri;
   }
 

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

@@ -17,9 +17,6 @@
 import org.asynchttpclient.*;
 import org.asynchttpclient.AsyncHandler.State;
 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 java.io.IOException;
@@ -28,19 +25,14 @@
 import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
 import static io.netty.handler.codec.http.HttpHeaderNames.RANGE;
 import static org.asynchttpclient.Dsl.get;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.*;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 /**
  * @author Benjamin Hanzelmann
  */
-@PrepareForTest({HttpResponseStatus.class, State.class})
-public class ResumableAsyncHandlerTest extends PowerMockTestCase {
+public class ResumableAsyncHandlerTest {
   @Test
   public void testAdjustRange() {
     MapResumableProcessor proc = new MapResumableProcessor();
@@ -89,14 +81,13 @@ public void testOnStatusReceivedOkStatusWithDecoratedAsyncHandler() throws Excep
 
     @SuppressWarnings("unchecked")
     AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
-    State mockState = mock(State.class);
-    when(decoratedAsyncHandler.onStatusReceived(mockResponseStatus)).thenReturn(mockState);
+    when(decoratedAsyncHandler.onStatusReceived(mockResponseStatus)).thenReturn(State.CONTINUE);
 
     ResumableAsyncHandler handler = new ResumableAsyncHandler(decoratedAsyncHandler);
 
     State state = handler.onStatusReceived(mockResponseStatus);
     verify(decoratedAsyncHandler).onStatusReceived(mockResponseStatus);
-    assertEquals(state, mockState, "State returned should be equal to the one returned from decoratedAsyncHandler");
+    assertEquals(state, State.CONTINUE, "State returned should be equal to the one returned from decoratedAsyncHandler");
   }
 
   @Test
@@ -113,7 +104,7 @@ public void testOnStatusReceived500Status() throws Exception {
   @Test
   public void testOnBodyPartReceived() throws Exception {
     ResumableAsyncHandler handler = new ResumableAsyncHandler();
-    HttpResponseBodyPart bodyPart = PowerMockito.mock(HttpResponseBodyPart.class);
+    HttpResponseBodyPart bodyPart = mock(HttpResponseBodyPart.class);
     when(bodyPart.getBodyPartBytes()).thenReturn(new byte[0]);
     ByteBuffer buffer = ByteBuffer.allocate(0);
     when(bodyPart.getBodyByteBuffer()).thenReturn(buffer);
@@ -125,40 +116,38 @@ public void testOnBodyPartReceived() throws Exception {
   public void testOnBodyPartReceivedWithResumableListenerThrowsException() throws Exception {
     ResumableAsyncHandler handler = new ResumableAsyncHandler();
 
-    ResumableListener resumableListener = PowerMockito.mock(ResumableListener.class);
-    doThrow(new IOException()).when(resumableListener).onBytesReceived(anyObject());
+    ResumableListener resumableListener = mock(ResumableListener.class);
+    doThrow(new IOException()).when(resumableListener).onBytesReceived(any());
     handler.setResumableListener(resumableListener);
 
-    HttpResponseBodyPart bodyPart = PowerMockito.mock(HttpResponseBodyPart.class);
+    HttpResponseBodyPart bodyPart = mock(HttpResponseBodyPart.class);
     State state = handler.onBodyPartReceived(bodyPart);
     assertEquals(state, AsyncHandler.State.ABORT,
             "State should be ABORT if the resumableListener threw an exception in onBodyPartReceived");
   }
 
   @Test
   public void testOnBodyPartReceivedWithDecoratedAsyncHandler() throws Exception {
-    HttpResponseBodyPart bodyPart = PowerMockito.mock(HttpResponseBodyPart.class);
+    HttpResponseBodyPart bodyPart = mock(HttpResponseBodyPart.class);
     when(bodyPart.getBodyPartBytes()).thenReturn(new byte[0]);
     ByteBuffer buffer = ByteBuffer.allocate(0);
     when(bodyPart.getBodyByteBuffer()).thenReturn(buffer);
 
     @SuppressWarnings("unchecked")
     AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
-    State mockState = mock(State.class);
-    when(decoratedAsyncHandler.onBodyPartReceived(bodyPart)).thenReturn(mockState);
+    when(decoratedAsyncHandler.onBodyPartReceived(bodyPart)).thenReturn(State.CONTINUE);
 
     // following is needed to set the url variable
     HttpResponseStatus mockResponseStatus = mock(HttpResponseStatus.class);
     when(mockResponseStatus.getStatusCode()).thenReturn(200);
-    Uri mockUri = mock(Uri.class);
-    when(mockUri.toUrl()).thenReturn("http://non.null");
-    when(mockResponseStatus.getUri()).thenReturn(mockUri);
+    Uri uri = Uri.create("http://non.null");
+    when(mockResponseStatus.getUri()).thenReturn(uri);
 
     ResumableAsyncHandler handler = new ResumableAsyncHandler(decoratedAsyncHandler);
     handler.onStatusReceived(mockResponseStatus);
 
     State state = handler.onBodyPartReceived(bodyPart);
-    assertEquals(state, mockState, "State should be equal to the state returned from decoratedAsyncHandler");
+    assertEquals(state, State.CONTINUE, "State should be equal to the state returned from decoratedAsyncHandler");
 
   }
 
@@ -176,12 +165,11 @@ public void testOnHeadersReceivedWithDecoratedAsyncHandler() throws Exception {
 
     @SuppressWarnings("unchecked")
     AsyncHandler<Response> decoratedAsyncHandler = mock(AsyncHandler.class);
-    State mockState = mock(State.class);
-    when(decoratedAsyncHandler.onHeadersReceived(responseHeaders)).thenReturn(mockState);
+    when(decoratedAsyncHandler.onHeadersReceived(responseHeaders)).thenReturn(State.CONTINUE);
 
     ResumableAsyncHandler handler = new ResumableAsyncHandler(decoratedAsyncHandler);
     State status = handler.onHeadersReceived(responseHeaders);
-    assertEquals(status, mockState, "State should be equal to the state returned from decoratedAsyncHandler");
+    assertEquals(status, State.CONTINUE, "State should be equal to the state returned from decoratedAsyncHandler");
   }
 
   @Test

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

@@ -13,20 +13,19 @@
  */
 package org.asynchttpclient.handler.resumable;
 
-import org.powermock.api.mockito.PowerMockito;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
 public class ResumableRandomAccessFileListenerTest {
 
   @Test
   public void testOnBytesReceivedBufferHasArray() throws IOException {
-    RandomAccessFile file = PowerMockito.mock(RandomAccessFile.class);
+    RandomAccessFile file = mock(RandomAccessFile.class);
     ResumableRandomAccessFileListener listener = new ResumableRandomAccessFileListener(file);
     byte[] array = new byte[]{1, 2, 23, 33};
     ByteBuffer buf = ByteBuffer.wrap(array);
@@ -36,7 +35,7 @@ public void testOnBytesReceivedBufferHasArray() throws IOException {
 
   @Test
   public void testOnBytesReceivedBufferHasNoArray() throws IOException {
-    RandomAccessFile file = PowerMockito.mock(RandomAccessFile.class);
+    RandomAccessFile file = mock(RandomAccessFile.class);
     ResumableRandomAccessFileListener listener = new ResumableRandomAccessFileListener(file);
 
     byte[] byteArray = new byte[]{1, 2, 23, 33};

extras/retrofit2/pom.xml

@@ -12,8 +12,8 @@
   <description>The Async Http Client Retrofit2 Extras.</description>
 
   <properties>
-    <retrofit2.version>2.3.0</retrofit2.version>
-    <lombok.version>1.16.18</lombok.version>
+    <retrofit2.version>2.4.0</retrofit2.version>
+    <lombok.version>1.16.20</lombok.version>
   </properties>
 
   <dependencies>

extras/retrofit2/src/test/java/org/asynchttpclient/extras/retrofit/AsyncHttpClientCallTest.java

@@ -86,7 +86,7 @@ void shouldInvokeConsumersOnEachExecution(Consumer<AsyncCompletionHandler<?>> ha
 
         when(httpClient.executeRequest((org.asynchttpclient.Request) any(), any())).then(invocationOnMock -> {
             @SuppressWarnings("rawtypes")
-            val handler = invocationOnMock.getArgumentAt(1, AsyncCompletionHandler.class);
+            AsyncCompletionHandler<?> handler = invocationOnMock.getArgument(1);
             handlerConsumer.accept(handler);
             return null;
         });
@@ -283,7 +283,7 @@ public void contentTypeIsProperlyParsedIfPresent() throws Exception {
 
     private void givenResponseIsProduced(AsyncHttpClient client, Response response) {
         when(client.executeRequest(any(org.asynchttpclient.Request.class), any())).thenAnswer(invocation -> {
-            AsyncCompletionHandler<Response> handler = invocation.getArgumentAt(1, AsyncCompletionHandler.class);
+            AsyncCompletionHandler<Response> handler = invocation.getArgument(1);
             handler.onCompleted(response);
             return null;
         });

extras/retrofit2/src/test/java/org/asynchttpclient/extras/retrofit/TestServices.java

@@ -13,8 +13,7 @@
 package org.asynchttpclient.extras.retrofit;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.NonNull;
-import lombok.Value;
+import lombok.*;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Path;
@@ -51,7 +50,9 @@ public interface GithubRxJava2 {
     io.reactivex.Single<List<Contributor>> contributors(@Path("owner") String owner, @Path("repo") String repo);
   }
 
-  @Value
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
   @JsonIgnoreProperties(ignoreUnknown = true)
   static class Contributor implements Serializable {
     private static final long serialVersionUID = 1;

extras/rxjava/src/test/java/org/asynchttpclient/extras/rxjava/single/AsyncHttpSingleTest.java

@@ -31,17 +31,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.testng.Assert.assertEquals;
 
 public class AsyncHttpSingleTest {

pom.xml

@@ -380,16 +380,14 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-testng</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>java-hamcrest</artifactId>
+      <version>${hamcrest.version}</version>
     </dependency>
   </dependencies>
   <properties>
@@ -410,6 +408,7 @@
     <commons-io.version>2.6</commons-io.version>
     <commons-fileupload.version>1.3.3</commons-fileupload.version>
     <privilegedaccessor.version>1.2.2</privilegedaccessor.version>
-    <powermock.version>1.6.6</powermock.version>
+    <mockito.version>2.18.3</mockito.version>
+    <hamcrest.version>2.0.0.0</hamcrest.version>
   </properties>
 </project>