Skip to content

Commit eea972f

Browse files
AbacnAbacn
authored
Eliminate usage of deprecated org.mockito.Matcherss (#33908)
* Add a checkstyle rule to enforce it
1 parent 2317228 commit eea972f

File tree

75 files changed

+142
-131
lines changed

Some content is hidden

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

75 files changed

+142
-131
lines changed

‎runners/core-java/src/test/java/org/apache/beam/runners/core/ReduceFnRunnerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import static org.junit.Assert.assertEquals;
3232
import static org.junit.Assert.assertFalse;
3333
import static org.junit.Assert.assertTrue;
34-
import static org.mockito.Matchers.any;
34+
import static org.mockito.ArgumentMatchers.any;
3535
import static org.mockito.Mockito.doAnswer;
3636
import static org.mockito.Mockito.doNothing;
3737
import static org.mockito.Mockito.mock;

‎runners/direct-java/src/test/java/org/apache/beam/runners/direct/DoFnLifecycleManagerRemovingTransformEvaluatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.hamcrest.Matchers.not;
2222
import static org.hamcrest.Matchers.nullValue;
2323
import static org.junit.Assert.fail;
24-
import static org.mockito.Matchers.any;
24+
import static org.mockito.ArgumentMatchers.any;
2525
import static org.mockito.Mockito.doThrow;
2626
import static org.mockito.Mockito.mock;
2727
import static org.mockito.Mockito.verify;

‎runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import static org.hamcrest.Matchers.containsInAnyOrder;
2222
import static org.hamcrest.Matchers.equalTo;
2323
import static org.mockito.ArgumentMatchers.any;
24-
import static org.mockito.Matchers.anyList;
25-
import static org.mockito.Matchers.eq;
24+
import static org.mockito.ArgumentMatchers.anyList;
25+
import static org.mockito.ArgumentMatchers.eq;
2626
import static org.mockito.Mockito.when;
2727

2828
import java.io.Serializable;
@@ -79,7 +79,7 @@
7979
import org.junit.Test;
8080
import org.junit.runner.RunWith;
8181
import org.junit.runners.JUnit4;
82-
import org.mockito.Matchers;
82+
import org.mockito.ArgumentMatchers;
8383
import org.mockito.Mock;
8484
import org.mockito.Mockito;
8585
import org.mockito.MockitoAnnotations;
@@ -187,13 +187,13 @@ public void process(ProcessContext c) {}
187187
eq(producingTransform), Mockito.<StructuralKey>any()))
188188
.thenReturn(mockExecutionContext);
189189
when(mockExecutionContext.getStepContext(any())).thenReturn(mockStepContext);
190-
when(mockEvaluationContext.createBundle(Matchers.<PCollection<Integer>>any()))
190+
when(mockEvaluationContext.createBundle(ArgumentMatchers.<PCollection<Integer>>any()))
191191
.thenReturn(mockUncommittedBundle);
192192
when(mockStepContext.getTimerUpdate()).thenReturn(TimerUpdate.empty());
193193

194194
// And digging to check whether the window is ready
195195
when(mockEvaluationContext.createSideInputReader(anyList())).thenReturn(mockSideInputReader);
196-
when(mockSideInputReader.isReady(Matchers.any(), Matchers.any())).thenReturn(false);
196+
when(mockSideInputReader.isReady(ArgumentMatchers.any(), ArgumentMatchers.any())).thenReturn(false);
197197

198198
IntervalWindow firstWindow = new IntervalWindow(new Instant(0), new Instant(9));
199199

‎runners/direct-java/src/test/java/org/apache/beam/runners/direct/UnboundedReadEvaluatorFactoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import static org.hamcrest.Matchers.not;
3131
import static org.hamcrest.Matchers.nullValue;
3232
import static org.junit.Assert.assertEquals;
33-
import static org.mockito.Matchers.any;
33+
import static org.mockito.ArgumentMatchers.any;
3434
import static org.mockito.Mockito.mock;
3535
import static org.mockito.Mockito.times;
3636
import static org.mockito.Mockito.verify;

‎runners/flink/src/test/java/org/apache/beam/runners/flink/metrics/FlinkMetricContainerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import static org.hamcrest.CoreMatchers.is;
2222
import static org.hamcrest.MatcherAssert.assertThat;
2323
import static org.junit.Assert.assertNotNull;
24+
import static org.mockito.ArgumentMatchers.anyObject;
2425
import static org.mockito.ArgumentMatchers.anyString;
25-
import static org.mockito.Matchers.anyObject;
26-
import static org.mockito.Matchers.argThat;
27-
import static org.mockito.Matchers.eq;
26+
import static org.mockito.ArgumentMatchers.argThat;
27+
import static org.mockito.ArgumentMatchers.eq;
2828
import static org.mockito.Mockito.verify;
2929
import static org.mockito.Mockito.when;
3030

