Skip to content

Commit c99b370

Browse files
committed
fix (ReactiveX#271): remove deprecated usage of Mockito Matchers
org.mockito.Matchers is deprecated, ArgumentMatchers should be used instead.
1 parent 2273863 commit c99b370

18 files changed

+18
-18
lines changed

resilience4j-ratelimiter/src/test/java/io/github/resilience4j/ratelimiter/RateLimiterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.assertj.core.api.BDDAssertions.then;
2323
import static org.hamcrest.CoreMatchers.equalTo;
2424
import static org.junit.Assert.assertTrue;
25-
import static org.mockito.Matchers.any;
25+
import static org.mockito.ArgumentMatchers.any;
2626
import static org.mockito.Mockito.mock;
2727
import static org.mockito.Mockito.never;
2828
import static org.mockito.Mockito.times;

resilience4j-ratelimiter/src/test/java/io/github/resilience4j/ratelimiter/internal/SemaphoreBasedRateLimiterImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import static java.time.Duration.ZERO;
4141
import static org.assertj.core.api.BDDAssertions.then;
4242
import static org.hamcrest.CoreMatchers.equalTo;
43-
import static org.mockito.Matchers.eq;
43+
import static org.mockito.ArgumentMatchers.eq;
4444
import static org.mockito.Mockito.*;
4545

4646

resilience4j-retrofit/src/test/java/io/github/resilience4j/retrofit/internal/DecoratedCallTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.io.IOException;
1010

11-
import static org.mockito.Matchers.any;
11+
import static org.mockito.ArgumentMatchers.any;
1212
import static org.mockito.Mockito.mock;
1313

1414
@RunWith(JUnit4.class)

resilience4j-rxjava2/src/test/java/io/github/resilience4j/bulkhead/operator/BulkheadCompletableObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.resilience4j.bulkhead.operator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Matchers.any;
4+
import static org.mockito.ArgumentMatchers.any;
55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.never;
77
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/bulkhead/operator/BulkheadMaybeObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.resilience4j.bulkhead.operator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Matchers.any;
4+
import static org.mockito.ArgumentMatchers.any;
55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.never;
77
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/bulkhead/operator/BulkheadObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.resilience4j.bulkhead.operator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Matchers.any;
4+
import static org.mockito.ArgumentMatchers.any;
55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.never;
77
import static org.mockito.Mockito.times;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/bulkhead/operator/BulkheadSingleObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.resilience4j.bulkhead.operator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Matchers.any;
4+
import static org.mockito.ArgumentMatchers.any;
55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.never;
77
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/bulkhead/operator/BulkheadSubscriberTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.resilience4j.bulkhead.operator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.mockito.Matchers.any;
4+
import static org.mockito.ArgumentMatchers.any;
55
import static org.mockito.Mockito.mock;
66
import static org.mockito.Mockito.never;
77
import static org.mockito.Mockito.times;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/circuitbreaker/operator/CircuitBreakerCompletableObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.circuitbreaker.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/circuitbreaker/operator/CircuitBreakerMaybeObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.circuitbreaker.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/circuitbreaker/operator/CircuitBreakerObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.circuitbreaker.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.times;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/circuitbreaker/operator/CircuitBreakerSingleObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.circuitbreaker.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/circuitbreaker/operator/CircuitBreakerSubscriberTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.circuitbreaker.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.times;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/ratelimiter/operator/RateLimiterCompletableObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.ratelimiter.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/ratelimiter/operator/RateLimiterMaybeObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.ratelimiter.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/ratelimiter/operator/RateLimiterObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.ratelimiter.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/ratelimiter/operator/RateLimiterSingleObserverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.ratelimiter.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

resilience4j-rxjava2/src/test/java/io/github/resilience4j/ratelimiter/operator/RateLimiterSubscriberTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.resilience4j.ratelimiter.operator;
22

3-
import static org.mockito.Matchers.any;
3+
import static org.mockito.ArgumentMatchers.any;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.never;
66
import static org.mockito.Mockito.verify;

0 commit comments

Comments
 (0)