Skip to content

Commit 28ec1de

Browse files
TimvdLippeakarnokd
TimvdLippe
authored and
akarnokd
committed
Update Mockito to 2.1.0-RC.2 (ReactiveX#4636)
1 parent ea5fb51 commit 28ec1de

161 files changed

Lines changed: 84 additions & 238 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
compile 'org.reactivestreams:reactive-streams:1.0.0'
2828

2929
testCompile 'junit:junit:4.12'
30-
testCompile 'org.mockito:mockito-core:1.10.19'
30+
testCompile 'org.mockito:mockito-core:2.1.0-RC.2'
3131

3232
perfCompile 'org.openjdk.jmh:jmh-core:1.13'
3333
perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.13'

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
package io.reactivex;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.any;
18-
import static org.mockito.Mockito.mock;
17+
import static org.mockito.Mockito.*;
1918

2019
import java.lang.reflect.*;
2120
import java.util.*;
@@ -57,7 +56,7 @@ public static <T> Subscriber<T> mockSubscriber() {
5756
Mockito.doAnswer(new Answer<Object>() {
5857
@Override
5958
public Object answer(InvocationOnMock a) throws Throwable {
60-
Subscription s = a.getArgumentAt(0, Subscription.class);
59+
Subscription s = a.getArgument(0);
6160
s.request(Long.MAX_VALUE);
6261
return null;
6362
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.completable;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.*;
1817
import static org.mockito.Mockito.*;
1918

2019
import java.util.*;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.disposables;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.anyInt;
1817
import static org.mockito.Mockito.*;
1918

2019
import java.io.IOException;

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.flowable;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.*;
1817
import static org.mockito.Mockito.*;
1918

2019
import java.util.*;
@@ -786,7 +785,7 @@ public void testOfType() {
786785
verify(observer, never()).onNext(false);
787786
verify(observer, never()).onNext(2L);
788787
verify(observer, never()).onError(
789-
org.mockito.Matchers.any(Throwable.class));
788+
any(Throwable.class));
790789
verify(observer, times(1)).onComplete();
791790
}
792791

@@ -808,7 +807,7 @@ public void testOfTypeWithPolymorphism() {
808807
verify(observer, times(1)).onNext(l2);
809808
verify(observer, never()).onNext("123");
810809
verify(observer, never()).onError(
811-
org.mockito.Matchers.any(Throwable.class));
810+
any(Throwable.class));
812811
verify(observer, times(1)).onComplete();
813812
}
814813

@@ -823,7 +822,7 @@ public void testContainsFlowable() {
823822
verify(observer, times(1)).onNext(true);
824823
verify(observer, never()).onNext(false);
825824
verify(observer, never()).onError(
826-
org.mockito.Matchers.any(Throwable.class));
825+
any(Throwable.class));
827826
verify(observer, times(1)).onComplete();
828827
}
829828

@@ -838,7 +837,7 @@ public void testContainsWithInexistenceFlowable() {
838837
verify(observer, times(1)).onNext(false);
839838
verify(observer, never()).onNext(true);
840839
verify(observer, never()).onError(
841-
org.mockito.Matchers.any(Throwable.class));
840+
any(Throwable.class));
842841
verify(observer, times(1)).onComplete();
843842
}
844843

@@ -854,7 +853,7 @@ public void testContainsWithNullFlowable() {
854853
verify(observer, times(1)).onNext(true);
855854
verify(observer, never()).onNext(false);
856855
verify(observer, never()).onError(
857-
org.mockito.Matchers.any(Throwable.class));
856+
any(Throwable.class));
858857
verify(observer, times(1)).onComplete();
859858
}
860859

@@ -869,7 +868,7 @@ public void testContainsWithEmptyObservableFlowable() {
869868
verify(observer, times(1)).onNext(false);
870869
verify(observer, never()).onNext(true);
871870
verify(observer, never()).onError(
872-
org.mockito.Matchers.any(Throwable.class));
871+
any(Throwable.class));
873872
verify(observer, times(1)).onComplete();
874873
}
875874

@@ -885,7 +884,7 @@ public void testContains() {
885884
verify(observer, times(1)).onSuccess(true);
886885
verify(observer, never()).onSuccess(false);
887886
verify(observer, never()).onError(
888-
org.mockito.Matchers.any(Throwable.class));
887+
any(Throwable.class));
889888
}
890889