‎runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/FlinkExecutableStageFunctionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import static org.apache.beam.sdk.util.construction.PTransformTranslation.PAR_DO_TRANSFORM_URN;
2121
import static org.hamcrest.Matchers.is;
22-
import static org.mockito.Matchers.any;
22+
import static org.mockito.ArgumentMatchers.any;
2323
import static org.mockito.Mockito.doThrow;
2424
import static org.mockito.Mockito.verify;
2525
import static org.mockito.Mockito.verifyNoMoreInteractions;

‎runners/flink/src/test/java/org/apache/beam/runners/flink/translation/functions/ImpulseSourceFunctionTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.hamcrest.MatcherAssert.assertThat;
2121
import static org.hamcrest.core.Is.is;
2222
import static org.hamcrest.core.IsInstanceOf.instanceOf;
23-
import static org.mockito.Matchers.argThat;
23+
import static org.mockito.ArgumentMatchers.argThat;
2424
import static org.mockito.Mockito.verify;
2525
import static org.mockito.Mockito.verifyNoMoreInteractions;
2626
import static org.mockito.Mockito.when;
@@ -39,7 +39,7 @@
3939
import org.junit.Test;
4040
import org.junit.rules.TestName;
4141
import org.mockito.ArgumentMatcher;
42-
import org.mockito.Matchers;
42+
import org.mockito.ArgumentMatchers;
4343
import org.mockito.Mockito;
4444
import org.slf4j.Logger;
4545
import org.slf4j.LoggerFactory;
@@ -187,7 +187,7 @@ private static <T> FunctionInitializationContext getInitializationContext(ListSt
187187
private static <T> OperatorStateStore getMockOperatorState(ListState<T> listState)
188188
throws Exception {
189189
OperatorStateStore mock = Mockito.mock(OperatorStateStore.class);
190-
when(mock.getListState(Matchers.any(ListStateDescriptor.class))).thenReturn(listState);
190+
when(mock.getListState(ArgumentMatchers.any(ListStateDescriptor.class))).thenReturn(listState);
191191
return mock;
192192
}
193193

‎runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/ExecutableStageDoFnOperatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import static org.junit.Assert.assertNotEquals;
2929
import static org.junit.Assert.assertNotNull;
3030
import static org.junit.Assert.assertTrue;
31+
import static org.mockito.ArgumentMatchers.any;
3132
import static org.mockito.ArgumentMatchers.anyString;
32-
import static org.mockito.Matchers.any;
3333
import static org.mockito.Mockito.doAnswer;
3434
import static org.mockito.Mockito.doThrow;
3535
import static org.mockito.Mockito.verify;

‎runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/BatchStatefulParDoOverridesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.hamcrest.Matchers.equalTo;
2222
import static org.hamcrest.Matchers.not;
2323
import static org.hamcrest.Matchers.nullValue;
24-
import static org.mockito.Matchers.any;
24+
import static org.mockito.ArgumentMatchers.any;
2525
import static org.mockito.Mockito.doNothing;
2626
import static org.mockito.Mockito.mock;
2727
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import static org.hamcrest.Matchers.lessThanOrEqualTo;
2525
import static org.junit.Assert.assertEquals;
2626
import static org.mockito.ArgumentMatchers.anyString;
27-
import static org.mockito.Matchers.anyLong;
28-
import static org.mockito.Matchers.eq;
27+
import static org.mockito.ArgumentMatchers.anyLong;
28+
import static org.mockito.ArgumentMatchers.eq;
2929
import static org.mockito.Mockito.any;
3030
import static org.mockito.Mockito.mock;
3131
import static org.mockito.Mockito.verify;

‎runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineTranslatorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import static org.junit.Assert.assertNotNull;
3232
import static org.junit.Assert.assertNull;
3333
import static org.junit.Assert.assertTrue;
34-
import static org.mockito.Matchers.any;
35-
import static org.mockito.Matchers.argThat;
36-
import static org.mockito.Matchers.eq;
34+
import static org.mockito.ArgumentMatchers.any;
35+
import static org.mockito.ArgumentMatchers.argThat;
36+
import static org.mockito.ArgumentMatchers.eq;
3737
import static org.mockito.Mockito.doNothing;
3838
import static org.mockito.Mockito.mock;
3939
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/TestDataflowRunnerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static org.junit.Assert.assertSame;
2626
import static org.junit.Assert.fail;
2727
import static org.mockito.ArgumentMatchers.anyString;
28-
import static org.mockito.Matchers.any;
28+
import static org.mockito.ArgumentMatchers.any;
2929
import static org.mockito.Mockito.doReturn;
3030
import static org.mockito.Mockito.never;
3131
import static org.mockito.Mockito.spy;

‎runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/util/PackageUtilTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import static org.junit.Assert.assertNull;
2828
import static org.junit.Assert.assertTrue;
2929
import static org.junit.Assert.fail;
30-
import static org.mockito.Matchers.any;
31-
import static org.mockito.Matchers.anyListOf;
30+
import static org.mockito.ArgumentMatchers.any;
31+
import static org.mockito.ArgumentMatchers.anyListOf;
3232
import static org.mockito.Mockito.times;
3333
import static org.mockito.Mockito.verify;
3434
import static org.mockito.Mockito.verifyNoMoreInteractions;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/DataflowWorkProgressUpdaterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import static org.apache.beam.runners.dataflow.worker.SourceTranslationUtils.cloudProgressToReaderProgress;
2424
import static org.apache.beam.runners.dataflow.worker.SourceTranslationUtils.toDynamicSplitRequest;
2525
import static org.junit.Assert.assertEquals;
26-
import static org.mockito.Matchers.isA;
27-
import static org.mockito.Matchers.isNull;
26+
import static org.mockito.ArgumentMatchers.isA;
27+
import static org.mockito.ArgumentMatchers.isNull;
2828
import static org.mockito.Mockito.atLeastOnce;
2929
import static org.mockito.Mockito.times;
3030
import static org.mockito.Mockito.verify;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/IntrinsicMapTaskExecutorFactoryTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import static org.junit.Assert.assertEquals;
3131
import static org.junit.Assert.assertNull;
3232
import static org.junit.Assert.assertSame;
33-
import static org.mockito.Matchers.anyBoolean;
34-
import static org.mockito.Matchers.anyLong;
35-
import static org.mockito.Matchers.eq;
33+
import static org.mockito.ArgumentMatchers.anyBoolean;
34+
import static org.mockito.ArgumentMatchers.anyLong;
35+
import static org.mockito.ArgumentMatchers.eq;
3636
import static org.mockito.Mockito.verify;
3737
import static org.mockito.Mockito.verifyNoMoreInteractions;
3838
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/IntrinsicMapTaskExecutorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import static org.hamcrest.Matchers.contains;
3333
import static org.hamcrest.Matchers.equalTo;
3434
import static org.junit.Assert.fail;
35-
import static org.mockito.Matchers.anyBoolean;
36-
import static org.mockito.Matchers.eq;
35+
import static org.mockito.ArgumentMatchers.anyBoolean;
36+
import static org.mockito.ArgumentMatchers.eq;
3737
import static org.mockito.Mockito.verify;
3838
import static org.mockito.Mockito.verifyNoMoreInteractions;
3939

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/LazilyInitializedSideInputReaderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.junit.Assert.assertEquals;
2121
import static org.junit.Assert.assertFalse;
2222
import static org.junit.Assert.assertTrue;
23-
import static org.mockito.Matchers.any;
23+
import static org.mockito.ArgumentMatchers.any;
2424
import static org.mockito.Mockito.when;
2525

2626
import com.google.api.services.dataflow.model.SideInputInfo;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/PartialGroupByKeyParDoFnsTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
import org.junit.Test;
8080
import org.junit.runner.RunWith;
8181
import org.junit.runners.JUnit4;
82-
import org.mockito.Matchers;
82+
import org.mockito.ArgumentMatchers;
8383
import org.mockito.Mock;
8484
import org.mockito.Mockito;
8585
import org.mockito.MockitoAnnotations;
@@ -248,7 +248,7 @@ public void testPartialGroupByKeyWithCombinerAndSideInputs() throws Exception {
248248
ImmutableList.of(
249249
WindowedValue.valueInGlobalWindow(KV.of("hi", 4)),
250250
WindowedValue.valueInGlobalWindow(KV.of("there", 5))));
251-
when(mockSideInputFetcher.storeIfBlocked(Matchers.<WindowedValue<KV<String, Integer>>>any()))
251+
when(mockSideInputFetcher.storeIfBlocked(ArgumentMatchers.<WindowedValue<KV<String, Integer>>>any()))
252252
.thenReturn(false, false, false, true);
253253

254254
pgbkParDoFn.startBundle(receiver);
@@ -360,7 +360,7 @@ public void testCreateWithCombinerAndStreamingSideInputs() throws Exception {
360360

361361
when(mockSideInputReader.isEmpty()).thenReturn(false);
362362
when(mockStreamingStepContext.stateInternals()).thenReturn((StateInternals) mockStateInternals);
363-
when(mockStateInternals.state(Matchers.<StateNamespace>any(), Matchers.<StateTag>any()))
363+
when(mockStateInternals.state(ArgumentMatchers.<StateNamespace>any(), ArgumentMatchers.<StateTag>any()))
364364
.thenReturn(mockState);
365365
when(mockState.read()).thenReturn(Maps.newHashMap());
366366

@@ -394,7 +394,7 @@ public void testCoderSizeEstimationWithNonLazyObserver() throws Exception {
394394
return null;
395395
})
396396
.when(mockCoder)
397-
.registerByteSizeObserver(Matchers.eq("apple"), Matchers.<ElementByteSizeObserver>any());
397+
.registerByteSizeObserver(ArgumentMatchers.eq("apple"), ArgumentMatchers.<ElementByteSizeObserver>any());
398398
CoderSizeEstimator<String> estimator = new CoderSizeEstimator(mockCoder);
399399
assertEquals(5, estimator.estimateSize("apple"));
400400
}
@@ -410,7 +410,7 @@ public void testCoderSizeEstimationWithLazyObserver() throws Exception {
410410
return null;
411411
})
412412
.when(mockCoder)
413-
.registerByteSizeObserver(Matchers.eq("apple"), Matchers.<ElementByteSizeObserver>any());
413+
.registerByteSizeObserver(ArgumentMatchers.eq("apple"), ArgumentMatchers.<ElementByteSizeObserver>any());
414414

