Update Mockito to 2.1.0-RC.2 (ReactiveX#4636)

Author: TimvdLippe

build.gradle

@@ -27,7 +27,7 @@ dependencies {
     compile 'org.reactivestreams:reactive-streams:1.0.0'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'org.mockito:mockito-core:2.1.0-RC.2'
 
     perfCompile 'org.openjdk.jmh:jmh-core:1.13'
     perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.13'

src/test/java/io/reactivex/TestHelper.java

@@ -14,8 +14,7 @@
 package io.reactivex;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 import java.lang.reflect.*;
 import java.util.*;
@@ -57,7 +56,7 @@ public static <T> Subscriber<T> mockSubscriber() {
         Mockito.doAnswer(new Answer<Object>() {
             @Override
             public Object answer(InvocationOnMock a) throws Throwable {
-                Subscription s = a.getArgumentAt(0, Subscription.class);
+                Subscription s = a.getArgument(0);
                 s.request(Long.MAX_VALUE);
                 return null;
             }

src/test/java/io/reactivex/completable/CompletableTest.java

@@ -14,7 +14,6 @@
 package io.reactivex.completable;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;

src/test/java/io/reactivex/disposables/DisposablesTest.java

@@ -14,7 +14,6 @@
 package io.reactivex.disposables;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;

src/test/java/io/reactivex/flowable/FlowableTests.java

@@ -14,7 +14,6 @@
 package io.reactivex.flowable;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.*;
@@ -786,7 +785,7 @@ public void testOfType() {
         verify(observer, never()).onNext(false);
         verify(observer, never()).onNext(2L);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -808,7 +807,7 @@ public void testOfTypeWithPolymorphism() {
         verify(observer, times(1)).onNext(l2);
         verify(observer, never()).onNext("123");
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -823,7 +822,7 @@ public void testContainsFlowable() {
         verify(observer, times(1)).onNext(true);
         verify(observer, never()).onNext(false);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -838,7 +837,7 @@ public void testContainsWithInexistenceFlowable() {
         verify(observer, times(1)).onNext(false);
         verify(observer, never()).onNext(true);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -854,7 +853,7 @@ public void testContainsWithNullFlowable() {
         verify(observer, times(1)).onNext(true);
         verify(observer, never()).onNext(false);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -869,7 +868,7 @@ public void testContainsWithEmptyObservableFlowable() {
         verify(observer, times(1)).onNext(false);
         verify(observer, never()).onNext(true);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -885,7 +884,7 @@ public void testContains() {
         verify(observer, times(1)).onSuccess(true);
         verify(observer, never()).onSuccess(false);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
     }
 
     @Test
@@ -899,7 +898,7 @@ public void testContainsWithInexistence() {
         verify(observer, times(1)).onSuccess(false);
         verify(observer, never()).onSuccess(true);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
     }
 
     @Test
@@ -914,7 +913,7 @@ public void testContainsWithNull() {
         verify(observer, times(1)).onSuccess(true);
         verify(observer, never()).onSuccess(false);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
     }
 
     @Test
@@ -928,7 +927,7 @@ public void testContainsWithEmptyObservable() {
         verify(observer, times(1)).onSuccess(false);
         verify(observer, never()).onSuccess(true);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
     }
 
     @Test

src/test/java/io/reactivex/internal/operators/flowable/FlowableAllTest.java

@@ -14,7 +14,6 @@
 package io.reactivex.internal.operators.flowable;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;

src/test/java/io/reactivex/internal/operators/flowable/FlowableAnyTest.java

@@ -44,7 +44,7 @@ public boolean test(Integer v) {
 
         verify(observer, never()).onSuccess(false);
         verify(observer, times(1)).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -58,7 +58,7 @@ public void testIsEmptyWithTwoItems() {
 
         verify(observer, never()).onSuccess(true);
         verify(observer, times(1)).onSuccess(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -77,7 +77,7 @@ public boolean test(Integer v) {
 
         verify(observer, never()).onSuccess(false);
         verify(observer, times(1)).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -91,7 +91,7 @@ public void testIsEmptyWithOneItem() {
 
         verify(observer, never()).onSuccess(true);
         verify(observer, times(1)).onSuccess(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -110,7 +110,7 @@ public boolean test(Integer v) {
 
         verify(observer, times(1)).onSuccess(false);
         verify(observer, never()).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -124,7 +124,7 @@ public void testIsEmptyWithEmpty() {
 
         verify(observer, times(1)).onSuccess(true);
         verify(observer, never()).onSuccess(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -143,7 +143,7 @@ public boolean test(Integer t1) {
 
         verify(observer, never()).onSuccess(false);
         verify(observer, times(1)).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -162,7 +162,7 @@ public boolean test(Integer t1) {
 
         verify(observer, never()).onSuccess(false);
         verify(observer, times(1)).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -181,7 +181,7 @@ public boolean test(Integer t1) {
 
         verify(observer, times(1)).onSuccess(false);
         verify(observer, never()).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -201,7 +201,7 @@ public boolean test(Integer t) {
 
         verify(observer, times(1)).onSuccess(false);
         verify(observer, never()).onSuccess(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -301,7 +301,7 @@ public boolean test(Integer v) {
 
         verify(observer, never()).onNext(false);
         verify(observer, times(1)).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -316,7 +316,7 @@ public void testIsEmptyWithTwoItemsFlowable() {
 
         verify(observer, never()).onNext(true);
         verify(observer, times(1)).onNext(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -336,7 +336,7 @@ public boolean test(Integer v) {
 
         verify(observer, never()).onNext(false);
         verify(observer, times(1)).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -351,7 +351,7 @@ public void testIsEmptyWithOneItemFlowable() {
 
         verify(observer, never()).onSuccess(true);
         verify(observer, times(1)).onSuccess(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
     }
 
     @Test
@@ -370,7 +370,7 @@ public boolean test(Integer v) {
 
         verify(observer, times(1)).onNext(false);
         verify(observer, never()).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -385,7 +385,7 @@ public void testIsEmptyWithEmptyFlowable() {
 
         verify(observer, times(1)).onNext(true);
         verify(observer, never()).onNext(false);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -405,7 +405,7 @@ public boolean test(Integer t1) {
 
         verify(observer, never()).onNext(false);
         verify(observer, times(1)).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -425,7 +425,7 @@ public boolean test(Integer t1) {
 
         verify(observer, never()).onNext(false);
         verify(observer, times(1)).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -445,7 +445,7 @@ public boolean test(Integer t1) {
 
         verify(observer, times(1)).onNext(false);
         verify(observer, never()).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -466,7 +466,7 @@ public boolean test(Integer t) {
 
         verify(observer, times(1)).onNext(false);
         verify(observer, never()).onNext(true);
-        verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
+        verify(observer, never()).onError(any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 

src/test/java/io/reactivex/internal/operators/flowable/FlowableAsObservableTest.java

@@ -14,7 +14,6 @@
 package io.reactivex.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;

src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java

@@ -14,7 +14,6 @@
 package io.reactivex.internal.operators.flowable;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import java.util.*;

src/test/java/io/reactivex/internal/operators/flowable/FlowableCastTest.java

@@ -36,7 +36,7 @@ public void testCast() {
         verify(observer, times(1)).onNext(1);
         verify(observer, times(1)).onNext(1);
         verify(observer, never()).onError(
-                org.mockito.Matchers.any(Throwable.class));
+                any(Throwable.class));
         verify(observer, times(1)).onComplete();
     }
 
@@ -50,7 +50,7 @@ public void testCastWithWrongType() {
         observable.subscribe(observer);
 
         verify(observer, times(1)).onError(
-                org.mockito.Matchers.any(ClassCastException.class));
+                any(ClassCastException.class));
     }
 
     @Test