You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by sn...@apache.org on 2024/10/30 16:08:08 UTC
(flink) branch master updated: [FLINK-30196][tests] Replace usage of deprecated Mockito methods and update Mockito to 4.11.0
This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new c488bf4675d [FLINK-30196][tests] Replace usage of deprecated Mockito methods and update Mockito to 4.11.0
c488bf4675d is described below
commit c488bf4675d8a16f9e6b958ade964a773eb49aac
Author: Sergey Nuyanzin <sn...@gmail.com>
AuthorDate: Wed Oct 30 17:08:00 2024 +0100
[FLINK-30196][tests] Replace usage of deprecated Mockito methods and update Mockito to 4.11.0
---
.../java/hadoop/mapred/HadoopOutputFormatTest.java | 6 +-
.../runtime/fs/hdfs/HadoopDataInputStreamTest.java | 2 +-
.../java/org/apache/flink/cep/nfa/NFAITCase.java | 2 +-
.../CheckpointCoordinatorMasterHooksTest.java | 4 +-
.../checkpoint/CheckpointCoordinatorTest.java | 2 +-
.../nonha/embedded/EmbeddedHaServicesTest.java | 2 +-
.../nonha/standalone/StandaloneHaServicesTest.java | 2 +-
.../io/network/api/reader/AbstractReaderTest.java | 8 +-
.../network/partition/InputChannelTestUtils.java | 2 +-
.../partition/consumer/RemoteInputChannelTest.java | 2 +-
.../ZooKeeperExecutionPlansStoreITCase.java | 2 +-
.../runtime/rest/handler/AbstractHandlerTest.java | 2 +-
.../flink/runtime/state/StateBackendTestBase.java | 4 +-
.../FsCheckpointStateOutputStreamTest.java | 6 +-
.../api/operators/StreamingRuntimeContextTest.java | 14 +-
.../operators/windowing/PurgingTriggerTest.java | 24 +-
.../RegularWindowOperatorContractTest.java | 14 +-
.../windowing/WindowOperatorContractTest.java | 324 +++++++--------------
.../runtime/tasks/StreamTaskTerminationTest.java | 4 +-
.../rocksdb/EmbeddedRocksDBStateBackendTest.java | 2 +-
.../functions/InternalWindowFunctionTest.java | 20 +-
.../DynamicEventTimeSessionWindowsTest.java | 14 +-
.../DynamicProcessingTimeSessionWindowsTest.java | 14 +-
.../windowing/EventTimeSessionWindowsTest.java | 12 +-
.../operators/windowing/MergingWindowSetTest.java | 8 +-
.../ProcessingTimeSessionWindowsTest.java | 12 +-
.../operators/windowing/WindowOperatorTest.java | 2 +-
.../assigners/SessionWindowAssignerTest.java | 6 +-
.../operator/WindowOperatorContractTest.java | 16 +-
pom.xml | 2 +-
30 files changed, 210 insertions(+), 324 deletions(-)
diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatTest.java b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatTest.java
index eebc1bc57d9..305f79fb80a 100644
--- a/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatTest.java
+++ b/flink-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatTest.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.mapred.Reporter;
import org.apache.hadoop.mapred.TaskAttemptContext;
import org.apache.hadoop.util.Progressable;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import java.io.IOException;
@@ -83,7 +83,7 @@ class HadoopOutputFormatTest {
HadoopOutputFormat<String, Long> outputFormat =
new HadoopOutputFormat<>(dummyOutputFormat, jobConf);
- outputFormat.configure(Matchers.<org.apache.flink.configuration.Configuration>any());
+ outputFormat.configure(ArgumentMatchers.any());
verify(dummyOutputFormat, times(1)).setConf(any(Configuration.class));
}
@@ -97,7 +97,7 @@ class HadoopOutputFormatTest {
HadoopOutputFormat<String, Long> outputFormat =
new HadoopOutputFormat<>(dummyOutputFormat, jobConf);
- outputFormat.configure(Matchers.<org.apache.flink.configuration.Configuration>any());
+ outputFormat.configure(ArgumentMatchers.any());
verify(dummyOutputFormat, times(1)).configure(any(JobConf.class));
}
diff --git a/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java b/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java
index f6a7c4333b9..f3c3722169f 100644
--- a/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java
+++ b/flink-filesystems/flink-hadoop-fs/src/test/java/org/apache/flink/runtime/fs/hdfs/HadoopDataInputStreamTest.java
@@ -29,7 +29,7 @@ import java.io.IOException;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java
index cc6d5386ac2..0768dda0537 100644
--- a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java
+++ b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/nfa/NFAITCase.java
@@ -59,7 +59,7 @@ import static org.apache.flink.cep.utils.NFAUtils.compile;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyLong;
/**
* General tests for {@link NFA} features. See also {@link IterativeConditionsITCase}, {@link
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorMasterHooksTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorMasterHooksTest.java
index 1cfd7b2775b..dd52fb92ec2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorMasterHooksTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorMasterHooksTest.java
@@ -55,8 +55,8 @@ import java.util.concurrent.ScheduledExecutorService;
import static org.apache.flink.runtime.checkpoint.CheckpointCoordinatorTestingUtils.StringSerializer;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.mock;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java
index 59c8476b522..1e5c4d82516 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/CheckpointCoordinatorTest.java
@@ -139,9 +139,9 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
import static org.apache.flink.util.Preconditions.checkState;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedHaServicesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedHaServicesTest.java
index 61220aa2b0f..deefa2bf2da 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedHaServicesTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/embedded/EmbeddedHaServicesTest.java
@@ -37,7 +37,7 @@ import java.util.UUID;
import static junit.framework.TestCase.assertTrue;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
index f9de159d016..d31b763820a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/highavailability/nonha/standalone/StandaloneHaServicesTest.java
@@ -30,7 +30,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java
index 32228784396..4f335ff0c12 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/api/reader/AbstractReaderTest.java
@@ -27,7 +27,7 @@ import org.apache.flink.runtime.io.network.partition.consumer.InputGate;
import org.apache.flink.runtime.util.event.EventListener;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.io.IOException;
@@ -57,9 +57,9 @@ class AbstractReaderTest {
reader.handleEvent(new TestTaskEvent1()); // for listener1 only
reader.handleEvent(new TestTaskEvent2()); // for listener2 only
- verify(listener1, times(1)).onEvent(Matchers.any(TaskEvent.class));
- verify(listener2, times(1)).onEvent(Matchers.any(TaskEvent.class));
- verify(listener3, times(0)).onEvent(Matchers.any(TaskEvent.class));
+ verify(listener1, times(1)).onEvent(ArgumentMatchers.any(TaskEvent.class));
+ verify(listener2, times(1)).onEvent(ArgumentMatchers.any(TaskEvent.class));
+ verify(listener3, times(0)).onEvent(ArgumentMatchers.any(TaskEvent.class));
}
@Test
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
index 8dab814680a..b59b8067c2a 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/InputChannelTestUtils.java
@@ -45,7 +45,7 @@ import java.util.Collections;
import java.util.function.Consumer;
import static org.apache.flink.runtime.io.network.buffer.BufferBuilderTestUtils.createFilledFinishedBufferConsumer;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java
index 0cfb031f968..08facc058db 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/io/network/partition/consumer/RemoteInputChannelTest.java
@@ -101,7 +101,7 @@ import static org.apache.flink.runtime.state.CheckpointStorageLocationReference.
import static org.apache.flink.util.Preconditions.checkNotNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperExecutionPlansStoreITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperExecutionPlansStoreITCase.java
index ac8a6eb6e82..c4879ffa41d 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperExecutionPlansStoreITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/ZooKeeperExecutionPlansStoreITCase.java
@@ -52,7 +52,7 @@ import java.util.concurrent.CountDownLatch;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
index 0343c352d16..653870638ac 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/AbstractHandlerTest.java
@@ -74,8 +74,8 @@ import java.util.concurrent.atomic.AtomicReference;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
index 1bfc9d4237e..c0756af7bad 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/StateBackendTestBase.java
@@ -125,8 +125,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assertions.fail;
import static org.assertj.core.api.Assumptions.assumeThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
index 8a0a330acf6..20c776b61ed 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/state/filesystem/FsCheckpointStateOutputStreamTest.java
@@ -60,9 +60,9 @@ import static org.assertj.core.api.Assumptions.assumeThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
index 0cf2009bedd..a61b40dc5a5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/api/operators/StreamingRuntimeContextTest.java
@@ -70,7 +70,7 @@ import org.apache.flink.streaming.util.CollectorOutput;
import org.apache.flink.streaming.util.MockStreamTaskBuilder;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -483,7 +483,9 @@ class StreamingRuntimeContextTest {
})
.when(keyedStateBackend)
.getPartitionedState(
- Matchers.any(), any(TypeSerializer.class), any(StateDescriptor.class));
+ ArgumentMatchers.any(),
+ any(TypeSerializer.class),
+ any(StateDescriptor.class));
doAnswer(
(Answer<Object>)
@@ -572,7 +574,9 @@ class StreamingRuntimeContextTest {
})
.when(keyedStateBackend)
.getPartitionedState(
- Matchers.any(), any(TypeSerializer.class), any(ListStateDescriptor.class));
+ ArgumentMatchers.any(),
+ any(TypeSerializer.class),
+ any(ListStateDescriptor.class));
when(operatorMock.getKeyedStateStore()).thenReturn(keyedStateStore);
when(operatorMock.getOperatorID()).thenReturn(new OperatorID());
@@ -643,7 +647,9 @@ class StreamingRuntimeContextTest {
})
.when(keyedStateBackend)
.getPartitionedState(
- Matchers.any(), any(TypeSerializer.class), any(MapStateDescriptor.class));
+ ArgumentMatchers.any(),
+ any(TypeSerializer.class),
+ any(MapStateDescriptor.class));
when(operatorMock.getKeyedStateStore()).thenReturn(keyedStateStore);
when(operatorMock.getOperatorID()).thenReturn(new OperatorID());
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
index 86dbfbe2f28..b0d867cf184 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/PurgingTriggerTest.java
@@ -25,7 +25,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -36,7 +36,7 @@ import static org.apache.flink.streaming.runtime.operators.windowing.WindowOpera
import static org.apache.flink.streaming.runtime.operators.windowing.WindowOperatorContractTest.anyTimeWindow;
import static org.apache.flink.streaming.runtime.operators.windowing.WindowOperatorContractTest.anyTriggerContext;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
@@ -69,25 +69,25 @@ class PurgingTriggerTest {
PurgingTrigger.of(mockTrigger), new TimeWindow.Serializer());
when(mockTrigger.onElement(
- Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
+ ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
.thenReturn(TriggerResult.CONTINUE);
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
.isEqualTo(TriggerResult.CONTINUE);
when(mockTrigger.onElement(
- Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
+ ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
.thenReturn(TriggerResult.FIRE);
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
.isEqualTo(TriggerResult.FIRE_AND_PURGE);
when(mockTrigger.onElement(
- Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
+ ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
.thenReturn(TriggerResult.FIRE_AND_PURGE);
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
.isEqualTo(TriggerResult.FIRE_AND_PURGE);
when(mockTrigger.onElement(
- Matchers.anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
+ ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
.thenReturn(TriggerResult.PURGE);
assertThat(testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2)))
.isEqualTo(TriggerResult.PURGE);
@@ -111,11 +111,7 @@ class PurgingTriggerTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
// set up our timers
testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2));
@@ -161,11 +157,7 @@ class PurgingTriggerTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
// set up our timers
testHarness.processElement(new StreamRecord<>(1), new TimeWindow(0, 2));
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
index 7308dffe253..cae47db4ff6 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/RegularWindowOperatorContractTest.java
@@ -40,16 +40,16 @@ import org.apache.flink.streaming.util.KeyedOneInputStreamOperatorTestHarness;
import org.apache.flink.util.OutputTag;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@@ -119,11 +119,7 @@ class RegularWindowOperatorContractTest extends WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(1, 0L));
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
index cc88380f123..90ae5211d38 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorContractTest.java
@@ -18,7 +18,6 @@
package org.apache.flink.streaming.runtime.operators.windowing;
-import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.functions.AggregateFunction;
import org.apache.flink.api.common.state.AggregatingStateDescriptor;
import org.apache.flink.api.common.state.KeyedStateStore;
@@ -45,7 +44,7 @@ import org.apache.flink.util.Collector;
import org.apache.flink.util.OutputTag;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -63,10 +62,10 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.HamcrestCondition.matching;
import static org.hamcrest.Matchers.contains;
-import static org.mockito.Matchers.anyCollection;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -86,7 +85,7 @@ import static org.mockito.hamcrest.MockitoHamcrest.argThat;
*/
abstract class WindowOperatorContractTest {
- private static ValueStateDescriptor<String> valueStateDescriptor =
+ private static final ValueStateDescriptor<String> valueStateDescriptor =
new ValueStateDescriptor<>("string-state", StringSerializer.INSTANCE, null);
static <IN, OUT, KEY, W extends Window>
@@ -103,11 +102,14 @@ abstract class WindowOperatorContractTest {
Trigger<T, W> mockTrigger = mock(Trigger.class);
when(mockTrigger.onElement(
- Matchers.<T>any(), anyLong(), Matchers.<W>any(), anyTriggerContext()))
+ ArgumentMatchers.any(),
+ anyLong(),
+ ArgumentMatchers.any(),
+ anyTriggerContext()))
.thenReturn(TriggerResult.CONTINUE);
- when(mockTrigger.onEventTime(anyLong(), Matchers.<W>any(), anyTriggerContext()))
+ when(mockTrigger.onEventTime(anyLong(), ArgumentMatchers.any(), anyTriggerContext()))
.thenReturn(TriggerResult.CONTINUE);
- when(mockTrigger.onProcessingTime(anyLong(), Matchers.<W>any(), anyTriggerContext()))
+ when(mockTrigger.onProcessingTime(anyLong(), ArgumentMatchers.any(), anyTriggerContext()))
.thenReturn(TriggerResult.CONTINUE);
return mockTrigger;
@@ -117,7 +119,7 @@ abstract class WindowOperatorContractTest {
@SuppressWarnings("unchecked")
WindowAssigner<T, TimeWindow> mockAssigner = mock(WindowAssigner.class);
- when(mockAssigner.getWindowSerializer(Mockito.<ExecutionConfig>any()))
+ when(mockAssigner.getWindowSerializer(Mockito.any()))
.thenReturn(new TimeWindow.Serializer());
when(mockAssigner.isEventTime()).thenReturn(true);
@@ -128,10 +130,10 @@ abstract class WindowOperatorContractTest {
@SuppressWarnings("unchecked")
WindowAssigner<T, GlobalWindow> mockAssigner = mock(WindowAssigner.class);
- when(mockAssigner.getWindowSerializer(Mockito.<ExecutionConfig>any()))
+ when(mockAssigner.getWindowSerializer(Mockito.any()))
.thenReturn(new GlobalWindow.Serializer());
when(mockAssigner.isEventTime()).thenReturn(true);
- when(mockAssigner.assignWindows(Mockito.<T>any(), anyLong(), anyAssignerContext()))
+ when(mockAssigner.assignWindows(Mockito.any(), anyLong(), anyAssignerContext()))
.thenReturn(Collections.singletonList(GlobalWindow.get()));
return mockAssigner;
@@ -141,7 +143,7 @@ abstract class WindowOperatorContractTest {
@SuppressWarnings("unchecked")
MergingWindowAssigner<T, TimeWindow> mockAssigner = mock(MergingWindowAssigner.class);
- when(mockAssigner.getWindowSerializer(Mockito.<ExecutionConfig>any()))
+ when(mockAssigner.getWindowSerializer(Mockito.any()))
.thenReturn(new TimeWindow.Serializer());
when(mockAssigner.isEventTime()).thenReturn(true);
@@ -200,8 +202,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
}
private static <T> void shouldDeleteEventTimeTimerOnElement(
@@ -219,8 +220,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
}
private static <T> void shouldRegisterProcessingTimeTimerOnElement(
@@ -238,8 +238,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
}
private static <T> void shouldDeleteProcessingTimeTimerOnElement(
@@ -257,8 +256,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
}
@SuppressWarnings("unchecked")
@@ -287,38 +285,16 @@ abstract class WindowOperatorContractTest {
}
})
.when(assigner)
- .mergeWindows(
- anyCollection(), Matchers.<MergingWindowAssigner.MergeCallback>anyObject());
- }
-
- private static <T> void shouldContinueOnElement(Trigger<T, TimeWindow> mockTrigger)
- throws Exception {
- when(mockTrigger.onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
- .thenReturn(TriggerResult.CONTINUE);
+ .mergeWindows(anyCollection(), ArgumentMatchers.any());
}
private static <T> void shouldFireOnElement(Trigger<T, TimeWindow> mockTrigger)
throws Exception {
when(mockTrigger.onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
+ ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext()))
.thenReturn(TriggerResult.FIRE);
}
- private static <T> void shouldPurgeOnElement(Trigger<T, TimeWindow> mockTrigger)
- throws Exception {
- when(mockTrigger.onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
- .thenReturn(TriggerResult.PURGE);
- }
-
- private static <T> void shouldFireAndPurgeOnElement(Trigger<T, TimeWindow> mockTrigger)
- throws Exception {
- when(mockTrigger.onElement(
- Matchers.<T>anyObject(), anyLong(), anyTimeWindow(), anyTriggerContext()))
- .thenReturn(TriggerResult.FIRE_AND_PURGE);
- }
-
private static <T> void shouldContinueOnEventTime(Trigger<T, TimeWindow> mockTrigger)
throws Exception {
when(mockTrigger.onEventTime(anyLong(), anyTimeWindow(), anyTriggerContext()))
@@ -388,7 +364,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Collections.<TimeWindow>emptyList());
+ .thenReturn(Collections.emptyList());
testHarness.processWatermark(0);
testHarness.processElement(new StreamRecord<>(0, 5L));
@@ -542,21 +518,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq((new TimeWindow(0, 2))),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
}
@Test
@@ -608,21 +584,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0, 0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(1),
eq(new TimeWindow(0, 1)),
anyInternalWindowContext(),
intIterable(1, 1),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
}
@Test
@@ -677,11 +653,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<Void>() {
@@ -700,7 +672,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<String>anyCollector());
+ WindowOperatorContractTest.anyCollector());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -710,7 +682,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<String>anyCollector());
+ WindowOperatorContractTest.anyCollector());
assertThat(testHarness.extractOutputStreamRecords())
.is(matching(contains(streamRecord("Hallo", 1L), streamRecord("Ciao", 1L))));
@@ -758,7 +730,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<String>anyCollector());
+ WindowOperatorContractTest.anyCollector());
timeAdaptor.shouldRegisterTimerOnElement(mockTrigger, 1);
@@ -770,7 +742,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<String>anyCollector());
+ WindowOperatorContractTest.anyCollector());
assertThat(testHarness.extractOutputStreamRecords()).isEmpty();
timeAdaptor.shouldFireOnTime(mockTrigger);
@@ -783,7 +755,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<String>anyCollector());
+ WindowOperatorContractTest.anyCollector());
assertThat(testHarness.extractOutputStreamRecords())
.is(matching(contains(streamRecord("Hallo", 1L), streamRecord("Ciao", 1L))));
@@ -822,11 +794,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -875,11 +843,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -889,21 +853,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// clear is only called at cleanup time/GC time
verify(mockTrigger, never()).clear(anyTimeWindow(), anyTriggerContext());
@@ -947,11 +911,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -961,21 +921,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// clear is only called at cleanup time/GC time
verify(mockTrigger, never()).clear(anyTimeWindow(), anyTriggerContext());
@@ -1020,11 +980,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1088,11 +1044,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
timeAdaptor.shouldContinueOnTime(mockTrigger);
@@ -1159,11 +1111,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
timeAdaptor.shouldFireOnTime(mockTrigger);
@@ -1183,21 +1131,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// clear is only called at cleanup time/GC time
verify(mockTrigger, never()).clear(anyTimeWindow(), anyTriggerContext());
@@ -1251,11 +1199,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
timeAdaptor.shouldFireAndPurgeOnTime(mockTrigger);
@@ -1275,21 +1219,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// clear is only called at cleanup time/GC time
verify(mockTrigger, never()).clear(anyTimeWindow(), anyTriggerContext());
@@ -1345,11 +1289,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
timeAdaptor.shouldPurgeOnTime(mockTrigger);
@@ -1408,7 +1348,7 @@ abstract class WindowOperatorContractTest {
timeAdaptor.advanceTime(testHarness, Long.MIN_VALUE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(2, 4)));
+ .thenReturn(List.of(new TimeWindow(2, 4)));
assertThat(testHarness.extractOutputStreamRecords()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -1426,11 +1366,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1486,7 +1422,7 @@ abstract class WindowOperatorContractTest {
timeAdaptor.advanceTime(testHarness, Long.MIN_VALUE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(2, 4)));
+ .thenReturn(List.of(new TimeWindow(2, 4)));
assertThat(testHarness.extractOutputStreamRecords()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -1504,11 +1440,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1564,7 +1496,7 @@ abstract class WindowOperatorContractTest {
timeAdaptor.advanceTime(testHarness, Long.MIN_VALUE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(2, 4)));
+ .thenReturn(List.of(new TimeWindow(2, 4)));
assertThat(testHarness.extractOutputStreamRecords()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -1582,11 +1514,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1613,7 +1541,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<List<Integer>>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// now we trigger the dangling timer
timeAdaptor.advanceTime(testHarness, 10L);
@@ -1647,7 +1575,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
assertThat(timeAdaptor.numTimers(testHarness)).isZero();
@@ -1697,7 +1625,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 100)));
+ .thenReturn(List.of(new TimeWindow(0, 100)));
assertThat(timeAdaptor.numTimers(testHarness)).isZero();
@@ -1759,7 +1687,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 100)));
+ .thenReturn(List.of(new TimeWindow(0, 100)));
assertThat(timeAdaptor.numTimers(testHarness)).isZero();
@@ -1863,11 +1791,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<TriggerResult>() {
@@ -1900,7 +1824,7 @@ abstract class WindowOperatorContractTest {
.clear(anyTimeWindow(), anyTriggerContext());
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1910,7 +1834,7 @@ abstract class WindowOperatorContractTest {
assertThat(timeAdaptor.numTimers(testHarness)).isEqualTo(2); // timer and GC timer
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(2, 4)));
+ .thenReturn(List.of(new TimeWindow(2, 4)));
shouldMergeWindows(
mockAssigner,
@@ -1929,11 +1853,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1983,7 +1903,7 @@ abstract class WindowOperatorContractTest {
assertThat(testHarness.numKeyedStateEntries()).isZero();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 22)));
+ .thenReturn(List.of(new TimeWindow(0, 22)));
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -1992,7 +1912,7 @@ abstract class WindowOperatorContractTest {
assertThat(timeAdaptor.numTimers(testHarness)).isOne(); // cleanup timer
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 25)));
+ .thenReturn(List.of(new TimeWindow(0, 25)));
timeAdaptor.advanceTime(testHarness, 20);
@@ -2015,7 +1935,7 @@ abstract class WindowOperatorContractTest {
// now merge it to a window that is just late
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 25)));
+ .thenReturn(List.of(new TimeWindow(0, 25)));
shouldMergeWindows(
mockAssigner,
@@ -2080,11 +2000,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<TriggerResult>() {
@@ -2118,7 +2034,7 @@ abstract class WindowOperatorContractTest {
.clear(anyTimeWindow(), anyTriggerContext());
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -2128,7 +2044,7 @@ abstract class WindowOperatorContractTest {
assertThat(timeAdaptor.numTimers(testHarness)).isEqualTo(2); // trigger timer plus GC timer
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(2, 4)));
+ .thenReturn(List.of(new TimeWindow(2, 4)));
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -2138,7 +2054,7 @@ abstract class WindowOperatorContractTest {
assertThat(timeAdaptor.numTimers(testHarness)).isEqualTo(4); // trigger timer plus GC timer
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(1, 3)));
+ .thenReturn(List.of(new TimeWindow(1, 3)));
shouldMergeWindows(
mockAssigner,
@@ -2174,7 +2090,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2188,11 +2104,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -2228,7 +2140,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 4)));
+ .thenReturn(List.of(new TimeWindow(0, 4)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2305,7 +2217,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, Long.MAX_VALUE - 10)));
+ .thenReturn(List.of(new TimeWindow(0, Long.MAX_VALUE - 10)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2335,7 +2247,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, Long.MAX_VALUE - 10)));
+ .thenReturn(List.of(new TimeWindow(0, Long.MAX_VALUE - 10)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2390,7 +2302,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2421,7 +2333,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 20)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockTrigger, times(1)).clear(anyTimeWindow(), anyTriggerContext());
@@ -2453,7 +2365,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2471,11 +2383,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -2520,7 +2428,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2539,11 +2447,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<Object>() {
@@ -2605,7 +2509,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2624,11 +2528,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<Object>() {
@@ -2693,7 +2593,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2712,11 +2612,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
doAnswer(
new Answer<Object>() {
@@ -2776,7 +2672,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2806,7 +2702,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2824,7 +2720,7 @@ abstract class WindowOperatorContractTest {
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// clear is only called at cleanup time/GC time
verify(mockTrigger, never()).clear(anyTimeWindow(), anyTriggerContext());
@@ -2848,7 +2744,7 @@ abstract class WindowOperatorContractTest {
testHarness.open();
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 2)));
+ .thenReturn(List.of(new TimeWindow(0, 2)));
assertThat(testHarness.getOutput()).isEmpty();
assertThat(testHarness.numKeyedStateEntries()).isZero();
@@ -2901,11 +2797,7 @@ abstract class WindowOperatorContractTest {
}
})
.when(mockTrigger)
- .onElement(
- Matchers.<Integer>anyObject(),
- anyLong(),
- anyTimeWindow(),
- anyTriggerContext());
+ .onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow(), anyTriggerContext());
shouldFireAndPurgeOnEventTime(mockTrigger);
@@ -2967,21 +2859,21 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(0, 2)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
verify(mockWindowFunction, times(1))
.process(
eq(0),
eq(new TimeWindow(2, 4)),
anyInternalWindowContext(),
intIterable(0),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
// it's also called for the cleanup timers
verify(mockTrigger, times(4)).onEventTime(anyLong(), anyTimeWindow(), anyTriggerContext());
@@ -3021,7 +2913,7 @@ abstract class WindowOperatorContractTest {
.thenReturn(TriggerResult.FIRE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
doAnswer(
new Answer<Object>() {
@@ -3043,7 +2935,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
doAnswer(
new Answer<Object>() {
@@ -3091,7 +2983,7 @@ abstract class WindowOperatorContractTest {
.thenReturn(TriggerResult.FIRE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
doAnswer(
new Answer<Object>() {
@@ -3113,7 +3005,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
assertThatThrownBy(() -> testHarness.processElement(new StreamRecord<>(0, 0L)))
.isInstanceOf(UnsupportedOperationException.class)
@@ -3171,7 +3063,7 @@ abstract class WindowOperatorContractTest {
.thenReturn(TriggerResult.FIRE);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
AtomicBoolean processWasInvoked = new AtomicBoolean(false);
@@ -3270,7 +3162,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
testHarness.processElement(new StreamRecord<>(0, 0L));
@@ -3292,7 +3184,7 @@ abstract class WindowOperatorContractTest {
shouldFireOnElement(mockTrigger);
when(mockAssigner.assignWindows(anyInt(), anyLong(), anyAssignerContext()))
- .thenReturn(Arrays.asList(new TimeWindow(0, 20)));
+ .thenReturn(List.of(new TimeWindow(0, 20)));
doAnswer(
new Answer<Object>() {
@@ -3312,7 +3204,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
doAnswer(
new Answer<Object>() {
@@ -3339,7 +3231,7 @@ abstract class WindowOperatorContractTest {
anyTimeWindow(),
anyInternalWindowContext(),
anyIntIterable(),
- WindowOperatorContractTest.<Void>anyCollector());
+ WindowOperatorContractTest.anyCollector());
timeAdaptor.advanceTime(testHarness, 100);
diff --git a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
index 15de9ae0c82..b75d417abb7 100644
--- a/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/streaming/runtime/tasks/StreamTaskTerminationTest.java
@@ -91,8 +91,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import static org.apache.flink.runtime.executiongraph.ExecutionGraphTestUtils.createExecutionAttemptId;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java
index 664f1dba2f4..b188f9afae5 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java
+++ b/flink-state-backends/flink-statebackend-rocksdb/src/test/java/org/apache/flink/state/rocksdb/EmbeddedRocksDBStateBackendTest.java
@@ -102,7 +102,7 @@ import static org.apache.flink.state.rocksdb.RocksDBConfigurableOptions.USE_INGE
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/windowing/functions/InternalWindowFunctionTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/windowing/functions/InternalWindowFunctionTest.java
index 978d5f554ab..1b94b8cd7ad 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/windowing/functions/InternalWindowFunctionTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/api/operators/windowing/functions/InternalWindowFunctionTest.java
@@ -58,10 +58,10 @@ import java.util.Map;
import java.util.Set;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.contains;
import static org.hamcrest.collection.IsMapContaining.hasEntry;
import static org.hamcrest.core.AllOf.allOf;
-import static org.mockito.Mockito.anyObject;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
@@ -151,7 +151,7 @@ class InternalWindowFunctionTest {
InternalWindowFunction.InternalWindowContext ctx =
mock(InternalWindowFunction.InternalWindowContext.class);
windowFunction.process(((byte) 0), w, ctx, i, c);
- verify(mock).process((ProcessAllWindowFunctionMock.Context) anyObject(), eq(i), eq(c));
+ verify(mock).process(any(), eq(i), eq(c));
// check close
windowFunction.close();
@@ -252,7 +252,7 @@ class InternalWindowFunctionTest {
}
})
.when(mock)
- .process(eq(42L), (ProcessWindowFunctionMock.Context) anyObject(), eq(i), eq(c));
+ .process(eq(42L), any(), eq(i), eq(c));
windowFunction.process(42L, w, ctx, i, c);
verify(ctx).currentProcessingTime();
@@ -398,7 +398,7 @@ class InternalWindowFunctionTest {
windowFunction.process(((byte) 0), w, ctx, 23L, c);
verify(mock)
.process(
- (ProcessAllWindowFunctionMock.Context) anyObject(),
+ (ProcessAllWindowFunctionMock.Context) any(),
(Iterable<Long>) argThat(IsIterableContainingInOrder.contains(23L)),
eq(c));
@@ -459,7 +459,7 @@ class InternalWindowFunctionTest {
.when(mock)
.process(
eq(42L),
- (ProcessWindowFunctionMock.Context) anyObject(),
+ (ProcessWindowFunctionMock.Context) any(),
(Iterable<Long>) argThat(IsIterableContainingInOrder.contains(23L)),
eq(c));
@@ -563,10 +563,10 @@ class InternalWindowFunctionTest {
.when(mock)
.process(
eq(42L),
- (AggregateProcessWindowFunctionMock.Context) anyObject(),
+ any(),
(Iterable)
argThat(
- containsInAnyOrder(
+ contains(
allOf(
hasEntry(is(23L), is(23L)),
hasEntry(is(24L), is(24L))))),
@@ -658,10 +658,10 @@ class InternalWindowFunctionTest {
windowFunction.process(((byte) 0), w, ctx, args, c);
verify(mock)
.process(
- (AggregateProcessAllWindowFunctionMock.Context) anyObject(),
+ any(),
(Iterable)
argThat(
- containsInAnyOrder(
+ contains(
allOf(
hasEntry(is(23L), is(23L)),
hasEntry(is(24L), is(24L))))),
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java
index 0baa5f14cea..e6832729a86 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicEventTimeSessionWindowsTest.java
@@ -27,7 +27,7 @@ import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger;
import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.util.Arrays;
import java.util.Collection;
@@ -36,8 +36,8 @@ import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyCollection;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -82,7 +82,7 @@ class DynamicEventTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 0)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -97,7 +97,7 @@ class DynamicEventTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 1)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -137,7 +137,7 @@ class DynamicEventTimeSessionWindowsTest {
new TimeWindow(4, 5), new TimeWindow(5, 6))),
eq(new TimeWindow(4, 6)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -174,7 +174,7 @@ class DynamicEventTimeSessionWindowsTest {
new TimeWindow(5, 6), new TimeWindow(4, 7))),
eq(new TimeWindow(4, 7)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java
index 56c42dd8c81..373796b4020 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/DynamicProcessingTimeSessionWindowsTest.java
@@ -27,7 +27,7 @@ import org.apache.flink.streaming.api.windowing.triggers.ProcessingTimeTrigger;
import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.util.Arrays;
import java.util.Collection;
@@ -36,8 +36,8 @@ import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyCollection;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -87,7 +87,7 @@ class DynamicProcessingTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 0)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -102,7 +102,7 @@ class DynamicProcessingTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 1)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -142,7 +142,7 @@ class DynamicProcessingTimeSessionWindowsTest {
new TimeWindow(4, 5), new TimeWindow(5, 6))),
eq(new TimeWindow(4, 6)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -179,7 +179,7 @@ class DynamicProcessingTimeSessionWindowsTest {
new TimeWindow(5, 6), new TimeWindow(4, 7))),
eq(new TimeWindow(4, 7)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java
index 89b31877e82..aa27fd3ad3d 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/EventTimeSessionWindowsTest.java
@@ -28,7 +28,7 @@ import org.apache.flink.streaming.api.windowing.triggers.EventTimeTrigger;
import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.time.Duration;
import java.util.Arrays;
@@ -38,7 +38,7 @@ import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.mockito.Matchers.anyCollection;
+import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -76,7 +76,7 @@ class EventTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 0)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -88,7 +88,7 @@ class EventTimeSessionWindowsTest {
assigner.mergeWindows(Collections.singletonList(new TimeWindow(0, 1)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -125,7 +125,7 @@ class EventTimeSessionWindowsTest {
new TimeWindow(4, 5), new TimeWindow(5, 6))),
eq(new TimeWindow(4, 6)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -159,7 +159,7 @@ class EventTimeSessionWindowsTest {
new TimeWindow(5, 6), new TimeWindow(4, 7))),
eq(new TimeWindow(4, 7)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
index a47043aafd5..af4310bea72 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java
@@ -31,7 +31,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.apache.flink.shaded.guava32.com.google.common.collect.Lists;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.time.Duration;
import java.util.ArrayList;
@@ -41,7 +41,7 @@ import java.util.Collections;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -468,7 +468,7 @@ class MergingWindowSetTest {
new TimeWindow(17, 42),
new TimeWindow(17, 42))))));
- verify(mockState, times(1)).update(Matchers.anyObject());
+ verify(mockState, times(1)).update(ArgumentMatchers.any());
}
@Test
@@ -491,7 +491,7 @@ class MergingWindowSetTest {
windowSet.persist();
- verify(mockState, times(0)).add(Matchers.<Tuple2<TimeWindow, TimeWindow>>anyObject());
+ verify(mockState, times(0)).add(ArgumentMatchers.any());
}
private static class TestingMergeFunction
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java
index c1d9fb69985..1f728e6cb14 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/ProcessingTimeSessionWindowsTest.java
@@ -30,7 +30,7 @@ import org.apache.flink.streaming.api.windowing.windows.TimeWindow;
import org.apache.flink.shaded.guava32.com.google.common.collect.Lists;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import java.time.Duration;
import java.util.Collection;
@@ -38,7 +38,7 @@ import java.util.Collection;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.mockito.Matchers.anyCollection;
+import static org.mockito.ArgumentMatchers.anyCollection;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -81,7 +81,7 @@ class ProcessingTimeSessionWindowsTest {
assigner.mergeWindows(Lists.newArrayList(new TimeWindow(0, 0)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -94,7 +94,7 @@ class ProcessingTimeSessionWindowsTest {
assigner.mergeWindows(Lists.newArrayList(new TimeWindow(0, 1)), callback);
- verify(callback, never()).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, never()).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -132,7 +132,7 @@ class ProcessingTimeSessionWindowsTest {
new TimeWindow(4, 5), new TimeWindow(5, 6))),
eq(new TimeWindow(4, 6)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
@@ -167,7 +167,7 @@ class ProcessingTimeSessionWindowsTest {
new TimeWindow(5, 6), new TimeWindow(4, 7))),
eq(new TimeWindow(4, 7)));
- verify(callback, times(2)).merge(anyCollection(), Matchers.anyObject());
+ verify(callback, times(2)).merge(anyCollection(), ArgumentMatchers.any());
}
@Test
diff --git a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java
index a842e467314..620e1b00d24 100644
--- a/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java
+++ b/flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorTest.java
@@ -83,7 +83,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicInteger;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssignerTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssignerTest.java
index 3912f7446f7..d0ae11a65a5 100644
--- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssignerTest.java
+++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/assigners/SessionWindowAssignerTest.java
@@ -34,8 +34,8 @@ import java.util.TreeSet;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyCollection;
-import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -70,7 +70,7 @@ class SessionWindowAssignerTest {
assigner.mergeWindows(TimeWindow.of(0, 1), new TreeSet<>(), callback);
- verify(callback, never()).merge(anyObject(), anyCollection());
+ verify(callback, never()).merge(any(), anyCollection());
}
@SuppressWarnings("unchecked")
@@ -83,7 +83,7 @@ class SessionWindowAssignerTest {
sortedWindows.add(TimeWindow.of(6000, 6001));
assigner.mergeWindows(TimeWindow.of(0, 1), sortedWindows, callback);
- verify(callback, never()).merge(anyObject(), anyCollection());
+ verify(callback, never()).merge(any(), anyCollection());
}
@SuppressWarnings("unchecked")
diff --git a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperatorContractTest.java b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperatorContractTest.java
index c112bc36704..4d50d1addff 100644
--- a/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperatorContractTest.java
+++ b/flink-table/flink-table-runtime/src/test/java/org/apache/flink/table/runtime/operators/window/groupwindow/operator/WindowOperatorContractTest.java
@@ -42,7 +42,7 @@ import org.apache.flink.table.types.logical.VarCharType;
import org.apache.flink.table.utils.HandwrittenSelectorUtil;
import org.junit.jupiter.api.Test;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import java.time.ZoneId;
@@ -53,9 +53,9 @@ import java.util.Collections;
import static org.apache.flink.table.runtime.util.StreamRecordUtils.insertRecord;
import static org.apache.flink.table.runtime.util.StreamRecordUtils.row;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -269,10 +269,10 @@ class WindowOperatorContractTest {
@SuppressWarnings("unchecked")
Trigger<W> mockTrigger = mock(Trigger.class);
- when(mockTrigger.onElement(Matchers.<RowData>any(), anyLong(), Matchers.any()))
+ when(mockTrigger.onElement(ArgumentMatchers.any(), anyLong(), ArgumentMatchers.any()))
.thenReturn(false);
- when(mockTrigger.onEventTime(anyLong(), Matchers.any())).thenReturn(false);
- when(mockTrigger.onProcessingTime(anyLong(), Matchers.any())).thenReturn(false);
+ when(mockTrigger.onEventTime(anyLong(), ArgumentMatchers.any())).thenReturn(false);
+ when(mockTrigger.onProcessingTime(anyLong(), ArgumentMatchers.any())).thenReturn(false);
return mockTrigger;
}
@@ -314,7 +314,7 @@ class WindowOperatorContractTest {
// ------------------------------------------------------------------------------------
private static <T> void shouldFireOnElement(Trigger<TimeWindow> mockTrigger) throws Exception {
- when(mockTrigger.onElement(Matchers.<T>anyObject(), anyLong(), anyTimeWindow()))
+ when(mockTrigger.onElement(ArgumentMatchers.any(), anyLong(), anyTimeWindow()))
.thenReturn(true);
}
}
diff --git a/pom.xml b/pom.xml
index a577adcfc33..3106f0e8972 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@ under the License.
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.10.1</junit5.version>
<archunit.version>1.2.0</archunit.version>
- <mockito.version>3.4.6</mockito.version>
+ <mockito.version>4.11.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<assertj.version>3.23.1</assertj.version>
<py4j.version>0.10.9.7</py4j.version>