Skip to content

Commit 385b268

Browse files
authored
Update Mockito to 4.2.x (opensearch-project#1830)
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
1 parent db91d2e commit 385b268

File tree

78 files changed

+206
-219
lines changed

Some content is hidden

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

78 files changed

+206
-219
lines changed

buildSrc/version.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ httpasyncclient = 4.1.4
3535
commonslogging = 1.1.3
3636
commonscodec = 1.13
3737
hamcrest = 2.1
38-
mockito = 3.12.4
38+
mockito = 4.2.0
3939
objenesis = 3.2
40-
bytebuddy = 1.11.13
40+
bytebuddy = 1.12.6
4141

4242
# benchmark dependencies
4343
jmh = 1.19

client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
import static java.util.Collections.emptySet;
6868
import static org.hamcrest.Matchers.contains;
6969
import static org.hamcrest.Matchers.hasSize;
70-
import static org.mockito.Matchers.any;
70+
import static org.mockito.Mockito.any;
7171
import static org.mockito.Mockito.doAnswer;
7272
import static org.mockito.Mockito.mock;
7373
import static org.mockito.Mockito.when;

client/rest-high-level/src/test/java/org/opensearch/client/MockRestHighLevelTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import java.util.List;
4747

4848
import static org.hamcrest.Matchers.equalTo;
49-
import static org.mockito.Matchers.any;
49+
import static org.mockito.Mockito.any;
5050
import static org.mockito.Mockito.doThrow;
5151
import static org.mockito.Mockito.mock;
5252
import static org.mockito.Mockito.when;

client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
import static org.hamcrest.CoreMatchers.endsWith;
113113
import static org.hamcrest.CoreMatchers.equalTo;
114114
import static org.hamcrest.CoreMatchers.instanceOf;
115-
import static org.mockito.Matchers.any;
115+
import static org.mockito.Mockito.any;
116116
import static org.mockito.Mockito.mock;
117117
import static org.mockito.Mockito.times;
118118
import static org.mockito.Mockito.verify;

client/rest/src/test/java/org/opensearch/client/RestClientSingleHostTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@
100100
import static org.junit.Assert.assertThat;
101101
import static org.junit.Assert.assertTrue;
102102
import static org.junit.Assert.fail;
103-
import static org.mockito.Matchers.any;
104-
import static org.mockito.Matchers.nullable;
103+
import static org.mockito.Mockito.any;
104+
import static org.mockito.Mockito.nullable;
105105
import static org.mockito.Mockito.mock;
106106
import static org.mockito.Mockito.times;
107107
import static org.mockito.Mockito.verify;

client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
import static org.junit.Assert.assertThat;
7575
import static org.junit.Assert.assertTrue;
7676
import static org.junit.Assert.fail;
77-
import static org.mockito.Matchers.any;
78-
import static org.mockito.Matchers.anyCollectionOf;
77+
import static org.mockito.Mockito.any;
78+
import static org.mockito.Mockito.anyCollection;
7979
import static org.mockito.Mockito.mock;
8080
import static org.mockito.Mockito.times;
8181
import static org.mockito.Mockito.verify;
@@ -217,7 +217,7 @@ public void shutdown() {
217217
int totalRuns = nodesSniffer.runs.get();
218218
assertEquals(iters, totalRuns);
219219
int setNodesRuns = totalRuns - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
220-
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
220+
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
221221
verifyNoMoreInteractions(restClient);
222222
}
223223

@@ -283,7 +283,7 @@ public void shutdown() {}
283283
int totalRuns = nodesSniffer.runs.get();
284284
assertEquals(0, totalRuns);
285285
int setNodesRuns = totalRuns - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
286-
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
286+
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
287287
verifyNoMoreInteractions(restClient);
288288
}
289289