891890
@Test
@@ -899,7 +898,7 @@ public void testContainsWithInexistence() {
899898
verify(observer, times(1)).onSuccess(false);
900899
verify(observer, never()).onSuccess(true);
901900
verify(observer, never()).onError(
902-
org.mockito.Matchers.any(Throwable.class));
901+
any(Throwable.class));
903902
}
904903

905904
@Test
@@ -914,7 +913,7 @@ public void testContainsWithNull() {
914913
verify(observer, times(1)).onSuccess(true);
915914
verify(observer, never()).onSuccess(false);
916915
verify(observer, never()).onError(
917-
org.mockito.Matchers.any(Throwable.class));
916+
any(Throwable.class));
918917
}
919918

920919
@Test
@@ -928,7 +927,7 @@ public void testContainsWithEmptyObservable() {
928927
verify(observer, times(1)).onSuccess(false);
929928
verify(observer, never()).onSuccess(true);
930929
verify(observer, never()).onError(
931-
org.mockito.Matchers.any(Throwable.class));
930+
any(Throwable.class));
932931
}
933932

934933
@Test

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.internal.operators.flowable;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.any;
1817
import static org.mockito.Mockito.*;
1918

2019
import java.util.concurrent.TimeUnit;

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public boolean test(Integer v) {
4444

4545
verify(observer, never()).onSuccess(false);
4646
verify(observer, times(1)).onSuccess(true);
47-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
47+
verify(observer, never()).onError(any(Throwable.class));
4848
}
4949

5050
@Test
@@ -58,7 +58,7 @@ public void testIsEmptyWithTwoItems() {
5858

5959
verify(observer, never()).onSuccess(true);
6060
verify(observer, times(1)).onSuccess(false);
61-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
61+
verify(observer, never()).onError(any(Throwable.class));
6262
}
6363

6464
@Test
@@ -77,7 +77,7 @@ public boolean test(Integer v) {
7777

7878
verify(observer, never()).onSuccess(false);
7979
verify(observer, times(1)).onSuccess(true);
80-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
80+
verify(observer, never()).onError(any(Throwable.class));
8181
}
8282

8383
@Test
@@ -91,7 +91,7 @@ public void testIsEmptyWithOneItem() {
9191

9292
verify(observer, never()).onSuccess(true);
9393
verify(observer, times(1)).onSuccess(false);
94-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
94+
verify(observer, never()).onError(any(Throwable.class));
9595
}
9696

9797
@Test
@@ -110,7 +110,7 @@ public boolean test(Integer v) {
110110

111111
verify(observer, times(1)).onSuccess(false);
112112
verify(observer, never()).onSuccess(true);
113-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
113+
verify(observer, never()).onError(any(Throwable.class));
114114
}
115115

116116
@Test
@@ -124,7 +124,7 @@ public void testIsEmptyWithEmpty() {
124124

125125
verify(observer, times(1)).onSuccess(true);
126126
verify(observer, never()).onSuccess(false);
127-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
127+
verify(observer, never()).onError(any(Throwable.class));
128128
}
129129

130130
@Test
@@ -143,7 +143,7 @@ public boolean test(Integer t1) {
143143

144144
verify(observer, never()).onSuccess(false);
145145
verify(observer, times(1)).onSuccess(true);
146-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
146+
verify(observer, never()).onError(any(Throwable.class));
147147
}
148148

149149
@Test
@@ -162,7 +162,7 @@ public boolean test(Integer t1) {
162162

163163
verify(observer, never()).onSuccess(false);
164164
verify(observer, times(1)).onSuccess(true);
165-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
165+
verify(observer, never()).onError(any(Throwable.class));
166166
}
167167

168168
@Test
@@ -181,7 +181,7 @@ public boolean test(Integer t1) {
181181

182182
verify(observer, times(1)).onSuccess(false);
183183
verify(observer, never()).onSuccess(true);
184-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
184+
verify(observer, never()).onError(any(Throwable.class));
185185
}
186186

187187
@Test
@@ -201,7 +201,7 @@ public boolean test(Integer t) {
201201

202202
verify(observer, times(1)).onSuccess(false);
203203
verify(observer, never()).onSuccess(true);
204-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
204+
verify(observer, never()).onError(any(Throwable.class));
205205
}
206206

