Skip to content

Commit c488bf4

Browse files
authoredOct 30, 2024
[FLINK-30196][tests] Replace usage of deprecated Mockito methods and update Mockito to 4.11.0
1 parent e19f576 commit c488bf4

File tree

30 files changed

+210
-324
lines changed

30 files changed

+210
-324
lines changed
 

‎flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.apache.hadoop.mapred.TaskAttemptContext;
3636
import org.apache.hadoop.util.Progressable;
3737
import org.junit.jupiter.api.Test;
38-
import org.mockito.Matchers;
38+
import org.mockito.ArgumentMatchers;
3939
import org.mockito.Mockito;
4040

4141
import java.io.IOException;
@@ -83,7 +83,7 @@ void testConfigureWithConfigurable() {
8383
HadoopOutputFormat<String, Long> outputFormat =
8484
new HadoopOutputFormat<>(dummyOutputFormat, jobConf);
8585

86-
outputFormat.configure(Matchers.<org.apache.flink.configuration.Configuration>any());
86+
outputFormat.configure(ArgumentMatchers.any());
8787

8888
verify(dummyOutputFormat, times(1)).setConf(any(Configuration.class));
8989
}
@@ -97,7 +97,7 @@ void testConfigureWithJobConfigurable() {
9797
HadoopOutputFormat<String, Long> outputFormat =
9898
new HadoopOutputFormat<>(dummyOutputFormat, jobConf);
9999

100-
outputFormat.configure(Matchers.<org.apache.flink.configuration.Configuration>any());
100+
outputFormat.configure(ArgumentMatchers.any());
101101

102102
verify(dummyOutputFormat, times(1)).configure(any(JobConf.class));
103103
}

‎flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import static org.assertj.core.api.Assertions.assertThat;
3131
import static org.assertj.core.api.Assertions.assertThatThrownBy;
32-
import static org.mockito.Matchers.anyLong;
32+
import static org.mockito.ArgumentMatchers.anyLong;
3333
import static org.mockito.Mockito.atLeastOnce;
3434
import static org.mockito.Mockito.never;
3535
import static org.mockito.Mockito.reset;

‎flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
import static org.hamcrest.CoreMatchers.equalTo;
6060
import static org.junit.Assert.assertEquals;
6161
import static org.junit.Assert.assertThat;
62-
import static org.mockito.Matchers.anyLong;
62+
import static org.mockito.ArgumentMatchers.anyLong;
6363