@@ -427,7 +427,7 @@ public void run() {
427427

428428
assertEquals(completedTasks, nodesSniffer.runs.get());
429429
int setNodesRuns = nodesSniffer.runs.get() - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
430-
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
430+
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
431431
verifyNoMoreInteractions(restClient);
432432
} finally {
433433
executor.shutdown();

libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
import org.mockito.Mockito;
4242

4343
import static org.hamcrest.Matchers.is;
44-
import static org.mockito.Matchers.any;
45-
import static org.mockito.Matchers.eq;
44+
import static org.mockito.Mockito.any;
45+
import static org.mockito.Mockito.eq;
4646
import static org.mockito.Mockito.doAnswer;
4747
import static org.mockito.Mockito.mock;
4848
import static org.mockito.Mockito.timeout;
4949
import static org.mockito.Mockito.verify;
5050
import static org.mockito.Mockito.verifyNoMoreInteractions;
51-
import static org.mockito.Mockito.verifyZeroInteractions;
51+
import static org.mockito.Mockito.verifyNoInteractions;
5252

5353
public class MatcherWatchdogTests extends OpenSearchTestCase {
5454

@@ -100,7 +100,7 @@ public void testIdleIfNothingRegistered() throws Exception {
100100
(delay, command) -> threadPool.schedule(command, delay, TimeUnit.MILLISECONDS)
101101
);
102102
// Periodic action is not scheduled because no thread is registered
103-
verifyZeroInteractions(threadPool);
103+
verifyNoInteractions(threadPool);
104104
CompletableFuture<Runnable> commandFuture = new CompletableFuture<>();
105105
// Periodic action is scheduled because a thread is registered
106106
doAnswer(invocationOnMock -> {
@@ -115,7 +115,7 @@ public void testIdleIfNothingRegistered() throws Exception {
115115
watchdog.unregister(matcher);
116116
command.run();
117117
// Periodic action is not scheduled again because no thread is registered
118-
verifyZeroInteractions(threadPool);
118+
verifyNoInteractions(threadPool);
119119
watchdog.register(matcher);
120120
Thread otherThread = new Thread(() -> {
121121
Matcher otherMatcher = mock(Matcher.class);

libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
import java.util.function.BiConsumer;
4444
import java.util.function.Consumer;
4545

46-
import static org.mockito.Matchers.any;
47-
import static org.mockito.Matchers.anyInt;
48-
import static org.mockito.Matchers.eq;
46+
import static org.mockito.Mockito.any;
47+
import static org.mockito.Mockito.anyInt;
48+
import static org.mockito.Mockito.eq;
4949
import static org.mockito.Mockito.mock;
5050
import static org.mockito.Mockito.times;
5151
import static org.mockito.Mockito.verify;

libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import java.nio.channels.SocketChannel;
4444
import java.util.function.Supplier;
4545

46-
import static org.mockito.Matchers.any;
46+
import static org.mockito.Mockito.any;
4747
import static org.mockito.Mockito.doThrow;
4848
import static org.mockito.Mockito.mock;
4949
import static org.mockito.Mockito.verify;

libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
import java.util.concurrent.atomic.AtomicBoolean;
5252
import java.util.function.BiConsumer;
5353

54-
import static org.mockito.Matchers.any;
55-
import static org.mockito.Matchers.anyLong;
56-
import static org.mockito.Matchers.isNull;
57-
import static org.mockito.Matchers.same;
54+
import static org.mockito.Mockito.any;
55+
import static org.mockito.Mockito.anyLong;
56+
import static org.mockito.Mockito.isNull;
57+
import static org.mockito.Mockito.same;
5858
import static org.mockito.Mockito.doAnswer;
5959
import static org.mockito.Mockito.doThrow;
6060
import static org.mockito.Mockito.mock;
@@ -325,7 +325,7 @@ public void testQueueWriteWhenNotRunning() throws Exception {
325325
selector.close();
326326
selector.queueWrite(new FlushReadyWrite(channelContext, buffers, listener));
327327
});
328-
verify(listener).accept(isNull(Void.class), any(ClosedSelectorException.class));
328+
verify(listener).accept(isNull(), any(ClosedSelectorException.class));
329329
}
330330

331331
public void testQueueWriteChannelIsClosed() throws Exception {
@@ -336,7 +336,7 @@ public void testQueueWriteChannelIsClosed() throws Exception {
336336
selector.preSelect();
337337

338338
verify(channelContext, times(0)).queueWriteOperation(writeOperation);
339-
verify(listener).accept(isNull(Void.class), any(ClosedChannelException.class));
339+
verify(listener).accept(isNull(), any(ClosedChannelException.class));
340340
}
341341

342342
public void testQueueWriteChannelIsUnregistered() throws Exception {
@@ -347,7 +347,7 @@ public void testQueueWriteChannelIsUnregistered() throws Exception {
347347
selector.preSelect();
348348

349349
verify(channelContext, times(0)).queueWriteOperation(writeOperation);
350-
verify(listener).accept(isNull(Void.class), any(IllegalStateException.class));
350+
verify(listener).accept(isNull(), any(IllegalStateException.class));
351351
}
352352

353353
public void testQueueWriteSuccessful() throws Exception {
@@ -508,7 +508,7 @@ public void testCleanup() throws Exception {
508508

509509
selector.cleanupAndCloseChannels();
510510

511-
verify(listener).accept(isNull(Void.class), any(ClosedSelectorException.class));
511+
verify(listener).accept(isNull(), any(ClosedSelectorException.class));
512512
verify(eventHandler).handleClose(channelContext);
513513
verify(eventHandler).handleClose(unregisteredContext);
514514
}

libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
import java.util.function.Consumer;
5454
import java.util.function.IntFunction;
5555

56-
import static org.mockito.Matchers.any;
57-
import static org.mockito.Matchers.anyInt;
58-
import static org.mockito.Matchers.isNull;
59-
import static org.mockito.Matchers.same;
56+
import static org.mockito.Mockito.any;
57+
import static org.mockito.Mockito.anyInt;
58+
import static org.mockito.Mockito.isNull;
59+
import static org.mockito.Mockito.same;
6060
import static org.mockito.Mockito.doThrow;
6161
import static org.mockito.Mockito.mock;
6262
import static org.mockito.Mockito.times;
@@ -252,7 +252,7 @@ public void testWriteFailsIfClosing() {
252252
ByteBuffer[] buffers = { ByteBuffer.wrap(createMessage(10)) };
253253
context.sendMessage(buffers, listener);
254254

255-
verify(listener).accept(isNull(Void.class), any(ClosedChannelException.class));
255+
verify(listener).accept(isNull(), any(ClosedChannelException.class));
256256
}
257257

258258
public void testSendMessageFromDifferentThreadIsQueuedWithSelector() throws Exception {

modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void testJavaPatternDefaultYear() {
216216
dateProcessor.execute(ingestDocument);
217217
assertThat(
218218
ingestDocument.getFieldValue("date_as_date", String.class),
219-
equalTo(ZonedDateTime.now().getYear() + "-06-12T00:00:00.000+02:00")
219+
equalTo(ZonedDateTime.now(ZoneId.of("Europe/Amsterdam")).getYear() + "-06-12T00:00:00.000+02:00")
220220
);
221221
}
222222

modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import static org.hamcrest.Matchers.containsString;
5353
import static org.hamcrest.Matchers.equalTo;
5454
import static org.hamcrest.Matchers.is;
55-
import static org.mockito.Matchers.any;
55+
import static org.mockito.Mockito.any;
5656
import static org.mockito.Mockito.mock;
5757
import static org.mockito.Mockito.when;
5858

modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
import java.util.Collections;
4848

4949
import static org.hamcrest.Matchers.equalTo;
50-
import static org.mockito.Matchers.anyInt;
51-
import static org.mockito.Matchers.anyObject;
50+
import static org.mockito.Mockito.anyInt;
51+
import static org.mockito.Mockito.any;
5252
import static org.mockito.Mockito.mock;
5353
import static org.mockito.Mockito.when;
5454

@@ -74,7 +74,7 @@ public void setUp() throws Exception {
7474

7575
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
7676
when(fieldData.getFieldName()).thenReturn("field");
77-
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
77+
when(fieldData.load(any())).thenReturn(atomicFieldData);
7878

7979
service = new ExpressionScriptEngine();
8080
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import org.opensearch.search.lookup.SearchLookup;
4747
import org.opensearch.test.OpenSearchTestCase;
4848

49-
import static org.mockito.Matchers.anyInt;
50-
import static org.mockito.Matchers.anyObject;
49+
import static org.mockito.Mockito.anyInt;
50+
import static org.mockito.Mockito.any;
5151
import static org.mockito.Mockito.mock;
5252
import static org.mockito.Mockito.when;
5353

@@ -73,7 +73,7 @@ public void setUp() throws Exception {
7373

7474
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
7575
when(fieldData.getFieldName()).thenReturn("field");
76-
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
76+
when(fieldData.load(any())).thenReturn(atomicFieldData);
7777

7878
service = new ExpressionScriptEngine();
7979
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import org.opensearch.search.lookup.SearchLookup;
4747
import org.opensearch.test.OpenSearchTestCase;
4848

49-
import static org.mockito.Matchers.anyInt;
50-
import static org.mockito.Matchers.anyObject;
49+
import static org.mockito.Mockito.anyInt;
50+
import static org.mockito.Mockito.any;
5151
import static org.mockito.Mockito.mock;
5252
import static org.mockito.Mockito.when;
5353

@@ -73,7 +73,7 @@ public void setUp() throws Exception {
7373

7474
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
7575
when(fieldData.getFieldName()).thenReturn("field");
76-
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
76+
when(fieldData.load(any())).thenReturn(atomicFieldData);
7777

7878
service = new ExpressionScriptEngine();
7979
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747

4848
import static java.util.Collections.singletonMap;
4949
import static org.hamcrest.Matchers.equalTo;
50-
import static org.mockito.Matchers.any;
51-
import static org.mockito.Matchers.eq;
50+
import static org.mockito.Mockito.any;
51+
import static org.mockito.Mockito.eq;
5252
import static org.mockito.Mockito.mock;
5353
import static org.mockito.Mockito.when;
5454

modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import static org.hamcrest.Matchers.containsString;
5656
import static org.hamcrest.Matchers.hasToString;
5757
import static org.hamcrest.Matchers.theInstance;
58-
import static org.mockito.Matchers.eq;
58+
import static org.mockito.Mockito.eq;
5959
import static org.mockito.Mockito.atMost;
6060
import static org.mockito.Mockito.mock;
6161
import static org.mockito.Mockito.verify;

modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
import static org.hamcrest.Matchers.empty;
9898
import static org.hamcrest.Matchers.hasSize;
9999
import static org.hamcrest.Matchers.instanceOf;
100-
import static org.mockito.Matchers.any;
100+
import static org.mockito.Mockito.any;
101101
import static org.mockito.Mockito.doThrow;
102102
import static org.mockito.Mockito.mock;
103103
import static org.mockito.Mockito.verify;

modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
import static org.hamcrest.Matchers.equalTo;
5252
import static org.hamcrest.Matchers.hasToString;
5353
import static org.hamcrest.Matchers.instanceOf;
54-
import static org.mockito.Matchers.any;
55-
import static org.mockito.Matchers.eq;
54+
import static org.mockito.Mockito.any;
55+
import static org.mockito.Mockito.eq;
5656
import static org.mockito.Mockito.mock;
5757
import static org.mockito.Mockito.verify;
5858
import static org.mockito.Mockito.when;

plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobStoreContainerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import java.util.List;
5050

5151
import static org.hamcrest.Matchers.instanceOf;
52-
import static org.mockito.Matchers.any;
53-
import static org.mockito.Matchers.eq;
52+
import static org.mockito.Mockito.any;
53+
import static org.mockito.Mockito.eq;
5454
import static org.mockito.Mockito.doAnswer;
5555
import static org.mockito.Mockito.doNothing;
5656
import static org.mockito.Mockito.doReturn;

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
import static org.hamcrest.Matchers.equalTo;
6666
import static org.hamcrest.Matchers.instanceOf;
67-
import static org.mockito.Matchers.any;
67+
import static org.mockito.Mockito.any;
6868
import static org.mockito.Mockito.doNothing;
6969
import static org.mockito.Mockito.mock;
7070
import static org.mockito.Mockito.times;

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3RetryingInputStreamTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import java.util.Arrays;
4747

4848
import static org.hamcrest.Matchers.is;
49-
import static org.mockito.Matchers.any;
49+
import static org.mockito.Mockito.any;
5050
import static org.mockito.Mockito.mock;
5151
import static org.mockito.Mockito.when;
5252

plugins/transport-nio/src/test/java/org/opensearch/http/nio/HttpReadWriteHandlerTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_MAX_CONTENT_LENGTH;
8080
import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_READ_TIMEOUT;
81-
import static org.mockito.Matchers.any;
82-
import static org.mockito.Matchers.eq;
81+
import static org.mockito.Mockito.any;
82+
import static org.mockito.Mockito.eq;
8383
import static org.mockito.Mockito.atLeastOnce;
8484
import static org.mockito.Mockito.doAnswer;
8585
import static org.mockito.Mockito.mock;

server/src/test/java/org/opensearch/action/admin/indices/close/TransportVerifyShardBeforeCloseActionTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
import static org.hamcrest.Matchers.greaterThan;
8787
import static org.hamcrest.Matchers.instanceOf;
8888
import static org.hamcrest.Matchers.is;
89-
import static org.mockito.Matchers.any;
89+
import static org.mockito.Mockito.any;
9090
import static org.mockito.Mockito.doThrow;
9191
import static org.mockito.Mockito.mock;
9292
import static org.mockito.Mockito.times;

server/src/test/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamRequestTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
import static org.hamcrest.Matchers.containsInAnyOrder;
6464
import static org.hamcrest.Matchers.containsString;
6565
import static org.hamcrest.Matchers.equalTo;
66-
import static org.mockito.Matchers.any;
66+
import static org.mockito.Mockito.any;
6767
import static org.mockito.Mockito.mock;
6868
import static org.mockito.Mockito.when;
6969

0 commit comments

Comments
 (0)