Skip to content

Commit d08266b

Browse files
akarnokdakarnokd
authored
2.x: fix Mockito 2.1 changes using deprecated API of its own (#4639)
1 parent 9461a70 commit d08266b

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

‎src/main/java/io/reactivex/internal/operators/single/SingleFlatMap.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ protected void subscribeActual(SingleObserver<? super R> actual) {
3939
static final class SingleFlatMapCallback<T, R>
4040
extends AtomicReference<Disposable>
4141
implements SingleObserver<T>, Disposable {
42+
private static final long serialVersionUID = 3258103020495908596L;
43+
4244
final SingleObserver<? super R> actual;
45+
4346
final Function<? super T, ? extends SingleSource<? extends R>> mapper;
4447

4548
SingleFlatMapCallback(SingleObserver<? super R> actual,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void testComplete() {
5353
Flowable<List<String>> buffered = source.buffer(3, 3);
5454
buffered.subscribe(observer);
5555

56-
Mockito.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
56+
Mockito.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
5757
Mockito.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
5858
Mockito.verify(observer, Mockito.times(1)).onComplete();
5959
}
@@ -79,7 +79,7 @@ public void subscribe(Subscriber<? super String> observer) {
7979
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
8080
inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three", "four"));
8181
inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four", "five"));
82-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
82+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
8383
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
8484
inOrder.verify(observer, Mockito.never()).onComplete();
8585
}
@@ -94,7 +94,7 @@ public void testSkipAndCountGaplessBuffers() {
9494
InOrder inOrder = Mockito.inOrder(observer);
9595
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
9696
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
97-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
97+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
9898
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
9999
inOrder.verify(observer, Mockito.times(1)).onComplete();
100100
}
@@ -109,7 +109,7 @@ public void testSkipAndCountBuffersWithGaps() {
109109
InOrder inOrder = Mockito.inOrder(observer);
110110
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
111111
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
112-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
112+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
113113
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
114114
inOrder.verify(observer, Mockito.times(1)).onComplete();
115115
}
@@ -141,7 +141,7 @@ public void subscribe(Subscriber<? super String> observer) {
141141

142142
scheduler.advanceTimeTo(300, TimeUnit.MILLISECONDS);
143143
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
144-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
144+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
145145
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
146146
inOrder.verify(observer, Mockito.times(1)).onComplete();
147147
}
@@ -175,7 +175,7 @@ public void subscribe(Subscriber<? super String> observer) {
175175

176176
scheduler.advanceTimeTo(201, TimeUnit.MILLISECONDS);
177177
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
178-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
178+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
179179
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
180180
inOrder.verify(observer, Mockito.times(1)).onComplete();
181181
}
@@ -226,7 +226,7 @@ public void subscribe(Subscriber<? super Object> observer) {
226226
scheduler.advanceTimeTo(500, TimeUnit.MILLISECONDS);
227227
inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three"));
228228
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
229-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
229+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
230230
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
231231
inOrder.verify(observer, Mockito.times(1)).onComplete();
232232
}
@@ -270,7 +270,7 @@ public void subscribe(Subscriber<? super Object> observer) {
270270
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
271271
inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four"));
272272
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
273-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
273+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
274274
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
275275
inOrder.verify(observer, Mockito.times(1)).onComplete();
276276
}

‎src/test/java/io/reactivex/internal/operators/observable/ObservableBufferTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testComplete() {
5252
Observable<List<String>> buffered = source.buffer(3, 3);
5353
buffered.subscribe(observer);
5454

55-
Mockito.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
55+
Mockito.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
5656
Mockito.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
5757
Mockito.verify(observer, Mockito.times(1)).onComplete();
5858
}
@@ -78,7 +78,7 @@ public void subscribe(Observer<? super String> observer) {
7878
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
7979
inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three", "four"));
8080
inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four", "five"));
81-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
81+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
8282
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
8383
inOrder.verify(observer, Mockito.never()).onComplete();
8484
}
@@ -93,7 +93,7 @@ public void testSkipAndCountGaplessBuffers() {
9393
InOrder inOrder = Mockito.inOrder(observer);
9494
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two", "three"));
9595
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
96-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
96+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
9797
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
9898
inOrder.verify(observer, Mockito.times(1)).onComplete();
9999
}
@@ -108,7 +108,7 @@ public void testSkipAndCountBuffersWithGaps() {
108108
InOrder inOrder = Mockito.inOrder(observer);
109109
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
110110
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
111-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
111+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
112112
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
113113
inOrder.verify(observer, Mockito.times(1)).onComplete();
114114
}
@@ -140,7 +140,7 @@ public void subscribe(Observer<? super String> observer) {
140140

141141
scheduler.advanceTimeTo(300, TimeUnit.MILLISECONDS);
142142
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
143-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
143+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
144144
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
145145
inOrder.verify(observer, Mockito.times(1)).onComplete();
146146
}
@@ -174,7 +174,7 @@ public void subscribe(Observer<? super String> observer) {
174174

175175
scheduler.advanceTimeTo(201, TimeUnit.MILLISECONDS);
176176
inOrder.verify(observer, Mockito.times(1)).onNext(list("four", "five"));
177-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
177+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
178178
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
179179
inOrder.verify(observer, Mockito.times(1)).onComplete();
180180
}
@@ -225,7 +225,7 @@ public void subscribe(Observer<? super Object> observer) {
225225
scheduler.advanceTimeTo(500, TimeUnit.MILLISECONDS);
226226
inOrder.verify(observer, Mockito.times(1)).onNext(list("two", "three"));
227227
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
228-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
228+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
229229
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
230230
inOrder.verify(observer, Mockito.times(1)).onComplete();
231231
}
@@ -269,7 +269,7 @@ public void subscribe(Observer<? super Object> observer) {
269269
inOrder.verify(observer, Mockito.times(1)).onNext(list("one", "two"));
270270
inOrder.verify(observer, Mockito.times(1)).onNext(list("three", "four"));
271271
inOrder.verify(observer, Mockito.times(1)).onNext(list("five"));
272-
inOrder.verify(observer, Mockito.never()).onNext(Mockito.anyListOf(String.class));
272+
inOrder.verify(observer, Mockito.never()).onNext(Mockito.<String>anyList());
273273
inOrder.verify(observer, Mockito.never()).onError(Mockito.any(Throwable.class));
274274
inOrder.verify(observer, Mockito.times(1)).onComplete();
275275
}

0 commit comments

Comments
 (0)