2.x: fix Mockito 2.1 changes using deprecated API of its own (#4639)

ReactiveX · Sep 29, 2016 · d08266b · d08266b
1 parent 9461a70
commit d08266b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java b/src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java
@@ -39,7 +39,10 @@ protected void subscribeActual(SingleObserver<? super R> actual) {
     static final class SingleFlatMapCallback<T, R>
     extends AtomicReference<Disposable>
     implements SingleObserver<T>, Disposable {
+        private static final long serialVersionUID = 3258103020495908596L;
+
         final SingleObserver<? super R> actual;
+
         final Function<? super T, ? extends SingleSource<? extends R>> mapper;
 
         SingleFlatMapCallback(SingleObserver<? super R> actual,

diff --git a/src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/internal/operators/flowable/FlowableBufferTest.java
@@ -53,7 +53,7 @@ public void testComplete() {
         Flowable<List<String>> buffered = source.buffer(3, 3);
         buffered.subscribe(observer);
 
-        Mockito.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        Mockito.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         Mockito.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         Mockito.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -79,7 +79,7 @@ public void subscribe(Subscriber<? super String> observer) {
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three", "four"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.never()).onComplete();
     }
@@ -94,7 +94,7 @@ public void testSkipAndCountGaplessBuffers() {
         InOrder inOrder = Mockito.inOrder(observer);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -109,7 +109,7 @@ public void testSkipAndCountBuffersWithGaps() {
         InOrder inOrder = Mockito.inOrder(observer);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -141,7 +141,7 @@ public void subscribe(Subscriber<? super String> observer) {
 
         scheduler.advanceTimeTo(300, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -175,7 +175,7 @@ public void subscribe(Subscriber<? super String> observer) {
 
         scheduler.advanceTimeTo(201, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -226,7 +226,7 @@ public void subscribe(Subscriber<? super Object> observer) {
         scheduler.advanceTimeTo(500, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -270,7 +270,7 @@ public void subscribe(Subscriber<? super Object> observer) {
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }

diff --git a/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java
@@ -52,7 +52,7 @@ public void testComplete() {
         Observable<List<String>> buffered = source.buffer(3, 3);
         buffered.subscribe(observer);
 
-        Mockito.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        Mockito.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         Mockito.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         Mockito.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -78,7 +78,7 @@ public void subscribe(Observer<? super String> observer) {
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three", "four"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.never()).onComplete();
     }
@@ -93,7 +93,7 @@ public void testSkipAndCountGaplessBuffers() {
         InOrder inOrder = Mockito.inOrder(observer);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -108,7 +108,7 @@ public void testSkipAndCountBuffersWithGaps() {
         InOrder inOrder = Mockito.inOrder(observer);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -140,7 +140,7 @@ public void subscribe(Observer<? super String> observer) {
 
         scheduler.advanceTimeTo(300, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -174,7 +174,7 @@ public void subscribe(Observer<? super String> observer) {
 
         scheduler.advanceTimeTo(201, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -225,7 +225,7 @@ public void subscribe(Observer<? super Object> observer) {
         scheduler.advanceTimeTo(500, TimeUnit.MILLISECONDS);
         inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }
@@ -269,7 +269,7 @@ public void subscribe(Observer<? super Object> observer) {
         inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four"));
         inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
-        inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
+        inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
         inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
         inOrder.verify(observer, Mockito.times(1)).onComplete();
     }