415415
// Encode the input to the output stream
416416
doAnswer(
@@ -422,7 +422,7 @@ public void testCoderSizeEstimationWithLazyObserver() throws Exception {
422422
return null;
423423
})
424424
.when(mockCoder)
425-
.encode(Matchers.eq("apple"), Matchers.<OutputStream>any());
425+
.encode(ArgumentMatchers.eq("apple"), ArgumentMatchers.<OutputStream>any());
426426
CoderSizeEstimator<String> estimator = new CoderSizeEstimator(mockCoder);
427427
// Observer never updates size, so if result is 5, must have delegated to actual encoding
428428
assertEquals(5L, estimator.estimateSize("apple"));

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.junit.Assert.fail;
3636
import static org.mockito.ArgumentMatchers.eq;
3737
import static org.mockito.ArgumentMatchers.nullable;
38-
import static org.mockito.Matchers.any;
38+
import static org.mockito.ArgumentMatchers.any;
3939
import static org.mockito.Mockito.atLeast;
4040
import static org.mockito.Mockito.atLeastOnce;
4141
import static org.mockito.Mockito.mock;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingKeyedWorkItemSideInputDoFnRunnerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import org.junit.Test;
6363
import org.junit.runner.RunWith;
6464
import org.junit.runners.JUnit4;
65-
import org.mockito.Matchers;
65+
import org.mockito.ArgumentMatchers;
6666
import org.mockito.Mock;
6767
import org.mockito.MockitoAnnotations;
6868