6464
/**
6565
* General tests for {@link NFA} features. See also {@link IterativeConditionsITCase}, {@link

‎flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorMasterHooksTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
import static org.apache.flink.runtime.checkpoint.CheckpointCoordinatorTestingUtils.StringSerializer;
5656
import static org.assertj.core.api.Assertions.assertThat;
5757
import static org.assertj.core.api.Assertions.fail;
58-
import static org.mockito.Matchers.eq;
59-
import static org.mockito.Matchers.isNull;
58+
import static org.mockito.ArgumentMatchers.eq;
59+
import static org.mockito.ArgumentMatchers.isNull;
6060
import static org.mockito.Mockito.any;
6161
import static org.mockito.Mockito.anyLong;
6262
import static org.mockito.Mockito.mock;

‎flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@
139139
import static org.apache.flink.util.Preconditions.checkState;
140140
import static org.assertj.core.api.Assertions.assertThat;
141141
import static org.assertj.core.api.Assertions.fail;
142+
import static org.mockito.ArgumentMatchers.any;
142143
import static org.mockito.ArgumentMatchers.anyList;
143144
import static org.mockito.ArgumentMatchers.anyLong;
144-
import static org.mockito.Matchers.any;
145145
import static org.mockito.Mockito.eq;
146146
import static org.mockito.Mockito.mock;
147147
import static org.mockito.Mockito.never;

‎flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedHaServicesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import static junit.framework.TestCase.assertTrue;
3838
import static org.hamcrest.Matchers.is;
3939
import static org.junit.Assert.assertThat;
40-
import static org.mockito.Matchers.any;
40+
import static org.mockito.ArgumentMatchers.any;
4141
import static org.mockito.Mockito.atLeast;
4242
import static org.mockito.Mockito.mock;
4343
import static org.mockito.Mockito.verify;

‎flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.junit.Before;
3131
import org.junit.Test;
3232

33-
import static org.mockito.Matchers.eq;
33+
import static org.mockito.ArgumentMatchers.eq;
3434
import static org.mockito.Mockito.mock;
3535
import static org.mockito.Mockito.verify;
3636

‎flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.flink.runtime.util.event.EventListener;
2828

2929
import org.junit.jupiter.api.Test;
30-
import org.mockito.Matchers;
30+
import org.mockito.ArgumentMatchers;
3131

3232
import java.io.IOException;
3333

@@ -57,9 +57,9 @@ void testTaskEvent() throws Exception {
5757
reader.handleEvent(new TestTaskEvent1()); // for listener1 only
5858
reader.handleEvent(new TestTaskEvent2()); // for listener2 only
5959

60-
verify(listener1, times(1)).onEvent(Matchers.any(TaskEvent.class));
61-
verify(listener2, times(1)).onEvent(Matchers.any(TaskEvent.class));
62-
verify(listener3, times(0)).onEvent(Matchers.any(TaskEvent.class));
60+
verify(listener1, times(1)).onEvent(ArgumentMatchers.any(TaskEvent.class));
61+
verify(listener2, times(1)).onEvent(ArgumentMatchers.any(TaskEvent.class));
62+
verify(listener3, times(0)).onEvent(ArgumentMatchers.any(TaskEvent.class));
6363
}
6464

6565
@Test

‎flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import java.util.function.Consumer;
4646

4747
import static org.apache.flink.runtime.io.network.buffer.BufferBuilderTestUtils.createFilledFinishedBufferConsumer;
48-
import static org.mockito.Matchers.any;
48+
import static org.mockito.ArgumentMatchers.any;
4949
import static org.mockito.Mockito.mock;
5050
import static org.mockito.Mockito.when;
5151

‎flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
import static org.apache.flink.util.Preconditions.checkNotNull;
102102
import static org.assertj.core.api.Assertions.assertThat;
103103
import static org.assertj.core.api.Assertions.assertThatThrownBy;
104-
import static org.mockito.Matchers.any;
104+
import static org.mockito.ArgumentMatchers.any;
105105
import static org.mockito.Mockito.mock;
106106
import static org.mockito.Mockito.spy;
107107
import static org.mockito.Mockito.times;

‎flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperExecutionPlansStoreITCase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
import static org.assertj.core.api.Assertions.assertThat;
5454
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
55-
import static org.mockito.Matchers.any;
55+
import static org.mockito.ArgumentMatchers.any;
5656
import static org.mockito.Mockito.atMost;
5757
import static org.mockito.Mockito.doAnswer;
5858
import static org.mockito.Mockito.mock;

‎flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474

7575
import static org.assertj.core.api.Assertions.assertThat;
7676
import static org.assertj.core.api.Assertions.assertThatThrownBy;
77+
import static org.mockito.ArgumentMatchers.any;
7778
import static org.mockito.ArgumentMatchers.eq;
78-
import static org.mockito.Matchers.any;
7979
import static org.mockito.Mockito.mock;
8080
import static org.mockito.Mockito.when;
8181

‎flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@
125125
import static org.assertj.core.api.Assertions.assertThatThrownBy;
126126
import static org.assertj.core.api.Assertions.fail;
127127
import static org.assertj.core.api.Assumptions.assumeThat;
128-
import static org.mockito.Matchers.any;
129-
import static org.mockito.Matchers.eq;
128+
import static org.mockito.ArgumentMatchers.any;
129+
import static org.mockito.ArgumentMatchers.eq;
130130
import static org.mockito.Mockito.mock;
131131
import static org.mockito.Mockito.times;
132132
import static org.mockito.Mockito.verify;

‎flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
import static org.junit.Assert.assertFalse;
6161
import static org.junit.Assert.assertThrows;
6262
import static org.junit.Assert.assertTrue;
63-
import static org.mockito.Matchers.any;
64-
import static org.mockito.Matchers.anyBoolean;
65-
import static org.mockito.Matchers.eq;
63+
import static org.mockito.ArgumentMatchers.any;
64+
import static org.mockito.ArgumentMatchers.anyBoolean;
65+
import static org.mockito.ArgumentMatchers.eq;
6666
import static org.mockito.Mockito.doAnswer;
6767
import static org.mockito.Mockito.doThrow;
6868
import static org.mockito.Mockito.mock;

‎flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
import org.apache.flink.streaming.util.MockStreamTaskBuilder;
7171

7272
import org.junit.jupiter.api.Test;
73-
import org.mockito.Matchers;
73+
import org.mockito.ArgumentMatchers;
7474
import org.mockito.invocation.InvocationOnMock;
7575
import org.mockito.stubbing.Answer;
7676

@@ -483,7 +483,9 @@ public <T> TypeSerializer<T> createSerializer(
483483
})
484484
.when(keyedStateBackend)
485485
.getPartitionedState(
486-
Matchers.any(), any(TypeSerializer.class), any(StateDescriptor.class));
486+
ArgumentMatchers.any(),
487+
any(TypeSerializer.class),
488+
any(StateDescriptor.class));
487489

488490
doAnswer(
489491
(Answer<Object>)
@@ -572,7 +574,9 @@ public ListState<String> answer(InvocationOnMock invocationOnMock)
572574
})
573575
.when(keyedStateBackend)
574576
.getPartitionedState(
575-
Matchers.any(), any(TypeSerializer.class), any(ListStateDescriptor.class));
577+
ArgumentMatchers.any(),
578+
any(TypeSerializer.class),
579+
any(ListStateDescriptor.class));
576580

577581
when(operatorMock.getKeyedStateStore()).thenReturn(keyedStateStore);
578582
when(operatorMock.getOperatorID()).thenReturn(new OperatorID());
@@ -643,7 +647,9 @@ public MapState<Integer, String> answer(
643647
})
644648
.when(keyedStateBackend)
645649
.getPartitionedState(
646-
Matchers.any(), any(TypeSerializer.class), any(MapStateDescriptor.class));
650+
ArgumentMatchers.any(),
651+
any(TypeSerializer.class),
652+
any(MapStateDescriptor.class));
647653

648654
when(operatorMock.getKeyedStateStore()).thenReturn(keyedStateStore);
649655
when(operatorMock.getOperatorID()).thenReturn(new OperatorID());

‎flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java

+8-16
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
2626

2727
import org.junit.jupiter.api.Test;
28-
import org.mockito.Matchers;
28+
import org.mockito.ArgumentMatchers;
2929
import org.mockito.invocation.InvocationOnMock;
3030
import org.mockito.stubbing.Answer;
3131

@@ -36,7 +36,7 @@
3636
import static org.apache.flink.streaming.runtime.operators.windowing.WindowOperatorContractTest.anyTimeWindow;
3737
import static org.apache.flink.streaming.runtime.operators.windowing.WindowOperatorContractTest.anyTriggerContext;
3838
import static org.assertj.core.api.Assertions.assertThat;
39-
import static org.mockito.Matchers.anyLong;
39+
import static org.mockito.ArgumentMatchers.anyLong;
4040
import static org.mockito.Mockito.doAnswer;
4141
import static org.mockito.Mockito.eq;
4242
import static org.mockito.Mockito.mock;
@@ -69,25 +69,25 @@ void testForwarding() throws Exception {
6969
PurgingTrigger.of(mockTrigger), new TimeWindow.Serializer());
7070

7171
when(mockTrigger.onElement(
72-
Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
72+
ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
7373
.thenReturn(TriggerResult.CONTINUE);
7474
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
7575
.isEqualTo(TriggerResult.CONTINUE);
7676

7777
when(mockTrigger.onElement(
78-
Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
78+
ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
7979
.thenReturn(TriggerResult.FIRE);
8080
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
8181
.isEqualTo(TriggerResult.FIRE_AND_PURGE);
8282

8383
when(mockTrigger.onElement(
84-
Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
84+
ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
8585
.thenReturn(TriggerResult.FIRE_AND_PURGE);
8686
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
8787
.isEqualTo(TriggerResult.FIRE_AND_PURGE);
8888

8989
when(mockTrigger.onElement(
90-
Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
90+
ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
9191
.thenReturn(TriggerResult.PURGE);
9292
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
9393
.isEqualTo(TriggerResult.PURGE);
@@ -111,11 +111,7 @@ public TriggerResult answer(InvocationOnMock invocation)
111111
}
112112
})
113113
.when(mockTrigger)
114-
.onElement(
115-
Matchers.<Integer>anyObject(),
116-
anyLong(),
117-
anyTimeWindow(),
118-
anyTriggerContext());
114+
.onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
119115

120116
// set up our timers
121117
testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2));
@@ -161,11 +157,7 @@ public TriggerResult answer(InvocationOnMock invocation)
161157
}
162158
})
163159
.when(mockTrigger)
164-
.onElement(
165-
Matchers.<Integer>anyObject(),
166-
anyLong(),
167-
anyTimeWindow(),
168-
anyTriggerContext());
160+
.onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
169161

170162
// set up our timers
171163
testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2));

‎flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
import org.apache.flink.util.OutputTag;
4141

4242
import org.junit.jupiter.api.Test;
43-
import org.mockito.Matchers;
43+
import org.mockito.ArgumentMatchers;
4444
import org.mockito.invocation.InvocationOnMock;
4545
import org.mockito.stubbing.Answer;
4646

4747
import java.util.Arrays;
4848

4949
import static org.assertj.core.api.Assertions.assertThat;
50-
import static org.mockito.Matchers.anyInt;
51-
import static org.mockito.Matchers.anyLong;
52-
import static org.mockito.Matchers.eq;
50+
import static org.mockito.ArgumentMatchers.anyInt;
51+
import static org.mockito.ArgumentMatchers.anyLong;
52+
import static org.mockito.ArgumentMatchers.eq;
5353
import static org.mockito.Mockito.doAnswer;
5454
import static org.mockito.Mockito.never;
5555
import static org.mockito.Mockito.times;
@@ -119,11 +119,7 @@ public TriggerResult answer(InvocationOnMock invocation)
119119
}
120120
})
121121
.when(mockTrigger)
122-
.onElement(
123-
Matchers.<Integer>anyObject(),
124-
anyLong(),
125-
anyTimeWindow(),
126-
anyTriggerContext());
122+
.onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
127123

128124
testHarness.processElement(new StreamRecord<>(1, 0L));
129125

0 commit comments

Comments
 (0)
Please sign in to comment.