Solve the conflict of 'any' method name in unit tests

Author: zsxwing

rxjava-core/src/main/java/rx/subjects/AsyncSubject.java

@@ -168,7 +168,7 @@ public void testCompleted() {
         private void assertCompletedObserver(Observer<String> aObserver)
         {
             verify(aObserver, times(1)).onNext("three");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, times(1)).onCompleted();
         }
 
@@ -221,7 +221,7 @@ public void testUnsubscribeBeforeCompleted() {
         private void assertNoOnNextEventsReceived(Observer<String> aObserver)
         {
             verify(aObserver, Mockito.never()).onNext(anyString());
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, Mockito.never()).onCompleted();
         }
 

rxjava-core/src/main/java/rx/subjects/BehaviorSubject.java

@@ -15,7 +15,6 @@
  */
 package rx.subjects;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -199,7 +198,7 @@ private void assertCompletedObserver(Observer<String> aObserver)
         {
             verify(aObserver, times(1)).onNext("default");
             verify(aObserver, times(1)).onNext("one");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, times(1)).onCompleted();
         }
 

rxjava-core/src/main/java/rx/subjects/PublishSubject.java

@@ -16,7 +16,6 @@
 package rx.subjects;
 
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -273,7 +272,7 @@ private void assertCompletedObserver(Observer<String> aObserver)
             verify(aObserver, times(1)).onNext("one");
             verify(aObserver, times(1)).onNext("two");
             verify(aObserver, times(1)).onNext("three");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, times(1)).onCompleted();
         }
 
@@ -340,7 +339,7 @@ private void assertCompletedStartingWithThreeObserver(Observer<String> aObserver
             verify(aObserver, Mockito.never()).onNext("one");
             verify(aObserver, Mockito.never()).onNext("two");
             verify(aObserver, times(1)).onNext("three");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, times(1)).onCompleted();
         }
 
@@ -374,7 +373,7 @@ private void assertObservedUntilTwo(Observer<String> aObserver)
             verify(aObserver, times(1)).onNext("one");
             verify(aObserver, times(1)).onNext("two");
             verify(aObserver, Mockito.never()).onNext("three");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, Mockito.never()).onCompleted();
         }
 
@@ -404,7 +403,7 @@ public void testUnsubscribeAfterOnCompleted() {
             inOrder.verify(anObserver, times(1)).onNext("one");
             inOrder.verify(anObserver, times(1)).onNext("two");
             inOrder.verify(anObserver, times(1)).onCompleted();
-            inOrder.verify(anObserver, Mockito.never()).onError(any(Throwable.class));
+            inOrder.verify(anObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
 
             @SuppressWarnings("unchecked")
             Observer<String> anotherObserver = mock(Observer.class);
@@ -414,7 +413,7 @@ public void testUnsubscribeAfterOnCompleted() {
             inOrder.verify(anotherObserver, Mockito.never()).onNext("one");
             inOrder.verify(anotherObserver, Mockito.never()).onNext("two");
             inOrder.verify(anotherObserver, times(1)).onCompleted();
-            inOrder.verify(anotherObserver, Mockito.never()).onError(any(Throwable.class));
+            inOrder.verify(anotherObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
         }
 
         @Test

rxjava-core/src/main/java/rx/subjects/ReplaySubject.java

@@ -15,7 +15,6 @@
  */
 package rx.subjects;
 
-import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
@@ -215,7 +214,7 @@ private void assertCompletedObserver(Observer<String> aObserver)
             inOrder.verify(aObserver, times(1)).onNext("one");
             inOrder.verify(aObserver, times(1)).onNext("two");
             inOrder.verify(aObserver, times(1)).onNext("three");
-            inOrder.verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            inOrder.verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             inOrder.verify(aObserver, times(1)).onCompleted();
             inOrder.verifyNoMoreInteractions();
         }
@@ -307,7 +306,7 @@ private void assertObservedUntilTwo(Observer<String> aObserver)
             verify(aObserver, times(1)).onNext("one");
             verify(aObserver, times(1)).onNext("two");
             verify(aObserver, Mockito.never()).onNext("three");
-            verify(aObserver, Mockito.never()).onError(any(Throwable.class));
+            verify(aObserver, Mockito.never()).onError(org.mockito.Matchers.any(Throwable.class));
             verify(aObserver, Mockito.never()).onCompleted();
         }