@@ -94,7 +94,7 @@ public void setUp() {
9494

9595
@Test
9696
public void testInvokeProcessElement() throws Exception {
97-
when(sideInputFetcher.storeIfBlocked(Matchers.<WindowedValue<Integer>>any()))
97+
when(sideInputFetcher.storeIfBlocked(ArgumentMatchers.<WindowedValue<Integer>>any()))
9898
.thenReturn(false, true, false)
9999
.thenThrow(new RuntimeException("Does not expect more calls"));
100100
when(mockTimerInternals.currentInputWatermarkTime()).thenReturn(new Instant(15L));

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputDoFnRunnerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import static org.hamcrest.Matchers.equalTo;
2323
import static org.junit.Assert.assertEquals;
2424
import static org.junit.Assert.assertTrue;
25-
import static org.mockito.Matchers.any;
26-
import static org.mockito.Matchers.eq;
25+
import static org.mockito.ArgumentMatchers.any;
26+
import static org.mockito.ArgumentMatchers.eq;
2727
import static org.mockito.Mockito.when;
2828

2929
import java.util.Arrays;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingSideInputFetcherTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import static org.hamcrest.MatcherAssert.assertThat;
2121
import static org.junit.Assert.assertTrue;
22-
import static org.mockito.Matchers.any;
23-
import static org.mockito.Matchers.eq;
22+
import static org.mockito.ArgumentMatchers.any;
23+
import static org.mockito.ArgumentMatchers.eq;
2424
import static org.mockito.Mockito.when;
2525

2626
import java.util.Arrays;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/UserParDoFnFactoryTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static org.hamcrest.Matchers.theInstance;
2525
import static org.hamcrest.core.AnyOf.anyOf;
2626
import static org.hamcrest.core.IsEqual.equalTo;
27-
import static org.mockito.Matchers.any;
27+
import static org.mockito.ArgumentMatchers.any;
2828
import static org.mockito.Mockito.mock;
2929
import static org.mockito.Mockito.verify;
3030
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/WorkItemStatusClientTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import static org.hamcrest.Matchers.hasEntry;
2727
import static org.hamcrest.Matchers.hasSize;
2828
import static org.hamcrest.Matchers.nullValue;
29-
import static org.mockito.Matchers.anyBoolean;
30-
import static org.mockito.Matchers.isA;
29+
import static org.mockito.ArgumentMatchers.anyBoolean;
30+
import static org.mockito.ArgumentMatchers.isA;
3131
import static org.mockito.Mockito.mock;
3232
import static org.mockito.Mockito.verify;
3333
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/status/DebugCaptureTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package org.apache.beam.runners.dataflow.worker.status;
1919

2020
import static org.junit.Assert.assertEquals;
21-
import static org.mockito.Matchers.eq;
22-
import static org.mockito.Matchers.isA;
21+
import static org.mockito.ArgumentMatchers.eq;
22+
import static org.mockito.ArgumentMatchers.isA;
2323
import static org.mockito.Mockito.mock;
2424
import static org.mockito.Mockito.never;
2525
import static org.mockito.Mockito.verify;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/streaming/harness/StreamingWorkerStatusReporterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package org.apache.beam.runners.dataflow.worker.streaming.harness;
1919

20-
import static org.mockito.Matchers.any;
21-
import static org.mockito.Matchers.anyInt;
20+
import static org.mockito.ArgumentMatchers.any;
21+
import static org.mockito.ArgumentMatchers.anyInt;
2222
import static org.mockito.Mockito.mock;
2323
import static org.mockito.Mockito.verify;
2424
import static org.mockito.Mockito.when;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/streaming/sideinput/SideInputStateFetcherTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.junit.Assert.assertEquals;
2323
import static org.junit.Assert.assertFalse;
2424
import static org.junit.Assert.assertNull;
25-
import static org.mockito.Matchers.any;
25+
import static org.mockito.ArgumentMatchers.any;
2626
import static org.mockito.Mockito.times;
2727
import static org.mockito.Mockito.verify;
2828
import static org.mockito.Mockito.verifyNoMoreInteractions;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/MapTaskExecutorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import static org.hamcrest.Matchers.equalTo;
3434
import static org.junit.Assert.assertEquals;
3535
import static org.junit.Assert.fail;
36-
import static org.mockito.Matchers.anyBoolean;
37-
import static org.mockito.Matchers.eq;
36+
import static org.mockito.ArgumentMatchers.anyBoolean;
37+
import static org.mockito.ArgumentMatchers.eq;
3838
import static org.mockito.Mockito.atLeastOnce;
3939
import static org.mockito.Mockito.verify;
4040
import static org.mockito.Mockito.verifyNoMoreInteractions;

‎runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/util/common/worker/ParDoOperationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import static org.apache.beam.runners.dataflow.worker.util.common.worker.TestOutputReceiver.TestOutputCounter.getMeanByteCounterName;
2121
import static org.apache.beam.runners.dataflow.worker.util.common.worker.TestOutputReceiver.TestOutputCounter.getObjectCounterName;
2222
import static org.hamcrest.MatcherAssert.assertThat;
23-
import static org.mockito.Matchers.anyBoolean;
24-
import static org.mockito.Matchers.eq;
23+
import static org.mockito.ArgumentMatchers.anyBoolean;
24+
import static org.mockito.ArgumentMatchers.eq;
2525
import static org.mockito.Mockito.verify;
2626
import static org.mockito.Mockito.verifyNoMoreInteractions;
2727
import static org.mockito.Mockito.when;

0 commit comments

Comments
 (0)