honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Mockito to 4.2.x (#1830)

Browse Source 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
This commit is contained in:
Andriy Redko 2022-01-03 12:00:45 -05:00 committed by GitHub
parent db91d2efe9
commit 385b268bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 206 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/version.properties
View File

@ -35,9 +35,9 @@ httpasyncclient = 4.1.4
commonslogging = 1.1.3
commonscodec = 1.13
hamcrest = 2.1
mockito = 3.12.4
mockito = 4.2.0
objenesis = 3.2
bytebuddy = 1.11.13
bytebuddy = 1.12.6
# benchmark dependencies
jmh = 1.19

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

@ -67,7 +67,7 @@ import java.util.stream.Collectors;
import static java.util.Collections.emptySet;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

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

@ -46,7 +46,7 @@ import java.util.Collections;
import java.util.List;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

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

@ -112,7 +112,7 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent;
import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

4
client/rest/src/test/java/org/opensearch/client/RestClientSingleHostTests.java
View File

@ -100,8 +100,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

10
client/sniffer/src/test/java/org/opensearch/client/sniff/SnifferTests.java
View File

@ -74,8 +74,8 @@ import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyCollectionOf;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyCollection;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -217,7 +217,7 @@ public class SnifferTests extends RestClientTestCase {
int totalRuns = nodesSniffer.runs.get();
assertEquals(iters, totalRuns);
int setNodesRuns = totalRuns - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
verifyNoMoreInteractions(restClient);
}
@ -283,7 +283,7 @@ public class SnifferTests extends RestClientTestCase {
int totalRuns = nodesSniffer.runs.get();
assertEquals(0, totalRuns);
int setNodesRuns = totalRuns - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
verifyNoMoreInteractions(restClient);
}
@ -427,7 +427,7 @@ public class SnifferTests extends RestClientTestCase {
assertEquals(completedTasks, nodesSniffer.runs.get());
int setNodesRuns = nodesSniffer.runs.get() - nodesSniffer.failures.get() - nodesSniffer.emptyList.get();
verify(restClient, times(setNodesRuns)).setNodes(anyCollectionOf(Node.class));
verify(restClient, times(setNodesRuns)).setNodes(anyCollection());
verifyNoMoreInteractions(restClient);
} finally {
executor.shutdown();

10
libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java
View File

@ -41,14 +41,14 @@ import org.joni.Matcher;
import org.mockito.Mockito;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
public class MatcherWatchdogTests extends OpenSearchTestCase {
@ -100,7 +100,7 @@ public class MatcherWatchdogTests extends OpenSearchTestCase {
(delay, command) -> threadPool.schedule(command, delay, TimeUnit.MILLISECONDS)
);
// Periodic action is not scheduled because no thread is registered
verifyZeroInteractions(threadPool);
verifyNoInteractions(threadPool);
CompletableFuture<Runnable> commandFuture = new CompletableFuture<>();
// Periodic action is scheduled because a thread is registered
doAnswer(invocationOnMock -> {
@ -115,7 +115,7 @@ public class MatcherWatchdogTests extends OpenSearchTestCase {
watchdog.unregister(matcher);
command.run();
// Periodic action is not scheduled again because no thread is registered
verifyZeroInteractions(threadPool);
verifyNoInteractions(threadPool);
watchdog.register(matcher);
Thread otherThread = new Thread(() -> {
Matcher otherMatcher = mock(Matcher.class);

6
libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java
View File

@ -43,9 +43,9 @@ import java.nio.channels.SocketChannel;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

2
libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java
View File

@ -43,7 +43,7 @@ import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.util.function.Supplier;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

16
libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java
View File

@ -51,10 +51,10 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.BiConsumer;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.isNull;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.isNull;
import static org.mockito.Mockito.same;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -325,7 +325,7 @@ public class NioSelectorTests extends OpenSearchTestCase {
selector.close();
selector.queueWrite(new FlushReadyWrite(channelContext, buffers, listener));
});
verify(listener).accept(isNull(Void.class), any(ClosedSelectorException.class));
verify(listener).accept(isNull(), any(ClosedSelectorException.class));
}
public void testQueueWriteChannelIsClosed() throws Exception {
@ -336,7 +336,7 @@ public class NioSelectorTests extends OpenSearchTestCase {
selector.preSelect();
verify(channelContext, times(0)).queueWriteOperation(writeOperation);
verify(listener).accept(isNull(Void.class), any(ClosedChannelException.class));
verify(listener).accept(isNull(), any(ClosedChannelException.class));
}
public void testQueueWriteChannelIsUnregistered() throws Exception {
@ -347,7 +347,7 @@ public class NioSelectorTests extends OpenSearchTestCase {
selector.preSelect();
verify(channelContext, times(0)).queueWriteOperation(writeOperation);
verify(listener).accept(isNull(Void.class), any(IllegalStateException.class));
verify(listener).accept(isNull(), any(IllegalStateException.class));
}
public void testQueueWriteSuccessful() throws Exception {
@ -508,7 +508,7 @@ public class NioSelectorTests extends OpenSearchTestCase {
selector.cleanupAndCloseChannels();
verify(listener).accept(isNull(Void.class), any(ClosedSelectorException.class));
verify(listener).accept(isNull(), any(ClosedSelectorException.class));
verify(eventHandler).handleClose(channelContext);
verify(eventHandler).handleClose(unregisteredContext);
}

10
libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java
View File

@ -53,10 +53,10 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.IntFunction;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.isNull;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.isNull;
import static org.mockito.Mockito.same;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -252,7 +252,7 @@ public class SocketChannelContextTests extends OpenSearchTestCase {
ByteBuffer[] buffers = { ByteBuffer.wrap(createMessage(10)) };
context.sendMessage(buffers, listener);
verify(listener).accept(isNull(Void.class), any(ClosedChannelException.class));
verify(listener).accept(isNull(), any(ClosedChannelException.class));
}
public void testSendMessageFromDifferentThreadIsQueuedWithSelector() throws Exception {

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

@ -216,7 +216,7 @@ public class DateProcessorTests extends OpenSearchTestCase {
dateProcessor.execute(ingestDocument);
assertThat(
ingestDocument.getFieldValue("date_as_date", String.class),
equalTo(ZonedDateTime.now().getYear() + "-06-12T00:00:00.000+02:00")
equalTo(ZonedDateTime.now(ZoneId.of("Europe/Amsterdam")).getYear() + "-06-12T00:00:00.000+02:00")
);
}

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

@ -52,7 +52,7 @@ import java.util.Map;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

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

@ -47,8 +47,8 @@ import java.text.ParseException;
import java.util.Collections;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -74,7 +74,7 @@ public class ExpressionFieldScriptTests extends OpenSearchTestCase {
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
when(fieldData.getFieldName()).thenReturn("field");
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
when(fieldData.load(any())).thenReturn(atomicFieldData);
service = new ExpressionScriptEngine();
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

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

@ -46,8 +46,8 @@ import org.opensearch.script.ScriptException;
import org.opensearch.search.lookup.SearchLookup;
import org.opensearch.test.OpenSearchTestCase;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -73,7 +73,7 @@ public class ExpressionNumberSortScriptTests extends OpenSearchTestCase {
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
when(fieldData.getFieldName()).thenReturn("field");
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
when(fieldData.load(any())).thenReturn(atomicFieldData);
service = new ExpressionScriptEngine();
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

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

@ -46,8 +46,8 @@ import org.opensearch.script.TermsSetQueryScript;
import org.opensearch.search.lookup.SearchLookup;
import org.opensearch.test.OpenSearchTestCase;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -73,7 +73,7 @@ public class ExpressionTermsSetQueryTests extends OpenSearchTestCase {
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);
when(fieldData.getFieldName()).thenReturn("field");
when(fieldData.load(anyObject())).thenReturn(atomicFieldData);
when(fieldData.load(any())).thenReturn(atomicFieldData);
service = new ExpressionScriptEngine();
lookup = new SearchLookup(mapperService, (ignored, lookup) -> fieldData, null);

4
modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java
View File

@ -47,8 +47,8 @@ import java.util.function.Consumer;
import static java.util.Collections.singletonMap;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java
View File

@ -55,7 +55,7 @@ import static org.opensearch.common.unit.TimeValue.timeValueMillis;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.theInstance;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.atMost;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

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

@ -97,7 +97,7 @@ import static org.opensearch.common.unit.TimeValue.timeValueMinutes;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

4
modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java
View File

@ -51,8 +51,8 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

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

@ -49,8 +49,8 @@ import java.util.Arrays;
import java.util.List;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;

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

@ -64,7 +64,7 @@ import java.util.stream.IntStream;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

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

@ -46,7 +46,7 @@ import java.io.IOException;
import java.util.Arrays;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

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

@ -78,8 +78,8 @@ import java.util.function.BiConsumer;
import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_MAX_CONTENT_LENGTH;
import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_READ_TIMEOUT;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;

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

@ -86,7 +86,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

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

@ -63,7 +63,7 @@ import static org.opensearch.cluster.DataStreamTestHelper.createTimestampField;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

14
server/src/test/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java
View File

@ -109,13 +109,13 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.same;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
public class MetadataRolloverServiceTests extends OpenSearchTestCase {
@ -877,8 +877,8 @@ public class MetadataRolloverServiceTests extends OpenSearchTestCase {
assertSame(rolloverResult.clusterState, clusterState);
verify(createIndexService).validateIndexName(any(), same(clusterState));
verifyZeroInteractions(createIndexService);
verifyZeroInteractions(metadataIndexAliasesService);
verifyNoMoreInteractions(createIndexService);
verifyNoMoreInteractions(metadataIndexAliasesService);
reset(createIndexService);
doThrow(new InvalidIndexNameException("test", "invalid")).when(createIndexService).validateIndexName(any(), any());
@ -897,8 +897,8 @@ public class MetadataRolloverServiceTests extends OpenSearchTestCase {
);
verify(createIndexService).validateIndexName(any(), same(clusterState));
verifyZeroInteractions(createIndexService);
verifyZeroInteractions(metadataIndexAliasesService);
verifyNoMoreInteractions(createIndexService);
verifyNoMoreInteractions(metadataIndexAliasesService);
}
public void testRolloverClusterStateForDataStreamNoTemplate() throws Exception {

6
server/src/test/java/org/opensearch/action/admin/indices/rollover/TransportRolloverActionTests.java
View File

@ -96,9 +96,9 @@ import static java.util.Collections.emptyList;
import static org.opensearch.action.admin.indices.rollover.TransportRolloverAction.evaluateConditions;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java
View File

@ -69,7 +69,7 @@ import java.util.function.Function;
import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

28
server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIngestTests.java
View File

@ -91,16 +91,16 @@ import java.util.function.BiConsumer;
import static java.util.Collections.emptyMap;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
public class TransportBulkActionIngestTests extends OpenSearchTestCase {
@ -295,7 +295,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
bulkRequest.add(indexRequest);
action.execute(null, bulkRequest, ActionListener.wrap(response -> {}, exception -> { throw new AssertionError(exception); }));
assertTrue(action.isExecuted);
verifyZeroInteractions(ingestService);
verifyNoInteractions(ingestService);
}
public void testSingleItemBulkActionIngestSkipped() throws Exception {
@ -307,7 +307,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
ActionListener.wrap(response -> {}, exception -> { throw new AssertionError(exception); })
);
assertTrue(action.isExecuted);
verifyZeroInteractions(ingestService);
verifyNoInteractions(ingestService);
}
public void testIngestLocal() throws Exception {
@ -355,7 +355,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
completionHandler.getValue().accept(DUMMY_WRITE_THREAD, null);
assertTrue(action.isExecuted);
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
public void testSingleItemBulkActionIngestLocal() throws Exception {
@ -390,7 +390,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
completionHandler.getValue().accept(DUMMY_WRITE_THREAD, null);
assertTrue(action.isExecuted);
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
public void testIngestSystemLocal() throws Exception {
@ -438,7 +438,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
completionHandler.getValue().accept(DUMMY_WRITE_THREAD, null);
assertTrue(action.isExecuted);
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
public void testIngestForward() throws Exception {
@ -599,7 +599,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
completionHandler.getValue().accept(DUMMY_WRITE_THREAD, null);
assertTrue(action.isExecuted);
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
public void testDoExecuteCalledTwiceCorrectly() throws Exception {
@ -639,7 +639,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
assertTrue(action.isExecuted);
assertTrue(action.indexCreated); // now the index is created since we skipped the ingest node path.
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
public void testNotFindDefaultPipelineFromTemplateMatches() {
@ -653,7 +653,7 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
failureCalled.set(true);
}));
assertEquals(IngestService.NOOP_PIPELINE_NAME, indexRequest.getPipeline());
verifyZeroInteractions(ingestService);
verifyNoInteractions(ingestService);
}
@ -789,6 +789,6 @@ public class TransportBulkActionIngestTests extends OpenSearchTestCase {
completionHandler.getValue().accept(DUMMY_WRITE_THREAD, null);
assertTrue(action.isExecuted);
assertFalse(responseCalled.get()); // listener would only be called by real index action, not our mocked one
verifyZeroInteractions(transportService);
verifyNoInteractions(transportService);
}
}

8
server/src/test/java/org/opensearch/action/bulk/TransportShardBulkActionTests.java
View File

@ -85,10 +85,10 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;

4
server/src/test/java/org/opensearch/action/get/TransportMultiGetActionTests.java
View File

@ -78,8 +78,8 @@ import static org.opensearch.common.UUIDs.randomBase64UUID;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

9
server/src/test/java/org/opensearch/action/resync/TransportResyncReplicationActionTests.java
View File

@ -84,10 +84,9 @@ import static org.opensearch.transport.TransportService.NOOP_TRANSPORT_INTERCEPT
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -168,7 +167,7 @@ public class TransportResyncReplicationActionTests extends OpenSearchTestCase {
acquiredPermits.incrementAndGet();
callback.onResponse(acquiredPermits::decrementAndGet);
return null;
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject(), eq(true));
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), any(), eq(true));
when(indexShard.getReplicationGroup()).thenReturn(
new ReplicationGroup(
shardRoutingTable,

18
server/src/test/java/org/opensearch/action/support/replication/TransportReplicationActionTests.java
View File

@ -134,12 +134,11 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -961,7 +960,7 @@ public class TransportReplicationActionTests extends OpenSearchTestCase {
// noinspection unchecked
((ActionListener<Releasable>) invocation.getArguments()[0]).onResponse(count::decrementAndGet);
return null;
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), anyObject(), eq(forceExecute));
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), any(), eq(forceExecute));
when(shard.getActiveOperationsCount()).thenAnswer(i -> count.get());
final IndexService indexService = mock(IndexService.class);
@ -1592,7 +1591,7 @@ public class TransportReplicationActionTests extends OpenSearchTestCase {
callback.onFailure(new ShardNotInPrimaryModeException(shardId, IndexShardState.STARTED));
}
return null;
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject(), eq(forceExecute));
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), any(), eq(forceExecute));
doAnswer(invocation -> {
long term = (Long) invocation.getArguments()[0];
ActionListener<Releasable> callback = (ActionListener<Releasable>) invocation.getArguments()[3];
@ -1605,8 +1604,7 @@ public class TransportReplicationActionTests extends OpenSearchTestCase {
count.incrementAndGet();
callback.onResponse(count::decrementAndGet);
return null;
}).when(indexShard)
.acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), anyObject());
}).when(indexShard).acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), any());
when(indexShard.getActiveOperationsCount()).thenAnswer(i -> count.get());
when(indexShard.routingEntry()).thenAnswer(invocationOnMock -> {

14
server/src/test/java/org/opensearch/action/support/replication/TransportWriteActionForIndexingPressureTests.java
View File

@ -63,11 +63,10 @@ import static org.opensearch.action.support.replication.ClusterStateCreationUtil
import static org.opensearch.test.ClusterServiceUtils.createClusterService;
import static org.opensearch.test.ClusterServiceUtils.setState;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -501,7 +500,7 @@ public class TransportWriteActionForIndexingPressureTests extends OpenSearchTest
callback.onFailure(new ShardNotInPrimaryModeException(shardId, IndexShardState.STARTED));
}
return null;
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject());
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), any());
doAnswer(invocation -> {
long term = (Long) invocation.getArguments()[0];
ActionListener<Releasable> callback = (ActionListener<Releasable>) invocation.getArguments()[3];
@ -514,8 +513,7 @@ public class TransportWriteActionForIndexingPressureTests extends OpenSearchTest
count.incrementAndGet();
callback.onResponse(count::decrementAndGet);
return null;
}).when(indexShard)
.acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), anyObject());
}).when(indexShard).acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), any());
when(indexShard.getActiveOperationsCount()).thenAnswer(i -> count.get());
when(indexShard.routingEntry()).thenAnswer(invocationOnMock -> {

14
server/src/test/java/org/opensearch/action/support/replication/TransportWriteActionTests.java
View File

@ -95,11 +95,10 @@ import static org.opensearch.test.ClusterServiceUtils.createClusterService;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
@ -540,7 +539,7 @@ public class TransportWriteActionTests extends OpenSearchTestCase {
count.incrementAndGet();
callback.onResponse(count::decrementAndGet);
return null;
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), anyObject());
}).when(indexShard).acquirePrimaryOperationPermit(any(ActionListener.class), anyString(), any());
doAnswer(invocation -> {
long term = (Long) invocation.getArguments()[0];
ActionListener<Releasable> callback = (ActionListener<Releasable>) invocation.getArguments()[1];
@ -553,8 +552,7 @@ public class TransportWriteActionTests extends OpenSearchTestCase {
count.incrementAndGet();
callback.onResponse(count::decrementAndGet);
return null;
}).when(indexShard)
.acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), anyObject());
}).when(indexShard).acquireReplicaOperationPermit(anyLong(), anyLong(), anyLong(), any(ActionListener.class), anyString(), any());
when(indexShard.routingEntry()).thenAnswer(invocationOnMock -> {
final ClusterState state = clusterService.state();
final RoutingNode node = state.getRoutingNodes().node(state.nodes().getLocalNodeId());

6
server/src/test/java/org/opensearch/action/termvectors/TransportMultiTermVectorsActionTests.java
View File

@ -78,9 +78,9 @@ import static java.util.Collections.emptySet;
import static org.opensearch.common.UUIDs.randomBase64UUID;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/cluster/ClusterStateObserverTests.java
View File

@ -43,7 +43,7 @@ import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.hamcrest.Matchers.containsString;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/cluster/action/index/MappingUpdatedActionTests.java
View File

@ -60,8 +60,8 @@ import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java
View File

@ -53,14 +53,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import static org.mockito.Matchers.anyBoolean;
import static org.opensearch.test.VersionUtils.maxCompatibleVersion;
import static org.opensearch.test.VersionUtils.randomCompatibleVersion;
import static org.opensearch.test.VersionUtils.randomVersion;
import static org.opensearch.test.VersionUtils.randomVersionBetween;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java
View File

@ -48,8 +48,8 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java
View File

@ -49,8 +49,8 @@ import static org.opensearch.cluster.DataStreamTestHelper.generateMapping;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/cluster/metadata/MetadataDeleteIndexServiceTests.java
View File

@ -66,7 +66,7 @@ import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

6
server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexAliasesServiceTests.java
View File

@ -57,8 +57,8 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.startsWith;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anySet;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -75,7 +75,7 @@ public class MetadataIndexAliasesServiceTests extends OpenSearchTestCase {
public MetadataIndexAliasesServiceTests() {
// Mock any deletes so we don't need to worry about how MetadataDeleteIndexService does its job
when(deleteIndexService.deleteIndices(any(ClusterState.class), anySetOf(Index.class))).then(i -> {
when(deleteIndexService.deleteIndices(any(ClusterState.class), anySet())).then(i -> {
ClusterState state = (ClusterState) i.getArguments()[0];
@SuppressWarnings("unchecked")
Collection<Index> indices = (Collection<Index>) i.getArguments()[1];

2
server/src/test/java/org/opensearch/cluster/metadata/TemplateUpgradeServiceTests.java
View File

@ -82,7 +82,7 @@ import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.notNullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/cluster/routing/DelayedAllocationServiceTests.java
View File

@ -63,8 +63,8 @@ import static org.opensearch.cluster.routing.ShardRoutingState.STARTED;
import static org.opensearch.common.unit.TimeValue.timeValueMillis;
import static org.opensearch.common.unit.TimeValue.timeValueSeconds;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

2
server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationConstraintsTests.java
View File

@ -13,7 +13,7 @@ import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocat
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.Settings;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/common/util/concurrent/AbstractLifecycleRunnableTests.java
View File

@ -39,7 +39,7 @@ import org.mockito.InOrder;
import java.util.concurrent.Callable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

6
server/src/test/java/org/opensearch/discovery/SeedHostsResolverTests.java
View File

@ -56,7 +56,7 @@ import org.opensearch.transport.TransportService;
import org.opensearch.transport.nio.MockNioTransport;
import org.junit.After;
import org.junit.Before;
import org.mockito.Matchers;
import org.mockito.Mockito;
import java.io.Closeable;
import java.io.IOException;
@ -81,7 +81,7 @@ import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.core.IsNull.nullValue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@ -459,6 +459,6 @@ public class SeedHostsResolverTests extends OpenSearchTestCase {
assertThat(transportAddresses, hasSize(1)); // only one of the two is valid and will be used
assertThat(transportAddresses.get(0).getAddress(), equalTo("127.0.0.1"));
assertThat(transportAddresses.get(0).getPort(), equalTo(9301));
verify(logger).warn(eq("failed to resolve host [127.0.0.1:9300:9300]"), Matchers.any(IllegalArgumentException.class));
verify(logger).warn(eq("failed to resolve host [127.0.0.1:9300:9300]"), Mockito.any(IllegalArgumentException.class));
}
}

2
server/src/test/java/org/opensearch/gateway/DanglingIndicesStateTests.java
View File

@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.anEmptyMap;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

4
server/src/test/java/org/opensearch/gateway/IncrementalClusterStateWriterTests.java
View File

@ -76,8 +76,8 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.lessThan;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

2
server/src/test/java/org/opensearch/http/DefaultRestChannelTests.java
View File

@ -74,7 +74,7 @@ import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;

4
server/src/test/java/org/opensearch/index/fielddata/IndexFieldDataServiceTests.java
View File

@ -66,7 +66,7 @@ import org.opensearch.test.IndexSettingsModule;
import org.opensearch.test.InternalSettingsPlugin;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;
import org.mockito.Matchers;
import org.mockito.Mockito;
import java.util.Arrays;
import java.util.Collection;
@ -137,7 +137,7 @@ public class IndexFieldDataServiceTests extends OpenSearchSingleNodeTestCase {
);
final SetOnce<Supplier<SearchLookup>> searchLookupSetOnce = new SetOnce<>();
MappedFieldType ft = mock(MappedFieldType.class);
when(ft.fielddataBuilder(Matchers.any(), Matchers.any())).thenAnswer(invocationOnMock -> {
when(ft.fielddataBuilder(Mockito.any(), Mockito.any())).thenAnswer(invocationOnMock -> {
@SuppressWarnings("unchecked")
Supplier<SearchLookup> searchLookup = (Supplier<SearchLookup>) invocationOnMock.getArguments()[1];
searchLookupSetOnce.set(searchLookup);

2
server/src/test/java/org/opensearch/index/query/QueryShardContextTests.java
View File

@ -85,7 +85,7 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/index/shard/GlobalCheckpointListenersTests.java
View File

@ -70,7 +70,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasToString;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;

6
server/src/test/java/org/opensearch/index/shard/PrimaryReplicaSyncerTests.java
View File

@ -75,9 +75,9 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java
View File

@ -126,8 +126,8 @@ import static java.util.Collections.emptyMap;
import static org.opensearch.env.Environment.PATH_HOME_SETTING;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

11
server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java
View File

@ -133,10 +133,9 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -655,7 +654,7 @@ public class RecoverySourceHandlerTests extends OpenSearchTestCase {
doAnswer(invocation -> {
((ActionListener<Releasable>) invocation.getArguments()[0]).onResponse(() -> {});
return null;
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), anyObject());
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), any());
final IndexMetadata.Builder indexMetadata = IndexMetadata.builder("test")
.settings(
@ -740,7 +739,7 @@ public class RecoverySourceHandlerTests extends OpenSearchTestCase {
freed.set(false);
((ActionListener<Releasable>) invocation.getArguments()[0]).onResponse(() -> freed.set(true));
return null;
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), anyObject());
}).when(shard).acquirePrimaryOperationPermit(any(), anyString(), any());
Thread cancelingThread = new Thread(() -> cancellableThreads.cancel("test"));
cancelingThread.start();

4
server/src/test/java/org/opensearch/ingest/ConfigurationUtilsTests.java
View File

@ -50,8 +50,8 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

10
server/src/test/java/org/opensearch/ingest/IngestServiceTests.java
View File

@ -105,11 +105,11 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.argThat;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;

4
server/src/test/java/org/opensearch/ingest/ValueSourceTests.java
View File

@ -44,8 +44,8 @@ import java.util.Map;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.sameInstance;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

4
server/src/test/java/org/opensearch/persistent/PersistentTasksClusterServiceTests.java
View File

@ -87,8 +87,8 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

8
server/src/test/java/org/opensearch/persistent/PersistentTasksNodeServiceTests.java
View File

@ -74,10 +74,10 @@ import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.sameInstance;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/rest/RestControllerTests.java
View File

@ -76,8 +76,8 @@ import java.util.stream.Collectors;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;

16
server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java
View File

@ -82,10 +82,10 @@ import java.util.function.Supplier;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -123,9 +123,7 @@ public class DefaultSearchContextTests extends OpenSearchTestCase {
when(indexCache.query()).thenReturn(queryCache);
when(indexService.cache()).thenReturn(indexCache);
QueryShardContext queryShardContext = mock(QueryShardContext.class);
when(indexService.newQueryShardContext(eq(shardId.id()), anyObject(), anyObject(), nullable(String.class))).thenReturn(
queryShardContext
);
when(indexService.newQueryShardContext(eq(shardId.id()), any(), any(), nullable(String.class))).thenReturn(queryShardContext);
MapperService mapperService = mock(MapperService.class);
when(mapperService.hasNested()).thenReturn(randomBoolean());
when(indexService.mapperService()).thenReturn(mapperService);
@ -383,9 +381,7 @@ public class DefaultSearchContextTests extends OpenSearchTestCase {
IndexService indexService = mock(IndexService.class);
QueryShardContext queryShardContext = mock(QueryShardContext.class);
when(indexService.newQueryShardContext(eq(shardId.id()), anyObject(), anyObject(), nullable(String.class))).thenReturn(
queryShardContext
);
when(indexService.newQueryShardContext(eq(shardId.id()), any(), any(), nullable(String.class))).thenReturn(queryShardContext);
BigArrays bigArrays = new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService());

6
server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java
View File

@ -41,7 +41,7 @@ import org.junit.Before;
import static org.opensearch.search.lookup.LeafDocLookup.TYPES_DEPRECATION_MESSAGE;
import static org.mockito.AdditionalAnswers.returnsFirstArg;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -56,7 +56,7 @@ public class LeafDocLookupTests extends OpenSearchTestCase {
MappedFieldType fieldType = mock(MappedFieldType.class);
when(fieldType.name()).thenReturn("field");
when(fieldType.valueForDisplay(anyObject())).then(returnsFirstArg());
when(fieldType.valueForDisplay(any())).then(returnsFirstArg());
MapperService mapperService = mock(MapperService.class);
when(mapperService.fieldType("_type")).thenReturn(fieldType);
@ -91,7 +91,7 @@ public class LeafDocLookupTests extends OpenSearchTestCase {
IndexFieldData<?> fieldData = mock(IndexFieldData.class);
when(fieldData.getFieldName()).thenReturn("field");
doReturn(leafFieldData).when(fieldData).load(anyObject());
doReturn(leafFieldData).when(fieldData).load(any());
return fieldData;
}

7
server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java
View File

@ -44,9 +44,8 @@ import org.junit.Before;
import java.util.Collections;
import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -61,7 +60,7 @@ public class LeafFieldsLookupTests extends OpenSearchTestCase {
MappedFieldType fieldType = mock(MappedFieldType.class);
when(fieldType.name()).thenReturn("field");
// Add 10 when valueForDisplay is called so it is easy to be sure it *was* called
when(fieldType.valueForDisplay(anyObject())).then(invocation -> (Double) invocation.getArguments()[0] + 10);
when(fieldType.valueForDisplay(any())).then(invocation -> (Double) invocation.getArguments()[0] + 10);
MapperService mapperService = mock(MapperService.class);
when(mapperService.fieldType("field")).thenReturn(fieldType);

2
server/src/test/java/org/opensearch/search/query/ScriptScoreQueryTests.java
View File

@ -61,7 +61,7 @@ import java.util.function.Function;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.collection.IsArrayWithSize.arrayWithSize;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java
View File

@ -87,7 +87,7 @@ import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java
View File

@ -69,7 +69,7 @@ import java.io.IOException;
import static java.util.Collections.emptyList;
import static org.opensearch.common.lucene.BytesRefs.toBytesRef;
import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java
View File

@ -43,7 +43,7 @@ import java.util.Collections;
import java.util.List;
import static org.opensearch.cluster.DataStreamTestHelper.createTimestampField;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

4
server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java
View File

@ -57,8 +57,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;

2
server/src/test/java/org/opensearch/transport/RemoteConnectionManagerTests.java
View File

@ -45,7 +45,7 @@ import java.util.Set;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;

6
server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java
View File

@ -46,9 +46,9 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Deque;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

10
test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java
View File

@ -73,8 +73,8 @@ import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
import static java.util.stream.Collectors.toList;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -242,10 +242,10 @@ public abstract class MapperServiceTestCase extends OpenSearchTestCase {
when(queryShardContext.getMapperService()).thenReturn(mapperService);
when(queryShardContext.fieldMapper(anyString())).thenAnswer(inv -> mapperService.fieldType(inv.getArguments()[0].toString()));
when(queryShardContext.getIndexAnalyzers()).thenReturn(mapperService.getIndexAnalyzers());
when(queryShardContext.getSearchQuoteAnalyzer(anyObject())).thenCallRealMethod();
when(queryShardContext.getSearchAnalyzer(anyObject())).thenCallRealMethod();
when(queryShardContext.getSearchQuoteAnalyzer(any())).thenCallRealMethod();
when(queryShardContext.getSearchAnalyzer(any())).thenCallRealMethod();
when(queryShardContext.getIndexSettings()).thenReturn(mapperService.getIndexSettings());
when(queryShardContext.simpleMatchToIndexNames(anyObject())).thenAnswer(
when(queryShardContext.simpleMatchToIndexNames(any())).thenAnswer(
inv -> mapperService.simpleMatchToFullName(inv.getArguments()[0].toString())
);
when(queryShardContext.allowExpensiveQueries()).thenReturn(true);

4
test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java
View File

@ -96,8 +96,8 @@ import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

6
test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
View File

@ -157,8 +157,8 @@ import static java.util.Collections.singletonMap;
import static org.opensearch.test.InternalAggregationTestCase.DEFAULT_MAX_BUCKETS;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -395,7 +395,7 @@ public abstract class AggregatorTestCase extends OpenSearchTestCase {
* close their sub-aggregations. This is fairly similar to what the production code does. */
releasables.add((Releasable) invocation.getArguments()[0]);
return null;
}).when(searchContext).addReleasable(anyObject());
}).when(searchContext).addReleasable(any());
return searchContext;
}

2
test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java
View File

@ -56,7 +56,7 @@ import java.util.concurrent.atomic.AtomicReference;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasToString;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;