207207
@Test
@@ -301,7 +301,7 @@ public boolean test(Integer v) {
301301

302302
verify(observer, never()).onNext(false);
303303
verify(observer, times(1)).onNext(true);
304-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
304+
verify(observer, never()).onError(any(Throwable.class));
305305
verify(observer, times(1)).onComplete();
306306
}
307307

@@ -316,7 +316,7 @@ public void testIsEmptyWithTwoItemsFlowable() {
316316

317317
verify(observer, never()).onNext(true);
318318
verify(observer, times(1)).onNext(false);
319-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
319+
verify(observer, never()).onError(any(Throwable.class));
320320
verify(observer, times(1)).onComplete();
321321
}
322322

@@ -336,7 +336,7 @@ public boolean test(Integer v) {
336336

337337
verify(observer, never()).onNext(false);
338338
verify(observer, times(1)).onNext(true);
339-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
339+
verify(observer, never()).onError(any(Throwable.class));
340340
verify(observer, times(1)).onComplete();
341341
}
342342

@@ -351,7 +351,7 @@ public void testIsEmptyWithOneItemFlowable() {
351351

352352
verify(observer, never()).onSuccess(true);
353353
verify(observer, times(1)).onSuccess(false);
354-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
354+
verify(observer, never()).onError(any(Throwable.class));
355355
}
356356

357357
@Test
@@ -370,7 +370,7 @@ public boolean test(Integer v) {
370370

371371
verify(observer, times(1)).onNext(false);
372372
verify(observer, never()).onNext(true);
373-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
373+
verify(observer, never()).onError(any(Throwable.class));
374374
verify(observer, times(1)).onComplete();
375375
}
376376

@@ -385,7 +385,7 @@ public void testIsEmptyWithEmptyFlowable() {
385385

386386
verify(observer, times(1)).onNext(true);
387387
verify(observer, never()).onNext(false);
388-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
388+
verify(observer, never()).onError(any(Throwable.class));
389389
verify(observer, times(1)).onComplete();
390390
}
391391

@@ -405,7 +405,7 @@ public boolean test(Integer t1) {
405405

406406
verify(observer, never()).onNext(false);
407407
verify(observer, times(1)).onNext(true);
408-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
408+
verify(observer, never()).onError(any(Throwable.class));
409409
verify(observer, times(1)).onComplete();
410410
}
411411

@@ -425,7 +425,7 @@ public boolean test(Integer t1) {
425425

426426
verify(observer, never()).onNext(false);
427427
verify(observer, times(1)).onNext(true);
428-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
428+
verify(observer, never()).onError(any(Throwable.class));
429429
verify(observer, times(1)).onComplete();
430430
}
431431

@@ -445,7 +445,7 @@ public boolean test(Integer t1) {
445445

446446
verify(observer, times(1)).onNext(false);
447447
verify(observer, never()).onNext(true);
448-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
448+
verify(observer, never()).onError(any(Throwable.class));
449449
verify(observer, times(1)).onComplete();
450450
}
451451

@@ -466,7 +466,7 @@ public boolean test(Integer t) {
466466

467467
verify(observer, times(1)).onNext(false);
468468
verify(observer, never()).onNext(true);
469-
verify(observer, never()).onError(org.mockito.Matchers.any(Throwable.class));
469+
verify(observer, never()).onError(any(Throwable.class));
470470
verify(observer, times(1)).onComplete();
471471
}
472472

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.internal.operators.flowable;
1515

1616
import static org.junit.Assert.assertFalse;
17-
import static org.mockito.Matchers.any;
1817
import static org.mockito.Mockito.*;
1918

2019
import org.junit.Test;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package io.reactivex.internal.operators.flowable;
1515

1616
import static org.junit.Assert.*;
17-
import static org.mockito.Matchers.any;
1817
import static org.mockito.Mockito.*;
1918

2019
import java.util.*;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void testCast() {
3636
verify(observer, times(1)).onNext(1);
3737
verify(observer, times(1)).onNext(1);
3838
verify(observer, never()).onError(
39-
org.mockito.Matchers.any(Throwable.class));
39+
any(Throwable.class));
4040
verify(observer, times(1)).onComplete();
4141
}
4242

@@ -50,7 +50,7 @@ public void testCastWithWrongType() {
5050
observable.subscribe(observer);
5151

5252
verify(observer, times(1)).onError(
53-
org.mockito.Matchers.any(ClassCastException.class));
53+
any(ClassCastException.class));
5454
}
5555

5656
@Test

0 commit comments

Comments
 (0)