From 665af957ffd6c8bda041d6eb0172ea2c39a09736 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Wed, 17 Mar 2021 22:51:17 -0500 Subject: [PATCH] [Rename] remaining packages and resources in test/fixture (#364) This commit refactors the remaining o.e.index and o.e.test packages in the test/fixtures module. References throughout the codebase are also refactored. Signed-off-by: Nicholas Walter Knize --- .../resources/forbidden/es-all-signatures.txt | 2 +- .../client/AbstractRequestTestCase.java | 4 +- .../client/AbstractResponseTestCase.java | 4 +- .../opensearch/client/BulkProcessorIT.java | 13 +- .../BulkRequestWithGlobalParametersIT.java | 9 +- .../opensearch/client/ClusterClientIT.java | 2 +- .../client/ClusterRequestConvertersTests.java | 34 +-- .../CustomRestHighLevelClientTests.java | 4 +- .../client/GetAliasesResponseTests.java | 2 +- .../client/IndicesRequestConvertersTests.java | 248 +++++++++--------- .../client/IngestRequestConvertersTests.java | 8 +- .../client/MockRestHighLevelTests.java | 4 +- ...OpenSearchRestHighLevelClientTestCase.java | 4 +- .../client/RequestConvertersTests.java | 9 +- .../client/RestHighLevelClientExtTests.java | 4 +- .../client/RestHighLevelClientTests.java | 17 +- .../java/org/opensearch/client/SearchIT.java | 3 +- .../SnapshotRequestConvertersTests.java | 4 +- .../opensearch/client/StoredScriptsIT.java | 2 +- .../client/SyncedFlushResponseTests.java | 4 +- .../client/TasksRequestConvertersTests.java | 4 +- .../opensearch/client/TimedRequestTests.java | 4 +- .../client/ValidationExceptionTests.java | 4 +- .../client/core/CountRequestTests.java | 2 +- .../client/core/CountResponseTests.java | 12 +- .../client/core/MainResponseTests.java | 2 +- .../core/MultiTermVectorsResponseTests.java | 6 +- .../core/ShardsAcknowledgedResponseTests.java | 6 +- .../client/core/TermVectorsResponseTests.java | 6 +- .../core/tasks/GetTaskResponseTests.java | 6 +- .../QueryDSLDocumentationTests.java | 4 +- .../StoredScriptsDocumentationIT.java | 2 +- .../client/indices/AnalyzeResponseTests.java | 2 +- .../indices/CloseIndexRequestTests.java | 4 +- .../indices/CreateIndexRequestTests.java | 2 +- .../GetComponentTemplatesResponseTests.java | 6 +- ...ComposableIndexTemplatesResponseTests.java | 6 +- .../GetFieldMappingsResponseTests.java | 6 +- .../client/indices/GetIndexRequestTests.java | 4 +- .../client/indices/GetIndexResponseTests.java | 8 +- .../GetIndexTemplatesResponseTests.java | 10 +- .../indices/GetMappingsResponseTests.java | 6 +- .../indices/PutIndexTemplateRequestTests.java | 2 +- .../indices/PutMappingRequestTests.java | 2 +- .../indices/RandomCreateIndexGenerator.java | 8 +- .../rollover/RolloverRequestTests.java | 4 +- .../rollover/RolloverResponseTests.java | 6 +- .../tasks/TaskSubmissionResponseTests.java | 6 +- .../test/rest/CreatedLocationHeaderIT.java | 3 +- .../opensearch/test/rest/NodeRestUsageIT.java | 3 +- .../test/rest/RequestsWithoutContentIT.java | 3 +- .../test/rest/WaitForRefreshAndCloseIT.java | 3 +- .../docker/test/DockerYmlTestSuiteIT.java | 6 +- .../opensearch/bootstrap/BootstrapTests.java | 4 +- .../common/settings/KeyStoreWrapperTests.java | 4 +- .../plugins/InstallPluginCommandTests.java | 42 +-- .../plugins/ListPluginsCommandTests.java | 14 +- .../plugins/ProgressInputStreamTests.java | 4 +- .../plugins/RemovePluginCommandTests.java | 6 +- .../opensearch/bootstrap/JarHellTests.java | 4 +- .../opensearch/common/CharArraysTests.java | 4 +- .../opensearch/common/collect/ListTests.java | 4 +- .../opensearch/common/collect/MapTests.java | 4 +- .../opensearch/common/collect/SetTests.java | 4 +- .../opensearch/common/collect/TupleTests.java | 4 +- .../common/unit/TimeValueTests.java | 6 +- .../util/OpenSearchSloppyMathTests.java | 4 +- .../util/concurrent/RefCountedTests.java | 4 +- .../core/internal/io/IOUtilsTests.java | 4 +- .../core/internal/io/StreamsTests.java | 4 +- .../core/internal/net/NetUtilsTests.java | 4 +- .../opensearch/dissect/DissectKeyTests.java | 4 +- .../opensearch/dissect/DissectMatchTests.java | 4 +- .../dissect/DissectParserTests.java | 4 +- .../geometry/BaseGeometryTestCase.java | 2 +- .../geometry/GeometryValidatorTests.java | 4 +- .../opensearch/geometry/LinearRingTests.java | 4 +- .../geometry/utils/GeoHashTests.java | 4 +- .../java/org/opensearch/grok/GrokTests.java | 4 +- .../opensearch/grok/MatcherWatchdogTests.java | 4 +- .../nio/BytesChannelContextTests.java | 4 +- .../opensearch/nio/ChannelContextTests.java | 4 +- .../opensearch/nio/ChannelFactoryTests.java | 4 +- .../org/opensearch/nio/EventHandlerTests.java | 4 +- .../opensearch/nio/FlushOperationTests.java | 4 +- .../nio/InboundChannelBufferTests.java | 4 +- .../opensearch/nio/NioSelectorGroupTests.java | 6 +- .../org/opensearch/nio/NioSelectorTests.java | 4 +- .../nio/SocketChannelContextTests.java | 4 +- .../opensearch/nio/TaskSchedulerTests.java | 4 +- .../ssl/DefaultJdkTrustConfigTests.java | 4 +- .../common/ssl/PemKeyConfigTests.java | 4 +- .../common/ssl/PemTrustConfigTests.java | 4 +- .../opensearch/common/ssl/PemUtilsTests.java | 4 +- .../ssl/SslConfigurationLoaderTests.java | 4 +- .../common/ssl/SslConfigurationTests.java | 6 +- .../common/ssl/SslDiagnosticsTests.java | 4 +- .../common/ssl/StoreKeyConfigTests.java | 4 +- .../common/ssl/StoreTrustConfigTests.java | 4 +- .../opensearch/common/ParseFieldTests.java | 4 +- .../ConstructingObjectParserTests.java | 4 +- .../InstantiatingObjectParserTests.java | 4 +- .../xcontent/MapXContentParserTests.java | 4 +- .../common/xcontent/ObjectParserTests.java | 4 +- .../common/xcontent/ObjectPathTests.java | 4 +- .../common/xcontent/XContentParserTests.java | 4 +- .../matrix/stats/BaseMatrixStatsTestCase.java | 4 +- .../stats/InternalMatrixStatsTests.java | 2 +- .../MatrixStatsClientYamlTestSuiteIT.java | 8 +- .../common/QueryStringWithAnalyzersIT.java | 8 +- .../common/ArmenianAnalyzerProvider.java | 8 +- .../ASCIIFoldingTokenFilterFactoryTests.java | 12 +- ...rdDelimiterTokenFilterFactoryTestCase.java | 22 +- .../common/CJKFilterFactoryTests.java | 10 +- .../CharGroupTokenizerFactoryTests.java | 6 +- .../analysis/common/CharMatcherTests.java | 4 +- .../common/CommonAnalysisPluginTests.java | 8 +- .../CommonGramsTokenFilterFactoryTests.java | 28 +- .../common/CompoundAnalysisTests.java | 8 +- .../common/DisableGraphQueryTests.java | 4 +- .../EdgeNGramTokenFilterFactoryTests.java | 12 +- .../common/EdgeNGramTokenizerTests.java | 8 +- .../common/ElisionFilterFactoryTests.java | 6 +- .../common/FingerprintAnalyzerTests.java | 4 +- .../FlattenGraphTokenFilterFactoryTests.java | 6 +- .../common/HighlighterWithAnalyzersTests.java | 8 +- .../HtmlStripCharFilterFactoryTests.java | 8 +- .../common/KeepFilterFactoryTests.java | 14 +- .../common/KeepTypesFilterFactoryTests.java | 12 +- .../KeywordMarkerFilterFactoryTests.java | 8 +- .../LimitTokenCountFilterFactoryTests.java | 18 +- .../analysis/common/MassiveWordListTests.java | 4 +- .../common/MinHashFilterFactoryTests.java | 12 +- .../common/MultiplexerTokenFilterTests.java | 6 +- .../common/NGramTokenFilterFactoryTests.java | 12 +- .../common/NGramTokenizerFactoryTests.java | 8 +- .../OpenSearchSolrSynonymParserTests.java | 4 +- .../OpenSearchWordnetSynonymParserTests.java | 4 +- .../PathHierarchyTokenizerFactoryTests.java | 6 +- .../analysis/common/PatternAnalyzerTests.java | 4 +- .../PatternCaptureTokenFilterTests.java | 8 +- .../PredicateTokenScriptFilterTests.java | 6 +- .../RemoveDuplicatesFilterFactoryTests.java | 10 +- .../ScriptedConditionTokenFilterTests.java | 6 +- .../common/ShingleTokenFilterTests.java | 10 +- .../common/SnowballAnalyzerTests.java | 4 +- ...temmerOverrideTokenFilterFactoryTests.java | 10 +- .../StemmerTokenFilterFactoryTests.java | 14 +- .../common/SynonymsAnalysisTests.java | 8 +- .../analysis/common/TrimTokenFilterTests.java | 10 +- .../common/UniqueTokenFilterTests.java | 4 +- .../WhitespaceTokenizerFactoryTests.java | 6 +- ...DelimiterGraphTokenFilterFactoryTests.java | 16 +- .../WordDelimiterTokenFilterFactoryTests.java | 6 +- .../CommonAnalysisClientYamlTestSuiteIT.java | 8 +- .../geo/GeoClientYamlTestSuiteIT.java | 8 +- .../ingest/common/IngestRestartIT.java | 8 +- ...bstractStringProcessorFactoryTestCase.java | 4 +- .../AbstractStringProcessorTestCase.java | 4 +- .../common/AppendProcessorFactoryTests.java | 4 +- .../ingest/common/AppendProcessorTests.java | 4 +- .../common/ConvertProcessorFactoryTests.java | 4 +- .../ingest/common/ConvertProcessorTests.java | 4 +- .../common/CsvProcessorFactoryTests.java | 4 +- .../ingest/common/CsvProcessorTests.java | 4 +- .../ingest/common/DateFormatTests.java | 4 +- .../common/DateIndexNameFactoryTests.java | 4 +- .../common/DateIndexNameProcessorTests.java | 4 +- .../common/DateProcessorFactoryTests.java | 4 +- .../ingest/common/DateProcessorTests.java | 4 +- .../common/DissectProcessorFactoryTests.java | 4 +- .../ingest/common/DissectProcessorTests.java | 4 +- .../DotExpanderProcessorFactoryTests.java | 4 +- .../common/DotExpanderProcessorTests.java | 4 +- .../common/FailProcessorFactoryTests.java | 4 +- .../ingest/common/FailProcessorTests.java | 4 +- .../common/ForEachProcessorFactoryTests.java | 4 +- .../ingest/common/ForEachProcessorTests.java | 4 +- .../common/GrokProcessorFactoryTests.java | 4 +- .../common/GrokProcessorGetActionTests.java | 4 +- .../ingest/common/GrokProcessorTests.java | 4 +- .../common/JoinProcessorFactoryTests.java | 4 +- .../ingest/common/JoinProcessorTests.java | 4 +- .../common/JsonProcessorFactoryTests.java | 4 +- .../ingest/common/JsonProcessorTests.java | 4 +- .../common/KeyValueProcessorFactoryTests.java | 4 +- .../ingest/common/KeyValueProcessorTests.java | 4 +- .../common/RemoveProcessorFactoryTests.java | 4 +- .../ingest/common/RemoveProcessorTests.java | 4 +- .../common/RenameProcessorFactoryTests.java | 4 +- .../ingest/common/RenameProcessorTests.java | 4 +- .../common/ScriptProcessorFactoryTests.java | 4 +- .../ingest/common/ScriptProcessorTests.java | 4 +- .../common/SetProcessorFactoryTests.java | 4 +- .../ingest/common/SetProcessorTests.java | 4 +- .../common/SortProcessorFactoryTests.java | 4 +- .../ingest/common/SortProcessorTests.java | 4 +- .../common/SplitProcessorFactoryTests.java | 4 +- .../ingest/common/SplitProcessorTests.java | 4 +- .../IngestCommonClientYamlTestSuiteIT.java | 8 +- .../geoip/GeoIpProcessorNonIngestNodeIT.java | 12 +- .../geoip/GeoIpProcessorFactoryTests.java | 6 +- .../ingest/geoip/GeoIpProcessorTests.java | 4 +- .../ingest/geoip/IngestGeoIpPluginTests.java | 4 +- .../IngestGeoIpClientYamlTestSuiteIT.java | 8 +- .../UserAgentProcessorFactoryTests.java | 4 +- .../useragent/UserAgentProcessorTests.java | 4 +- .../IngestUserAgentClientYamlTestSuiteIT.java | 8 +- .../kibana/KibanaSystemIndexIT.java | 4 +- .../kibana/KibanaPluginTests.java | 4 +- .../script/expression/MoreExpressionIT.java | 22 +- .../script/expression/StoredExpressionIT.java | 4 +- .../ExpressionFieldScriptTests.java | 4 +- .../ExpressionNumberSortScriptTests.java | 4 +- .../ExpressionTermsSetQueryTests.java | 4 +- .../LangExpressionClientYamlTestSuiteIT.java | 8 +- .../mustache/MultiSearchTemplateIT.java | 6 +- .../script/mustache/SearchTemplateIT.java | 8 +- .../SearchTemplateWithoutContentIT.java | 4 +- .../mustache/CustomMustacheFactoryTests.java | 4 +- .../MultiSearchTemplateRequestTests.java | 8 +- .../MultiSearchTemplateResponseTests.java | 2 +- .../mustache/MustacheScriptEngineTests.java | 4 +- .../script/mustache/MustacheTests.java | 4 +- .../RestMultiSearchTemplateActionTests.java | 4 +- .../RestSearchTemplateActionTests.java | 4 +- .../mustache/SearchTemplateRequestTests.java | 2 +- .../SearchTemplateRequestXContentTests.java | 4 +- .../mustache/SearchTemplateResponseTests.java | 4 +- .../LangMustacheClientYamlTestSuiteIT.java | 8 +- .../painless/AnalyzerCasterTests.java | 4 +- .../painless/DefBootstrapTests.java | 4 +- .../org/opensearch/painless/EqualsTests.java | 6 +- .../opensearch/painless/NeedsScoreTests.java | 4 +- .../opensearch/painless/ScriptTestCase.java | 4 +- .../painless/action/ContextInfoTests.java | 2 +- .../action/PainlessExecuteApiTests.java | 4 +- .../action/PainlessExecuteRequestTests.java | 2 +- .../action/PainlessExecuteResponseTests.java | 2 +- .../api/LimitedCharSequenceTests.java | 4 +- .../LangPainlessClientYamlTestSuiteIT.java | 8 +- .../TokenCountFieldMapperIntegrationIT.java | 4 +- .../index/mapper/BWCTemplateTests.java | 6 +- .../RankFeatureMetaFieldMapperTests.java | 4 +- .../mapper/SearchAsYouTypeAnalyzerTests.java | 4 +- .../query/RankFeatureQueryBuilderTests.java | 4 +- .../MapperExtrasClientYamlTestSuiteIT.java | 8 +- .../AbstractParentChildTestCase.java | 2 +- .../join/aggregations/ChildrenIT.java | 8 +- .../join/aggregations/ParentIT.java | 2 +- .../join/query/ChildQuerySearchIT.java | 12 +- .../opensearch/join/query/InnerHitsIT.java | 12 +- .../join/query/ParentChildTestCase.java | 8 +- .../join/aggregations/ChildrenTests.java | 2 +- .../join/aggregations/ParentTests.java | 2 +- .../mapper/ParentJoinFieldMapperTests.java | 4 +- .../join/query/HasChildQueryBuilderTests.java | 6 +- .../query/HasParentQueryBuilderTests.java | 6 +- .../join/query/ParentIdQueryBuilderTests.java | 4 +- .../ParentChildClientYamlTestSuiteIT.java | 6 +- .../percolator/PercolatorQuerySearchIT.java | 10 +- .../percolator/CandidateQueryTests.java | 4 +- .../PercolateQueryBuilderTests.java | 4 +- .../percolator/PercolateQueryTests.java | 4 +- .../PercolatorFieldMapperTests.java | 6 +- ...PercolatorHighlightSubFetchPhaseTests.java | 4 +- ...rcolatorMatchedSlotSubFetchPhaseTests.java | 4 +- .../PercolatorQuerySearchTests.java | 8 +- .../percolator/QueryAnalyzerTests.java | 4 +- .../percolator/QueryBuilderStoreTests.java | 4 +- .../PercolatorClientYamlTestSuiteIT.java | 8 +- .../index/rankeval/RankEvalRequestIT.java | 6 +- .../DiscountedCumulativeGainTests.java | 10 +- .../index/rankeval/EvalQueryQualityTests.java | 12 +- .../rankeval/ExpectedReciprocalRankTests.java | 10 +- .../rankeval/MeanReciprocalRankTests.java | 10 +- .../index/rankeval/PrecisionAtKTests.java | 10 +- .../index/rankeval/RankEvalRequestTests.java | 2 +- .../index/rankeval/RankEvalResponseTests.java | 10 +- .../index/rankeval/RankEvalSpecTests.java | 10 +- .../index/rankeval/RatedDocumentTests.java | 10 +- .../index/rankeval/RatedRequestsTests.java | 10 +- .../index/rankeval/RatedSearchHitTests.java | 8 +- .../index/rankeval/RecallAtKTests.java | 10 +- .../TransportRankEvalActionTests.java | 4 +- .../index/rankeval/RankEvalYamlIT.java | 8 +- .../documentation/ReindexDocumentationIT.java | 6 +- .../index/reindex/ManyDocumentsIT.java | 4 +- .../reindex/ReindexWithoutContentIT.java | 4 +- .../remote/ReindexFromOldRemoteIT.java | 4 +- .../reindex/remote/RemoteResponseParsers.java | 4 +- ...yncBulkByScrollActionMetadataTestCase.java | 1 - ...AsyncBulkByScrollActionScriptTestCase.java | 1 - .../reindex/AsyncBulkByScrollActionTests.java | 20 +- ...ulkByScrollParallelizationHelperTests.java | 4 +- .../BulkIndexByScrollResponseTests.java | 4 +- .../opensearch/index/reindex/CancelTests.java | 4 +- .../ClientScrollableHitSourceTests.java | 12 +- .../reindex/DeleteByQueryBasicTests.java | 8 +- .../reindex/DeleteByQueryConcurrentTests.java | 2 +- .../index/reindex/ReindexBasicTests.java | 2 +- .../ReindexFromRemoteWhitelistTests.java | 4 +- .../ReindexFromRemoteWithAuthTests.java | 4 +- .../reindex/ReindexRestClientSslTests.java | 4 +- .../index/reindex/ReindexSingleNodeTests.java | 6 +- .../ReindexSourceTargetValidationTests.java | 5 +- .../index/reindex/ReindexTestCase.java | 8 +- .../reindex/RestDeleteByQueryActionTests.java | 4 +- .../index/reindex/RestReindexActionTests.java | 4 +- .../reindex/RestUpdateByQueryActionTests.java | 4 +- .../opensearch/index/reindex/RetryTests.java | 8 +- .../index/reindex/RoundTripTests.java | 4 +- .../TransportRethrottleActionTests.java | 4 +- .../reindex/UpdateByQueryBasicTests.java | 2 +- .../index/reindex/remote/RemoteInfoTests.java | 4 +- .../remote/RemoteRequestBuildersTests.java | 4 +- .../remote/RemoteResponseParsersTests.java | 10 +- .../RemoteScrollableHitSourceTests.java | 12 +- .../reindex/ReindexClientYamlTestSuiteIT.java | 8 +- .../url/URLSnapshotRestoreIT.java | 8 +- .../blobstore/url/URLBlobStoreTests.java | 4 +- .../repositories/url/URLFixture.java | 2 +- .../repositories/url/URLRepositoryTests.java | 4 +- .../RepositoryURLClientYamlTestSuiteIT.java | 8 +- .../systemd/SystemdPluginTests.java | 6 +- .../OpenSearchNetty4IntegTestCase.java | 4 +- .../netty4/Netty4HttpRequestSizeLimitIT.java | 4 +- .../http/netty4/Netty4PipeliningIT.java | 4 +- .../rest/discovery/Zen2RestApiIT.java | 6 +- ...Netty4TransportMultiPortIntegrationIT.java | 6 +- .../Netty4TransportPublishAddressIT.java | 4 +- .../netty4/OpenSearchLoggingHandlerIT.java | 10 +- .../opensearch/rest/Netty4BadRequestIT.java | 8 +- .../rest/Netty4HeadBodyIsEmptyIT.java | 4 +- .../netty4/Netty4HttpServerTransport.java | 4 +- .../transport/SharedGroupFactory.java | 2 +- .../transport/netty4/Netty4Transport.java | 6 +- .../http/netty4/Netty4BadRequestTests.java | 4 +- .../Netty4HttpPipeliningHandlerTests.java | 4 +- .../Netty4HttpServerPipeliningTests.java | 4 +- .../Netty4HttpServerTransportTests.java | 6 +- .../CopyBytesSocketChannelTests.java | 4 +- .../transport/SharedGroupFactoryTests.java | 4 +- .../Netty4SizeHeaderFrameDecoderTests.java | 4 +- .../transport/netty4/Netty4UtilsTests.java | 4 +- .../netty4/NettyTransportMultiPortTests.java | 4 +- .../netty4/SimpleNetty4TransportTests.java | 4 +- .../netty4/Netty4ClientYamlTestSuiteIT.java | 8 +- .../ICUCollationKeywordFieldMapperIT.java | 4 +- .../index/analysis/NoriAnalysisTests.java | 4 +- .../AbstractAzureComputeServiceTestCase.java | 4 +- .../AzureDiscoveryClusterFormationTests.java | 6 +- .../azure/classic/AzureSimpleTests.java | 4 +- .../classic/AzureTwoStartedNodesTests.java | 4 +- .../discovery/ec2/AbstractAwsTestCase.java | 6 +- .../ec2/Ec2DiscoveryUpdateSettingsTests.java | 4 +- .../discovery/gce/GceDiscoverTests.java | 6 +- .../index/mapper/size/SizeMappingIT.java | 4 +- .../azure/AzureBlobContainerRetriesTests.java | 2 +- ...CloudStorageBlobContainerRetriesTests.java | 2 +- .../hdfs/HaHdfsFailoverTestSuiteIT.java | 4 +- .../hdfs/HdfsBlobStoreContainerTests.java | 6 +- .../hdfs/HdfsBlobStoreRepositoryTests.java | 8 +- .../s3/S3BlobStoreRepositoryTests.java | 4 +- .../index/store/AbstractAzureFsTestCase.java | 4 +- .../index/store/SmbMMapDirectoryTests.java | 2 +- .../store/SmbSimpleFSDirectoryTests.java | 2 +- .../java/org/opensearch/NioIntegTestCase.java | 4 +- .../opensearch/http/nio/NioPipeliningIT.java | 4 +- .../transport/nio/NioTransportLoggingIT.java | 4 +- .../threadpool/EvilThreadPoolTests.java | 38 +-- .../MixedClusterClientYamlTestSuiteIT.java | 4 +- .../MultiClusterSearchYamlTestSuiteIT.java | 4 +- .../UpgradeClusterClientYamlTestSuiteIT.java | 4 +- .../http/ContextAndHeaderTransportIT.java | 4 +- .../java/org/opensearch/http/CorsRegexIT.java | 4 +- .../http/DanglingIndicesRestIT.java | 6 +- .../http/DetailedErrorsDisabledIT.java | 4 +- .../opensearch/http/HttpSmokeTestCase.java | 4 +- .../http/IndexingPressureRestIT.java | 4 +- .../http/ResponseHeaderPluginIT.java | 4 +- ...stIngestDisabledClientYamlTestSuiteIT.java | 6 +- ...ngestWithAllDepsClientYamlTestSuiteIT.java | 6 +- ...okeTestMultiNodeClientYamlTestSuiteIT.java | 6 +- ...SmokeTestPluginsClientYamlTestSuiteIT.java | 6 +- .../test/rest/ClientYamlTestSuiteIT.java | 4 +- server/build.gradle | 2 +- .../opensearch/action/RejectionActionIT.java | 4 +- .../admin/cluster/stats/ClusterStatsIT.java | 8 +- .../action/bulk/BulkRejectionIT.java | 4 +- .../opensearch/index/IndexingPressureIT.java | 6 +- .../indices/recovery/IndexRecoveryIT.java | 4 +- .../nodesinfo/SimpleNodesInfoIT.java | 6 +- .../fs/FsBlobStoreRepositoryIT.java | 4 +- .../search/functionscore/FunctionScoreIT.java | 6 +- .../java/org/opensearch/ExceptionsHelper.java | 4 +- .../org/opensearch/OpenSearchException.java | 2 +- .../org/opensearch/action/StepListener.java | 4 +- .../search/SearchPhaseExecutionException.java | 2 +- .../replication/ReplicationOperation.java | 4 +- .../cluster/service/TaskBatcher.java | 4 +- .../index/OpenSearchDirectoryReader.java | 2 +- .../lucene/index/OpenSearchLeafReader.java | 2 +- .../util/concurrent/EsThreadPoolExecutor.java | 8 +- .../util/concurrent/ListenableFuture.java | 4 +- ...Policy.java => OpenSearchAbortPolicy.java} | 4 +- ...xecutors.java => OpenSearchExecutors.java} | 20 +- ...OpenSearchRejectedExecutionException.java} | 8 +- .../opensearch/gateway/GatewayMetaState.java | 6 +- .../opensearch/index/IndexingPressure.java | 8 +- .../opensearch/index/MergePolicyConfig.java | 2 +- .../index/OpenSearchTieredMergePolicy.java | 4 +- .../reindex/ClientScrollableHitSource.java | 4 +- .../reindex/WorkerBulkByScrollTaskState.java | 4 +- .../org/opensearch/monitor/os/OsService.java | 4 +- .../opensearch/search/SearchShardTarget.java | 2 +- .../AbstractAggregationBuilder.java | 2 +- .../aggregations/AggregatorFactory.java | 2 +- .../PipelineAggregationBuilder.java | 4 +- .../search/internal/SearchContext.java | 16 +- .../org/opensearch/threadpool/Scheduler.java | 14 +- .../DeDuplicatingTokenFilterTests.java | 4 +- .../TruncateTokenFilterTests.java | 4 +- .../CollapsingTopDocsCollectorTests.java | 4 +- .../BinaryDocValuesRangeQueryTests.java | 4 +- .../lucene/queries/BlendedTermQueryTests.java | 4 +- .../lucene/queries/MinDocQueryTests.java | 4 +- .../SearchAfterSortedDocQueryTests.java | 4 +- .../queries/SpanMatchNoDocsQueryTests.java | 4 +- .../BoundedBreakIteratorScannerTests.java | 4 +- .../CustomPassageFormatterTests.java | 4 +- .../CustomUnifiedHighlighterTests.java | 4 +- .../lucene/util/CombinedBitSetTests.java | 4 +- .../cluster/ClusterChangedEventTests.java | 6 +- .../cluster/ClusterInfoTests.java | 4 +- .../cluster/ClusterModuleTests.java | 2 +- .../cluster/ClusterStateObserverTests.java | 4 +- .../ClusterStateTaskExecutorTests.java | 4 +- .../cluster/ClusterStateTests.java | 6 +- .../elasticsearch/cluster/DiskUsageTests.java | 4 +- .../cluster/FeatureAwareTests.java | 8 +- ...rnalClusterInfoServiceSchedulingTests.java | 8 +- .../cluster/NodeConnectionsServiceTests.java | 8 +- .../index/MappingUpdatedActionTests.java | 4 +- .../action/shard/ShardStateActionTests.java | 14 +- .../cluster/block/ClusterBlockTests.java | 12 +- .../ClusterBootstrapServiceTests.java | 8 +- .../ClusterFormationFailureHelperTests.java | 4 +- .../CoordinationMetadataTests.java | 16 +- .../coordination/CoordinationStateTests.java | 6 +- .../coordination/CoordinatorTests.java | 4 +- .../DiscoveryUpgradeServiceTests.java | 4 +- .../ElectionSchedulerFactoryTests.java | 4 +- .../coordination/FollowersCheckerTests.java | 12 +- .../cluster/coordination/JoinHelperTests.java | 10 +- .../coordination/JoinTaskExecutorTests.java | 18 +- .../coordination/LagDetectorTests.java | 4 +- .../coordination/LeaderCheckerTests.java | 12 +- .../LinearizabilityCheckerTests.java | 4 +- .../cluster/coordination/MessagesTests.java | 28 +- .../NoMasterBlockServiceTests.java | 4 +- .../cluster/coordination/NodeJoinTests.java | 8 +- ...eRemovalClusterStateTaskExecutorTests.java | 4 +- .../OpenSearchNodeCommandTests.java | 4 +- .../coordination/PreVoteCollectorTests.java | 6 +- .../coordination/PublicationTests.java | 4 +- .../PublicationTransportHandlerTests.java | 6 +- .../coordination/ReconfiguratorTests.java | 4 +- .../health/ClusterIndexHealthTests.java | 2 +- .../health/ClusterShardHealthTests.java | 2 +- .../health/ClusterStateHealthTests.java | 12 +- .../cluster/metadata/AliasMetadataTests.java | 2 +- .../cluster/metadata/AliasValidatorTests.java | 4 +- .../metadata/AutoExpandReplicasTests.java | 6 +- .../ClusterNameExpressionResolverTests.java | 4 +- .../ComponentTemplateMetadataTests.java | 2 +- .../metadata/ComponentTemplateTests.java | 6 +- .../ComposableIndexTemplateMetadataTests.java | 2 +- .../ComposableIndexTemplateTests.java | 8 +- .../metadata/DataStreamMetadataTests.java | 2 +- .../cluster/metadata/DataStreamTests.java | 2 +- .../DateMathExpressionResolverTests.java | 4 +- .../metadata/DiffableStringMapTests.java | 4 +- .../HumanReadableIndexSettingsTests.java | 6 +- .../metadata/IndexAbstractionTests.java | 4 +- .../cluster/metadata/IndexGraveyardTests.java | 4 +- .../cluster/metadata/IndexMetadataTests.java | 4 +- .../IndexNameExpressionResolverTests.java | 8 +- .../metadata/IndexTemplateMetadataTests.java | 4 +- .../cluster/metadata/ManifestTests.java | 6 +- .../MetadataCreateDataStreamServiceTests.java | 4 +- .../MetadataCreateIndexServiceTests.java | 10 +- .../MetadataDeleteIndexServiceTests.java | 6 +- .../MetadataIndexAliasesServiceTests.java | 6 +- .../MetadataIndexStateServiceTests.java | 6 +- .../MetadataIndexTemplateServiceTests.java | 4 +- .../MetadataIndexUpgradeServiceTests.java | 6 +- .../metadata/MetadataMappingServiceTests.java | 6 +- .../cluster/metadata/MetadataTests.java | 6 +- .../metadata/TemplateUpgradeServiceTests.java | 8 +- .../metadata/ToAndFromJsonMetadataTests.java | 6 +- .../WildcardExpressionResolverTests.java | 4 +- .../node/DiscoveryNodeFiltersTests.java | 4 +- .../node/DiscoveryNodeRoleSettingTests.java | 8 +- .../cluster/node/DiscoveryNodeRoleTests.java | 6 +- .../cluster/node/DiscoveryNodeTests.java | 8 +- .../cluster/node/DiscoveryNodesTests.java | 4 +- .../cluster/routing/AllocationIdTests.java | 4 +- .../routing/BatchedRerouteServiceTests.java | 6 +- .../DelayedAllocationServiceTests.java | 2 +- .../routing/GroupShardsIteratorTests.java | 4 +- .../routing/IndexShardRoutingTableTests.java | 4 +- .../routing/OperationRoutingTests.java | 6 +- .../routing/PlainShardIteratorTests.java | 6 +- .../routing/RandomShardRoutingMutator.java | 6 +- .../cluster/routing/RecoverySourceTests.java | 4 +- .../cluster/routing/RoutingNodeTests.java | 4 +- .../cluster/routing/ShardRoutingTests.java | 4 +- .../cluster/routing/UnassignedInfoTests.java | 2 +- .../AllocateUnassignedDecisionTests.java | 4 +- .../allocation/AllocationDecisionTests.java | 4 +- .../allocation/AllocationServiceTests.java | 6 +- .../allocation/BalanceConfigurationTests.java | 2 +- .../ClusterRebalanceRoutingTests.java | 2 +- .../DecisionsImpactOnClusterHealthTests.java | 2 +- .../allocation/DiskThresholdMonitorTests.java | 4 +- .../DiskThresholdSettingsTests.java | 4 +- .../allocation/FailedNodeRoutingTests.java | 2 +- .../allocation/FailedShardsRoutingTests.java | 2 +- .../MaxRetryAllocationDeciderTests.java | 2 +- .../routing/allocation/MoveDecisionTests.java | 4 +- .../allocation/NodeAllocationResultTests.java | 4 +- .../NodeVersionAllocationDeciderTests.java | 6 +- .../RandomAllocationDeciderTests.java | 2 +- .../ResizeAllocationDeciderTests.java | 2 +- .../allocation/ThrottlingAllocationTests.java | 2 +- .../decider/AllocationDecidersTests.java | 4 +- .../allocation/decider/DecisionTests.java | 4 +- .../decider/DiskThresholdDeciderTests.java | 2 +- .../EnableAllocationShortCircuitTests.java | 2 +- .../decider/FilterAllocationDeciderTests.java | 2 +- .../murmur3/Murmur3HashFunctionTests.java | 4 +- .../ClusterSerializationTests.java | 2 +- .../cluster/serialization/DiffableTests.java | 4 +- .../service/ClusterApplierServiceTests.java | 12 +- .../cluster/service/MasterServiceTests.java | 8 +- .../cluster/service/TaskExecutorTests.java | 10 +- .../cluster/shards/ShardCounts.java | 14 +- .../elasticsearch/index/IndexModuleTests.java | 16 +- .../index/IndexServiceTests.java | 14 +- .../index/IndexSettingsTests.java | 6 +- .../index/IndexSortSettingsTests.java | 4 +- .../org/elasticsearch/index/IndexTests.java | 4 +- .../index/IndexingPressureTests.java | 14 +- .../index/IndexingSlowLogTests.java | 4 +- .../index/MergePolicySettingsTests.java | 46 ++-- .../index/MergeSchedulerSettingsTests.java | 6 +- ... => OpenSearchTieredMergePolicyTests.java} | 20 +- .../index/SearchSlowLogTests.java | 6 +- .../index/SlowLogLevelTests.java | 4 +- .../elasticsearch/index/VersionTypeTests.java | 4 +- .../index/analysis/AnalysisRegistryTests.java | 8 +- .../index/analysis/AnalysisTests.java | 4 +- .../index/analysis/CustomNormalizerTests.java | 11 +- .../HunspellTokenFilterFactoryTests.java | 5 +- .../index/analysis/IndexAnalyzersTests.java | 4 +- .../index/analysis/NamedAnalyzerTests.java | 4 +- .../index/analysis/PreBuiltAnalyzerTests.java | 8 +- .../PreConfiguredTokenFilterTests.java | 8 +- .../ReloadableCustomAnalyzerTests.java | 6 +- .../ShingleTokenFilterFactoryTests.java | 19 +- .../index/analysis/StopAnalyzerTests.java | 8 +- .../index/analysis/StopTokenFilterTests.java | 11 +- .../cache/bitset/BitSetFilterCacheTests.java | 6 +- .../elasticsearch/index/codec/CodecTests.java | 6 +- .../engine/CombinedDeletionPolicyTests.java | 6 +- .../engine/CompletionStatsCacheTests.java | 4 +- .../engine/InternalEngineSettingsTests.java | 4 +- .../index/engine/InternalEngineTests.java | 9 +- .../index/engine/LiveVersionMapTests.java | 4 +- .../engine/LuceneChangesSnapshotTests.java | 5 +- .../index/engine/NoOpEngineRecoveryTests.java | 2 +- .../index/engine/NoOpEngineTests.java | 3 +- .../engine/PrunePostingsMergePolicyTests.java | 4 +- .../index/engine/ReadOnlyEngineTests.java | 3 + .../RecoverySourcePruneMergePolicyTests.java | 4 +- .../index/engine/SegmentTests.java | 4 +- .../index/engine/SoftDeletesPolicyTests.java | 4 +- .../index/engine/VersionValueTests.java | 4 +- .../fielddata/AbstractFieldDataTestCase.java | 6 +- .../index/fielddata/FieldDataCacheTests.java | 6 +- .../index/fielddata/FieldDataStatsTests.java | 4 +- .../index/fielddata/FieldDataTests.java | 14 +- .../fielddata/IndexFieldDataServiceTests.java | 8 +- .../ScriptDocValuesGeoPointsTests.java | 4 +- .../fielddata/ScriptDocValuesLongsTests.java | 4 +- .../fieldcomparator/ReplaceMissingTests.java | 4 +- .../ordinals/MultiOrdinalsTests.java | 4 +- .../ordinals/SingleOrdinalsTests.java | 4 +- .../plain/HalfFloatFielddataTests.java | 4 +- .../FieldStatsProviderRefreshTests.java | 8 +- .../index/get/DocumentFieldTests.java | 12 +- .../index/get/GetResultTests.java | 10 +- .../index/mapper/AllFieldMapperTests.java | 6 +- .../index/mapper/BinaryFieldMapperTests.java | 1 + .../index/mapper/BinaryRangeUtilTests.java | 6 +- .../index/mapper/BooleanFieldMapperTests.java | 1 + .../index/mapper/BooleanFieldTypeTests.java | 1 + .../index/mapper/CamelCaseFieldNameTests.java | 2 + .../mapper/CompletionFieldMapperTests.java | 1 + .../mapper/CompletionFieldTypeTests.java | 1 + .../index/mapper/CopyToMapperTests.java | 1 + .../index/mapper/DateFieldMapperTests.java | 1 + .../index/mapper/DateFieldTypeTests.java | 1 + .../index/mapper/DefaultAnalyzersTests.java | 1 + .../mapper/DocumentMapperParserTests.java | 2 + .../index/mapper/DocumentMapperTests.java | 1 + .../index/mapper/DocumentParserTests.java | 6 +- .../index/mapper/DoubleIndexingDocTests.java | 1 + .../index/mapper/DynamicMappingTests.java | 1 + .../index/mapper/DynamicTemplateTests.java | 4 +- .../index/mapper/DynamicTemplatesTests.java | 3 +- .../mapper/ExternalFieldMapperTests.java | 1 + .../index/mapper/FieldAliasMapperTests.java | 1 + .../FieldAliasMapperValidationTests.java | 5 +- .../mapper/FieldFilterMapperPluginTests.java | 8 +- .../mapper/FieldNamesFieldMapperTests.java | 4 +- .../mapper/FieldNamesFieldTypeTests.java | 4 +- .../index/mapper/FieldTypeLookupTests.java | 5 +- .../GenericStoreDynamicTemplateTests.java | 8 +- .../mapper/GeoPointFieldMapperTests.java | 1 + .../index/mapper/GeoPointFieldTypeTests.java | 1 + .../mapper/GeoShapeFieldMapperTests.java | 3 +- .../index/mapper/GeoShapeFieldTypeTests.java | 1 + .../index/mapper/IdFieldMapperTests.java | 6 +- .../index/mapper/IdFieldTypeTests.java | 4 +- .../index/mapper/IgnoredFieldTypeTests.java | 1 + .../index/mapper/IndexFieldMapperTests.java | 6 +- .../index/mapper/IndexFieldTypeTests.java | 4 +- .../index/mapper/IpFieldMapperTests.java | 1 + .../index/mapper/IpFieldTypeTests.java | 1 + .../index/mapper/IpRangeFieldMapperTests.java | 4 +- .../index/mapper/IpRangeFieldTypeTests.java | 1 + .../mapper/JavaMultiFieldMergeTests.java | 6 +- .../index/mapper/KeywordFieldMapperTests.java | 1 + .../index/mapper/KeywordFieldTypeTests.java | 1 + .../mapper/LegacyDynamicMappingTests.java | 4 +- .../LegacyGeoShapeFieldMapperTests.java | 3 +- .../mapper/LegacyGeoShapeFieldTypeTests.java | 1 + .../mapper/LegacyMapperServiceTests.java | 4 +- .../mapper/LegacyTypeFieldMapperTests.java | 4 +- .../index/mapper/MapperServiceTests.java | 6 +- .../index/mapper/MapperTests.java | 4 +- .../mapper/MultiFieldCopyToMapperTests.java | 2 + .../index/mapper/MultiFieldTests.java | 8 +- .../index/mapper/NestedObjectMapperTests.java | 8 +- .../mapper/NullValueObjectMappingTests.java | 4 +- .../index/mapper/NullValueTests.java | 1 + .../index/mapper/NumberFieldMapperTests.java | 1 + .../index/mapper/NumberFieldTypeTests.java | 1 + .../index/mapper/ObjectMapperMergeTests.java | 4 +- .../index/mapper/ObjectMapperTests.java | 6 +- .../index/mapper/ParametrizedMapperTests.java | 1 + .../index/mapper/PathMapperTests.java | 6 +- .../mapper/PathMatchDynamicTemplateTests.java | 8 +- .../index/mapper/RangeFieldMapperTests.java | 1 + ...angeFieldQueryStringQueryBuilderTests.java | 2 +- .../index/mapper/RangeFieldTypeTests.java | 3 +- .../index/mapper/RootObjectMapperTests.java | 6 +- .../index/mapper/RoutingFieldMapperTests.java | 4 +- .../index/mapper/RoutingFieldTypeTests.java | 1 + .../index/mapper/SourceFieldMapperTests.java | 8 +- .../mapper/StoredNumericValuesTests.java | 4 +- .../mapper/TextFieldAnalyzerModeTests.java | 4 +- .../index/mapper/TextFieldMapperTests.java | 1 + .../index/mapper/TextFieldTypeTests.java | 1 + .../index/mapper/TypeFieldMapperTests.java | 6 +- .../index/mapper/TypeFieldTypeTests.java | 4 +- .../index/mapper/TypeParsersTests.java | 4 +- .../elasticsearch/index/mapper/UidTests.java | 4 +- .../index/mapper/UpdateMappingTests.java | 6 +- .../query/AbstractQueryBuilderTests.java | 4 +- .../query/AbstractTermQueryTestCase.java | 2 +- .../index/query/BoolQueryBuilderTests.java | 2 +- .../query/BoostingQueryBuilderTests.java | 2 +- .../index/query/CombineFunctionTests.java | 4 +- .../CombineIntervalsSourceProviderTests.java | 2 +- .../query/CommonTermsQueryBuilderTests.java | 4 +- .../query/CommonTermsQueryParserTests.java | 4 +- .../query/ConstantScoreQueryBuilderTests.java | 2 +- .../index/query/DisMaxQueryBuilderTests.java | 2 +- ...sjunctionIntervalsSourceProviderTests.java | 2 +- .../DistanceFeatureQueryBuilderTests.java | 2 +- .../index/query/ExistsQueryBuilderTests.java | 2 +- .../FieldMaskingSpanQueryBuilderTests.java | 2 +- .../FilterIntervalsSourceProviderTests.java | 2 +- .../FuzzyIntervalsSourceProviderTests.java | 2 +- .../index/query/FuzzyQueryBuilderTests.java | 2 +- .../GeoBoundingBoxQueryBuilderTests.java | 2 +- .../query/GeoDistanceQueryBuilderTests.java | 2 +- .../query/GeoPolygonQueryBuilderTests.java | 4 +- .../query/GeoShapeQueryBuilderTests.java | 4 +- .../index/query/IdsQueryBuilderTests.java | 2 +- .../index/query/InnerHitBuilderTests.java | 8 +- .../index/query/IntervalBuilderTests.java | 4 +- .../query/IntervalQueryBuilderTests.java | 2 +- .../query/LegacyGeoShapeFieldQueryTests.java | 2 +- .../query/MatchAllQueryBuilderTests.java | 2 +- .../MatchBoolPrefixQueryBuilderTests.java | 2 +- .../MatchIntervalsSourceProviderTests.java | 2 +- .../query/MatchNoneQueryBuilderTests.java | 2 +- .../MatchPhrasePrefixQueryBuilderTests.java | 2 +- .../query/MatchPhraseQueryBuilderTests.java | 2 +- .../index/query/MatchQueryBuilderTests.java | 2 +- .../query/MoreLikeThisQueryBuilderTests.java | 2 +- .../query/MultiMatchQueryBuilderTests.java | 6 +- .../index/query/NestedQueryBuilderTests.java | 4 +- .../index/query/OperatorTests.java | 4 +- .../PrefixIntervalsSourceProviderTests.java | 2 +- .../index/query/PrefixQueryBuilderTests.java | 2 +- .../index/query/QueryShardContextTests.java | 4 +- .../index/query/QueryShardExceptionTests.java | 4 +- .../query/QueryStringQueryBuilderTests.java | 6 +- .../index/query/RandomQueryBuilder.java | 6 +- .../index/query/RangeQueryBuilderTests.java | 2 +- .../index/query/RangeQueryRewriteTests.java | 4 +- .../index/query/RegexpQueryBuilderTests.java | 2 +- .../index/query/RewriteableTests.java | 4 +- .../index/query/ScoreModeTests.java | 4 +- .../index/query/ScriptQueryBuilderTests.java | 2 +- .../query/ScriptScoreQueryBuilderTests.java | 2 +- .../query/SearchIndexNameMatcherTests.java | 4 +- .../query/SimpleQueryStringBuilderTests.java | 2 +- .../SpanContainingQueryBuilderTests.java | 2 +- .../query/SpanFirstQueryBuilderTests.java | 2 +- .../index/query/SpanGapQueryBuilderTests.java | 2 +- .../query/SpanMultiTermQueryBuilderTests.java | 2 +- .../query/SpanNearQueryBuilderTests.java | 2 +- .../index/query/SpanNotQueryBuilderTests.java | 2 +- .../index/query/SpanOrQueryBuilderTests.java | 2 +- .../query/SpanWithinQueryBuilderTests.java | 2 +- .../index/query/TermsQueryBuilderTests.java | 2 +- .../query/TermsSetQueryBuilderTests.java | 6 +- .../index/query/TypeQueryBuilderTests.java | 2 +- .../WildcardIntervalsSourceProviderTests.java | 2 +- .../query/WildcardQueryBuilderTests.java | 2 +- .../index/query/WrapperQueryBuilderTests.java | 2 +- ...FieldValueFactorFunctionModifierTests.java | 4 +- .../FunctionScoreEquivalenceTests.java | 2 +- .../FunctionScoreQueryBuilderTests.java | 4 +- .../functionscore/FunctionScoreTests.java | 6 +- .../ScoreFunctionBuilderTests.java | 4 +- .../index/refresh/RefreshStatsTests.java | 4 +- .../AbstractBulkByScrollRequestTestCase.java | 6 +- .../reindex/BulkByScrollResponseTests.java | 2 +- ...ulkByScrollTaskStatusOrExceptionTests.java | 2 +- .../reindex/BulkByScrollTaskStatusTests.java | 2 +- .../index/reindex/BulkByScrollTaskTests.java | 4 +- .../LeaderBulkByScrollTaskStateTests.java | 4 +- .../WorkerBulkByScrollTaskStateTests.java | 4 +- .../IndexLevelReplicationTests.java | 5 +- .../RecoveryDuringReplicationTests.java | 9 +- .../RetentionLeasesReplicationTests.java | 7 +- .../index/search/MultiMatchQueryTests.java | 8 +- .../index/search/NestedHelperTests.java | 4 +- ...penSearchToParentBlockJoinQueryTests.java} | 4 +- .../SimpleQueryStringQueryParserTests.java | 4 +- .../search/geo/GeoPointParsingTests.java | 6 +- .../index/search/geo/GeoUtilsTests.java | 4 +- .../index/search/stats/SearchStatsTests.java | 4 +- .../index/seqno/CountedBitSetTests.java | 4 +- .../GlobalCheckpointSyncActionTests.java | 8 +- .../seqno/LocalCheckpointTrackerTests.java | 8 +- ...PeerRecoveryRetentionLeaseExpiryTests.java | 2 +- ...ReplicationTrackerRetentionLeaseTests.java | 2 +- .../seqno/ReplicationTrackerTestCase.java | 6 +- .../index/seqno/ReplicationTrackerTests.java | 2 +- .../seqno/RetentionLeaseActionsTests.java | 4 +- ...tentionLeaseBackgroundSyncActionTests.java | 8 +- .../index/seqno/RetentionLeaseStatsTests.java | 5 +- ...tentionLeaseStatsWireSerializingTests.java | 2 +- .../seqno/RetentionLeaseSyncActionTests.java | 8 +- .../index/seqno/RetentionLeaseTests.java | 4 +- .../seqno/RetentionLeaseXContentTests.java | 2 +- .../index/seqno/RetentionLeasesTests.java | 4 +- .../seqno/RetentionLeasesXContentTests.java | 2 +- .../index/seqno/SequenceNumbersTests.java | 6 +- .../index/shard/DocsStatsTests.java | 4 +- .../shard/GlobalCheckpointListenersTests.java | 8 +- .../index/shard/IndexReaderWrapperTests.java | 4 +- .../IndexShardOperationPermitsTests.java | 10 +- .../shard/IndexShardRetentionLeaseTests.java | 1 + .../index/shard/IndexShardTests.java | 14 +- .../shard/IndexingOperationListenerTests.java | 4 +- .../index/shard/NewPathForShardTests.java | 6 +- .../shard/PrimaryReplicaSyncerTests.java | 1 + .../index/shard/RefreshListenersTests.java | 10 +- .../RemoveCorruptedShardDataCommandTests.java | 5 +- .../shard/SearchOperationListenerTests.java | 6 +- .../index/shard/ShardGetServiceTests.java | 1 + .../index/shard/ShardIdTests.java | 4 +- .../index/shard/ShardPathTests.java | 4 +- .../index/shard/ShardSplittingQueryTests.java | 4 +- .../index/shard/ShardUtilsTests.java | 4 +- .../index/shard/StoreRecoveryTests.java | 4 +- .../similarity/LegacySimilarityTests.java | 4 +- .../NonNegativeScoresSimilarityTests.java | 4 +- .../similarity/ScriptedSimilarityTests.java | 4 +- .../similarity/SimilarityServiceTests.java | 6 +- .../index/similarity/SimilarityTests.java | 6 +- .../snapshots/blobstore/FileInfoTests.java | 4 +- .../blobstore/SlicedInputStreamTests.java | 4 +- .../store/ByteSizeCachingDirectoryTests.java | 4 +- .../index/store/FsDirectoryFactoryTests.java | 6 +- .../elasticsearch/index/store/StoreTests.java | 10 +- .../suggest/stats/CompletionsStatsTests.java | 4 +- .../termvectors/TermVectorsServiceTests.java | 4 +- .../index/translog/MultiSnapshotTests.java | 4 +- .../translog/TranslogDeletionPolicyTests.java | 4 +- .../index/translog/TranslogHeaderTests.java | 4 +- .../index/translog/TranslogTests.java | 10 +- .../IndexingMemoryControllerTests.java | 2 +- ...dicesLifecycleListenerSingleNodeTests.java | 8 +- .../indices/IndicesModuleTests.java | 6 +- .../indices/IndicesQueryCacheTests.java | 4 +- .../indices/IndicesRequestCacheTests.java | 4 +- .../indices/IndicesServiceCloseTests.java | 28 +- .../indices/IndicesServiceTests.java | 14 +- .../indices/NodeIndicesStatsTests.java | 4 +- .../indices/ShardLimitValidatorTests.java | 4 +- .../indices/SystemIndexDescriptorTests.java | 4 +- .../indices/SystemIndicesTests.java | 4 +- .../indices/TermsLookupTests.java | 4 +- .../indices/analysis/AnalysisModuleTests.java | 10 +- .../indices/analyze/HunspellServiceTests.java | 4 +- .../indices/breaker/BreakerSettingsTests.java | 4 +- .../HierarchyCircuitBreakerServiceTests.java | 4 +- ...actIndicesClusterStateServiceTestCase.java | 4 +- .../indices/cluster/ClusterStateChanges.java | 2 +- .../flush/SyncedFlushSingleNodeTests.java | 6 +- .../indices/flush/SyncedFlushUtil.java | 4 +- .../breaker/CircuitBreakerUnitTests.java | 4 +- .../PeerRecoverySourceServiceTests.java | 4 +- .../PeerRecoveryTargetServiceTests.java | 2 +- .../recovery/RecoveryRequestTrackerTests.java | 4 +- .../RecoverySettingsDynamicUpdateTests.java | 4 +- .../recovery/RecoverySourceHandlerTests.java | 14 +- .../indices/recovery/RecoveryStatusTests.java | 4 +- .../indices/recovery/RecoveryTargetTests.java | 6 +- .../indices/recovery/RecoveryTests.java | 6 +- .../recovery/StartRecoveryRequestTests.java | 6 +- .../indices/store/IndicesStoreTests.java | 4 +- .../monitor/fs/DeviceStatsTests.java | 4 +- .../monitor/fs/FsHealthServiceTests.java | 8 +- .../monitor/fs/FsProbeTests.java | 4 +- .../jvm/JvmGcMonitorServiceSettingsTests.java | 4 +- .../monitor/jvm/JvmGcMonitorServiceTests.java | 4 +- .../monitor/jvm/JvmInfoTests.java | 4 +- .../monitor/jvm/JvmMonitorTests.java | 4 +- .../monitor/jvm/JvmStatsTests.java | 4 +- .../monitor/os/OsProbeTests.java | 4 +- .../monitor/os/OsStatsTests.java | 4 +- .../monitor/process/ProcessProbeTests.java | 4 +- .../CancelPersistentTaskRequestTests.java | 2 +- .../PersistentTasksClusterServiceTests.java | 10 +- .../PersistentTasksCustomMetadataTests.java | 12 +- .../PersistentTasksDecidersTestCase.java | 6 +- .../PersistentTasksExecutorResponseTests.java | 2 +- ...PersistentTasksNodeServiceStatusTests.java | 2 +- .../PersistentTasksNodeServiceTests.java | 8 +- .../RestartPersistentTaskRequestTests.java | 2 +- .../StartPersistentActionRequestTests.java | 2 +- .../persistent/TestPersistentTasksPlugin.java | 4 +- .../UpdatePersistentTaskRequestTests.java | 2 +- .../decider/AssignmentDecisionTests.java | 4 +- .../plugins/IndexStorePluginTests.java | 6 +- .../elasticsearch/plugins/PlatformsTests.java | 4 +- .../plugins/PluginInfoTests.java | 4 +- .../plugins/PluginsServiceTests.java | 4 +- .../elasticsearch/plugins/PluginsTests.java | 4 +- .../spi/NamedXContentProviderTests.java | 4 +- .../recovery/RecoveriesCollectionTests.java | 4 +- .../SharedSignificantTermsTestMethods.java | 18 +- .../watcher/FileWatcherTests.java | 4 +- .../watcher/ResourceWatcherServiceTests.java | 4 +- .../test/java/org/opensearch/BuildTests.java | 4 +- .../ExceptionSerializationTests.java | 6 +- .../org/opensearch/ExceptionsHelperTests.java | 8 +- .../opensearch/OpenSearchExceptionTests.java | 4 +- .../opensearch/SpecialPermissionTests.java | 4 +- .../java/org/opensearch/VersionTests.java | 4 +- .../opensearch/action/bulk/RetryTests.java | 9 +- ...ActionIndicesThatCannotBeCreatedTests.java | 8 +- .../bulk/TransportBulkActionIngestTests.java | 10 +- .../action/bulk/TransportBulkActionTests.java | 8 +- .../bulk/TransportShardBulkActionTests.java | 13 +- .../CanMatchPreFilterSearchPhaseTests.java | 12 +- .../action/search/DfsQueryPhaseTests.java | 8 +- .../action/search/FetchSearchPhaseTests.java | 14 +- .../search/QueryPhaseResultConsumerTests.java | 4 +- .../search/SearchPhaseControllerTests.java | 6 +- .../SearchPhaseExecutionExceptionTests.java | 6 +- .../SearchQueryThenFetchAsyncActionTests.java | 4 +- ...ultShardOperationFailedExceptionTests.java | 5 +- .../action/support/RetryableActionTests.java | 30 +-- .../ReplicationOperationTests.java | 4 +- .../AbstractTermVectorsTestCase.java | 4 +- .../org/opensearch/common/BooleansTests.java | 4 +- .../org/opensearch/common/ChannelsTests.java | 4 +- ...ponentiallyWeightedMovingAverageTests.java | 5 +- .../common/FieldMemoryStatsTests.java | 5 +- .../common/LocalTimeOffsetTests.java | 7 +- .../org/opensearch/common/NumbersTests.java | 5 +- .../org/opensearch/common/PidFileTests.java | 5 +- .../org/opensearch/common/PriorityTests.java | 5 +- .../opensearch/common/ReleasablesTests.java | 4 +- .../org/opensearch/common/RoundingTests.java | 4 +- .../opensearch/common/RoundingWireTests.java | 3 +- .../org/opensearch/common/StringsTests.java | 5 +- .../org/opensearch/common/TableTests.java | 5 +- .../java/org/opensearch/common/UUIDTests.java | 4 +- .../common/blobstore/BlobPathTests.java | 5 +- .../blobstore/fs/FsBlobContainerTests.java | 8 +- .../RecyclingBytesStreamOutputTests.java | 4 +- .../common/cache/CacheBuilderTests.java | 6 +- .../opensearch/common/cache/CacheTests.java | 7 +- .../collect/CopyOnWriteHashMapTests.java | 5 +- .../common/collect/EvictingQueueTests.java | 5 +- .../common/collect/IteratorsTests.java | 5 +- .../common/compress/DeflateCompressTests.java | 6 +- .../DeflateCompressedXContentTests.java | 7 +- .../common/geo/BaseGeoParsingTestCase.java | 6 +- .../common/geo/GeoBoundingBoxTests.java | 4 +- .../common/geo/GeoDistanceTests.java | 6 +- .../common/geo/GeoJsonSerializationTests.java | 6 +- .../common/geo/GeoJsonShapeParserTests.java | 2 +- .../opensearch/common/geo/GeoUtilTests.java | 5 +- .../common/geo/GeometryIOTests.java | 4 +- .../common/geo/GeometryIndexerTests.java | 4 +- .../common/geo/GeometryParserTests.java | 6 +- .../common/geo/ShapeBuilderTests.java | 4 +- .../common/geo/ShapeRelationTests.java | 5 +- .../common/geo/SpatialStrategyTests.java | 5 +- .../AbstractShapeBuilderTestCase.java | 8 +- .../common/hash/MessageDigestsTests.java | 5 +- .../common/hashing/MurmurHash3Tests.java | 4 +- .../opensearch/common/hppc/HppcMapsTests.java | 4 +- .../common/io/FileSystemUtilsTests.java | 5 +- .../opensearch/common/io/StreamsTests.java | 5 +- .../stream/AbstractWriteableEnumTestCase.java | 8 +- .../common/io/stream/BytesStreamsTests.java | 11 +- .../io/stream/DelayableWriteableTests.java | 14 +- .../stream/NamedWriteableRegistryTests.java | 9 +- .../ReleasableBytesStreamOutputTests.java | 5 +- .../common/io/stream/StreamTests.java | 10 +- .../joda/JavaJodaTimeDuellingTests.java | 6 +- .../common/joda/JodaDateMathParserTests.java | 6 +- .../org/opensearch/common/joda/JodaTests.java | 6 +- .../logging/DeprecationLoggerTests.java | 4 +- .../common/logging/HeaderWarningTests.java | 9 +- .../JsonThrowablePatternConverterTests.java | 7 +- .../common/logging/LoggersTests.java | 4 +- .../logging/LoggingOutputStreamTests.java | 5 +- .../common/logging/PrefixLoggerTests.java | 5 +- .../logging/RateLimitingFilterTests.java | 6 +- .../opensearch/common/lucene/LuceneTests.java | 7 +- .../common/lucene/ShardCoreKeyMapTests.java | 5 +- .../lucene/index/FreqTermsEnumTests.java | 5 +- ...va => OpenSearchDirectoryReaderTests.java} | 5 +- .../search/MultiPhrasePrefixQueryTests.java | 5 +- .../common/lucene/search/QueriesTests.java | 7 +- .../morelikethis/MoreLikeThisQueryTests.java | 4 +- .../morelikethis/XMoreLikeThisTests.java | 4 +- .../store/InputStreamIndexInputTests.java | 5 +- .../common/lucene/uid/VersionLookupTests.java | 5 +- .../common/lucene/uid/VersionsTests.java | 7 +- .../opensearch/common/network/CidrsTests.java | 5 +- .../common/network/InetAddressesTests.java | 5 +- .../common/network/NetworkAddressTests.java | 5 +- .../common/network/NetworkModuleTests.java | 4 +- .../common/network/NetworkServiceTests.java | 5 +- .../common/network/NetworkUtilsTests.java | 7 +- .../opensearch/common/path/PathTrieTests.java | 5 +- .../recycler/AbstractRecyclerTestCase.java | 6 +- .../opensearch/common/regex/RegexTests.java | 5 +- .../common/rounding/DateTimeUnitTests.java | 5 +- .../common/rounding/RoundingDuelTests.java | 8 +- .../rounding/TimeZoneRoundingTests.java | 6 +- .../ConsistentSettingsServiceTests.java | 9 +- .../settings/MemorySizeSettingsTests.java | 6 +- .../settings/PropertyPlaceholderTests.java | 5 +- .../common/settings/ScopedSettingsTests.java | 8 +- .../common/settings/SecureStringTests.java | 5 +- .../common/settings/SettingTests.java | 14 +- .../common/settings/SettingsFilterTests.java | 10 +- .../common/settings/SettingsTests.java | 11 +- .../common/time/DateFormattersTests.java | 8 +- .../common/time/DateUtilsRoundingTests.java | 5 +- .../common/time/DateUtilsTests.java | 5 +- .../common/time/JavaDateMathParserTests.java | 8 +- .../transport/BoundTransportAddressTests.java | 6 +- .../common/unit/ByteSizeUnitTests.java | 6 +- .../common/unit/ByteSizeValueTests.java | 4 +- .../common/unit/DistanceUnitTests.java | 5 +- .../common/unit/FuzzinessTests.java | 5 +- .../common/unit/RatioValueTests.java | 5 +- .../common/unit/SizeValueTests.java | 8 +- .../common/util/ArrayUtilsTests.java | 5 +- .../common/util/BigArraysTests.java | 21 +- .../common/util/BinarySearcherTests.java | 10 +- .../opensearch/common/util/BitArrayTests.java | 6 +- .../common/util/ByteUtilsTests.java | 5 +- .../common/util/BytesRefHashTests.java | 8 +- .../common/util/CancellableThreadsTests.java | 5 +- .../common/util/CollectionUtilsTests.java | 5 +- .../common/util/CuckooFilterTests.java | 3 +- .../common/util/LocaleUtilsTests.java | 5 +- .../opensearch/common/util/LongHashTests.java | 8 +- .../common/util/LongLongHashTests.java | 8 +- .../common/util/LongObjectHashMapTests.java | 8 +- .../org/opensearch/common/util/MapsTests.java | 5 +- .../SetBackedScalingCuckooFilterTests.java | 3 +- .../common/util/SingleObjectCacheTests.java | 5 +- .../common/util/URIPatternTests.java | 5 +- .../concurrent/AbstractAsyncTaskTests.java | 4 +- .../AbstractLifecycleRunnableTests.java | 5 +- .../concurrent/AbstractRunnableTests.java | 5 +- .../concurrent/AsyncIOProcessorTests.java | 6 +- .../util/concurrent/CountDownTests.java | 5 +- .../util/concurrent/FutureUtilsTests.java | 5 +- .../util/concurrent/KeyedLockTests.java | 5 +- .../concurrent/ListenableFutureTests.java | 15 +- .../concurrent/OpenSearchExecutorsTests.java | 39 ++- .../OpenSearchThreadPoolExecutorTests.java | 5 +- .../concurrent/PrioritizedExecutorsTests.java | 25 +- .../concurrent/PrioritizedRunnableTests.java | 5 +- ...zingOpenSearchThreadPoolExecutorTests.java | 30 +-- .../util/concurrent/ReleasableLockTests.java | 5 +- .../ResizableBlockingQueueTests.java | 6 +- .../common/util/concurrent/RunOnceTests.java | 6 +- .../concurrent/SizeBlockingQueueTests.java | 5 +- .../util/concurrent/ThreadContextTests.java | 6 +- .../util/concurrent/TimedRunnableTests.java | 6 +- .../common/util/iterable/IterablesTests.java | 5 +- .../opensearch/common/util/set/SetsTests.java | 5 +- .../common/xcontent/BaseXContentTestCase.java | 4 +- .../SuggestingErrorOnUnknownTests.java | 5 +- .../common/xcontent/XContentFactoryTests.java | 4 +- .../xcontent/XContentParserUtilsTests.java | 4 +- .../common/xcontent/XContentTypeTests.java | 4 +- .../builder/XContentBuilderTests.java | 4 +- .../cbor/CborXContentParserTests.java | 4 +- .../common/xcontent/cbor/JsonVsCborTests.java | 4 +- .../xcontent/smile/JsonVsSmileTests.java | 4 +- .../support/AbstractFilteringTestCase.java | 4 +- .../xcontent/support/XContentHelperTests.java | 4 +- .../FilterPathGeneratorFilteringTests.java | 4 +- .../support/filtering/FilterPathTests.java | 4 +- .../discovery/SeedHostsResolverTests.java | 6 +- .../http/DefaultRestChannelTests.java | 6 +- .../opensearch/ingest/IngestServiceTests.java | 6 +- .../node/InternalSettingsPreparerTests.java | 4 +- .../java/org/opensearch/node/NodeTests.java | 12 +- .../node/ResponseCollectorServiceTests.java | 4 +- .../nodesinfo/NodeInfoStreamingTests.java | 6 +- .../opensearch/repositories/IndexIdTests.java | 4 +- .../repositories/RepositoriesModuleTests.java | 4 +- .../RepositoriesServiceTests.java | 4 +- .../RepositoriesStatsArchiveTests.java | 4 +- .../repositories/RepositoryDataTests.java | 4 +- .../BlobStoreRepositoryRestoreTests.java | 2 +- .../blobstore/BlobStoreRepositoryTests.java | 38 +-- .../repositories/fs/FsRepositoryTests.java | 8 +- .../opensearch/rest/BaseRestHandlerTests.java | 8 +- .../rest/BytesRestResponseTests.java | 8 +- .../rest/DeprecationRestHandlerTests.java | 4 +- .../opensearch/rest/RestControllerTests.java | 8 +- .../rest/RestHttpResponseHeadersTests.java | 8 +- .../org/opensearch/rest/RestRequestTests.java | 6 +- .../org/opensearch/rest/RestUtilsTests.java | 4 +- .../rest/action/RestActionsTests.java | 4 +- .../rest/action/RestBuilderListenerTests.java | 8 +- .../RestCancellableNodeClientTests.java | 4 +- .../rest/action/RestMainActionTests.java | 6 +- ...stAddVotingConfigExclusionActionTests.java | 4 +- .../RestClusterGetSettingsActionTests.java | 4 +- .../cluster/RestClusterHealthActionTests.java | 6 +- .../cluster/RestNodesInfoActionTests.java | 6 +- .../cluster/RestNodesStatsActionTests.java | 6 +- .../RestReloadSecureSettingsActionTests.java | 4 +- .../admin/indices/RestAnalyzeActionTests.java | 8 +- .../RestClearIndicesCacheActionTests.java | 6 +- .../indices/RestCreateIndexActionTests.java | 4 +- .../indices/RestGetAliasesActionTests.java | 4 +- .../RestGetFieldMappingActionTests.java | 6 +- .../indices/RestGetIndicesActionTests.java | 4 +- .../indices/RestGetMappingActionTests.java | 6 +- .../indices/RestIndicesStatsActionTests.java | 6 +- .../RestPutIndexTemplateActionTests.java | 4 +- .../indices/RestPutMappingActionTests.java | 6 +- .../admin/indices/RestResizeHandlerTests.java | 6 +- .../indices/RestValidateQueryActionTests.java | 4 +- .../action/cat/RestIndicesActionTests.java | 6 +- .../rest/action/cat/RestNodesActionTests.java | 6 +- .../action/cat/RestRecoveryActionTests.java | 4 +- .../action/cat/RestShardsActionTests.java | 6 +- .../rest/action/cat/RestTableTests.java | 6 +- .../rest/action/cat/RestTasksActionTests.java | 10 +- .../action/document/RestBulkActionTests.java | 8 +- .../document/RestDeleteActionTests.java | 4 +- .../action/document/RestGetActionTests.java | 4 +- .../document/RestGetSourceActionTests.java | 6 +- .../action/document/RestIndexActionTests.java | 6 +- .../document/RestMultiGetActionTests.java | 4 +- .../RestMultiTermVectorsActionTests.java | 4 +- .../document/RestTermVectorsActionTests.java | 4 +- .../document/RestUpdateActionTests.java | 4 +- .../action/search/RestCountActionTests.java | 4 +- .../action/search/RestExplainActionTests.java | 4 +- .../search/RestMultiSearchActionTests.java | 4 +- .../action/search/RestSearchActionTests.java | 4 +- .../script/ClassPermissionTests.java | 4 +- .../JodaCompatibleZonedDateTimeTests.java | 4 +- .../opensearch/script/ScriptCacheTests.java | 4 +- .../script/ScriptContextInfoTests.java | 4 +- .../opensearch/script/ScriptContextTests.java | 4 +- .../script/ScriptExceptionTests.java | 4 +- .../script/ScriptLanguagesInfoTests.java | 4 +- .../script/ScriptMetadataTests.java | 2 +- .../opensearch/script/ScriptServiceTests.java | 4 +- .../org/opensearch/script/ScriptTests.java | 4 +- .../script/StoredScriptSourceTests.java | 2 +- .../opensearch/script/StoredScriptTests.java | 2 +- .../search/AbstractSearchTestCase.java | 4 +- .../search/ClearScrollResponseTests.java | 6 +- .../search/DefaultSearchContextTests.java | 4 +- .../search/DocValueFormatTests.java | 4 +- .../search/MultiValueModeTests.java | 4 +- .../search/NestedIdentityTests.java | 6 +- .../search/SearchCancellationTests.java | 4 +- .../org/opensearch/search/SearchHitTests.java | 10 +- .../opensearch/search/SearchHitsTests.java | 2 +- .../opensearch/search/SearchModuleTests.java | 4 +- .../opensearch/search/SearchServiceTests.java | 10 +- .../SearchSortValuesAndFormatsTests.java | 2 +- .../search/SearchSortValuesTests.java | 4 +- .../AggregationCollectorTests.java | 4 +- .../AggregationTestScriptsPlugin.java | 4 +- .../aggregations/AggregationsTests.java | 14 +- .../aggregations/AggregatorBaseTests.java | 4 +- .../AggregatorFactoriesBuilderTests.java | 2 +- .../AggregatorFactoriesTests.java | 6 +- .../CardinalityUpperBoundTests.java | 4 +- .../InternalAggregationsTests.java | 6 +- .../InternalMultiBucketAggregationTests.java | 4 +- .../aggregations/InternalOrderTests.java | 4 +- .../MultiBucketCollectorTests.java | 4 +- .../SubAggCollectionModeTests.java | 4 +- .../aggregations/bucket/BucketUtilsTests.java | 4 +- .../aggregations/bucket/GeoHashGridTests.java | 2 +- .../aggregations/bucket/GeoTileGridTests.java | 2 +- .../bucket/ShardSizeTestCase.java | 8 +- ...djacencyMatrixAggregationBuilderTests.java | 6 +- .../InternalAdjacencyMatrixTests.java | 2 +- .../composite/CompositeAggregatorTests.java | 2 +- .../GeoTileGridValuesSourceBuilderTests.java | 6 +- .../composite/InternalCompositeTests.java | 2 +- .../SingleDimensionValuesSourceTests.java | 4 +- .../bucket/filter/InternalFiltersTests.java | 2 +- .../bucket/geogrid/GeoGridTestCase.java | 2 +- .../geogrid/GeoHashGridParserTests.java | 4 +- .../geogrid/GeoTileGridParserTests.java | 4 +- .../bucket/geogrid/GeoTileUtilsTests.java | 4 +- ...oDateHistogramAggregationBuilderTests.java | 4 +- .../histogram/DateIntervalWrapperTests.java | 4 +- .../bucket/histogram/DoubleBoundsTests.java | 6 +- .../InternalAutoDateHistogramTests.java | 2 +- .../histogram/InternalDateHistogramTests.java | 2 +- .../histogram/InternalHistogramTests.java | 4 +- .../InternalVariableWidthHistogramTests.java | 2 +- .../bucket/histogram/LongBoundsTests.java | 4 +- .../bucket/nested/NestedAggregatorTests.java | 2 +- .../range/BinaryRangeAggregatorTests.java | 4 +- .../bucket/range/InternalRangeTestCase.java | 2 +- .../range/RangeAggregationBuilderTests.java | 2 +- .../terms/BytesKeyedBucketOrdsTests.java | 4 +- .../terms/InternalRareTermsTestCase.java | 2 +- .../InternalSignificantTermsTestCase.java | 2 +- .../bucket/terms/InternalTermsTestCase.java | 2 +- .../terms/LongKeyedBucketOrdsTests.java | 6 +- .../terms/SignificanceHeuristicTests.java | 8 +- .../terms/TermsAggregatorFactoryTests.java | 4 +- .../metrics/AbstractGeoTestCase.java | 10 +- .../metrics/AbstractPercentilesTestCase.java | 2 +- .../metrics/CompensatedSumTests.java | 4 +- .../HyperLogLogPlusPlusSparseTests.java | 4 +- .../metrics/HyperLogLogPlusPlusTests.java | 4 +- .../metrics/InternalAvgTests.java | 2 +- .../metrics/InternalCardinalityTests.java | 4 +- .../metrics/InternalExtendedStatsTests.java | 2 +- .../metrics/InternalGeoBoundsTests.java | 2 +- .../metrics/InternalGeoCentroidTests.java | 2 +- .../metrics/InternalMaxTests.java | 2 +- .../InternalMedianAbsoluteDeviationTests.java | 2 +- .../metrics/InternalMinTests.java | 2 +- .../metrics/InternalScriptedMetricTests.java | 4 +- .../metrics/InternalStatsTests.java | 2 +- .../metrics/InternalSumTests.java | 2 +- .../metrics/InternalTopHitsTests.java | 12 +- .../metrics/InternalValueCountTests.java | 2 +- .../metrics/InternalWeightedAvgTests.java | 2 +- .../metrics/MetricAggScriptPlugin.java | 4 +- .../metrics/PercentilesMethodTests.java | 4 +- .../metrics/TDigestStateTests.java | 4 +- .../aggregations/metrics/TopHitsTests.java | 2 +- .../WeightedAvgAggregationBuilderTests.java | 2 +- .../pipeline/BucketHelpersTests.java | 4 +- .../InternalBucketMetricValueTests.java | 2 +- .../pipeline/InternalDerivativeTests.java | 2 +- .../InternalPercentilesBucketTests.java | 2 +- .../pipeline/InternalSimpleValueTests.java | 2 +- .../pipeline/MovAvgUnitTests.java | 4 +- .../MovFnWhitelistedFunctionTests.java | 4 +- .../PipelineAggregationHelperTests.java | 4 +- .../support/AggregationPathTests.java | 4 +- .../support/CoreValuesSourceTypeTests.java | 4 +- .../support/IncludeExcludeTests.java | 4 +- .../support/MissingValuesTests.java | 4 +- .../MultiValuesSourceFieldConfigTests.java | 2 +- .../support/ScriptValuesTests.java | 4 +- .../aggregations/support/ValueTypeTests.java | 4 +- .../support/ValuesSourceConfigTests.java | 4 +- .../support/ValuesSourceRegistryTests.java | 4 +- .../builder/SearchSourceBuilderTests.java | 6 +- .../search/collapse/CollapseBuilderTests.java | 2 +- .../search/fetch/FetchPhaseTests.java | 4 +- .../fetch/subphase/FetchSourcePhaseTests.java | 4 +- .../fetch/subphase/FieldFetcherTests.java | 4 +- .../highlight/HighlightBuilderTests.java | 10 +- .../highlight/HighlightFieldTests.java | 6 +- .../opensearch/search/geo/GeoQueryTests.java | 10 +- .../search/geo/GeoShapeQueryTests.java | 4 +- .../search/internal/AliasFilterTests.java | 6 +- .../internal/ContextIndexSearcherTests.java | 6 +- .../internal/ShardSearchRequestTests.java | 2 +- .../search/lookup/LeafDocLookupTests.java | 4 +- .../search/lookup/LeafFieldsLookupTests.java | 4 +- .../search/profile/ProfileResultTests.java | 8 +- .../SearchProfileShardResultsTests.java | 8 +- .../opensearch/search/profile/TimerTests.java | 4 +- .../AggregationProfileShardResultTests.java | 6 +- .../profile/query/CollectorResultTests.java | 8 +- .../profile/query/ProfileScorerTests.java | 4 +- .../query/QueryProfileShardResultTests.java | 6 +- .../profile/query/QueryProfilerTests.java | 4 +- .../search/query/QueryPhaseTests.java | 4 +- .../search/query/QuerySearchResultTests.java | 4 +- .../search/query/ScriptScoreQueryTests.java | 4 +- .../search/rescore/QueryRescoreModeTests.java | 4 +- .../rescore/QueryRescorerBuilderTests.java | 10 +- .../scroll/RestClearScrollActionTests.java | 10 +- .../scroll/RestSearchScrollActionTests.java | 10 +- .../searchafter/SearchAfterBuilderTests.java | 6 +- .../slice/DocValuesSliceQueryTests.java | 4 +- .../search/slice/SliceBuilderTests.java | 6 +- .../search/slice/TermsSliceQueryTests.java | 4 +- .../search/sort/AbstractSortTestCase.java | 8 +- .../search/sort/BucketedSortTestCase.java | 4 +- .../search/sort/NestedSortBuilderTests.java | 6 +- .../search/sort/SortBuilderTests.java | 4 +- .../opensearch/search/sort/SortModeTests.java | 4 +- .../search/sort/SortOrderTests.java | 4 +- .../search/sort/SortValueTests.java | 2 +- .../AbstractSuggestionBuilderTestCase.java | 8 +- .../CompletionSuggestionOptionTests.java | 8 +- .../search/suggest/SuggestBuilderTests.java | 6 +- .../search/suggest/SuggestTests.java | 8 +- .../search/suggest/SuggestionEntryTests.java | 8 +- .../search/suggest/SuggestionOptionTests.java | 8 +- .../search/suggest/SuggestionTests.java | 8 +- .../suggest/TermSuggestionOptionTests.java | 8 +- .../CategoryContextMappingTests.java | 4 +- .../completion/CompletionSuggestionTests.java | 4 +- .../suggest/completion/FuzzyOptionsTests.java | 6 +- .../completion/GeoContextMappingTests.java | 4 +- .../completion/QueryContextTestCase.java | 4 +- .../suggest/completion/RegexOptionsTests.java | 4 +- .../phrase/DirectCandidateGeneratorTests.java | 6 +- .../phrase/NoisyChannelSpellCheckerTests.java | 4 +- .../phrase/SmoothingModelTestCase.java | 8 +- .../snapshots/BlobStoreFormatTests.java | 4 +- .../InternalSnapshotsInfoServiceTests.java | 8 +- ...epositoriesMetadataSerializationTests.java | 2 +- .../snapshots/RestoreServiceTests.java | 4 +- .../snapshots/SnapshotInfoTests.java | 8 +- .../snapshots/SnapshotRequestsTests.java | 4 +- .../snapshots/SnapshotResiliencyTests.java | 6 +- .../snapshots/SnapshotShardsServiceTests.java | 6 +- .../opensearch/snapshots/SnapshotTests.java | 4 +- .../snapshots/SnapshotUtilsTests.java | 4 +- ...SnapshotsInProgressSerializationTests.java | 4 +- .../snapshots/SnapshotsServiceTests.java | 4 +- .../MockEventuallyConsistentRepository.java | 4 +- ...ckEventuallyConsistentRepositoryTests.java | 4 +- .../tasks/CancelTasksResponseTests.java | 2 +- .../tasks/ListTasksResponseTests.java | 2 +- .../org/opensearch/tasks/TaskIdTests.java | 4 +- .../org/opensearch/tasks/TaskInfoTests.java | 2 +- .../opensearch/tasks/TaskManagerTests.java | 4 +- .../org/opensearch/tasks/TaskResultTests.java | 4 +- .../threadpool/FixedThreadPoolTests.java | 8 +- .../OpenSearchThreadPoolTestCase.java | 4 +- .../ScheduleWithFixedDelayTests.java | 8 +- .../opensearch/threadpool/SchedulerTests.java | 4 +- .../ThreadPoolSerializationTests.java | 4 +- .../threadpool/ThreadPoolStatsTests.java | 4 +- .../threadpool/ThreadPoolTests.java | 8 +- .../UpdateThreadPoolSettingsTests.java | 8 +- .../ClusterConnectionManagerTests.java | 4 +- .../CompressibleBytesOutputStreamTests.java | 4 +- .../transport/ConnectionProfileTests.java | 10 +- .../transport/InboundAggregatorTests.java | 4 +- .../transport/InboundDecoderTests.java | 6 +- .../transport/InboundHandlerTests.java | 8 +- .../transport/InboundPipelineTests.java | 4 +- .../transport/OutboundHandlerTests.java | 4 +- .../ProxyConnectionStrategyTests.java | 6 +- .../transport/PublishPortTests.java | 4 +- .../RemoteClusterAwareClientTests.java | 6 +- .../transport/RemoteClusterAwareTests.java | 4 +- .../transport/RemoteClusterClientTests.java | 12 +- .../RemoteClusterConnectionTests.java | 8 +- .../transport/RemoteClusterServiceTests.java | 12 +- .../transport/RemoteClusterSettingsTests.java | 8 +- .../RemoteConnectionManagerTests.java | 4 +- .../RemoteConnectionStrategyTests.java | 4 +- .../SniffConnectionStrategyTests.java | 10 +- .../transport/TcpTransportTests.java | 8 +- .../transport/TransportActionProxyTests.java | 6 +- .../transport/TransportDecompressorTests.java | 4 +- .../transport/TransportHandshakerTests.java | 4 +- .../transport/TransportInfoTests.java | 4 +- .../transport/TransportKeepAliveTests.java | 4 +- .../transport/TransportLoggerTests.java | 8 +- .../TransportRequestDeduplicatorTests.java | 4 +- ...ortServiceDeserializationFailureTests.java | 6 +- .../TransportServiceHandshakeTests.java | 8 +- .../opensearch/usage/UsageServiceTests.java | 8 +- .../DelayedShardAggregationBuilderTests.java | 2 +- ...ShardAggregationClientYamlTestSuiteIT.java | 8 +- test/framework/build.gradle | 14 +- .../ClusterStateCreationUtils.java | 10 +- .../bootstrap/OpenSearchCliTestCase.java | 4 +- .../org/opensearch/cli/CommandTestCase.java | 4 +- .../client/RestClientBuilderTestCase.java | 4 +- .../cluster/DataStreamTestHelper.java | 12 +- .../cluster/OpenSearchAllocationTestCase.java | 10 +- .../AbstractCoordinatorTestCase.java | 8 +- .../CoordinationStateTestCluster.java | 12 +- .../coordination/DeterministicTaskQueue.java | 4 +- .../MockSinglePrioritizingExecutor.java | 4 +- .../cluster/routing/TestShardRouting.java | 15 +- .../service/FakeThreadPoolMasterService.java | 6 +- .../bytes/AbstractBytesReferenceTestCase.java | 8 +- .../common/inject/ModuleTestCase.java | 4 +- .../common/logging/JsonLogsIntegTestCase.java | 4 +- .../TestThreadInfoPatternConverter.java | 4 +- .../store/OpenSearchIndexInputTestCase.java | 8 +- .../opensearch/common/util/MockBigArrays.java | 2 +- .../common/util/MockPageCacheRecycler.java | 3 +- .../org/opensearch/geo/GeometryTestUtils.java | 24 +- .../index/MapperTestUtils.java | 8 +- .../index/MockEngineFactoryPlugin.java | 8 +- .../index/RandomCreateIndexGenerator.java | 12 +- .../alias/RandomAliasActionsGenerator.java | 20 +- .../index/analysis/AnalysisTestsHelper.java | 20 +- .../analysis/MyFilterTokenFilterFactory.java | 4 +- .../index/engine/DocIdSeqNoAndSource.java | 4 +- .../index/engine/EngineTestCase.java | 20 +- .../index/engine/InternalTestEngine.java | 4 +- .../index/engine/TranslogHandler.java | 4 +- .../AbstractNumericFieldMapperTestCase.java | 4 +- .../index/mapper/FieldMapperTestCase.java | 6 +- .../index/mapper/FieldMapperTestCase2.java | 2 +- .../index/mapper/FieldTypeTestCase.java | 8 +- .../index/mapper/MapperServiceTestCase.java | 6 +- .../index/mapper/MapperTestCase.java | 4 +- .../index/mapper/MockFieldFilterPlugin.java | 4 +- .../index/mapper/MockFieldMapper.java | 4 +- ...stractAsyncBulkByScrollActionTestCase.java | 8 +- ...nSearchIndexLevelReplicationTestCase.java} | 14 +- .../index/seqno/RetentionLeaseUtils.java | 4 +- .../index/shard/IndexShardTestCase.java | 22 +- .../index/shard/RestoreOnlyRepository.java | 4 +- .../OpenSearchBaseDirectoryTestCase.java} | 14 +- .../translog/TranslogDeletionPolicies.java | 4 +- .../analysis/AnalysisFactoryTestCase.java | 4 +- .../java/org/opensearch/node/MockNode.java | 4 +- .../AbstractThirdPartyRepositoryTestCase.java | 4 +- .../AbstractBlobContainerRetriesTestCase.java | 4 +- .../blobstore/BlobStoreTestUtil.java | 6 +- ...archBlobStoreRepositoryIntegTestCase.java} | 8 +- ...hMockAPIBasedRepositoryIntegTestCase.java} | 8 +- .../search/RandomSearchRequestGenerator.java | 32 +-- .../aggregations/AggregatorTestCase.java | 8 +- .../aggregations/BaseAggregationTestCase.java | 4 +- .../BasePipelineAggregationTestCase.java | 8 +- ...ternalSingleBucketAggregationTestCase.java | 4 +- .../bucket/AbstractTermsTestCase.java | 6 +- .../metrics/AbstractNumericTestCase.java | 6 +- .../AbstractSnapshotIntegTestCase.java | 8 +- .../test/AbstractBootstrapCheckTestCase.java | 6 +- .../AbstractBroadcastResponseTestCase.java | 4 +- .../test/AbstractBuilderTestCase.java | 6 +- ...AbstractDiffableSerializationTestCase.java | 4 +- ...ractDiffableWireSerializationTestCase.java | 4 +- .../test/AbstractMultiClustersTestCase.java | 6 +- .../test/AbstractNamedWriteableTestCase.java | 4 +- .../test/AbstractQueryTestCase.java | 22 +- .../test/AbstractSerializingTestCase.java | 6 +- .../test/AbstractWireSerializingTestCase.java | 4 +- .../test/AbstractWireTestCase.java | 6 +- .../test/AbstractXContentTestCase.java | 10 +- .../test/BackgroundIndexer.java | 4 +- .../test/ClusterServiceUtils.java | 6 +- .../test/CorruptionUtils.java | 4 +- .../test/DiffableTestUtils.java | 6 +- .../test/DummyShardLock.java | 4 +- .../test/EqualsHashCodeTestUtils.java | 6 +- .../test/ExternalTestCluster.java | 8 +- .../test/FieldMaskingReader.java | 4 +- .../test/IndexSettingsModule.java | 6 +- .../test/InternalAggregationTestCase.java | 11 +- ...nternalMultiBucketAggregationTestCase.java | 4 +- .../test/InternalSettingsPlugin.java | 4 +- .../test/InternalTestCluster.java | 46 ++-- .../test/MockHttpTransport.java | 4 +- .../test/MockIndexEventListener.java | 4 +- .../test/MockKeywordPlugin.java | 4 +- .../test/MockLogAppender.java | 4 +- .../test/NodeConfigurationSource.java | 4 +- .../test/NodeRoles.java | 2 +- .../test/NotEqualMessageBuilder.java | 4 +- .../test/OpenSearchIntegTestCase.java} | 72 ++--- .../test/OpenSearchSingleNodeTestCase.java} | 18 +- .../test/OpenSearchTestCase.java} | 30 +-- .../test/OpenSearchTokenStreamTestCase.java} | 10 +- .../test/PosixPermissionsResetter.java | 4 +- .../test/RandomObjects.java | 6 +- .../test/StreamsUtils.java | 4 +- .../test/TestCluster.java | 15 +- .../test/TestCustomMetadata.java | 4 +- .../test/TestGeoShapeFieldMapperPlugin.java | 4 +- .../test/TestSearchContext.java | 4 +- .../test/VersionUtils.java | 4 +- .../test/XContentTestUtils.java | 6 +- .../test/client/NoOpClient.java | 4 +- .../test/client/NoOpNodeClient.java | 2 +- .../test/client/RandomizingClient.java | 4 +- .../BlockClusterStateProcessing.java | 6 +- .../BlockMasterServiceOnMaster.java | 6 +- .../BusyMasterServiceDisruption.java | 7 +- .../disruption/DisruptableMockTransport.java | 8 +- .../IntermittentLongGCDisruption.java | 4 +- .../test/disruption/LongGCDisruption.java | 6 +- .../test/disruption/NetworkDisruption.java | 8 +- .../disruption/ServiceDisruptionScheme.java | 6 +- .../test/disruption/SingleNodeDisruption.java | 6 +- .../SlowClusterStateProcessing.java | 6 +- .../test/engine/MockEngineFactory.java | 4 +- .../test/engine/MockEngineSupport.java | 8 +- .../test/engine/MockInternalEngine.java | 4 +- .../engine/ThrowingLeafReaderWrapper.java | 6 +- .../test/fixture/AbstractHttpFixture.java | 4 +- .../test/gateway/TestGatewayAllocator.java | 4 +- .../test/hamcrest/CollectionAssertions.java | 4 +- .../test/hamcrest/CollectionMatchers.java | 4 +- .../test/hamcrest/OpenSearchAssertions.java} | 18 +- .../test/hamcrest/OpenSearchMatchers.java} | 6 +- .../test/hamcrest/OptionalMatchers.java | 4 +- .../test/hamcrest/RegexMatcher.java | 4 +- .../test/hamcrest/TupleMatchers.java | 4 +- .../test/junit/annotations/Network.java | 4 +- .../junit/annotations/TestIssueLogging.java | 4 +- .../test/junit/annotations/TestLogging.java | 4 +- .../test/junit/listeners/LoggingListener.java | 8 +- .../junit/listeners/ReproduceInfoPrinter.java | 22 +- .../test/rest/FakeRestChannel.java | 4 +- .../test/rest/FakeRestRequest.java | 4 +- .../test/rest/OpenSearchRestTestCase.java} | 20 +- .../test/rest/RestActionTestCase.java | 10 +- .../test/rest/package-info.java | 6 +- .../yaml/BlacklistedPathPatternMatcher.java | 4 +- .../rest/yaml/ClientYamlDocsTestClient.java | 6 +- .../rest/yaml/ClientYamlTestCandidate.java | 12 +- .../test/rest/yaml/ClientYamlTestClient.java | 10 +- .../yaml/ClientYamlTestExecutionContext.java | 4 +- .../rest/yaml/ClientYamlTestResponse.java | 4 +- .../yaml/ClientYamlTestResponseException.java | 4 +- .../test/rest/yaml/Features.java | 4 +- .../test/rest/yaml/ObjectPath.java | 4 +- .../OpenSearchClientYamlSuiteTestCase.java} | 22 +- .../test/rest/yaml/Stash.java | 4 +- .../test/rest/yaml/package-info.java | 4 +- .../yaml/restspec/ClientYamlSuiteRestApi.java | 4 +- .../ClientYamlSuiteRestApiParser.java | 4 +- .../restspec/ClientYamlSuiteRestSpec.java | 4 +- .../test/rest/yaml/restspec/package-info.java | 4 +- .../rest/yaml/section/ApiCallSection.java | 4 +- .../test/rest/yaml/section/Assertion.java | 6 +- .../yaml/section/ClientYamlTestSection.java | 4 +- .../yaml/section/ClientYamlTestSuite.java | 4 +- .../rest/yaml/section/ContainsAssertion.java | 4 +- .../test/rest/yaml/section/DoSection.java | 15 +- .../rest/yaml/section/ExecutableSection.java | 6 +- .../yaml/section/GreaterThanAssertion.java | 4 +- .../section/GreaterThanEqualToAssertion.java | 4 +- .../rest/yaml/section/IsFalseAssertion.java | 4 +- .../rest/yaml/section/IsTrueAssertion.java | 4 +- .../rest/yaml/section/LengthAssertion.java | 4 +- .../rest/yaml/section/LessThanAssertion.java | 4 +- .../section/LessThanOrEqualToAssertion.java | 4 +- .../rest/yaml/section/MatchAssertion.java | 11 +- .../test/rest/yaml/section/ParserUtils.java | 4 +- .../test/rest/yaml/section/SetSection.java | 6 +- .../test/rest/yaml/section/SetupSection.java | 4 +- .../test/rest/yaml/section/SkipSection.java | 8 +- .../rest/yaml/section/TeardownSection.java | 4 +- .../yaml/section/TransformAndSetSection.java | 6 +- .../test/rest/yaml/section/VersionRange.java | 4 +- .../test/rest/yaml/section/package-info.java | 4 +- .../test/store/MockFSDirectoryFactory.java | 16 +- .../test/store/MockFSIndexStore.java | 4 +- .../test/tasks/MockTaskManager.java | 4 +- .../test/tasks/MockTaskManagerListener.java | 4 +- .../test/transport/CapturingTransport.java | 4 +- .../test/transport/FakeTransport.java | 2 +- .../test/transport/MockTransport.java | 4 +- .../test/transport/MockTransportService.java | 10 +- .../transport/StubbableConnectionManager.java | 4 +- .../test/transport/StubbableTransport.java | 4 +- .../opensearch/threadpool/TestThreadPool.java | 6 +- .../AbstractSimpleTransportTestCase.java | 14 +- .../transport/nio/MockNioTransport.java | 2 +- .../AbstractFullClusterRestartTestCase.java | 4 +- .../src/main/resources/log4j2-test.properties | 4 +- .../analysis/common/test1.json | 0 .../analysis/common/test1.yml | 0 .../ingest/IngestDocumentMatcherTests.java | 4 +- .../test/AbstractQueryTestCaseTests.java | 7 +- .../test/AbstractXContentTestCaseTests.java | 4 +- .../elasticsearch/test/VersionUtilsTests.java | 4 +- .../test/XContentTestUtilsTests.java | 6 +- .../DisruptableMockTransportTests.java | 7 +- .../disruption/LongGCDisruptionTests.java | 5 +- .../test/disruption/NetworkDisruptionIT.java | 13 +- .../disruption/NetworkDisruptionTests.java | 9 +- .../hamcrest/OpenSearchAssertionsTests.java | 10 +- ....java => OpenSearchRestTestCaseTests.java} | 9 +- .../VersionSensitiveWarningsHandlerTests.java | 8 +- .../BlacklistedPathPatternMatcherTests.java | 8 +- .../ClientYamlTestExecutionContextTests.java | 10 +- .../test/rest/yaml/ObjectPathTests.java | 6 +- ...enSearchClientYamlSuiteTestCaseTests.java} | 17 +- .../test/rest/yaml/StashTests.java | 5 +- ...entYamlSuiteRestApiParserFailingTests.java | 5 +- .../ClientYamlSuiteRestApiParserTests.java | 2 + .../restspec/ClientYamlSuiteRestApiTests.java | 7 +- ...tClientYamlTestFragmentParserTestCase.java | 6 +- .../rest/yaml/section/AssertionTests.java | 13 +- .../section/ClientYamlTestSectionTests.java | 10 + .../section/ClientYamlTestSuiteTests.java | 11 + .../rest/yaml/section/DoSectionTests.java | 6 +- .../yaml/section/MatchAssertionTests.java | 5 +- .../rest/yaml/section/SetSectionTests.java | 1 + .../rest/yaml/section/SetupSectionTests.java | 3 + .../rest/yaml/section/SkipSectionTests.java | 3 +- .../yaml/section/TeardownSectionTests.java | 2 + .../section/TransformAndSetSectionTests.java | 5 +- .../test/test/InternalTestClusterIT.java | 10 +- .../test/test/InternalTestClusterTests.java | 14 +- .../test/test/LoggingListenerTests.java | 10 +- ...ests.java => OpenSearchTestCaseTests.java} | 14 +- .../test/test/SuiteScopeClusterIT.java | 8 +- .../test/test/TestScopeClusterIT.java | 8 +- .../DeterministicTaskQueueTests.java | 5 +- .../MockSinglePrioritizingExecutorTests.java | 6 +- .../FakeThreadPoolMasterServiceTests.java | 7 +- .../TestThreadInfoPatternConverterTests.java | 8 +- .../common/util/NamedFormatterTests.java | 5 +- .../org/opensearch/node/MockNodeTests.java | 6 +- .../search/MockSearchServiceTests.java | 4 +- .../transport/nio/TestEventHandlerTests.java | 6 +- ...s.java => OpenSearchLoggerUsageTests.java} | 6 +- .../test/loggerusage/TestMessage.java | 2 +- 1595 files changed, 4503 insertions(+), 4691 deletions(-) rename server/src/main/java/org/opensearch/common/util/concurrent/{EsAbortPolicy.java => OpenSearchAbortPolicy.java} (90%) rename server/src/main/java/org/opensearch/common/util/concurrent/{EsExecutors.java => OpenSearchExecutors.java} (96%) rename server/src/main/java/org/opensearch/common/util/concurrent/{EsRejectedExecutionException.java => OpenSearchRejectedExecutionException.java} (84%) rename server/src/test/java/org/elasticsearch/index/{EsTieredMergePolicyTests.java => OpenSearchTieredMergePolicyTests.java} (77%) rename server/src/test/java/org/elasticsearch/index/search/{ESToParentBlockJoinQueryTests.java => OpenSearchToParentBlockJoinQueryTests.java} (96%) rename server/src/test/java/org/opensearch/common/lucene/index/{ESDirectoryReaderTests.java => OpenSearchDirectoryReaderTests.java} (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/MapperTestUtils.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/MockEngineFactoryPlugin.java (90%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/RandomCreateIndexGenerator.java (93%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/alias/RandomAliasActionsGenerator.java (86%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/analysis/AnalysisTestsHelper.java (81%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/analysis/MyFilterTokenFilterFactory.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/engine/DocIdSeqNoAndSource.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/engine/EngineTestCase.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/engine/InternalTestEngine.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/engine/TranslogHandler.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/AbstractNumericFieldMapperTestCase.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/FieldMapperTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/FieldMapperTestCase2.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/FieldTypeTestCase.java (92%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/MapperServiceTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/MapperTestCase.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/MockFieldFilterPlugin.java (93%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/mapper/MockFieldMapper.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java (91%) rename test/framework/src/main/java/org/{elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java => opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java} (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/seqno/RetentionLeaseUtils.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/shard/IndexShardTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/shard/RestoreOnlyRepository.java (98%) rename test/framework/src/main/java/org/{elasticsearch/index/store/EsBaseDirectoryTestCase.java => opensearch/index/store/OpenSearchBaseDirectoryTestCase.java} (80%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/index/translog/TranslogDeletionPolicies.java (94%) rename test/framework/src/main/java/org/opensearch/repositories/blobstore/{ESBlobStoreRepositoryIntegTestCase.java => OpenSearchBlobStoreRepositoryIntegTestCase.java} (98%) rename test/framework/src/main/java/org/opensearch/repositories/blobstore/{ESMockAPIBasedRepositoryIntegTestCase.java => OpenSearchMockAPIBasedRepositoryIntegTestCase.java} (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractBootstrapCheckTestCase.java (90%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractBroadcastResponseTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractBuilderTestCase.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractDiffableSerializationTestCase.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractDiffableWireSerializationTestCase.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractMultiClustersTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractNamedWriteableTestCase.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractQueryTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractSerializingTestCase.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractWireSerializingTestCase.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractWireTestCase.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/AbstractXContentTestCase.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/BackgroundIndexer.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/ClusterServiceUtils.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/CorruptionUtils.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/DiffableTestUtils.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/DummyShardLock.java (92%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/EqualsHashCodeTestUtils.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/ExternalTestCluster.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/FieldMaskingReader.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/IndexSettingsModule.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/InternalAggregationTestCase.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/InternalMultiBucketAggregationTestCase.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/InternalSettingsPlugin.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/InternalTestCluster.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/MockHttpTransport.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/MockIndexEventListener.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/MockKeywordPlugin.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/MockLogAppender.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/NodeConfigurationSource.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/NodeRoles.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/NotEqualMessageBuilder.java (98%) rename test/framework/src/main/java/org/{elasticsearch/test/ESIntegTestCase.java => opensearch/test/OpenSearchIntegTestCase.java} (97%) rename test/framework/src/main/java/org/{elasticsearch/test/ESSingleNodeTestCase.java => opensearch/test/OpenSearchSingleNodeTestCase.java} (96%) rename test/framework/src/main/java/org/{elasticsearch/test/ESTestCase.java => opensearch/test/OpenSearchTestCase.java} (98%) rename test/framework/src/main/java/org/{elasticsearch/test/ESTokenStreamTestCase.java => opensearch/test/OpenSearchTokenStreamTestCase.java} (86%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/PosixPermissionsResetter.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/RandomObjects.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/StreamsUtils.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/TestCluster.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/TestCustomMetadata.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/TestGeoShapeFieldMapperPlugin.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/TestSearchContext.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/VersionUtils.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/XContentTestUtils.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/client/NoOpClient.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/client/NoOpNodeClient.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/client/RandomizingClient.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/BlockClusterStateProcessing.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/BlockMasterServiceOnMaster.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/BusyMasterServiceDisruption.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/DisruptableMockTransport.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/IntermittentLongGCDisruption.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/LongGCDisruption.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/NetworkDisruption.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/ServiceDisruptionScheme.java (89%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/SingleNodeDisruption.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/disruption/SlowClusterStateProcessing.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/engine/MockEngineFactory.java (93%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/engine/MockEngineSupport.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/engine/MockInternalEngine.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/engine/ThrowingLeafReaderWrapper.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/fixture/AbstractHttpFixture.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/gateway/TestGatewayAllocator.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/hamcrest/CollectionAssertions.java (93%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/hamcrest/CollectionMatchers.java (97%) rename test/framework/src/main/java/org/{elasticsearch/test/hamcrest/ElasticsearchAssertions.java => opensearch/test/hamcrest/OpenSearchAssertions.java} (98%) rename test/framework/src/main/java/org/{elasticsearch/test/hamcrest/ElasticsearchMatchers.java => opensearch/test/hamcrest/OpenSearchMatchers.java} (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/hamcrest/OptionalMatchers.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/hamcrest/RegexMatcher.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/hamcrest/TupleMatchers.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/junit/annotations/Network.java (92%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/junit/annotations/TestIssueLogging.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/junit/annotations/TestLogging.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/junit/listeners/LoggingListener.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/junit/listeners/ReproduceInfoPrinter.java (89%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/FakeRestChannel.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/FakeRestRequest.java (98%) rename test/framework/src/main/java/org/{elasticsearch/test/rest/ESRestTestCase.java => opensearch/test/rest/OpenSearchRestTestCase.java} (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/RestActionTestCase.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/package-info.java (77%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/BlacklistedPathPatternMatcher.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlDocsTestClient.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlTestCandidate.java (84%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlTestClient.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlTestExecutionContext.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlTestResponse.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ClientYamlTestResponseException.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/Features.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/ObjectPath.java (98%) rename test/framework/src/main/java/org/{elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java => opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java} (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/Stash.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/package-info.java (91%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/restspec/package-info.java (89%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ApiCallSection.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/Assertion.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ClientYamlTestSection.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ClientYamlTestSuite.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ContainsAssertion.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/DoSection.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ExecutableSection.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/GreaterThanAssertion.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/GreaterThanEqualToAssertion.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/IsFalseAssertion.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/IsTrueAssertion.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/LengthAssertion.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/LessThanAssertion.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/LessThanOrEqualToAssertion.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/MatchAssertion.java (92%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/ParserUtils.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/SetSection.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/SetupSection.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/SkipSection.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/TeardownSection.java (96%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/TransformAndSetSection.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/VersionRange.java (93%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/rest/yaml/section/package-info.java (89%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/store/MockFSDirectoryFactory.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/store/MockFSIndexStore.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/tasks/MockTaskManager.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/tasks/MockTaskManagerListener.java (92%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/CapturingTransport.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/FakeTransport.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/MockTransport.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/MockTransportService.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/StubbableConnectionManager.java (98%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/test/transport/StubbableTransport.java (99%) rename test/framework/src/main/resources/org/{elasticsearch => opensearch}/analysis/common/test1.json (100%) rename test/framework/src/main/resources/org/{elasticsearch => opensearch}/analysis/common/test1.yml (100%) rename test/framework/src/test/java/org/elasticsearch/test/rest/{ESRestTestCaseTests.java => OpenSearchRestTestCaseTests.java} (85%) rename test/framework/src/test/java/org/elasticsearch/test/rest/yaml/{ESClientYamlSuiteTestCaseTests.java => OpenSearchClientYamlSuiteTestCaseTests.java} (82%) rename test/framework/src/test/java/org/elasticsearch/test/test/{ESTestCaseTests.java => OpenSearchTestCaseTests.java} (95%) rename test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/{ESLoggerUsageTests.java => OpenSearchLoggerUsageTests.java} (98%) diff --git a/buildSrc/src/main/resources/forbidden/es-all-signatures.txt b/buildSrc/src/main/resources/forbidden/es-all-signatures.txt index 35eac9f57ad33..1e4e669e4722f 100644 --- a/buildSrc/src/main/resources/forbidden/es-all-signatures.txt +++ b/buildSrc/src/main/resources/forbidden/es-all-signatures.txt @@ -51,7 +51,7 @@ java.lang.Boolean#getBoolean(java.lang.String) org.apache.lucene.util.IOUtils @ use @org.opensearch.core.internal.io instead -@defaultMessage use executors from org.opensearch.common.util.concurrent.EsExecutors instead which will properly bubble up Errors +@defaultMessage use executors from org.opensearch.common.util.concurrent.OpenSearchExecutors instead which will properly bubble up Errors java.util.concurrent.AbstractExecutorService#() java.util.concurrent.ThreadPoolExecutor#(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue) java.util.concurrent.ThreadPoolExecutor#(int, int, long, java.util.concurrent.TimeUnit, java.util.concurrent.BlockingQueue, java.util.concurrent.ThreadFactory) diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/AbstractRequestTestCase.java b/client/rest-high-level/src/test/java/org/opensearch/client/AbstractRequestTestCase.java index e84bda70dfbd1..bbecedcda5631 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/AbstractRequestTestCase.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/AbstractRequestTestCase.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -39,7 +39,7 @@ * @param The class representing the request on the client side. * @param The class representing the request on the server side. */ -public abstract class AbstractRequestTestCase extends ESTestCase { +public abstract class AbstractRequestTestCase extends OpenSearchTestCase { public final void testFromXContent() throws IOException { final C clientTestInstance = createClientTestInstance(); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/AbstractResponseTestCase.java b/client/rest-high-level/src/test/java/org/opensearch/client/AbstractResponseTestCase.java index cac9dac301631..adbc6712fd92b 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/AbstractResponseTestCase.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/AbstractResponseTestCase.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -39,7 +39,7 @@ * @param The class representing the response on the server side. * @param The class representing the response on the client side. */ -public abstract class AbstractResponseTestCase extends ESTestCase { +public abstract class AbstractResponseTestCase extends OpenSearchTestCase { public final void testFromXContent() throws IOException { final XContentType xContentType = randomFrom(XContentType.values()); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java index 3c073b7935619..1d084a15e4b60 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java @@ -20,9 +20,6 @@ package org.opensearch.client; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -import org.opensearch.client.Request; -import org.opensearch.client.RequestOptions; -import org.opensearch.client.Response; import org.opensearch.action.bulk.BulkItemResponse; import org.opensearch.action.bulk.BulkProcessor; import org.opensearch.action.bulk.BulkRequest; @@ -57,11 +54,11 @@ import java.util.stream.IntStream; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.fieldFromSource; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasProperty; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasType; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.fieldFromSource; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasId; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasIndex; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasProperty; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasType; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.either; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/BulkRequestWithGlobalParametersIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/BulkRequestWithGlobalParametersIT.java index 16a208a81682a..35c7ecbec782d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/BulkRequestWithGlobalParametersIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/BulkRequestWithGlobalParametersIT.java @@ -19,7 +19,6 @@ package org.opensearch.client; -import org.opensearch.client.RequestOptions; import org.opensearch.action.bulk.BulkRequest; import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.index.IndexRequest; @@ -31,10 +30,10 @@ import java.io.IOException; import java.util.function.Function; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasProperty; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasType; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasId; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasIndex; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasProperty; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasType; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.emptyIterable; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java index d29a4186fbbb3..9312079f4a407 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java @@ -65,7 +65,7 @@ import java.util.Map; import static java.util.Collections.emptyMap; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterRequestConvertersTests.java index dac4f5fa7cd6f..569f82192f3eb 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterRequestConvertersTests.java @@ -31,7 +31,7 @@ import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.common.Priority; import org.opensearch.common.util.CollectionUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import org.junit.Assert; @@ -44,7 +44,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class ClusterRequestConvertersTests extends ESTestCase { +public class ClusterRequestConvertersTests extends OpenSearchTestCase { public void testClusterPutSettings() throws IOException { ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest(); @@ -62,7 +62,7 @@ public void testClusterGetSettings() throws IOException { ClusterGetSettingsRequest request = new ClusterGetSettingsRequest(); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomMasterTimeout(request, expectedParams); - request.includeDefaults(ESTestCase.randomBoolean()); + request.includeDefaults(OpenSearchTestCase.randomBoolean()); if (request.includeDefaults()) { expectedParams.put("include_defaults", String.valueOf(true)); } @@ -77,9 +77,9 @@ public void testClusterHealth() { ClusterHealthRequest healthRequest = new ClusterHealthRequest(); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomLocal(healthRequest::local, expectedParams); - String timeoutType = ESTestCase.randomFrom("timeout", "masterTimeout", "both", "none"); - String timeout = ESTestCase.randomTimeValue(); - String masterTimeout = ESTestCase.randomTimeValue(); + String timeoutType = OpenSearchTestCase.randomFrom("timeout", "masterTimeout", "both", "none"); + String timeout = OpenSearchTestCase.randomTimeValue(); + String masterTimeout = OpenSearchTestCase.randomTimeValue(); switch (timeoutType) { case "timeout": healthRequest.timeout(timeout); @@ -106,38 +106,38 @@ public void testClusterHealth() { throw new UnsupportedOperationException(); } RequestConvertersTests.setRandomWaitForActiveShards(healthRequest::waitForActiveShards, ActiveShardCount.NONE, expectedParams); - if (ESTestCase.randomBoolean()) { - ClusterHealthRequest.Level level = ESTestCase.randomFrom(ClusterHealthRequest.Level.values()); + if (OpenSearchTestCase.randomBoolean()) { + ClusterHealthRequest.Level level = OpenSearchTestCase.randomFrom(ClusterHealthRequest.Level.values()); healthRequest.level(level); expectedParams.put("level", level.name().toLowerCase(Locale.ROOT)); } else { expectedParams.put("level", "cluster"); } - if (ESTestCase.randomBoolean()) { - Priority priority = ESTestCase.randomFrom(Priority.values()); + if (OpenSearchTestCase.randomBoolean()) { + Priority priority = OpenSearchTestCase.randomFrom(Priority.values()); healthRequest.waitForEvents(priority); expectedParams.put("wait_for_events", priority.name().toLowerCase(Locale.ROOT)); } - if (ESTestCase.randomBoolean()) { - ClusterHealthStatus status = ESTestCase.randomFrom(ClusterHealthStatus.values()); + if (OpenSearchTestCase.randomBoolean()) { + ClusterHealthStatus status = OpenSearchTestCase.randomFrom(ClusterHealthStatus.values()); healthRequest.waitForStatus(status); expectedParams.put("wait_for_status", status.name().toLowerCase(Locale.ROOT)); } - if (ESTestCase.randomBoolean()) { - boolean waitForNoInitializingShards = ESTestCase.randomBoolean(); + if (OpenSearchTestCase.randomBoolean()) { + boolean waitForNoInitializingShards = OpenSearchTestCase.randomBoolean(); healthRequest.waitForNoInitializingShards(waitForNoInitializingShards); if (waitForNoInitializingShards) { expectedParams.put("wait_for_no_initializing_shards", Boolean.TRUE.toString()); } } - if (ESTestCase.randomBoolean()) { - boolean waitForNoRelocatingShards = ESTestCase.randomBoolean(); + if (OpenSearchTestCase.randomBoolean()) { + boolean waitForNoRelocatingShards = OpenSearchTestCase.randomBoolean(); healthRequest.waitForNoRelocatingShards(waitForNoRelocatingShards); if (waitForNoRelocatingShards) { expectedParams.put("wait_for_no_relocating_shards", Boolean.TRUE.toString()); } } - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); healthRequest.indices(indices); Request request = ClusterRequestConverters.clusterHealth(healthRequest); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java index 5ebc17b364da0..fd69fd14564c7 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java @@ -44,7 +44,7 @@ import org.opensearch.common.SuppressForbidden; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -67,7 +67,7 @@ /** * Test and demonstrates how {@link RestHighLevelClient} can be extended to support custom endpoints. */ -public class CustomRestHighLevelClientTests extends ESTestCase { +public class CustomRestHighLevelClientTests extends OpenSearchTestCase { private static final String ENDPOINT = "/_custom"; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/GetAliasesResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/GetAliasesResponseTests.java index 9b2de19e41041..4ed015e15d95c 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/GetAliasesResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/GetAliasesResponseTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java index ffb25ad18fe37..a40b659679e8d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java @@ -66,7 +66,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CollectionUtils; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import java.io.IOException; @@ -82,14 +82,14 @@ import static java.util.Collections.singletonList; import static org.opensearch.client.indices.RandomCreateIndexGenerator.randomAliases; import static org.opensearch.client.indices.RandomCreateIndexGenerator.randomMapping; -import static org.elasticsearch.index.RandomCreateIndexGenerator.randomAlias; -import static org.elasticsearch.index.RandomCreateIndexGenerator.randomIndexSettings; -import static org.elasticsearch.index.alias.RandomAliasActionsGenerator.randomAliasAction; +import static org.opensearch.index.RandomCreateIndexGenerator.randomAlias; +import static org.opensearch.index.RandomCreateIndexGenerator.randomIndexSettings; +import static org.opensearch.index.alias.RandomAliasActionsGenerator.randomAliasAction; import static org.opensearch.rest.BaseRestHandler.INCLUDE_TYPE_NAME_PARAMETER; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class IndicesRequestConvertersTests extends ESTestCase { +public class IndicesRequestConvertersTests extends OpenSearchTestCase { public void testAnalyzeRequest() throws Exception { AnalyzeRequest indexAnalyzeRequest @@ -174,7 +174,7 @@ public void testCreateIndex() throws IOException { public void testCreateIndexWithTypes() throws IOException { org.opensearch.action.admin.indices.create.CreateIndexRequest createIndexRequest = - org.elasticsearch.index.RandomCreateIndexGenerator.randomCreateIndexRequest(); + org.opensearch.index.RandomCreateIndexGenerator.randomCreateIndexRequest(); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomTimeout(createIndexRequest::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams); @@ -241,7 +241,7 @@ public void testPutMappingWithTypes() throws IOException { String[] indices = RequestConvertersTests.randomIndicesNames(0, 5); putMappingRequest.indices(indices); - String type = ESTestCase.randomAlphaOfLengthBetween(3, 10); + String type = OpenSearchTestCase.randomAlphaOfLengthBetween(3, 10); putMappingRequest.type(type); Map expectedParams = new HashMap<>(); @@ -485,7 +485,7 @@ public void testDeleteIndex() { } public void testGetSettings() throws IOException { - String[] indicesUnderTest = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indicesUnderTest = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); GetSettingsRequest getSettingsRequest = new GetSettingsRequest().indices(indicesUnderTest); @@ -496,10 +496,10 @@ public void testGetSettings() throws IOException { RequestConvertersTests.setRandomLocal(getSettingsRequest::local, expectedParams); - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { // the request object will not have include_defaults present unless it is set to // true - getSettingsRequest.includeDefaults(ESTestCase.randomBoolean()); + getSettingsRequest.includeDefaults(OpenSearchTestCase.randomBoolean()); if (getSettingsRequest.includeDefaults()) { expectedParams.put("include_defaults", Boolean.toString(true)); } @@ -511,11 +511,11 @@ public void testGetSettings() throws IOException { } endpoint.add("_settings"); - if (ESTestCase.randomBoolean()) { - String[] names = ESTestCase.randomBoolean() ? null : new String[ESTestCase.randomIntBetween(0, 3)]; + if (OpenSearchTestCase.randomBoolean()) { + String[] names = OpenSearchTestCase.randomBoolean() ? null : new String[OpenSearchTestCase.randomIntBetween(0, 3)]; if (names != null) { for (int x = 0; x < names.length; x++) { - names[x] = ESTestCase.randomAlphaOfLengthBetween(3, 10); + names[x] = OpenSearchTestCase.randomAlphaOfLengthBetween(3, 10); } } getSettingsRequest.names(names); @@ -533,7 +533,7 @@ public void testGetSettings() throws IOException { } public void testGetIndex() throws IOException { - String[] indicesUnderTest = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indicesUnderTest = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); GetIndexRequest getIndexRequest = new GetIndexRequest(indicesUnderTest); @@ -543,10 +543,10 @@ public void testGetIndex() throws IOException { RequestConvertersTests.setRandomLocal(getIndexRequest::local, expectedParams); RequestConvertersTests.setRandomHumanReadable(getIndexRequest::humanReadable, expectedParams); - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { // the request object will not have include_defaults present unless it is set to // true - getIndexRequest.includeDefaults(ESTestCase.randomBoolean()); + getIndexRequest.includeDefaults(OpenSearchTestCase.randomBoolean()); if (getIndexRequest.includeDefaults()) { expectedParams.put("include_defaults", Boolean.toString(true)); } @@ -566,7 +566,7 @@ public void testGetIndex() throws IOException { } public void testGetIndexWithTypes() throws IOException { - String[] indicesUnderTest = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indicesUnderTest = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); org.opensearch.action.admin.indices.get.GetIndexRequest getIndexRequest = new org.opensearch.action.admin.indices.get.GetIndexRequest().indices(indicesUnderTest); @@ -578,10 +578,10 @@ public void testGetIndexWithTypes() throws IOException { RequestConvertersTests.setRandomHumanReadable(getIndexRequest::humanReadable, expectedParams); expectedParams.put(INCLUDE_TYPE_NAME_PARAMETER, "true"); - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { // the request object will not have include_defaults present unless it is set to // true - getIndexRequest.includeDefaults(ESTestCase.randomBoolean()); + getIndexRequest.includeDefaults(OpenSearchTestCase.randomBoolean()); if (getIndexRequest.includeDefaults()) { expectedParams.put("include_defaults", Boolean.toString(true)); } @@ -601,7 +601,7 @@ public void testGetIndexWithTypes() throws IOException { } public void testDeleteIndexEmptyIndices() { - String[] indices = ESTestCase.randomBoolean() ? null : Strings.EMPTY_ARRAY; + String[] indices = OpenSearchTestCase.randomBoolean() ? null : Strings.EMPTY_ARRAY; ActionRequestValidationException validationException = new DeleteIndexRequest(indices).validate(); Assert.assertNotNull(validationException); } @@ -626,7 +626,7 @@ public void testOpenIndex() { } public void testOpenIndexEmptyIndices() { - String[] indices = ESTestCase.randomBoolean() ? null : Strings.EMPTY_ARRAY; + String[] indices = OpenSearchTestCase.randomBoolean() ? null : Strings.EMPTY_ARRAY; ActionRequestValidationException validationException = new OpenIndexRequest(indices).validate(); Assert.assertNotNull(validationException); } @@ -651,9 +651,9 @@ public void testCloseIndex() { } public void testRefresh() { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); RefreshRequest refreshRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { refreshRequest = new RefreshRequest(indices); } else { refreshRequest = new RefreshRequest(); @@ -674,9 +674,9 @@ public void testRefresh() { } public void testFlush() { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); FlushRequest flushRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { flushRequest = new FlushRequest(indices); } else { flushRequest = new FlushRequest(); @@ -684,12 +684,12 @@ public void testFlush() { } Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomIndicesOptions(flushRequest::indicesOptions, flushRequest::indicesOptions, expectedParams); - if (ESTestCase.randomBoolean()) { - flushRequest.force(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + flushRequest.force(OpenSearchTestCase.randomBoolean()); } expectedParams.put("force", Boolean.toString(flushRequest.force())); - if (ESTestCase.randomBoolean()) { - flushRequest.waitIfOngoing(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + flushRequest.waitIfOngoing(OpenSearchTestCase.randomBoolean()); } expectedParams.put("wait_if_ongoing", Boolean.toString(flushRequest.waitIfOngoing())); @@ -706,9 +706,9 @@ public void testFlush() { } public void testSyncedFlush() { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); SyncedFlushRequest syncedFlushRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { syncedFlushRequest = new SyncedFlushRequest(indices); } else { syncedFlushRequest = new SyncedFlushRequest(); @@ -730,9 +730,9 @@ public void testSyncedFlush() { } public void testForceMerge() { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); ForceMergeRequest forceMergeRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { forceMergeRequest = new ForceMergeRequest(indices); } else { forceMergeRequest = new ForceMergeRequest(); @@ -742,16 +742,16 @@ public void testForceMerge() { Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomIndicesOptions(forceMergeRequest::indicesOptions, forceMergeRequest::indicesOptions, expectedParams); - if (ESTestCase.randomBoolean()) { - forceMergeRequest.maxNumSegments(ESTestCase.randomInt()); + if (OpenSearchTestCase.randomBoolean()) { + forceMergeRequest.maxNumSegments(OpenSearchTestCase.randomInt()); } expectedParams.put("max_num_segments", Integer.toString(forceMergeRequest.maxNumSegments())); - if (ESTestCase.randomBoolean()) { - forceMergeRequest.onlyExpungeDeletes(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + forceMergeRequest.onlyExpungeDeletes(OpenSearchTestCase.randomBoolean()); } expectedParams.put("only_expunge_deletes", Boolean.toString(forceMergeRequest.onlyExpungeDeletes())); - if (ESTestCase.randomBoolean()) { - forceMergeRequest.flush(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + forceMergeRequest.flush(OpenSearchTestCase.randomBoolean()); } expectedParams.put("flush", Boolean.toString(forceMergeRequest.flush())); @@ -768,9 +768,9 @@ public void testForceMerge() { } public void testClearCache() { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); ClearIndicesCacheRequest clearIndicesCacheRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { clearIndicesCacheRequest = new ClearIndicesCacheRequest(indices); } else { clearIndicesCacheRequest = new ClearIndicesCacheRequest(); @@ -779,19 +779,19 @@ public void testClearCache() { Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomIndicesOptions(clearIndicesCacheRequest::indicesOptions, clearIndicesCacheRequest::indicesOptions, expectedParams); - if (ESTestCase.randomBoolean()) { - clearIndicesCacheRequest.queryCache(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + clearIndicesCacheRequest.queryCache(OpenSearchTestCase.randomBoolean()); } expectedParams.put("query", Boolean.toString(clearIndicesCacheRequest.queryCache())); - if (ESTestCase.randomBoolean()) { - clearIndicesCacheRequest.fieldDataCache(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + clearIndicesCacheRequest.fieldDataCache(OpenSearchTestCase.randomBoolean()); } expectedParams.put("fielddata", Boolean.toString(clearIndicesCacheRequest.fieldDataCache())); - if (ESTestCase.randomBoolean()) { - clearIndicesCacheRequest.requestCache(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + clearIndicesCacheRequest.requestCache(OpenSearchTestCase.randomBoolean()); } expectedParams.put("request", Boolean.toString(clearIndicesCacheRequest.requestCache())); - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { clearIndicesCacheRequest.fields(RequestConvertersTests.randomIndicesNames(1, 5)); expectedParams.put("fields", String.join(",", clearIndicesCacheRequest.fields())); } @@ -810,13 +810,13 @@ public void testClearCache() { public void testExistsAlias() { GetAliasesRequest getAliasesRequest = new GetAliasesRequest(); - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); getAliasesRequest.indices(indices); // the HEAD endpoint requires at least an alias or an index boolean hasIndices = indices != null && indices.length > 0; String[] aliases; if (hasIndices) { - aliases = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + aliases = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); } else { aliases = RequestConvertersTests.randomIndicesNames(1, 5); } @@ -878,11 +878,11 @@ private void resizeTest(ResizeType resizeType, CheckedFunction resizeRequest.setTimeout(TimeValue.parseTimeValue(s, "timeout")), resizeRequest.timeout(), expectedParams); - if (ESTestCase.randomBoolean()) { - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { resizeRequest.setSettings(randomIndexSettings()); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { int count = randomIntBetween(0, 2); for (int i = 0; i < count; i++) { resizeRequest.setAliases(singletonList(randomAlias())); @@ -904,29 +904,29 @@ private void resizeTest(ResizeType resizeType, CheckedFunction expectedParams = new HashMap<>(); RequestConvertersTests.setRandomTimeout(rolloverRequest, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams); RequestConvertersTests.setRandomMasterTimeout(rolloverRequest, expectedParams); - if (ESTestCase.randomBoolean()) { - rolloverRequest.dryRun(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + rolloverRequest.dryRun(OpenSearchTestCase.randomBoolean()); if (rolloverRequest.isDryRun()) { expectedParams.put("dry_run", "true"); } } - if (ESTestCase.randomBoolean()) { - rolloverRequest.addMaxIndexAgeCondition(new TimeValue(ESTestCase.randomNonNegativeLong())); + if (OpenSearchTestCase.randomBoolean()) { + rolloverRequest.addMaxIndexAgeCondition(new TimeValue(OpenSearchTestCase.randomNonNegativeLong())); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { rolloverRequest.getCreateIndexRequest().mapping(randomMapping()); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { randomAliases(rolloverRequest.getCreateIndexRequest()); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { rolloverRequest.getCreateIndexRequest().settings( - org.elasticsearch.index.RandomCreateIndexGenerator.randomIndexSettings()); + org.opensearch.index.RandomCreateIndexGenerator.randomIndexSettings()); } RequestConvertersTests.setRandomWaitForActiveShards(rolloverRequest.getCreateIndexRequest()::waitForActiveShards, expectedParams); @@ -944,32 +944,32 @@ public void testRollover() throws IOException { public void testRolloverWithTypes() throws IOException { org.opensearch.action.admin.indices.rollover.RolloverRequest rolloverRequest = - new org.opensearch.action.admin.indices.rollover.RolloverRequest(ESTestCase.randomAlphaOfLengthBetween(3, 10), - ESTestCase.randomBoolean() ? null : ESTestCase.randomAlphaOfLengthBetween(3, 10)); + new org.opensearch.action.admin.indices.rollover.RolloverRequest(OpenSearchTestCase.randomAlphaOfLengthBetween(3, 10), + OpenSearchTestCase.randomBoolean() ? null : OpenSearchTestCase.randomAlphaOfLengthBetween(3, 10)); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomTimeout(rolloverRequest::timeout, rolloverRequest.timeout(), expectedParams); RequestConvertersTests.setRandomMasterTimeout(rolloverRequest, expectedParams); - if (ESTestCase.randomBoolean()) { - rolloverRequest.dryRun(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + rolloverRequest.dryRun(OpenSearchTestCase.randomBoolean()); if (rolloverRequest.isDryRun()) { expectedParams.put("dry_run", "true"); } } expectedParams.put(INCLUDE_TYPE_NAME_PARAMETER, "true"); - if (ESTestCase.randomBoolean()) { - rolloverRequest.addMaxIndexAgeCondition(new TimeValue(ESTestCase.randomNonNegativeLong())); + if (OpenSearchTestCase.randomBoolean()) { + rolloverRequest.addMaxIndexAgeCondition(new TimeValue(OpenSearchTestCase.randomNonNegativeLong())); } - if (ESTestCase.randomBoolean()) { - String type = ESTestCase.randomAlphaOfLengthBetween(3, 10); + if (OpenSearchTestCase.randomBoolean()) { + String type = OpenSearchTestCase.randomAlphaOfLengthBetween(3, 10); rolloverRequest.getCreateIndexRequest().mapping(type, - org.elasticsearch.index.RandomCreateIndexGenerator.randomMapping(type)); + org.opensearch.index.RandomCreateIndexGenerator.randomMapping(type)); } - if (ESTestCase.randomBoolean()) { - org.elasticsearch.index.RandomCreateIndexGenerator.randomAliases(rolloverRequest.getCreateIndexRequest()); + if (OpenSearchTestCase.randomBoolean()) { + org.opensearch.index.RandomCreateIndexGenerator.randomAliases(rolloverRequest.getCreateIndexRequest()); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { rolloverRequest.getCreateIndexRequest().settings( - org.elasticsearch.index.RandomCreateIndexGenerator.randomIndexSettings()); + org.opensearch.index.RandomCreateIndexGenerator.randomIndexSettings()); } RequestConvertersTests.setRandomWaitForActiveShards(rolloverRequest.getCreateIndexRequest()::waitForActiveShards, expectedParams); @@ -993,8 +993,8 @@ public void testGetAlias() { RequestConvertersTests.setRandomIndicesOptions(getAliasesRequest::indicesOptions, getAliasesRequest::indicesOptions, expectedParams); - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); - String[] aliases = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); + String[] aliases = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); getAliasesRequest.indices(indices); getAliasesRequest.aliases(aliases); @@ -1017,15 +1017,15 @@ public void testGetAlias() { } public void testIndexPutSettings() throws IOException { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 2); UpdateSettingsRequest updateSettingsRequest = new UpdateSettingsRequest(indices); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomMasterTimeout(updateSettingsRequest, expectedParams); RequestConvertersTests.setRandomTimeout(updateSettingsRequest::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams); RequestConvertersTests.setRandomIndicesOptions(updateSettingsRequest::indicesOptions, updateSettingsRequest::indicesOptions, expectedParams); - if (ESTestCase.randomBoolean()) { - updateSettingsRequest.setPreserveExisting(ESTestCase.randomBoolean()); + if (OpenSearchTestCase.randomBoolean()) { + updateSettingsRequest.setPreserveExisting(OpenSearchTestCase.randomBoolean()); if (updateSettingsRequest.isPreserveExisting()) { expectedParams.put("preserve_existing", "true"); } @@ -1052,32 +1052,32 @@ public void testPutTemplateRequestWithTypes() throws Exception { org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest putTemplateRequest = new org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest() - .name(ESTestCase.randomFrom(names.keySet())) - .patterns(Arrays.asList(ESTestCase.generateRandomStringArray(20, 100, false, false))); - if (ESTestCase.randomBoolean()) { - putTemplateRequest.order(ESTestCase.randomInt()); + .name(OpenSearchTestCase.randomFrom(names.keySet())) + .patterns(Arrays.asList(OpenSearchTestCase.generateRandomStringArray(20, 100, false, false))); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.order(OpenSearchTestCase.randomInt()); } - if (ESTestCase.randomBoolean()) { - putTemplateRequest.version(ESTestCase.randomInt()); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.version(OpenSearchTestCase.randomInt()); } - if (ESTestCase.randomBoolean()) { - putTemplateRequest.settings(Settings.builder().put("setting-" + ESTestCase.randomInt(), ESTestCase.randomTimeValue())); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.settings(Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue())); } Map expectedParams = new HashMap<>(); - if (ESTestCase.randomBoolean()) { - putTemplateRequest.mapping("doc-" + ESTestCase.randomInt(), - "field-" + ESTestCase.randomInt(), "type=" + ESTestCase.randomFrom("text", "keyword")); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.mapping("doc-" + OpenSearchTestCase.randomInt(), + "field-" + OpenSearchTestCase.randomInt(), "type=" + OpenSearchTestCase.randomFrom("text", "keyword")); } expectedParams.put(INCLUDE_TYPE_NAME_PARAMETER, "true"); - if (ESTestCase.randomBoolean()) { - putTemplateRequest.alias(new Alias("alias-" + ESTestCase.randomInt())); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.alias(new Alias("alias-" + OpenSearchTestCase.randomInt())); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { expectedParams.put("create", Boolean.TRUE.toString()); putTemplateRequest.create(true); } - if (ESTestCase.randomBoolean()) { - String cause = ESTestCase.randomUnicodeOfCodepointLengthBetween(1, 50); + if (OpenSearchTestCase.randomBoolean()) { + String cause = OpenSearchTestCase.randomUnicodeOfCodepointLengthBetween(1, 50); putTemplateRequest.cause(cause); expectedParams.put("cause", cause); } @@ -1097,31 +1097,31 @@ public void testPutTemplateRequest() throws Exception { names.put("foo^bar", "foo%5Ebar"); PutIndexTemplateRequest putTemplateRequest = - new PutIndexTemplateRequest(ESTestCase.randomFrom(names.keySet())) - .patterns(Arrays.asList(ESTestCase.generateRandomStringArray(20, 100, false, false))); - if (ESTestCase.randomBoolean()) { - putTemplateRequest.order(ESTestCase.randomInt()); + new PutIndexTemplateRequest(OpenSearchTestCase.randomFrom(names.keySet())) + .patterns(Arrays.asList(OpenSearchTestCase.generateRandomStringArray(20, 100, false, false))); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.order(OpenSearchTestCase.randomInt()); } - if (ESTestCase.randomBoolean()) { - putTemplateRequest.version(ESTestCase.randomInt()); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.version(OpenSearchTestCase.randomInt()); } - if (ESTestCase.randomBoolean()) { - putTemplateRequest.settings(Settings.builder().put("setting-" + ESTestCase.randomInt(), ESTestCase.randomTimeValue())); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.settings(Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue())); } Map expectedParams = new HashMap<>(); - if (ESTestCase.randomBoolean()) { - putTemplateRequest.mapping("{ \"properties\": { \"field-" + ESTestCase.randomInt() + - "\" : { \"type\" : \"" + ESTestCase.randomFrom("text", "keyword") + "\" }}}", XContentType.JSON); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.mapping("{ \"properties\": { \"field-" + OpenSearchTestCase.randomInt() + + "\" : { \"type\" : \"" + OpenSearchTestCase.randomFrom("text", "keyword") + "\" }}}", XContentType.JSON); } - if (ESTestCase.randomBoolean()) { - putTemplateRequest.alias(new Alias("alias-" + ESTestCase.randomInt())); + if (OpenSearchTestCase.randomBoolean()) { + putTemplateRequest.alias(new Alias("alias-" + OpenSearchTestCase.randomInt())); } - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { expectedParams.put("create", Boolean.TRUE.toString()); putTemplateRequest.create(true); } - if (ESTestCase.randomBoolean()) { - String cause = ESTestCase.randomUnicodeOfCodepointLengthBetween(1, 50); + if (OpenSearchTestCase.randomBoolean()) { + String cause = OpenSearchTestCase.randomUnicodeOfCodepointLengthBetween(1, 50); putTemplateRequest.cause(cause); expectedParams.put("cause", cause); } @@ -1133,10 +1133,10 @@ public void testPutTemplateRequest() throws Exception { RequestConvertersTests.assertToXContentBody(putTemplateRequest, request.getEntity()); } public void testValidateQuery() throws Exception { - String[] indices = ESTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); - String[] types = ESTestCase.randomBoolean() ? ESTestCase.generateRandomStringArray(5, 5, false, false) : null; + String[] indices = OpenSearchTestCase.randomBoolean() ? null : RequestConvertersTests.randomIndicesNames(0, 5); + String[] types = OpenSearchTestCase.randomBoolean() ? OpenSearchTestCase.generateRandomStringArray(5, 5, false, false) : null; ValidateQueryRequest validateQueryRequest; - if (ESTestCase.randomBoolean()) { + if (OpenSearchTestCase.randomBoolean()) { validateQueryRequest = new ValidateQueryRequest(indices); } else { validateQueryRequest = new ValidateQueryRequest(); @@ -1146,9 +1146,9 @@ public void testValidateQuery() throws Exception { Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomIndicesOptions(validateQueryRequest::indicesOptions, validateQueryRequest::indicesOptions, expectedParams); - validateQueryRequest.explain(ESTestCase.randomBoolean()); - validateQueryRequest.rewrite(ESTestCase.randomBoolean()); - validateQueryRequest.allShards(ESTestCase.randomBoolean()); + validateQueryRequest.explain(OpenSearchTestCase.randomBoolean()); + validateQueryRequest.rewrite(OpenSearchTestCase.randomBoolean()); + validateQueryRequest.allShards(OpenSearchTestCase.randomBoolean()); expectedParams.put("explain", Boolean.toString(validateQueryRequest.explain())); expectedParams.put("rewrite", Boolean.toString(validateQueryRequest.rewrite())); expectedParams.put("all_shards", Boolean.toString(validateQueryRequest.allShards())); @@ -1174,7 +1174,7 @@ public void testGetTemplateRequest() throws Exception { encodes.put("template#1", "template%231"); encodes.put("template-*", "template-*"); encodes.put("foo^bar", "foo%5Ebar"); - List names = ESTestCase.randomSubsetOf(1, encodes.keySet()); + List names = OpenSearchTestCase.randomSubsetOf(1, encodes.keySet()); GetIndexTemplatesRequest getTemplatesRequest = new GetIndexTemplatesRequest(names); Map expectedParams = new HashMap<>(); RequestConvertersTests.setRandomMasterTimeout(getTemplatesRequest::setMasterNodeTimeout, expectedParams); @@ -1194,11 +1194,11 @@ public void testGetTemplateRequest() throws Exception { } public void testTemplatesExistRequest() { - final int numberOfNames = ESTestCase.usually() + final int numberOfNames = OpenSearchTestCase.usually() ? 1 - : ESTestCase.randomIntBetween(2, 20); - final List names = Arrays.asList(ESTestCase.randomArray(numberOfNames, numberOfNames, String[]::new, - () -> ESTestCase.randomAlphaOfLengthBetween(1, 100))); + : OpenSearchTestCase.randomIntBetween(2, 20); + final List names = Arrays.asList(OpenSearchTestCase.randomArray(numberOfNames, numberOfNames, String[]::new, + () -> OpenSearchTestCase.randomAlphaOfLengthBetween(1, 100))); final Map expectedParams = new HashMap<>(); final IndexTemplatesExistRequest indexTemplatesExistRequest = new IndexTemplatesExistRequest(names); RequestConvertersTests.setRandomMasterTimeout(indexTemplatesExistRequest::setMasterNodeTimeout, expectedParams); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IngestRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/IngestRequestConvertersTests.java index a3c487df5f5a6..02b88f4184899 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/IngestRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/IngestRequestConvertersTests.java @@ -31,7 +31,7 @@ import org.opensearch.action.support.master.AcknowledgedRequest; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.Map; import java.util.StringJoiner; -public class IngestRequestConvertersTests extends ESTestCase { +public class IngestRequestConvertersTests extends OpenSearchTestCase { public void testPutPipeline() throws IOException { String pipelineId = "some_pipeline_id"; @@ -92,8 +92,8 @@ public void testDeletePipeline() { } public void testSimulatePipeline() throws IOException { - String pipelineId = ESTestCase.randomBoolean() ? "some_pipeline_id" : null; - boolean verbose = ESTestCase.randomBoolean(); + String pipelineId = OpenSearchTestCase.randomBoolean() ? "some_pipeline_id" : null; + boolean verbose = OpenSearchTestCase.randomBoolean(); String json = "{" + " \"pipeline\": {" + " \"description\": \"_description\"," diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/MockRestHighLevelTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/MockRestHighLevelTests.java index fde6dcae8a54c..72e08dfdc772f 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/MockRestHighLevelTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/MockRestHighLevelTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.client.Response; import org.elasticsearch.client.RestClient; import org.elasticsearch.client.WarningFailureException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MockRestHighLevelTests extends ESTestCase { +public class MockRestHighLevelTests extends OpenSearchTestCase { private RestHighLevelClient client; private static final List WARNINGS = Collections.singletonList("Some Warning"); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java b/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java index 7e754b2fa07d8..eba053553c26b 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java @@ -47,7 +47,7 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchModule; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import org.junit.AfterClass; import org.junit.Before; @@ -71,7 +71,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; -public abstract class OpenSearchRestHighLevelClientTestCase extends ESRestTestCase { +public abstract class OpenSearchRestHighLevelClientTestCase extends OpenSearchRestTestCase { protected static final String CONFLICT_PIPELINE_ID = "conflict_pipeline"; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java index 26ad7be51b953..a91ec4afbba19 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java @@ -27,7 +27,6 @@ import org.apache.http.client.methods.HttpPut; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.util.EntityUtils; -import org.opensearch.client.Request; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest; @@ -104,8 +103,8 @@ import org.opensearch.search.suggest.SuggestBuilder; import org.opensearch.search.suggest.completion.CompletionSuggestionBuilder; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.RandomObjects; import org.hamcrest.Matchers; import java.io.IOException; @@ -130,13 +129,13 @@ import static org.opensearch.client.RequestConverters.enforceSameContentType; import static org.opensearch.index.query.QueryBuilders.matchAllQuery; import static org.opensearch.search.RandomSearchRequestGenerator.randomSearchRequest; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.nullValue; -public class RequestConvertersTests extends ESTestCase { +public class RequestConvertersTests extends OpenSearchTestCase { private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(RequestConvertersTests.class); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientExtTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientExtTests.java index 89cd515b70664..15b7c6bf364b1 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientExtTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientExtTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -40,7 +40,7 @@ * This test works against a {@link RestHighLevelClient} subclass that simulates how custom response sections returned by * OpenSearch plugins can be parsed using the high level client. */ -public class RestHighLevelClientExtTests extends ESTestCase { +public class RestHighLevelClientExtTests extends OpenSearchTestCase { private RestHighLevelClient restHighLevelClient; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java index db70dcc23286a..3f750222ad2be 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java @@ -33,13 +33,6 @@ import org.apache.http.message.BasicStatusLine; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.http.nio.entity.NStringEntity; -import org.opensearch.client.Cancellable; -import org.opensearch.client.Request; -import org.opensearch.client.RequestOptions; -import org.opensearch.client.Response; -import org.opensearch.client.ResponseException; -import org.opensearch.client.ResponseListener; -import org.opensearch.client.RestClient; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; @@ -77,10 +70,10 @@ import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.suggest.Suggest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; import org.hamcrest.Matchers; import org.junit.Before; @@ -112,7 +105,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class RestHighLevelClientTests extends ESTestCase { +public class RestHighLevelClientTests extends OpenSearchTestCase { private static final String SUBMIT_TASK_PREFIX = "submit_"; private static final String SUBMIT_TASK_SUFFIX = "_task"; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java index e521dfccd8e0f..ffd60e33e82c9 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java @@ -21,7 +21,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPut; -import org.opensearch.client.Request; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchStatusException; import org.opensearch.action.explain.ExplainRequest; @@ -96,7 +95,7 @@ import java.util.Map; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.containsString; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java index b6794860152f6..13699f56a2820 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java @@ -38,7 +38,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.repositories.fs.FsRepository; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.Path; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class SnapshotRequestConvertersTests extends ESTestCase { +public class SnapshotRequestConvertersTests extends OpenSearchTestCase { public void testGetRepositories() { Map expectedParams = new HashMap<>(); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/StoredScriptsIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/StoredScriptsIT.java index f44090728711d..928c2b1cb1d9d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/StoredScriptsIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/StoredScriptsIT.java @@ -34,7 +34,7 @@ import java.util.Map; import static org.opensearch.common.xcontent.support.XContentMapValues.extractValue; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; public class StoredScriptsIT extends OpenSearchRestHighLevelClientTestCase { diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/SyncedFlushResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/SyncedFlushResponseTests.java index 2e19710af28c1..6f8cc3fcce373 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/SyncedFlushResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/SyncedFlushResponseTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.flush.ShardsSyncedFlushResult; import org.elasticsearch.indices.flush.SyncedFlushService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Set; -public class SyncedFlushResponseTests extends ESTestCase { +public class SyncedFlushResponseTests extends OpenSearchTestCase { public void testXContentSerialization() throws IOException { final XContentType xContentType = randomFrom(XContentType.values()); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/TasksRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/TasksRequestConvertersTests.java index 5ad97850590e0..d0a632a6d915a 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/TasksRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/TasksRequestConvertersTests.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksRequest; import org.opensearch.client.tasks.CancelTasksRequest; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class TasksRequestConvertersTests extends ESTestCase { +public class TasksRequestConvertersTests extends OpenSearchTestCase { public void testCancelTasks() { Map expectedParams = new HashMap<>(); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java index f7ccf644908b2..bf34bc0a54fba 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java @@ -20,9 +20,9 @@ package org.opensearch.client; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class TimedRequestTests extends ESTestCase { +public class TimedRequestTests extends OpenSearchTestCase { public void testDefaults() { TimedRequest timedRequest = new TimedRequest(){}; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/ValidationExceptionTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/ValidationExceptionTests.java index a024d204ad721..e314fe0d4dd71 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/ValidationExceptionTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/ValidationExceptionTests.java @@ -19,14 +19,14 @@ package org.opensearch.client; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.hasSize; -public class ValidationExceptionTests extends ESTestCase { +public class ValidationExceptionTests extends OpenSearchTestCase { private static final String ERROR = "some-error"; private static final String OTHER_ERROR = "some-other-error"; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java index 2bc7fe7b379b9..2146749060681 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/CountRequestTests.java @@ -37,7 +37,7 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.equalTo; // similar to SearchRequestTests as CountRequest inline several members (and functionality) from SearchRequest diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/CountResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/CountResponseTests.java index 8f0b30c608eef..c228c4a3c3e7d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/CountResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/CountResponseTests.java @@ -24,20 +24,20 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.rest.action.RestActions; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class CountResponseTests extends ESTestCase { +public class CountResponseTests extends OpenSearchTestCase { // Not comparing XContent for equivalence as we cannot compare the ShardSearchFailure#cause, because it will be wrapped in an outer - // ElasticSearchException. Best effort: try to check that the original message appears somewhere in the rendered xContent + // OpenSearchException. Best effort: try to check that the original message appears somewhere in the rendered xContent // For more see ShardSearchFailureTests. public void testFromXContent() throws IOException { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java index 01a1523acbdff..6891bf139588f 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/MainResponseTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.ClusterName; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Date; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/MultiTermVectorsResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/MultiTermVectorsResponseTests.java index 382dc5c72ccf8..48590d67d0a6d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/MultiTermVectorsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/MultiTermVectorsResponseTests.java @@ -20,15 +20,15 @@ package org.opensearch.client.core; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class MultiTermVectorsResponseTests extends ESTestCase { +public class MultiTermVectorsResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/ShardsAcknowledgedResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/ShardsAcknowledgedResponseTests.java index 3c6fbbf812b61..e296525a94f4d 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/ShardsAcknowledgedResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/ShardsAcknowledgedResponseTests.java @@ -19,13 +19,13 @@ package org.opensearch.client.core; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class ShardsAcknowledgedResponseTests extends ESTestCase { +public class ShardsAcknowledgedResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester(this::createParser, diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/TermVectorsResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/TermVectorsResponseTests.java index 14aba77ac0939..66a0b3f31a890 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/TermVectorsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/TermVectorsResponseTests.java @@ -20,7 +20,7 @@ package org.opensearch.client.core; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -28,9 +28,9 @@ import java.util.Collections; import java.util.Comparator; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class TermVectorsResponseTests extends ESTestCase { +public class TermVectorsResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java index f6dd7dd8f6a71..9736ecdfd6598 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java @@ -28,15 +28,15 @@ import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.Map; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetTaskResponseTests extends ESTestCase { +public class GetTaskResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/QueryDSLDocumentationTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/QueryDSLDocumentationTests.java index 78f6c919970ea..1f9c322e18e06 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/QueryDSLDocumentationTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/QueryDSLDocumentationTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.query.RankFeatureQueryBuilders; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -87,7 +87,7 @@ * compile and don't throw weird runtime exceptions. Assertions and example data would be nice, but * that is secondary. */ -public class QueryDSLDocumentationTests extends ESTestCase { +public class QueryDSLDocumentationTests extends OpenSearchTestCase { public void testBool() { // tag::bool boolQuery() diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java index 02d2c41acc037..5db2a9cef2605 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java @@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit; import static org.opensearch.common.xcontent.support.XContentMapValues.extractValue; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; /** diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/AnalyzeResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/AnalyzeResponseTests.java index 819c13c3c9a99..0cfd6f2584dae 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/AnalyzeResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/AnalyzeResponseTests.java @@ -23,7 +23,7 @@ import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.RandomObjects; import java.io.IOException; import java.util.Arrays; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java index a799af42ebfa6..7d90ceba597d2 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java @@ -24,13 +24,13 @@ import org.opensearch.client.ValidationException; import org.opensearch.common.Strings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Optional; import static org.hamcrest.Matchers.equalTo; -public class CloseIndexRequestTests extends ESTestCase { +public class CloseIndexRequestTests extends OpenSearchTestCase { public void testIndices() { String[] indices = generateRandomStringArray(5, 5, false, true); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CreateIndexRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CreateIndexRequestTests.java index e8d432e55e2e5..1d988c9791db3 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CreateIndexRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CreateIndexRequestTests.java @@ -21,7 +21,7 @@ import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.Set; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComponentTemplatesResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComponentTemplatesResponseTests.java index f3d85904eddc0..6de6d18c5cee4 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComponentTemplatesResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComponentTemplatesResponseTests.java @@ -25,16 +25,16 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetComponentTemplatesResponseTests extends ESTestCase { +public class GetComponentTemplatesResponseTests extends OpenSearchTestCase { public void testFromXContent() throws Exception { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComposableIndexTemplatesResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComposableIndexTemplatesResponseTests.java index 1d719012c29ba..a604acb44ce75 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComposableIndexTemplatesResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetComposableIndexTemplatesResponseTests.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -31,9 +31,9 @@ import static org.opensearch.client.indices.GetComponentTemplatesResponseTests.randomMeta; import static org.opensearch.client.indices.GetComponentTemplatesResponseTests.randomTemplate; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetComposableIndexTemplatesResponseTests extends ESTestCase { +public class GetComposableIndexTemplatesResponseTests extends OpenSearchTestCase { public void testFromXContent() throws Exception { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetFieldMappingsResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetFieldMappingsResponseTests.java index d81f0e9446a60..566290f7aa0b4 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetFieldMappingsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetFieldMappingsResponseTests.java @@ -22,16 +22,16 @@ import org.opensearch.client.indices.GetFieldMappingsResponse.FieldMappingMetadata; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.function.Predicate; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetFieldMappingsResponseTests extends ESTestCase { +public class GetFieldMappingsResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester( diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexRequestTests.java index b8f8ffa1851c0..789f892bd6f0f 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexRequestTests.java @@ -21,9 +21,9 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.client.indices.GetIndexRequest.Feature; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class GetIndexRequestTests extends ESTestCase { +public class GetIndexRequestTests extends OpenSearchTestCase { public void testIndices() { String[] indices = generateRandomStringArray(5, 5, false, true); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexResponseTests.java index 789f3566f91b3..6b5cf319b9419 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexResponseTests.java @@ -29,10 +29,10 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent.Params; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.RandomCreateIndexGenerator; +import org.opensearch.index.RandomCreateIndexGenerator; import org.elasticsearch.index.mapper.MapperService; import org.opensearch.rest.BaseRestHandler; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -44,9 +44,9 @@ import java.util.Map; import java.util.Objects; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetIndexResponseTests extends ESTestCase { +public class GetIndexResponseTests extends OpenSearchTestCase { // Because the client-side class does not have a toXContent method, we test xContent serialization by creating // a random client object, converting it to a server object then serializing it to xContent, and finally diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexTemplatesResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexTemplatesResponseTests.java index c2428af926c1b..433ea1c811d12 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexTemplatesResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetIndexTemplatesResponseTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.UncheckedIOException; @@ -49,12 +49,12 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.elasticsearch.index.RandomCreateIndexGenerator.randomIndexSettings; -import static org.elasticsearch.index.RandomCreateIndexGenerator.randomMappingFields; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.index.RandomCreateIndexGenerator.randomIndexSettings; +import static org.opensearch.index.RandomCreateIndexGenerator.randomMappingFields; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; import static org.hamcrest.Matchers.equalTo; -public class GetIndexTemplatesResponseTests extends ESTestCase { +public class GetIndexTemplatesResponseTests extends OpenSearchTestCase { static final String mappingString = "{\"properties\":{\"f1\": {\"type\":\"text\"},\"f2\": {\"type\":\"keyword\"}}}"; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetMappingsResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetMappingsResponseTests.java index 44dd844b4d1f2..b7c58f14aeba1 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetMappingsResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/GetMappingsResponseTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperService; import org.opensearch.rest.BaseRestHandler; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -36,9 +36,9 @@ import java.util.function.Predicate; import static org.opensearch.client.indices.GetMappingsResponse.MAPPINGS; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class GetMappingsResponseTests extends ESTestCase { +public class GetMappingsResponseTests extends OpenSearchTestCase { // Because the client-side class does not have a toXContent method, we test xContent serialization by creating // a random client object, converting it to a server object then serializing it to xContent, and finally diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutIndexTemplateRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutIndexTemplateRequestTests.java index 35877b36d7ba5..dfe19ef54eb95 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutIndexTemplateRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutIndexTemplateRequestTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutMappingRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutMappingRequestTests.java index 6cd8221b1077e..9ade5d422ba74 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutMappingRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/PutMappingRequestTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.Map; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/RandomCreateIndexGenerator.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/RandomCreateIndexGenerator.java index ced5b15f00b4b..c1631dd98392c 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/RandomCreateIndexGenerator.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/RandomCreateIndexGenerator.java @@ -24,8 +24,8 @@ import java.io.IOException; -import static org.elasticsearch.index.RandomCreateIndexGenerator.randomAlias; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; +import static org.opensearch.index.RandomCreateIndexGenerator.randomAlias; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; public class RandomCreateIndexGenerator { @@ -41,7 +41,7 @@ public static CreateIndexRequest randomCreateIndexRequest() { // Because client requests only accept typeless mappings, we must swap out the // mapping definition for one that does not contain types. org.opensearch.action.admin.indices.create.CreateIndexRequest serverRequest = - org.elasticsearch.index.RandomCreateIndexGenerator.randomCreateIndexRequest(); + org.opensearch.index.RandomCreateIndexGenerator.randomCreateIndexRequest(); return new CreateIndexRequest(serverRequest.index()) .settings(serverRequest.settings()) .aliases(serverRequest.aliases()) @@ -57,7 +57,7 @@ public static CreateIndexRequest randomCreateIndexRequest() { public static XContentBuilder randomMapping() throws IOException { XContentBuilder builder = XContentFactory.jsonBuilder(); builder.startObject(); - org.elasticsearch.index.RandomCreateIndexGenerator.randomMappingFields(builder, true); + org.opensearch.index.RandomCreateIndexGenerator.randomMappingFields(builder, true); builder.endObject(); return builder; } diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java index 007a1a6f97a01..104d7fab84ff9 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.rollover.MaxSizeCondition; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; -public class RolloverRequestTests extends ESTestCase { +public class RolloverRequestTests extends OpenSearchTestCase { public void testConstructorAndFieldAssignments() { // test constructor String alias = randomAlphaOfLength(5); diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java index cf09c7e53f133..8e61599c949d8 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.rest.BaseRestHandler; import org.opensearch.common.xcontent.ToXContent.Params; @@ -40,9 +40,9 @@ import java.util.function.Supplier; import java.util.Collections; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class RolloverResponseTests extends ESTestCase { +public class RolloverResponseTests extends OpenSearchTestCase { private static final List>> conditionSuppliers = new ArrayList<>(); static { diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/tasks/TaskSubmissionResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/tasks/TaskSubmissionResponseTests.java index e607b1b20a20e..447e87c3cf459 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/tasks/TaskSubmissionResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/tasks/TaskSubmissionResponseTests.java @@ -20,13 +20,13 @@ package org.opensearch.client.tasks; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; -public class TaskSubmissionResponseTests extends ESTestCase { +public class TaskSubmissionResponseTests extends OpenSearchTestCase { public void testFromXContent() throws IOException { xContentTester( diff --git a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/CreatedLocationHeaderIT.java b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/CreatedLocationHeaderIT.java index 2801a9a07242c..33c5d986e854a 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/CreatedLocationHeaderIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/CreatedLocationHeaderIT.java @@ -19,7 +19,6 @@ package org.opensearch.test.rest; -import org.elasticsearch.test.rest.ESRestTestCase; import org.opensearch.client.Request; import org.opensearch.client.Response; @@ -32,7 +31,7 @@ /** * Tests for the "Location" header returned when returning {@code 201 CREATED}. */ -public class CreatedLocationHeaderIT extends ESRestTestCase { +public class CreatedLocationHeaderIT extends OpenSearchRestTestCase { public void testCreate() throws IOException { locationTestCase("PUT", "test/_doc/1"); diff --git a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/NodeRestUsageIT.java b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/NodeRestUsageIT.java index e786cdb9256aa..15204458af453 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/NodeRestUsageIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/NodeRestUsageIT.java @@ -19,7 +19,6 @@ package org.opensearch.test.rest; -import org.elasticsearch.test.rest.ESRestTestCase; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.ResponseException; @@ -37,7 +36,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; -public class NodeRestUsageIT extends ESRestTestCase { +public class NodeRestUsageIT extends OpenSearchRestTestCase { @SuppressWarnings("unchecked") public void testWithRestUsage() throws IOException { diff --git a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/RequestsWithoutContentIT.java b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/RequestsWithoutContentIT.java index 6445edb2e65c2..d325b70c96ad6 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/RequestsWithoutContentIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/RequestsWithoutContentIT.java @@ -19,7 +19,6 @@ package org.opensearch.test.rest; -import org.elasticsearch.test.rest.ESRestTestCase; import org.opensearch.client.ResponseException; import org.opensearch.client.Request; @@ -27,7 +26,7 @@ import static org.hamcrest.CoreMatchers.containsString; -public class RequestsWithoutContentIT extends ESRestTestCase { +public class RequestsWithoutContentIT extends OpenSearchRestTestCase { public void testIndexMissingBody() throws IOException { ResponseException responseException = expectThrows(ResponseException.class, () -> diff --git a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/WaitForRefreshAndCloseIT.java b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/WaitForRefreshAndCloseIT.java index b378a01c3a5a3..e1b96ea1576af 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/WaitForRefreshAndCloseIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/opensearch/test/rest/WaitForRefreshAndCloseIT.java @@ -20,7 +20,6 @@ package org.opensearch.test.rest; import org.apache.http.util.EntityUtils; -import org.elasticsearch.test.rest.ESRestTestCase; import org.opensearch.action.ActionFuture; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.client.Request; @@ -41,7 +40,7 @@ /** * Tests that wait for refresh is fired if the index is closed. */ -public class WaitForRefreshAndCloseIT extends ESRestTestCase { +public class WaitForRefreshAndCloseIT extends OpenSearchRestTestCase { @Before public void setupIndex() throws IOException { Request request = new Request("PUT", "/test"); diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java index e5dc890ae282d..291a8e2cd4493 100644 --- a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java +++ b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java @@ -23,8 +23,8 @@ import org.opensearch.client.Request; import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -34,7 +34,7 @@ import java.nio.file.Files; import java.nio.file.Path; -public class DockerYmlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class DockerYmlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { private static final String USER = "rest_user"; private static final String PASS = "test-password"; diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java index 190739c3a9e71..66ef90ea9361a 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.settings.SecureString; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; -public class BootstrapTests extends ESTestCase { +public class BootstrapTests extends OpenSearchTestCase { Environment env; List fileSystems = new ArrayList<>(); diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java index 0672458867845..d1e88657f0e81 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.Randomness; import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; @@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.notNullValue; -public class KeyStoreWrapperTests extends ESTestCase { +public class KeyStoreWrapperTests extends OpenSearchTestCase { Environment env; List fileSystems = new ArrayList<>(); diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java index bb2797d30b65e..a304fd5be329c 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java @@ -56,8 +56,8 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.PosixPermissionsResetter; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.PosixPermissionsResetter; import org.junit.After; import org.junit.Before; @@ -107,7 +107,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -118,7 +118,7 @@ import static org.hamcrest.Matchers.startsWith; @LuceneTestCase.SuppressFileSystems("*") -public class InstallPluginCommandTests extends ESTestCase { +public class InstallPluginCommandTests extends OpenSearchTestCase { private InstallPluginCommand skipJarHellCommand; private InstallPluginCommand defaultCommand; @@ -990,7 +990,7 @@ public void assertInstallPluginFromUrl( ); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPlugin() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -998,7 +998,7 @@ public void testOfficialPlugin() throws Exception { assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPluginSnapshot() throws Exception { String url = String.format( Locale.ROOT, @@ -1009,7 +1009,7 @@ public void testOfficialPluginSnapshot() throws Exception { assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testInstallReleaseBuildOfPluginOnSnapshotBuild() { String url = String.format( Locale.ROOT, @@ -1025,11 +1025,11 @@ public void testInstallReleaseBuildOfPluginOnSnapshotBuild() { assertThat(e.exitCode, equalTo(ExitCodes.CONFIG)); assertThat( e, - hasToString(containsString("attempted to install release build of official plugin on snapshot build of Elasticsearch")) + hasToString(containsString("attempted to install release build of official plugin on snapshot build of OpenSearch")) ); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPluginStaging() throws Exception { String url = "https://staging.elastic.co/" + Version.CURRENT @@ -1039,7 +1039,7 @@ public void testOfficialPluginStaging() throws Exception { assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", false); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPlatformPlugin() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Platforms.PLATFORM_NAME @@ -1049,7 +1049,7 @@ public void testOfficialPlatformPlugin() throws Exception { assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, false); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPlatformPluginSnapshot() throws Exception { String url = String.format( Locale.ROOT, @@ -1061,7 +1061,7 @@ public void testOfficialPlatformPluginSnapshot() throws Exception { assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, "abc123", true); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialPlatformPluginStaging() throws Exception { String url = "https://staging.elastic.co/" + Version.CURRENT @@ -1106,7 +1106,7 @@ public void testMavenChecksumWithoutFilename() throws Exception { ); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialChecksumWithoutFilename() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1130,7 +1130,7 @@ public void testOfficialChecksumWithoutFilename() throws Exception { assertThat(e.getMessage(), startsWith("Invalid checksum file")); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testOfficialShaMissing() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1174,7 +1174,7 @@ public void testMavenShaMissing() throws Exception { assertEquals("Plugin checksum missing: " + url + ".sha1", e.getMessage()); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testInvalidShaFileMissingFilename() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1198,7 +1198,7 @@ public void testInvalidShaFileMissingFilename() throws Exception { assertTrue(e.getMessage(), e.getMessage().startsWith("Invalid checksum file")); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testInvalidShaFileMismatchFilename() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1222,7 +1222,7 @@ public void testInvalidShaFileMismatchFilename() throws Exception { assertThat(e, hasToString(matches("checksum file at \\[.*\\] is not for this plugin"))); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testInvalidShaFileContainingExtraLine() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1246,7 +1246,7 @@ public void testInvalidShaFileContainingExtraLine() throws Exception { assertTrue(e.getMessage(), e.getMessage().startsWith("Invalid checksum file")); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testSha512Mismatch() throws Exception { String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-" + Build.CURRENT.getQualifiedVersion() @@ -1289,7 +1289,7 @@ public void testSha1Mismatch() throws Exception { assertTrue(e.getMessage(), e.getMessage().contains("SHA-1 mismatch, expected foobar")); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception { final String icu = "analysis-icu"; final String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" @@ -1325,7 +1325,7 @@ public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception { assertThat(e, hasToString(containsString("key id [" + actualID + "] does not match expected key id [" + expectedID + "]"))); } - @AwaitsFix(bugUrl = "https://github.com/opendistro-for-elasticsearch/search/issues/100") + @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100") public void testFailedSignatureVerification() throws Exception { final String icu = "analysis-icu"; final String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/" @@ -1341,7 +1341,7 @@ public void testFailedSignatureVerification() throws Exception { */ final BiFunction signature = (b, p) -> { final byte[] bytes = Arrays.copyOf(b, b.length); - bytes[0] = randomValueOtherThan(b[0], ESTestCase::randomByte); + bytes[0] = randomValueOtherThan(b[0], OpenSearchTestCase::randomByte); return signature(bytes, p); }; final IllegalStateException e = expectThrows( diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java index 2f15974aac2ea..ba863f6091a83 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java @@ -35,11 +35,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; @LuceneTestCase.SuppressFileSystems("*") -public class ListPluginsCommandTests extends ESTestCase { +public class ListPluginsCommandTests extends OpenSearchTestCase { private Path home; private Environment env; @@ -151,7 +151,7 @@ public void testPluginWithVerbose() throws Exception { "Name: fake_plugin", "Description: fake desc", "Version: 1.0", - "Elasticsearch Version: " + Version.CURRENT.toString(), + "OpenSearch Version: " + Version.CURRENT.toString(), "Java Version: 1.8", "Native Controller: false", "Extended Plugins: []", @@ -173,7 +173,7 @@ public void testPluginWithNativeController() throws Exception { "Name: fake_plugin1", "Description: fake desc 1", "Version: 1.0", - "Elasticsearch Version: " + Version.CURRENT.toString(), + "OpenSearch Version: " + Version.CURRENT.toString(), "Java Version: 1.8", "Native Controller: true", "Extended Plugins: []", @@ -196,7 +196,7 @@ public void testPluginWithVerboseMultiplePlugins() throws Exception { "Name: fake_plugin1", "Description: fake desc 1", "Version: 1.0", - "Elasticsearch Version: " + Version.CURRENT.toString(), + "OpenSearch Version: " + Version.CURRENT.toString(), "Java Version: 1.8", "Native Controller: false", "Extended Plugins: []", @@ -206,7 +206,7 @@ public void testPluginWithVerboseMultiplePlugins() throws Exception { "Name: fake_plugin2", "Description: fake desc 2", "Version: 1.0", - "Elasticsearch Version: " + Version.CURRENT.toString(), + "OpenSearch Version: " + Version.CURRENT.toString(), "Java Version: 1.8", "Native Controller: false", "Extended Plugins: []", @@ -258,7 +258,7 @@ public void testExistingIncompatiblePlugin() throws Exception { buildFakePlugin(env, "fake desc 2", "fake_plugin2", "org.fake2"); MockTerminal terminal = listPlugins(home); - String message = "plugin [fake_plugin1] was built for Elasticsearch version 1.0 but version " + Version.CURRENT + " is required"; + String message = "plugin [fake_plugin1] was built for OpenSearch version 1.0 but version " + Version.CURRENT + " is required"; assertEquals("fake_plugin1\nfake_plugin2\n", terminal.getOutput()); assertEquals("WARNING: " + message + "\n", terminal.getErrorOutput()); diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ProgressInputStreamTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ProgressInputStreamTests.java index f6518cf602dc0..76761eef90d4a 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ProgressInputStreamTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ProgressInputStreamTests.java @@ -19,7 +19,7 @@ package org.opensearch.plugins; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; -public class ProgressInputStreamTests extends ESTestCase { +public class ProgressInputStreamTests extends OpenSearchTestCase { private List progresses = new ArrayList<>(); diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java index b7db59be4b6e6..5a0d77d473b2d 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java @@ -27,8 +27,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.junit.Before; import java.io.BufferedReader; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.hasToString; @LuceneTestCase.SuppressFileSystems("*") -public class RemovePluginCommandTests extends ESTestCase { +public class RemovePluginCommandTests extends OpenSearchTestCase { private Path home; private Environment env; diff --git a/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java b/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java index b8d0d51e410fa..86d70a2dd5a22 100644 --- a/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java +++ b/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.PathUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.URL; @@ -38,7 +38,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -public class JarHellTests extends ESTestCase { +public class JarHellTests extends OpenSearchTestCase { URL makeJar(Path dir, String name, Manifest manifest, String... files) throws IOException { Path jarpath = dir.resolve(name); diff --git a/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java b/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java index 1cd46f4548299..01a5ab161e350 100644 --- a/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java +++ b/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java @@ -19,13 +19,13 @@ package org.opensearch.common; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.charset.StandardCharsets; import static org.hamcrest.Matchers.is; -public class CharArraysTests extends ESTestCase { +public class CharArraysTests extends OpenSearchTestCase { public void testCharsToBytes() { final String originalValue = randomUnicodeOfCodepointLengthBetween(0, 32); diff --git a/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java b/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java index ba138dff4f7a5..fdb42de7d9698 100644 --- a/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java @@ -19,14 +19,14 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collection; import static org.hamcrest.CoreMatchers.equalTo; -public class ListTests extends ESTestCase { +public class ListTests extends OpenSearchTestCase { public void testStringListOfZero() { final String[] strings = {}; diff --git a/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java b/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java index 306154ecf138e..9c2ead445c783 100644 --- a/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java @@ -19,11 +19,11 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.CoreMatchers.equalTo; -public class MapTests extends ESTestCase { +public class MapTests extends OpenSearchTestCase { private static final String[] numbers = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"}; diff --git a/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java b/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java index 2ae33ba13a0b4..27b1e04a01a4e 100644 --- a/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java @@ -19,14 +19,14 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collection; import static org.hamcrest.CoreMatchers.equalTo; -public class SetTests extends ESTestCase { +public class SetTests extends OpenSearchTestCase { public void testStringSetOfZero() { final String[] strings = {}; diff --git a/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java b/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java index 1fb1e5fa6f737..5939e1951a229 100644 --- a/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java @@ -19,11 +19,11 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class TupleTests extends ESTestCase { +public class TupleTests extends OpenSearchTestCase { public void testTuple() { Tuple t1 = new Tuple<>(2L, "foo"); diff --git a/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java b/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java index a4c409bbbc2c5..60b31cba96112 100644 --- a/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java +++ b/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.unit; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.object.HasToString.hasToString; -public class TimeValueTests extends ESTestCase { +public class TimeValueTests extends OpenSearchTestCase { public void testSimple() { assertThat(TimeUnit.MILLISECONDS.toMillis(10), equalTo(new TimeValue(10, TimeUnit.MILLISECONDS).millis())); @@ -216,7 +216,7 @@ public void testCompareEquality() { public void testCompareValue() { long firstRandom = randomNonNegativeLong(); - long secondRandom = randomValueOtherThan(firstRandom, ESTestCase::randomNonNegativeLong); + long secondRandom = randomValueOtherThan(firstRandom, OpenSearchTestCase::randomNonNegativeLong); TimeUnit unit = randomFrom(TimeUnit.values()); TimeValue firstValue = new TimeValue(firstRandom, unit); TimeValue secondValue = new TimeValue(secondRandom, unit); diff --git a/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java b/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java index d4da1885b4524..5c10b7310f805 100644 --- a/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java +++ b/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java @@ -19,12 +19,12 @@ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.common.util.OpenSearchSloppyMath.atan; import static org.opensearch.common.util.OpenSearchSloppyMath.sinh; -public class OpenSearchSloppyMathTests extends ESTestCase { +public class OpenSearchSloppyMathTests extends OpenSearchTestCase { // accuracy for atan(x) static double ATAN_DELTA = 1E-15; diff --git a/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java b/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java index 6d8b04b9c486a..82ec58b756478 100644 --- a/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java +++ b/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.io.IOException; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class RefCountedTests extends ESTestCase { +public class RefCountedTests extends OpenSearchTestCase { public void testRefCount() throws IOException { MyRefCounted counted = new MyRefCounted(); diff --git a/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java index 0b90c6cc56045..3d264a34d3193 100644 --- a/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.Constants; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.io.PathUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.Closeable; import java.io.IOException; @@ -53,7 +53,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; -public class IOUtilsTests extends ESTestCase { +public class IOUtilsTests extends OpenSearchTestCase { public void testCloseArray() throws IOException { runTestClose(Function.identity(), IOUtils::close); diff --git a/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java index 43f18784c86f2..fdfc0312b3cfd 100644 --- a/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java @@ -19,7 +19,7 @@ package org.opensearch.core.internal.io; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; -public class StreamsTests extends ESTestCase { +public class StreamsTests extends OpenSearchTestCase { public void testCopyFromInputStream() throws IOException { byte[] content = "content".getBytes(StandardCharsets.UTF_8); ByteArrayInputStream in = new ByteArrayInputStream(content); diff --git a/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java index 17c0d3497dcc4..1eef5679d71ad 100644 --- a/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java @@ -22,9 +22,9 @@ import org.apache.lucene.util.Constants; import org.opensearch.bootstrap.JavaVersion; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class NetUtilsTests extends ESTestCase { +public class NetUtilsTests extends OpenSearchTestCase { public void testExtendedSocketOptions() { assumeTrue("JDK possibly not supported", Constants.JVM_NAME.contains("HotSpot") || Constants.JVM_NAME.contains("OpenJDK")); diff --git a/libs/dissect/src/test/java/org/opensearch/dissect/DissectKeyTests.java b/libs/dissect/src/test/java/org/opensearch/dissect/DissectKeyTests.java index 8877112a325a5..457aa4934fb51 100644 --- a/libs/dissect/src/test/java/org/opensearch/dissect/DissectKeyTests.java +++ b/libs/dissect/src/test/java/org/opensearch/dissect/DissectKeyTests.java @@ -19,7 +19,7 @@ package org.opensearch.dissect; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import java.util.EnumSet; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class DissectKeyTests extends ESTestCase { +public class DissectKeyTests extends OpenSearchTestCase { public void testNoModifier() { String keyName = randomAlphaOfLengthBetween(1, 10); diff --git a/libs/dissect/src/test/java/org/opensearch/dissect/DissectMatchTests.java b/libs/dissect/src/test/java/org/opensearch/dissect/DissectMatchTests.java index e565b0492b4c1..581459f173428 100644 --- a/libs/dissect/src/test/java/org/opensearch/dissect/DissectMatchTests.java +++ b/libs/dissect/src/test/java/org/opensearch/dissect/DissectMatchTests.java @@ -20,7 +20,7 @@ package org.opensearch.dissect; import org.opensearch.common.collect.MapBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; -public class DissectMatchTests extends ESTestCase { +public class DissectMatchTests extends OpenSearchTestCase { public void testIllegalArgs() { expectThrows(IllegalArgumentException.class, () -> new DissectMatch("", 0, 1, 0, 0)); diff --git a/libs/dissect/src/test/java/org/opensearch/dissect/DissectParserTests.java b/libs/dissect/src/test/java/org/opensearch/dissect/DissectParserTests.java index 8c99b37b8b8b3..4bf89ae4b54b7 100644 --- a/libs/dissect/src/test/java/org/opensearch/dissect/DissectParserTests.java +++ b/libs/dissect/src/test/java/org/opensearch/dissect/DissectParserTests.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; import org.mockito.internal.util.collections.Sets; @@ -34,7 +34,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomAsciiAlphanumOfLengthBetween; -public class DissectParserTests extends ESTestCase { +public class DissectParserTests extends OpenSearchTestCase { public void testJavaDocExamples() { assertMatch("%{a} %{b},%{c}", "foo bar,baz", Arrays.asList("a", "b", "c"), Arrays.asList("foo", "bar", "baz")); diff --git a/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java b/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java index 5fbfb43688ac0..053d4c3c4f702 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/BaseGeometryTestCase.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.WellKnownText; -import org.elasticsearch.test.AbstractWireTestCase; +import org.opensearch.test.AbstractWireTestCase; import java.io.IOException; import java.text.ParseException; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/GeometryValidatorTests.java b/libs/geo/src/test/java/org/opensearch/geometry/GeometryValidatorTests.java index 1850abfa53b06..6181984a262a5 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/GeometryValidatorTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/GeometryValidatorTests.java @@ -22,9 +22,9 @@ import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.GeometryValidator; import org.opensearch.geometry.utils.WellKnownText; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class GeometryValidatorTests extends ESTestCase { +public class GeometryValidatorTests extends OpenSearchTestCase { public static class NoopValidator implements GeometryValidator { diff --git a/libs/geo/src/test/java/org/opensearch/geometry/LinearRingTests.java b/libs/geo/src/test/java/org/opensearch/geometry/LinearRingTests.java index cc42f4b11444b..4e688789100c7 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/LinearRingTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/LinearRingTests.java @@ -23,9 +23,9 @@ import org.opensearch.geometry.utils.GeometryValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class LinearRingTests extends ESTestCase { +public class LinearRingTests extends OpenSearchTestCase { public void testBasicSerialization() { UnsupportedOperationException ex = expectThrows(UnsupportedOperationException.class, diff --git a/libs/geo/src/test/java/org/opensearch/geometry/utils/GeoHashTests.java b/libs/geo/src/test/java/org/opensearch/geometry/utils/GeoHashTests.java index b28a1e4733fd5..25ac16d70ccc9 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/utils/GeoHashTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/utils/GeoHashTests.java @@ -20,12 +20,12 @@ import org.opensearch.common.geo.GeoPoint; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; /** * Tests for {@link Geohash} */ -public class GeoHashTests extends ESTestCase { +public class GeoHashTests extends OpenSearchTestCase { public void testGeohashAsLongRoutines() { final GeoPoint expected = new GeoPoint(); final GeoPoint actual = new GeoPoint(); diff --git a/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java b/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java index aa6b16c02e2e3..7967a4533127a 100644 --- a/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java +++ b/libs/grok/src/test/java/org/opensearch/grok/GrokTests.java @@ -20,7 +20,7 @@ package org.opensearch.grok; import org.opensearch.grok.GrokCaptureConfig.NativeExtracterMap; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.nullValue; -public class GrokTests extends ESTestCase { +public class GrokTests extends OpenSearchTestCase { public void testMatchWithoutCaptures() { Grok grok = new Grok(Grok.BUILTIN_PATTERNS, "value", logger::warn); assertThat(grok.captures("value"), equalTo(org.elasticsearch.common.collect.Map.of())); diff --git a/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java b/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java index d3f45dca23e82..c5b3f70cc6514 100644 --- a/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java +++ b/libs/grok/src/test/java/org/opensearch/grok/MatcherWatchdogTests.java @@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joni.Matcher; import org.mockito.Mockito; @@ -37,7 +37,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; -public class MatcherWatchdogTests extends ESTestCase { +public class MatcherWatchdogTests extends OpenSearchTestCase { public void testInterrupt() throws Exception { AtomicBoolean run = new AtomicBoolean(true); // to avoid a lingering thread when test has completed diff --git a/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java b/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java index 1ad4d9266b5ce..7b32f11e56871 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.CheckedFunction; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class BytesChannelContextTests extends ESTestCase { +public class BytesChannelContextTests extends OpenSearchTestCase { private CheckedFunction readConsumer; private NioSocketChannel channel; diff --git a/libs/nio/src/test/java/org/opensearch/nio/ChannelContextTests.java b/libs/nio/src/test/java/org/opensearch/nio/ChannelContextTests.java index acf5917c74e9f..9fca1e624cd01 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/ChannelContextTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/ChannelContextTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class ChannelContextTests extends ESTestCase { +public class ChannelContextTests extends OpenSearchTestCase { private TestChannelContext context; private Consumer exceptionHandler; diff --git a/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java b/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java index bccf2ff71daee..fdc451ada3041 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.nio; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class ChannelFactoryTests extends ESTestCase { +public class ChannelFactoryTests extends OpenSearchTestCase { private ChannelFactory channelFactory; private ChannelFactory.RawChannelFactory rawChannelFactory; diff --git a/libs/nio/src/test/java/org/opensearch/nio/EventHandlerTests.java b/libs/nio/src/test/java/org/opensearch/nio/EventHandlerTests.java index a7bca1ea54eff..01075feaeb2bf 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/EventHandlerTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/EventHandlerTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class EventHandlerTests extends ESTestCase { +public class EventHandlerTests extends OpenSearchTestCase { private Consumer channelExceptionHandler; private Consumer genericExceptionHandler; diff --git a/libs/nio/src/test/java/org/opensearch/nio/FlushOperationTests.java b/libs/nio/src/test/java/org/opensearch/nio/FlushOperationTests.java index 55af1c5559b69..8ba1c2a24e258 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/FlushOperationTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/FlushOperationTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -28,7 +28,7 @@ import static org.mockito.Mockito.mock; -public class FlushOperationTests extends ESTestCase { +public class FlushOperationTests extends OpenSearchTestCase { private BiConsumer listener; diff --git a/libs/nio/src/test/java/org/opensearch/nio/InboundChannelBufferTests.java b/libs/nio/src/test/java/org/opensearch/nio/InboundChannelBufferTests.java index ee986261fb7e9..416d562040bd5 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/InboundChannelBufferTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/InboundChannelBufferTests.java @@ -19,14 +19,14 @@ package org.opensearch.nio; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.IntFunction; -public class InboundChannelBufferTests extends ESTestCase { +public class InboundChannelBufferTests extends OpenSearchTestCase { private IntFunction defaultPageAllocator; diff --git a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java index 86a974e7496b4..51e5bf9d77ffc 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java @@ -21,16 +21,16 @@ import org.opensearch.common.CheckedRunnable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.InetSocketAddress; import java.util.function.Consumer; -import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory; import static org.mockito.Mockito.mock; -public class NioSelectorGroupTests extends ESTestCase { +public class NioSelectorGroupTests extends OpenSearchTestCase { private NioSelectorGroup nioGroup; diff --git a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java index 9776f003a2728..493c4139d75bb 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.CheckedRunnable; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.mockito.ArgumentCaptor; @@ -49,7 +49,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class NioSelectorTests extends ESTestCase { +public class NioSelectorTests extends OpenSearchTestCase { private NioSelector selector; private EventHandler eventHandler; diff --git a/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java b/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java index 34af9c692f15a..f8543b4aab628 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java @@ -20,7 +20,7 @@ package org.opensearch.nio; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.mockito.ArgumentCaptor; import org.mockito.stubbing.Answer; @@ -51,7 +51,7 @@ import static org.mockito.Mockito.when; @SuppressForbidden(reason = "allow call to socket connect") -public class SocketChannelContextTests extends ESTestCase { +public class SocketChannelContextTests extends OpenSearchTestCase { private SocketChannel rawChannel; private TestSocketChannelContext context; diff --git a/libs/nio/src/test/java/org/opensearch/nio/TaskSchedulerTests.java b/libs/nio/src/test/java/org/opensearch/nio/TaskSchedulerTests.java index 08b5fd3cfccb5..f2f8189d4f0f7 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/TaskSchedulerTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/TaskSchedulerTests.java @@ -19,13 +19,13 @@ package org.opensearch.nio; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.LockSupport; -public class TaskSchedulerTests extends ESTestCase { +public class TaskSchedulerTests extends OpenSearchTestCase { private TaskScheduler scheduler = new TaskScheduler(); diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java index d21536f8c4b1d..4181ff0348c14 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/DefaultJdkTrustConfigTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import javax.net.ssl.X509ExtendedTrustManager; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.not; -public class DefaultJdkTrustConfigTests extends ESTestCase { +public class DefaultJdkTrustConfigTests extends OpenSearchTestCase { private static final BiFunction EMPTY_SYSTEM_PROPERTIES = (key, defaultValue) -> defaultValue; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java index cd4cb3134340d..78b1d04ded81e 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import javax.net.ssl.X509ExtendedKeyManager; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.iterableWithSize; import static org.hamcrest.Matchers.notNullValue; -public class PemKeyConfigTests extends ESTestCase { +public class PemKeyConfigTests extends OpenSearchTestCase { private static final int IP_NAME = 7; private static final int DNS_NAME = 2; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java index 241563b77e738..682badd6a838b 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.nio.file.Files; @@ -38,7 +38,7 @@ import javax.net.ssl.X509ExtendedTrustManager; -public class PemTrustConfigTests extends ESTestCase { +public class PemTrustConfigTests extends OpenSearchTestCase { public void testBuildTrustConfigFromSinglePemFile() throws Exception { final Path cert = getDataPath("/certs/ca1/ca.crt"); diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java index dd1962fb7414a..36d98bc432345 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.InputStream; import java.nio.file.Files; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.StringContains.containsString; -public class PemUtilsTests extends ESTestCase { +public class PemUtilsTests extends OpenSearchTestCase { private static final Supplier EMPTY_PASSWORD = () -> new char[0]; private static final Supplier TESTNODE_PASSWORD = "testnode"::toCharArray; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java index db31b3c83fe23..348fff4f808ad 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.common.settings.SecureString; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManagerFactory; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class SslConfigurationLoaderTests extends ESTestCase { +public class SslConfigurationLoaderTests extends OpenSearchTestCase { private final Path certRoot = getDataPath("/certs/ca1/ca.crt").getParent().getParent(); diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java index 3fac556ae3ba1..851c9036c7239 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationTests.java @@ -19,8 +19,8 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.hamcrest.Matchers; import org.mockito.Mockito; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class SslConfigurationTests extends ESTestCase { +public class SslConfigurationTests extends OpenSearchTestCase { static final String[] VALID_PROTOCOLS = { "TLSv1.2", "TLSv1.1", "TLSv1", "SSLv3", "SSLv2Hello", "SSLv2" }; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java index 63676329d1ebd..1f830673d8e54 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java @@ -20,7 +20,7 @@ package org.opensearch.common.ssl; import org.opensearch.common.Nullable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import org.mockito.Mockito; @@ -43,7 +43,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -public class SslDiagnosticsTests extends ESTestCase { +public class SslDiagnosticsTests extends OpenSearchTestCase { // Some constants for use in mock certificates private static final byte[] MOCK_ENCODING_1 = { 0x61, 0x62, 0x63, 0x64, 0x65, 0x66 }; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java index f10fa9bf6c439..fbbc8be84589c 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreKeyConfigTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import javax.net.ssl.KeyManagerFactory; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class StoreKeyConfigTests extends ESTestCase { +public class StoreKeyConfigTests extends OpenSearchTestCase { private static final int IP_NAME = 7; private static final int DNS_NAME = 2; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java index a69d6ec07b7cc..323714cd75d23 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/StoreTrustConfigTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import javax.net.ssl.TrustManagerFactory; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.nullValue; -public class StoreTrustConfigTests extends ESTestCase { +public class StoreTrustConfigTests extends OpenSearchTestCase { private static final char[] P12_PASS = "p12-pass".toCharArray(); private static final char[] JKS_PASS = "jks-pass".toCharArray(); diff --git a/libs/x-content/src/test/java/org/opensearch/common/ParseFieldTests.java b/libs/x-content/src/test/java/org/opensearch/common/ParseFieldTests.java index 3f86f7ba4db0d..71e5e42602748 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/ParseFieldTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/ParseFieldTests.java @@ -19,14 +19,14 @@ package org.opensearch.common; import org.opensearch.common.xcontent.LoggingDeprecationHandler; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; -public class ParseFieldTests extends ESTestCase { +public class ParseFieldTests extends OpenSearchTestCase { public void testParse() { String name = "foo_bar"; ParseField field = new ParseField(name); diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ConstructingObjectParserTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ConstructingObjectParserTests.java index aba99a62e4011..db52cd2afea22 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ConstructingObjectParserTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ConstructingObjectParserTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.ObjectParserTests.NamedObject; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import java.io.ByteArrayOutputStream; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; -public class ConstructingObjectParserTests extends ESTestCase { +public class ConstructingObjectParserTests extends OpenSearchTestCase { public void testNullDeclares() { ConstructingObjectParser objectParser = new ConstructingObjectParser<>("foo", a -> null); Exception e = expectThrows(IllegalArgumentException.class, diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/InstantiatingObjectParserTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/InstantiatingObjectParserTests.java index 211f72618d203..529ffd662d79c 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/InstantiatingObjectParserTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/InstantiatingObjectParserTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Objects; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class InstantiatingObjectParserTests extends ESTestCase { +public class InstantiatingObjectParserTests extends OpenSearchTestCase { public static class NoAnnotations { final int a; diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/MapXContentParserTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/MapXContentParserTests.java index 77d7c4e78e9be..99b1bd48ceb8e 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/MapXContentParserTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/MapXContentParserTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.support.MapXContentParser; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.EnumSet; @@ -30,7 +30,7 @@ import static org.opensearch.common.xcontent.XContentParserTests.generateRandomObject; -public class MapXContentParserTests extends ESTestCase { +public class MapXContentParserTests extends OpenSearchTestCase { public void testSimpleMap() throws IOException { compareTokens(builder -> { diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectParserTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectParserTests.java index 9322145868b59..e03a854355c5e 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectParserTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectParserTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.xcontent.ObjectParser.NamedObjectParser; import org.opensearch.common.xcontent.ObjectParser.ValueType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -public class ObjectParserTests extends ESTestCase { +public class ObjectParserTests extends OpenSearchTestCase { public void testBasics() throws IOException { XContentParser parser = createParser( diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectPathTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectPathTests.java index c5de545543ff2..acabec3a11dc3 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectPathTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/ObjectPathTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.xcontent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.Matchers.is; -public class ObjectPathTests extends ESTestCase { +public class ObjectPathTests extends OpenSearchTestCase { public void testEval() { Map map = singletonMap("key", "value"); diff --git a/libs/x-content/src/test/java/org/opensearch/common/xcontent/XContentParserTests.java b/libs/x-content/src/test/java/org/opensearch/common/xcontent/XContentParserTests.java index d6f72aa22605e..750a12bda2335 100644 --- a/libs/x-content/src/test/java/org/opensearch/common/xcontent/XContentParserTests.java +++ b/libs/x-content/src/test/java/org/opensearch/common/xcontent/XContentParserTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.internal.matchers.ThrowableMessageMatcher.hasMessage; -public class XContentParserTests extends ESTestCase { +public class XContentParserTests extends OpenSearchTestCase { public void testFloat() throws IOException { final XContentType xContentType = randomFrom(XContentType.values()); diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java index 939f360fd2cc7..4f1d81133cd18 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/BaseMatrixStatsTestCase.java @@ -18,12 +18,12 @@ */ package org.opensearch.search.aggregations.matrix.stats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.ArrayList; -public abstract class BaseMatrixStatsTestCase extends ESTestCase { +public abstract class BaseMatrixStatsTestCase extends OpenSearchTestCase { protected final int numObs = atLeast(10000); protected final ArrayList fieldA = new ArrayList<>(numObs); protected final ArrayList fieldB = new ArrayList<>(numObs); diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java index f55d73ba78278..ca4b5f9d888c6 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java @@ -33,7 +33,7 @@ import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats.Fields; import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java b/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java index 99655b7bbc9ce..e6adf99698ea5 100644 --- a/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java +++ b/modules/aggs-matrix-stats/src/yamlRestTest/java/org/opensearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java @@ -20,16 +20,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class MatrixStatsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class MatrixStatsClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public MatrixStatsClientYamlTestSuiteIT(@Name("yaml")ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java index e53b944973784..ded97c0a244cb 100644 --- a/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java +++ b/modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java @@ -23,16 +23,16 @@ import org.opensearch.common.settings.Settings; import org.opensearch.index.query.Operator; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.Arrays; import java.util.Collection; import static org.opensearch.index.query.QueryBuilders.queryStringQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; -public class QueryStringWithAnalyzersIT extends ESIntegTestCase { +public class QueryStringWithAnalyzersIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(CommonAnalysisPlugin.class); diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java index a6aaf21ef70cb..06eca415e68b2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java @@ -22,10 +22,10 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hy.ArmenianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class ArmenianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java index 0f07bc364561d..d28af5e6b3009 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java @@ -23,17 +23,17 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; -public class ASCIIFoldingTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class ASCIIFoldingTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ascii_folding.type", "asciifolding") @@ -48,7 +48,7 @@ public void testDefault() throws IOException { } public void testPreserveOriginal() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ascii_folding.type", "asciifolding") diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java index 6cdc8b65e9e0e..e5ad572266439 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; @@ -35,7 +35,7 @@ * Base class to test {@link WordDelimiterTokenFilterFactory} and * {@link WordDelimiterGraphTokenFilterFactory}. */ -public abstract class BaseWordDelimiterTokenFilterFactoryTestCase extends ESTokenStreamTestCase { +public abstract class BaseWordDelimiterTokenFilterFactoryTestCase extends OpenSearchTokenStreamTestCase { final String type; public BaseWordDelimiterTokenFilterFactoryTestCase(String type) { @@ -43,7 +43,7 @@ public BaseWordDelimiterTokenFilterFactoryTestCase(String type) { } public void testDefault() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -59,7 +59,7 @@ public void testDefault() throws IOException { } public void testCatenateWords() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -77,7 +77,7 @@ public void testCatenateWords() throws IOException { } public void testCatenateNumbers() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -95,7 +95,7 @@ public void testCatenateNumbers() throws IOException { } public void testCatenateAll() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -113,7 +113,7 @@ public void testCatenateAll() throws IOException { } public void testSplitOnCaseChange() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -129,7 +129,7 @@ public void testSplitOnCaseChange() throws IOException { } public void testPreserveOriginal() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -147,7 +147,7 @@ public void testPreserveOriginal() throws IOException { } public void testStemEnglishPossessive() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java index 9b81100229157..8c316bd9262e2 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java @@ -23,19 +23,19 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.apache.lucene.analysis.standard.StandardTokenizer; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Before; import java.io.IOException; import java.io.StringReader; -public class CJKFilterFactoryTests extends ESTokenStreamTestCase { +public class CJKFilterFactoryTests extends OpenSearchTokenStreamTestCase { private static final String RESOURCE = "/org/opensearch/analysis/common/cjk_analysis.json"; - private ESTestCase.TestAnalysis analysis; + private OpenSearchTestCase.TestAnalysis analysis; @Before public void setup() throws IOException { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java index 0c83f62fa14fb..1949bc1b7d2b3 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java @@ -25,15 +25,15 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.util.Arrays; -public class CharGroupTokenizerFactoryTests extends ESTokenStreamTestCase { +public class CharGroupTokenizerFactoryTests extends OpenSearchTokenStreamTestCase { public void testParseTokenChars() { final Index index = new Index("test", "_na_"); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java index ce379685fcc74..6017fb4035917 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharMatcherTests.java @@ -19,9 +19,9 @@ package org.opensearch.analysis.common; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class CharMatcherTests extends ESTestCase { +public class CharMatcherTests extends OpenSearchTestCase { public void testLetter() { assertTrue(CharMatcher.Basic.LETTER.isTokenChar('a')); // category Ll diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java index 1514a0ecbd6c5..530c63f942270 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java @@ -29,14 +29,14 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Map; -public class CommonAnalysisPluginTests extends ESTestCase { +public class CommonAnalysisPluginTests extends OpenSearchTestCase { /** * Check that the deprecated name "nGram" issues a deprecation warning for indices created since 6.0.0 diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java index 513de2df56989..ab3b8c634d09e 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java @@ -24,11 +24,11 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Assert; import java.io.IOException; @@ -37,7 +37,7 @@ import java.nio.file.Files; import java.nio.file.Path; -public class CommonGramsTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class CommonGramsTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { Settings settings = Settings.builder() .put("index.analysis.filter.common_grams_default.type", "common_grams") @@ -60,7 +60,7 @@ public void testWithoutCommonWordsMatch() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); { TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_default"); String source = "the quick brown is a fox Or noT"; @@ -77,7 +77,7 @@ public void testWithoutCommonWordsMatch() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .putList("index.analysis.filter.common_grams_default.common_words", "chromosome", "protein") .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); { TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_default"); String source = "the quick brown is a fox Or noT"; @@ -96,7 +96,7 @@ public void testSettings() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .putList("index.analysis.filter.common_grams_1.common_words", "the", "Or", "Not", "a", "is", "an", "they", "are") .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_1"); String source = "the quick brown is a fox or noT"; String[] expected = new String[] { "the", "the_quick", "quick", "brown", "brown_is", "is", "is_a", "a", @@ -111,7 +111,7 @@ public void testSettings() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .putList("index.analysis.filter.common_grams_2.common_words", "the", "Or", "noT", "a", "is", "an", "they", "are") .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_2"); String source = "the quick brown is a fox or why noT"; String[] expected = new String[] { "the", "the_quick", "quick", "brown", "brown_is", "is", "is_a", "a", "" + @@ -125,7 +125,7 @@ public void testSettings() throws IOException { .putList("index.analysis.filter.common_grams_3.common_words", "the", "or", "not", "a", "is", "an", "they", "are") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_3"); String source = "the quick brown is a fox Or noT"; String[] expected = new String[] { "the", "the_quick", "quick", "brown", "brown_is", "is", "is_a", "a", @@ -170,7 +170,7 @@ public void testQueryModeSettings() throws IOException { .put("index.analysis.filter.common_grams_1.ignore_case", true) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_1"); String source = "the quick brown is a fox or noT"; String[] expected = new String[] { "the_quick", "quick", "brown_is", "is_a", "a_fox", "fox_or", "or_noT" }; @@ -185,7 +185,7 @@ public void testQueryModeSettings() throws IOException { .put("index.analysis.filter.common_grams_2.ignore_case", false) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_2"); String source = "the quick brown is a fox or why noT"; String[] expected = new String[] { "the_quick", "quick", "brown_is", "is_a", "a_fox", "fox", "or", "why_noT" }; @@ -199,7 +199,7 @@ public void testQueryModeSettings() throws IOException { .putList("index.analysis.filter.common_grams_3.common_words", "the", "Or", "noT", "a", "is", "an", "they", "are") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_3"); String source = "the quick brown is a fox or why noT"; String[] expected = new String[] { "the_quick", "quick", "brown_is", "is_a", "a_fox", "fox", "or", "why_noT" }; @@ -213,7 +213,7 @@ public void testQueryModeSettings() throws IOException { .putList("index.analysis.filter.common_grams_4.common_words", "the", "or", "not", "a", "is", "an", "they", "are") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("common_grams_4"); String source = "the quick brown is a fox Or noT"; String[] expected = new String[] { "the_quick", "quick", "brown_is", "is_a", "a_fox", "fox", "Or", "noT" }; @@ -256,7 +256,7 @@ private Path createHome() throws IOException { return home; } - private static ESTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { + private static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); } diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index 6426ba1e1c15b..b5d54b13e7bce 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -29,13 +29,13 @@ import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.MyFilterTokenFilterFactory; +import org.opensearch.index.analysis.MyFilterTokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.opensearch.plugins.AnalysisPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.hamcrest.MatcherAssert; import java.io.IOException; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.instanceOf; -public class CompoundAnalysisTests extends ESTestCase { +public class CompoundAnalysisTests extends OpenSearchTestCase { public void testDefaultsCompoundAnalysis() throws Exception { Settings settings = getJsonSettings(); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("test", settings); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java index f90b1051537d4..131bbfb136bfa 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.query.SimpleQueryStringFlag; import org.elasticsearch.index.search.MatchQuery; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.After; import org.junit.Before; @@ -51,7 +51,7 @@ /** * Makes sure that graph analysis is disabled with shingle filters of different size */ -public class DisableGraphQueryTests extends ESSingleNodeTestCase { +public class DisableGraphQueryTests extends OpenSearchSingleNodeTestCase { private static IndexService indexService; private static QueryShardContext shardContext; private static Query expectedQuery; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java index 28f02dbb52a27..88d92bd83232f 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java @@ -23,18 +23,18 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; -public class EdgeNGramTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class EdgeNGramTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_edge_ngram.type", "edge_ngram") @@ -49,7 +49,7 @@ public void testDefault() throws IOException { } public void testPreserveOriginal() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_edge_ngram.type", "edge_ngram") diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java index 0252f9139af16..9e8d3b6665fc4 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java @@ -30,15 +30,15 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; import java.util.Collections; -public class EdgeNGramTokenizerTests extends ESTokenStreamTestCase { +public class EdgeNGramTokenizerTests extends OpenSearchTokenStreamTestCase { private IndexAnalyzers buildAnalyzers(Version version, String tokenizer) throws IOException { Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java index 82d5c9283b66c..cde9da8a3c987 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java @@ -21,12 +21,12 @@ import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; -public class ElisionFilterFactoryTests extends ESTokenStreamTestCase { +public class ElisionFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testElisionFilterWithNoArticles() throws IOException { Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java index ec0f49fc8cd75..70ec2a15b0f55 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FingerprintAnalyzerTests.java @@ -21,9 +21,9 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; -public class FingerprintAnalyzerTests extends ESTokenStreamTestCase { +public class FingerprintAnalyzerTests extends OpenSearchTokenStreamTestCase { public void testFingerprint() throws Exception { Analyzer a = new FingerprintAnalyzer(CharArraySet.EMPTY_SET, ' ', 255); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java index f68b3326744ff..b31eb5194db74 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java @@ -25,12 +25,12 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; -public class FlattenGraphTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class FlattenGraphTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testBasic() throws IOException { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java index a7388051c1304..3da7d98c81fbe 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java @@ -28,7 +28,7 @@ import org.opensearch.plugins.Plugin; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.Arrays; @@ -43,13 +43,13 @@ import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.search.builder.SearchSourceBuilder.highlight; import static org.opensearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHighlight; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHighlight; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.startsWith; -public class HighlighterWithAnalyzersTests extends ESIntegTestCase { +public class HighlighterWithAnalyzersTests extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(CommonAnalysisPlugin.class); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java index 75f529dd9223a..227501da024fe 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java @@ -25,16 +25,16 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; import java.util.Map; -public class HtmlStripCharFilterFactoryTests extends ESTestCase { +public class HtmlStripCharFilterFactoryTests extends OpenSearchTestCase { /** * Check that the deprecated name "htmlStrip" issues a deprecation warning for indices created since 6.3.0 diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java index 3b776b6c3da2a..9f2bf4afaf057 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Assert; import java.io.IOException; @@ -34,11 +34,11 @@ import static org.hamcrest.Matchers.instanceOf; -public class KeepFilterFactoryTests extends ESTokenStreamTestCase { +public class KeepFilterFactoryTests extends OpenSearchTokenStreamTestCase { private static final String RESOURCE = "/org/opensearch/analysis/common/keep_analysis.json"; public void testLoadWithoutSettings() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep"); Assert.assertNull(tokenFilter); @@ -90,7 +90,7 @@ public void testKeepWordsPathSettings() { } public void testCaseInsensitiveMapping() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_keep_filter"); assertThat(tokenFilter, instanceOf(KeepWordFilterFactory.class)); @@ -102,7 +102,7 @@ public void testCaseInsensitiveMapping() throws IOException { } public void testCaseSensitiveMapping() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath( createTempDir(), RESOURCE, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_case_sensitive_keep_filter"); assertThat(tokenFilter, instanceOf(KeepWordFilterFactory.class)); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java index 69a648512bf2f..3d2436937cdc3 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java @@ -23,17 +23,17 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class KeepTypesFilterFactoryTests extends ESTokenStreamTestCase { +public class KeepTypesFilterFactoryTests extends OpenSearchTokenStreamTestCase { private static final String BASE_SETTING = "index.analysis.filter.keep_numbers"; @@ -47,7 +47,7 @@ public void testKeepTypesInclude() throws IOException { KeepTypesFilterFactory.KeepTypesMode.INCLUDE); } Settings settings = settingsBuilder.build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep_numbers"); assertThat(tokenFilter, instanceOf(KeepTypesFilterFactory.class)); String source = "Hello 123 world"; @@ -62,7 +62,7 @@ public void testKeepTypesExclude() throws IOException { .put(BASE_SETTING + ".type", "keep_types") .putList(BASE_SETTING + "." + KeepTypesFilterFactory.KEEP_TYPES_KEY, new String[] { "", "" }) .put(BASE_SETTING + "." + KeepTypesFilterFactory.KEEP_TYPES_MODE_KEY, KeepTypesFilterFactory.KeepTypesMode.EXCLUDE).build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("keep_numbers"); assertThat(tokenFilter, instanceOf(KeepTypesFilterFactory.class)); String source = "Hello 123 world"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java index c266261e35fd0..2125e17bee451 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java @@ -25,11 +25,11 @@ import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase.TestAnalysis; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase.TestAnalysis; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; @@ -38,7 +38,7 @@ /** * Tests for the {@link KeywordMarkerTokenFilterFactory} class. */ -public class KeywordMarkerFilterFactoryTests extends ESTokenStreamTestCase { +public class KeywordMarkerFilterFactoryTests extends OpenSearchTokenStreamTestCase { /** * Tests using a keyword set for the keyword marker filter. diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java index e46a9d9527f67..a148c52665832 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java @@ -23,21 +23,21 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; -public class LimitTokenCountFilterFactoryTests extends ESTokenStreamTestCase { +public class LimitTokenCountFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { Settings settings = Settings.builder() .put("index.analysis.filter.limit_default.type", "limit") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); { TokenFilterFactory tokenFilter = analysis.tokenFilter.get("limit_default"); String source = "the quick brown fox"; @@ -64,7 +64,7 @@ public void testSettings() throws IOException { .put("index.analysis.filter.limit_1.consume_all_tokens", true) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("limit_1"); String source = "the quick brown fox"; String[] expected = new String[] { "the", "quick", "brown" }; @@ -79,7 +79,7 @@ public void testSettings() throws IOException { .put("index.analysis.filter.limit_1.consume_all_tokens", false) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("limit_1"); String source = "the quick brown fox"; String[] expected = new String[] { "the", "quick", "brown" }; @@ -95,7 +95,7 @@ public void testSettings() throws IOException { .put("index.analysis.filter.limit_1.consume_all_tokens", true) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("limit_1"); String source = "the quick brown fox"; String[] expected = new String[] { "the", "quick", "brown", "fox" }; @@ -105,7 +105,7 @@ public void testSettings() throws IOException { } } - private static ESTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { + private static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings(Settings settings) throws IOException { return AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); } diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java index 001568f421c9c..ad049d1e462e7 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java @@ -21,12 +21,12 @@ import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Collection; import java.util.Collections; -public class MassiveWordListTests extends ESSingleNodeTestCase { +public class MassiveWordListTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java index a1c2677070fad..4e0634391443e 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java @@ -23,15 +23,15 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; -public class MinHashFilterFactoryTests extends ESTokenStreamTestCase { +public class MinHashFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { int default_hash_count = 1; int default_bucket_size = 512; @@ -39,7 +39,7 @@ public void testDefault() throws IOException { Settings settings = Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("min_hash"); String source = "the quick brown fox"; Tokenizer tokenizer = new WhitespaceTokenizer(); @@ -60,7 +60,7 @@ public void testSettings() throws IOException { .put("index.analysis.filter.test_min_hash.with_rotation", false) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("test_min_hash"); String source = "sushi"; Tokenizer tokenizer = new WhitespaceTokenizer(); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java index 656e843c68678..6514b65809aa3 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java @@ -28,13 +28,13 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.util.Collections; -public class MultiplexerTokenFilterTests extends ESTokenStreamTestCase { +public class MultiplexerTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testMultiplexingFilter() throws IOException { Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java index 1b297d0d65bfb..5341c7b912d46 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java @@ -23,18 +23,18 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; -public class NGramTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class NGramTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefault() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ngram.type", "ngram") @@ -49,7 +49,7 @@ public void testDefault() throws IOException { } public void testPreserveOriginal() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ngram.type", "ngram") diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java index cd700a2bb3444..ec17f0a6f3159 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java @@ -30,9 +30,9 @@ import org.opensearch.common.settings.Settings.Builder; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; @@ -41,7 +41,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween; import static org.hamcrest.Matchers.instanceOf; -public class NGramTokenizerFactoryTests extends ESTokenStreamTestCase { +public class NGramTokenizerFactoryTests extends OpenSearchTokenStreamTestCase { public void testParseTokenChars() { final Index index = new Index("test", "_na_"); final String name = "ngr"; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java index c1fee60f9b8ed..248ea58d29956 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchSolrSynonymParserTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.containsString; -public class OpenSearchSolrSynonymParserTests extends ESTokenStreamTestCase { +public class OpenSearchSolrSynonymParserTests extends OpenSearchTokenStreamTestCase { public void testLenientParser() throws IOException, ParseException { OpenSearchSolrSynonymParser parser = new OpenSearchSolrSynonymParser(true, false, true, new StandardAnalyzer()); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java index fa4f9b24e3f91..dc564caad8b85 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/OpenSearchWordnetSynonymParserTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.synonym.SynonymFilter; import org.apache.lucene.analysis.synonym.SynonymMap; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.StringReader; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.containsString; -public class OpenSearchWordnetSynonymParserTests extends ESTokenStreamTestCase { +public class OpenSearchWordnetSynonymParserTests extends OpenSearchTokenStreamTestCase { public void testLenientParser() throws IOException, ParseException { OpenSearchWordnetSynonymParser parser = new OpenSearchWordnetSynonymParser(true, false, true, new StandardAnalyzer()); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java index ca58c550b77a5..d1985330cc3c9 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java @@ -24,13 +24,13 @@ import org.apache.lucene.analysis.Tokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.io.StringReader; -public class PathHierarchyTokenizerFactoryTests extends ESTokenStreamTestCase { +public class PathHierarchyTokenizerFactoryTests extends OpenSearchTokenStreamTestCase { public void testDefaults() throws IOException { final Index index = new Index("test", "_na_"); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java index 660913ac8123d..bcb41065e5a20 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternAnalyzerTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.util.Arrays; @@ -31,7 +31,7 @@ /** * Verifies the behavior of PatternAnalyzer. */ -public class PatternAnalyzerTests extends ESTokenStreamTestCase { +public class PatternAnalyzerTests extends OpenSearchTokenStreamTestCase { /** * Test PatternAnalyzer when it is configured with a non-word pattern. diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java index e04553eef312f..87d08c2ec6f62 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java @@ -26,13 +26,13 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; -import static org.elasticsearch.test.ESTestCase.createTestAnalysis; +import static org.opensearch.test.OpenSearchTestCase.createTestAnalysis; import static org.hamcrest.Matchers.containsString; -public class PatternCaptureTokenFilterTests extends ESTokenStreamTestCase { +public class PatternCaptureTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testPatternCaptureTokenFilter() throws Exception { String json = "/org/opensearch/analysis/common/pattern_capture.json"; Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java index 058cf8f406b8b..a845eae4095fd 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java @@ -31,13 +31,13 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.util.Collections; -public class PredicateTokenScriptFilterTests extends ESTokenStreamTestCase { +public class PredicateTokenScriptFilterTests extends OpenSearchTokenStreamTestCase { public void testSimpleFilter() throws IOException { Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java index 5331e91059630..d1d6c632f19d8 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java @@ -23,23 +23,23 @@ import org.apache.lucene.analysis.Token; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import static org.hamcrest.Matchers.instanceOf; -public class RemoveDuplicatesFilterFactoryTests extends ESTokenStreamTestCase { +public class RemoveDuplicatesFilterFactoryTests extends OpenSearchTokenStreamTestCase { public void testRemoveDuplicatesFilter() throws IOException { Settings settings = Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.removedups.type", "remove_duplicates") .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("removedups"); assertThat(tokenFilter, instanceOf(RemoveDuplicatesTokenFilterFactory.class)); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java index cd6e04eff01b0..e2ad535d1a567 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java @@ -31,12 +31,12 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; import java.util.Collections; -public class ScriptedConditionTokenFilterTests extends ESTokenStreamTestCase { +public class ScriptedConditionTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testSimpleCondition() throws Exception { Settings settings = Settings.builder() diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java index 7ed72a9a951ca..b65ff694ce843 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java @@ -25,16 +25,16 @@ import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.StringReader; -public class ShingleTokenFilterTests extends ESTokenStreamTestCase { +public class ShingleTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testPreConfiguredShingleFilterDisableGraphAttribute() throws Exception { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_ascii_folding.type", "asciifolding") diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java index 6fe3d6f255d67..e2681d6809f18 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SnowballAnalyzerTests.java @@ -21,9 +21,9 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.en.EnglishAnalyzer; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; -public class SnowballAnalyzerTests extends ESTokenStreamTestCase { +public class SnowballAnalyzerTests extends OpenSearchTokenStreamTestCase { public void testEnglish() throws Exception { Analyzer a = new SnowballAnalyzer("English"); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java index 0e4f7135058d1..ba13f4a38de44 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Rule; import org.junit.rules.ExpectedException; @@ -35,12 +35,12 @@ import java.util.Arrays; import java.util.Locale; -public class StemmerOverrideTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class StemmerOverrideTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); public static TokenFilterFactory create(String... rules) throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put("index.analysis.filter.my_stemmer_override.type", "stemmer_override") .putList("index.analysis.filter.my_stemmer_override.rules", rules) diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java index cbb264208cb43..7ab382964d112 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java @@ -26,13 +26,13 @@ import org.opensearch.Version; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; @@ -41,7 +41,7 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED; import static org.hamcrest.Matchers.instanceOf; -public class StemmerTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class StemmerTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { private static final CommonAnalysisPlugin PLUGIN = new CommonAnalysisPlugin(); @@ -58,7 +58,7 @@ public void testEnglishFilterFactory() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, PLUGIN); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, PLUGIN); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_english"); assertThat(tokenFilter, instanceOf(StemmerTokenFilterFactory.class)); Tokenizer tokenizer = new WhitespaceTokenizer(); @@ -85,7 +85,7 @@ public void testPorter2FilterFactory() throws IOException { .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, PLUGIN); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, PLUGIN); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_porter2"); assertThat(tokenFilter, instanceOf(StemmerTokenFilterFactory.class)); Tokenizer tokenizer = new WhitespaceTokenizer(); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java index a2b84841b184e..e7080c9e34072 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java @@ -33,9 +33,9 @@ import org.elasticsearch.index.analysis.PreConfiguredTokenFilter; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.hamcrest.MatcherAssert; import java.io.IOException; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -public class SynonymsAnalysisTests extends ESTestCase { +public class SynonymsAnalysisTests extends OpenSearchTestCase { private IndexAnalyzers indexAnalyzers; public void testSynonymsAnalysis() throws IOException { diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java index baca9f66a6562..1ab8de2467fa3 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java @@ -22,21 +22,21 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; -public class TrimTokenFilterTests extends ESTokenStreamTestCase { +public class TrimTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testNormalizer() throws IOException { Settings settings = Settings.builder() .putList("index.analysis.normalizer.my_normalizer.filter", "trim") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); assertNull(analysis.indexAnalyzers.get("my_normalizer")); NamedAnalyzer normalizer = analysis.indexAnalyzers.getNormalizer("my_normalizer"); assertNotNull(normalizer); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java index d71e6da883e68..bbc8605f4a182 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java @@ -24,13 +24,13 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class UniqueTokenFilterTests extends ESTestCase { +public class UniqueTokenFilterTests extends OpenSearchTestCase { public void testSimple() throws IOException { Analyzer analyzer = new Analyzer() { @Override diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java index f4f1b08912a97..58ddb8212be6a 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java @@ -27,8 +27,8 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.io.Reader; @@ -36,7 +36,7 @@ import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents; -public class WhitespaceTokenizerFactoryTests extends ESTestCase { +public class WhitespaceTokenizerFactoryTests extends OpenSearchTestCase { public void testSimpleWhiteSpaceTokenizer() throws IOException { final Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build(); diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java index 6438fd5ed2711..ac602a1e00a80 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java @@ -26,14 +26,14 @@ import org.elasticsearch.env.Environment; import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; @@ -46,7 +46,7 @@ public WordDelimiterGraphTokenFilterFactoryTests() { } public void testMultiTerms() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -74,7 +74,7 @@ public void testMultiTerms() throws IOException { * Correct offset order when doing both parts and concatenation: PowerShot is a synonym of Power */ public void testPartsAndCatenate() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -96,7 +96,7 @@ public void testPartsAndCatenate() throws IOException { } public void testAdjustingOffsets() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) @@ -130,7 +130,7 @@ public void testIgnoreKeywords() throws IOException { .put("index.analysis.analyzer.my_analyzer.filter", "my_keyword, my_word_delimiter") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, new CommonAnalysisPlugin()); String source = "PowerShot PowerHungry"; int[] expectedStartOffsets = new int[]{0, 5, 10, 15}; int[] expectedEndOffsets = new int[]{5, 9, 15, 21}; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java index c887c09fec4b7..762dcd07b4ceb 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.AnalysisTestsHelper; +import org.opensearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.StringReader; @@ -40,7 +40,7 @@ public WordDelimiterTokenFilterFactoryTests() { * Correct offset order when doing both parts and concatenation: PowerShot is a synonym of Power */ public void testPartsAndCatenate() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings( Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put("index.analysis.filter.my_word_delimiter.type", type) diff --git a/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java b/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java index 8005fb1f8a29b..d0010a09e79da 100644 --- a/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java +++ b/modules/analysis-common/src/yamlRestTest/java/org/opensearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java @@ -21,16 +21,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class CommonAnalysisClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class CommonAnalysisClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public CommonAnalysisClientYamlTestSuiteIT(@Name("yaml")ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java b/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java index e76f013450feb..f21789a865476 100644 --- a/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java +++ b/modules/geo/src/yamlRestTest/java/org/opensearch/geo/GeoClientYamlTestSuiteIT.java @@ -21,11 +21,11 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; /** Runs yaml rest tests */ -public class GeoClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class GeoClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public GeoClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,6 +33,6 @@ public GeoClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandid @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java index bb8813a3f27da..cdb9684e8d890 100644 --- a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java +++ b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java @@ -28,8 +28,8 @@ import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptPlugin; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.InternalTestCluster; import java.util.Arrays; import java.util.Collection; @@ -45,8 +45,8 @@ // Ideally I like this test to live in the server module, but otherwise a large part of the ScriptProcessor // ends up being copied into this test. -@ESIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = ESIntegTestCase.Scope.TEST) -public class IngestRestartIT extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 0, numClientNodes = 0, scope = OpenSearchIntegTestCase.Scope.TEST) +public class IngestRestartIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java index dc9250cd2ab36..e000b3dbadad1 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.is; -public abstract class AbstractStringProcessorFactoryTestCase extends ESTestCase { +public abstract class AbstractStringProcessorFactoryTestCase extends OpenSearchTestCase { protected abstract AbstractStringProcessor.Factory newFactory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java index 8fb1d04ee7f21..2db45f7dd0b78 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java @@ -22,7 +22,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public abstract class AbstractStringProcessorTestCase extends ESTestCase { +public abstract class AbstractStringProcessorTestCase extends OpenSearchTestCase { protected abstract AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java index 78acd902d6d24..1fe8975f73d32 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Arrays; @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class AppendProcessorFactoryTests extends ESTestCase { +public class AppendProcessorFactoryTests extends OpenSearchTestCase { private AppendProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java index e8fc86ddbe7a3..866a3f82243f1 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java @@ -26,7 +26,7 @@ import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -44,7 +44,7 @@ import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.Matchers.containsInAnyOrder; -public class AppendProcessorTests extends ESTestCase { +public class AppendProcessorTests extends OpenSearchTestCase { public void testAppendValuesToExistingList() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java index 8c6f3eb344433..34025b544745f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.HashMap; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class ConvertProcessorFactoryTests extends ESTestCase { +public class ConvertProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() throws Exception { ConvertProcessor.Factory factory = new ConvertProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java index c436e0a49995c..496670f75bd25 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.opensearch.ingest.common.ConvertProcessor.Type; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public class ConvertProcessorTests extends ESTestCase { +public class ConvertProcessorTests extends OpenSearchTestCase { public void testConvertInt() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorFactoryTests.java index 6db9e497e519e..9265845038860 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class CsvProcessorFactoryTests extends ESTestCase { +public class CsvProcessorFactoryTests extends OpenSearchTestCase { public void testProcessorIsCreated() { CsvProcessor.Factory factory = new CsvProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java index 9c1a5043af66d..3b42d9c6f0a9f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java @@ -23,7 +23,7 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashMap; @@ -32,7 +32,7 @@ import java.util.Map; import java.util.stream.Collectors; -public class CsvProcessorTests extends ESTestCase { +public class CsvProcessorTests extends OpenSearchTestCase { private static final Character[] SEPARATORS = new Character[]{',', ';', '|', '.', '\t'}; private static final String[] QUOTES = new String[]{"'", "\"", ""}; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java index 0d629edbbd653..67b7d5fd2cad4 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java @@ -22,7 +22,7 @@ import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.time.ZoneId; import java.time.ZoneOffset; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsEqual.equalTo; -public class DateFormatTests extends ESTestCase { +public class DateFormatTests extends OpenSearchTestCase { public void testParseJava() { Function javaFunction = DateFormat.Java.getFunction("MMM dd HH:mm:ss Z", diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java index 7c9055b3e58ed..058988379b2b8 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.time.ZoneOffset; @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.Map; -public class DateIndexNameFactoryTests extends ESTestCase { +public class DateIndexNameFactoryTests extends OpenSearchTestCase { public void testDefaults() throws Exception { DateIndexNameProcessor.Factory factory = new DateIndexNameProcessor.Factory(TestTemplateService.instance()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java index 84fcdb0a66ed1..2d73776b5c0f9 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.time.DateFormatter; import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.time.ZoneId; import java.time.ZoneOffset; @@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class DateIndexNameProcessorTests extends ESTestCase { +public class DateIndexNameProcessorTests extends OpenSearchTestCase { public void testJavaPattern() throws Exception { Function function = DateFormat.Java.getFunction("yyyy-MM-dd'T'HH:mm:ss.SSSXX", ZoneOffset.UTC, Locale.ROOT); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java index a693b7f29f826..73cc0c9545650 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.time.ZoneId; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class DateProcessorFactoryTests extends ESTestCase { +public class DateProcessorFactoryTests extends OpenSearchTestCase { private DateProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java index dd898470776ff..4311349b4c7f6 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java @@ -23,7 +23,7 @@ import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.time.Instant; import java.time.ZoneId; @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; -public class DateProcessorTests extends ESTestCase { +public class DateProcessorTests extends OpenSearchTestCase { private TemplateScript.Factory templatize(Locale locale) { return new TestTemplateService.MockTemplateScript.Factory(locale.getLanguage()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java index cb01b621ea10e..b1d43524375d1 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.dissect.DissectException; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.HashMap; @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.is; -public class DissectProcessorFactoryTests extends ESTestCase { +public class DissectProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() { DissectProcessor.Factory factory = new DissectProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java index 1a19b590fec49..fe9bca0ea277b 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import java.util.Collections; @@ -37,7 +37,7 @@ * Basic tests for the {@link DissectProcessor}. See the {@link org.opensearch.dissect.DissectParser} test suite for a comprehensive * set of dissect tests. */ -public class DissectProcessorTests extends ESTestCase { +public class DissectProcessorTests extends OpenSearchTestCase { public void testMatch() { IngestDocument ingestDocument = new IngestDocument("_index", "_type", "_id", null, null, null, diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java index 649c85e8d81ac..12ab0ef14a085 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class DotExpanderProcessorFactoryTests extends ESTestCase { +public class DotExpanderProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() throws Exception { DotExpanderProcessor.Factory factory = new DotExpanderProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java index 8a76dfac32178..2af4cae9b211f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; -public class DotExpanderProcessorTests extends ESTestCase { +public class DotExpanderProcessorTests extends OpenSearchTestCase { public void testEscapeFields() throws Exception { Map source = new HashMap<>(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java index 13bbd90817ad9..d2aebda0be2bf 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class FailProcessorFactoryTests extends ESTestCase { +public class FailProcessorFactoryTests extends OpenSearchTestCase { private FailProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java index 3a0ee7183f92b..bb452b1a0fa01 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java @@ -23,11 +23,11 @@ import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class FailProcessorTests extends ESTestCase { +public class FailProcessorTests extends OpenSearchTestCase { public void test() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java index 32f678dff8ef4..a5bda6db02dfd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.TestProcessor; import org.opensearch.script.ScriptService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.Collections; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; -public class ForEachProcessorFactoryTests extends ESTestCase { +public class ForEachProcessorFactoryTests extends OpenSearchTestCase { private final ScriptService scriptService = mock(ScriptService.class); private final Consumer genericExecutor = Runnable::run; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java index 36c48684b33a7..3f7802da859ba 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java @@ -25,7 +25,7 @@ import org.opensearch.ingest.TestProcessor; import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -41,7 +41,7 @@ import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; -public class ForEachProcessorTests extends ESTestCase { +public class ForEachProcessorTests extends OpenSearchTestCase { public void testExecuteWithAsyncProcessor() throws Exception { List values = new ArrayList<>(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java index 65ccf3c11fe7a..1f7b16447cd7b 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorFactoryTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.grok.MatcherWatchdog; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class GrokProcessorFactoryTests extends ESTestCase { +public class GrokProcessorFactoryTests extends OpenSearchTestCase { public void testBuild() throws Exception { GrokProcessor.Factory factory = new GrokProcessor.Factory(Collections.emptyMap(), MatcherWatchdog.noop()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java index 71e2c06cd9606..7d91a84c914a2 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.TransportService; import java.util.ArrayList; @@ -43,7 +43,7 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.mockito.Mockito.mock; -public class GrokProcessorGetActionTests extends ESTestCase { +public class GrokProcessorGetActionTests extends OpenSearchTestCase { private static final Map TEST_PATTERNS = org.elasticsearch.common.collect.Map.of("PATTERN2", "foo2", "PATTERN1", "foo1"); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java index dfdd32260162a..de676e50f9e0b 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java @@ -22,7 +22,7 @@ import org.opensearch.grok.MatcherWatchdog; import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; -public class GrokProcessorTests extends ESTestCase { +public class GrokProcessorTests extends OpenSearchTestCase { public void testMatch() throws Exception { String fieldName = RandomDocumentPicks.randomFieldName(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java index b6b7681615f0e..50a21c0495f9a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorFactoryTests.java @@ -20,14 +20,14 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; -public class JoinProcessorFactoryTests extends ESTestCase { +public class JoinProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() throws Exception { JoinProcessor.Factory factory = new JoinProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java index c90fc46fd42c4..c3fd60c51addc 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class JoinProcessorTests extends ESTestCase { +public class JoinProcessorTests extends OpenSearchTestCase { private static final String[] SEPARATORS = new String[]{"-", "_", "."}; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java index 01cb48dde0ed5..f3e8a903c1b5f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorFactoryTests.java @@ -21,14 +21,14 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; -public class JsonProcessorFactoryTests extends ESTestCase { +public class JsonProcessorFactoryTests extends OpenSearchTestCase { private static final JsonProcessor.Factory FACTORY = new JsonProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java index b352d0bebcbbf..fa11250359110 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashMap; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class JsonProcessorTests extends ESTestCase { +public class JsonProcessorTests extends OpenSearchTestCase { @SuppressWarnings("unchecked") public void testExecute() throws Exception { diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java index 758b156a2d97a..e5a7acded1d4f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class KeyValueProcessorFactoryTests extends ESTestCase { +public class KeyValueProcessorFactoryTests extends OpenSearchTestCase { public void testCreateWithDefaults() throws Exception { KeyValueProcessor.Factory factory = new KeyValueProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java index d9bb7e2dfed1a..ddddf5dc416a0 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -36,7 +36,7 @@ import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; -public class KeyValueProcessorTests extends ESTestCase { +public class KeyValueProcessorTests extends OpenSearchTestCase { private static final KeyValueProcessor.Factory FACTORY = new KeyValueProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java index b32c57fd41797..3d076373ebd20 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Arrays; @@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class RemoveProcessorFactoryTests extends ESTestCase { +public class RemoveProcessorFactoryTests extends OpenSearchTestCase { private RemoveProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java index 669526f3b77fc..07782ef2ff464 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class RemoveProcessorTests extends ESTestCase { +public class RemoveProcessorTests extends OpenSearchTestCase { public void testRemoveFields() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java index 62626b75e487e..f4e231e0e1957 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class RenameProcessorFactoryTests extends ESTestCase { +public class RenameProcessorFactoryTests extends OpenSearchTestCase { private RenameProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java index 5e6f9bbfd5aa6..d293ae2d246ae 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; -public class RenameProcessorTests extends ESTestCase { +public class RenameProcessorTests extends OpenSearchTestCase { public void testRename() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java index 69178ee096105..055d2c64e6c22 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorFactoryTests.java @@ -29,7 +29,7 @@ import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ScriptProcessorFactoryTests extends ESTestCase { +public class ScriptProcessorFactoryTests extends OpenSearchTestCase { private ScriptProcessor.Factory factory; private static final Map ingestScriptParamToType; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java index 7d4aa30ad8efd..4a37666f1f5a4 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java @@ -28,7 +28,7 @@ import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.core.Is.is; -public class ScriptProcessorTests extends ESTestCase { +public class ScriptProcessorTests extends OpenSearchTestCase { private ScriptService scriptService; private Script script; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java index 5ce831262e2b2..0e87a3c2bd8fd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class SetProcessorFactoryTests extends ESTestCase { +public class SetProcessorFactoryTests extends OpenSearchTestCase { private SetProcessor.Factory factory; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java index bf1a9d97bf366..b11c5260396fe 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java @@ -25,14 +25,14 @@ import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.HashMap; import static org.hamcrest.Matchers.equalTo; -public class SetProcessorTests extends ESTestCase { +public class SetProcessorTests extends OpenSearchTestCase { public void testSetExistingFields() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java index 253c105453400..0e70eee89a23c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java @@ -21,14 +21,14 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; -public class SortProcessorFactoryTests extends ESTestCase { +public class SortProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() throws Exception { String processorTag = randomAlphaOfLength(10); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java index 7166c1bf0ba9a..2b4cc4507fe6c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.common.SortProcessor.SortOrder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class SortProcessorTests extends ESTestCase { +public class SortProcessorTests extends OpenSearchTestCase { public void testSortStrings() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java index 18fc74edac8e0..4ab82de7edadd 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorFactoryTests.java @@ -20,14 +20,14 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; import static org.hamcrest.CoreMatchers.equalTo; -public class SplitProcessorFactoryTests extends ESTestCase { +public class SplitProcessorFactoryTests extends OpenSearchTestCase { public void testCreate() throws Exception { SplitProcessor.Factory factory = new SplitProcessor.Factory(); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java index 6f3b09fe14307..0cf4a49073f7a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class SplitProcessorTests extends ESTestCase { +public class SplitProcessorTests extends OpenSearchTestCase { public void testSplit() throws Exception { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); diff --git a/modules/ingest-common/src/yamlRestTest/java/org/opensearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java b/modules/ingest-common/src/yamlRestTest/java/org/opensearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java index 157b97b54e7fd..22444b46510e4 100644 --- a/modules/ingest-common/src/yamlRestTest/java/org/opensearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java +++ b/modules/ingest-common/src/yamlRestTest/java/org/opensearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class IngestCommonClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class IngestCommonClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public IngestCommonClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public IngestCommonClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate t @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java index 4e08baa4d25db..21a449ed51ad8 100644 --- a/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java +++ b/modules/ingest-geoip/src/internalClusterTest/java/org/opensearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java @@ -32,9 +32,9 @@ import org.opensearch.ingest.IngestService; import org.opensearch.plugins.Plugin; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.NodeRoles; -import org.elasticsearch.test.StreamsUtils; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.NodeRoles; +import org.opensearch.test.StreamsUtils; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -46,11 +46,11 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.NodeRoles.nonIngestNode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.NodeRoles.nonIngestNode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class GeoIpProcessorNonIngestNodeIT extends ESIntegTestCase { +public class GeoIpProcessorNonIngestNodeIT extends OpenSearchIntegTestCase { public static class IngestGeoIpSettingsPlugin extends Plugin { diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 4db3939b7109c..9b2de91995f56 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -25,8 +25,8 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.StreamsUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.StreamsUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.sameInstance; -public class GeoIpProcessorFactoryTests extends ESTestCase { +public class GeoIpProcessorFactoryTests extends OpenSearchTestCase { private static Map databaseReaders; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index a36f908a8987b..8b3b9a2a8194b 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.InputStream; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class GeoIpProcessorTests extends ESTestCase { +public class GeoIpProcessorTests extends OpenSearchTestCase { public void testCity() throws Exception { GeoIpProcessor processor = new GeoIpProcessor(randomAlphaOfLength(10), null, "source_field", diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java index c39a90e132bef..4246188f7bb5a 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/IngestGeoIpPluginTests.java @@ -22,11 +22,11 @@ import com.maxmind.geoip2.model.AbstractResponse; import org.opensearch.common.network.InetAddresses; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; -public class IngestGeoIpPluginTests extends ESTestCase { +public class IngestGeoIpPluginTests extends OpenSearchTestCase { public void testCachesAndEvictsResults() { GeoIpCache cache = new GeoIpCache(1); diff --git a/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java b/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java index 305ea2b27ff3f..7dc9b60efd639 100644 --- a/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java +++ b/modules/ingest-geoip/src/yamlRestTest/java/org/opensearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class IngestGeoIpClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class IngestGeoIpClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public IngestGeoIpClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,6 +33,6 @@ public IngestGeoIpClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate te @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java index f72ee6a5d1f69..cdfb0f903029f 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.Strings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.BeforeClass; import java.io.BufferedReader; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class UserAgentProcessorFactoryTests extends ESTestCase { +public class UserAgentProcessorFactoryTests extends OpenSearchTestCase { private static Map userAgentParsers; diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java index 01a65d50127fa..3a2337d22cbee 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java @@ -21,7 +21,7 @@ import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.BeforeClass; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; -public class UserAgentProcessorTests extends ESTestCase { +public class UserAgentProcessorTests extends OpenSearchTestCase { private static UserAgentProcessor processor; diff --git a/modules/ingest-user-agent/src/yamlRestTest/java/org/opensearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java b/modules/ingest-user-agent/src/yamlRestTest/java/org/opensearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java index e88978e408c1b..f655871179cc1 100644 --- a/modules/ingest-user-agent/src/yamlRestTest/java/org/opensearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java +++ b/modules/ingest-user-agent/src/yamlRestTest/java/org/opensearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class IngestUserAgentClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class IngestUserAgentClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public IngestUserAgentClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,6 +33,6 @@ public IngestUserAgentClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidat @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java b/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java index 3913b315e72f3..c23ee802a365c 100644 --- a/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java +++ b/modules/kibana/src/javaRestTest/java/org/elasticsearch/kibana/KibanaSystemIndexIT.java @@ -26,7 +26,7 @@ import org.opensearch.client.Response; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import java.util.Arrays; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class KibanaSystemIndexIT extends ESRestTestCase { +public class KibanaSystemIndexIT extends OpenSearchRestTestCase { private final String indexName; diff --git a/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java b/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java index 492304ac57f36..76c85f7d2e6b3 100644 --- a/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java +++ b/modules/kibana/src/test/java/org/elasticsearch/kibana/KibanaPluginTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.SystemIndexDescriptor; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; -public class KibanaPluginTests extends ESTestCase { +public class KibanaPluginTests extends OpenSearchTestCase { public void testKibanaIndexNames() { assertThat(new KibanaPlugin().getSettings(), contains(KibanaPlugin.KIBANA_INDEX_NAMES_SETTING)); diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java index c168208b3e64d..8741fb859d804 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java @@ -40,8 +40,8 @@ import org.opensearch.search.aggregations.pipeline.SimpleValue; import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.hamcrest.OpenSearchAssertions; import java.util.Collection; import java.util.Collections; @@ -54,14 +54,14 @@ import static org.opensearch.search.aggregations.AggregationBuilders.histogram; import static org.opensearch.search.aggregations.AggregationBuilders.sum; import static org.opensearch.search.aggregations.PipelineAggregatorBuilders.bucketScript; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; // TODO: please convert to unit tests! -public class MoreExpressionIT extends ESIntegTestCase { +public class MoreExpressionIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { @@ -143,7 +143,7 @@ public void testScore() throws Exception { } public void testDateMethods() throws Exception { - ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "date0", "type=date", "date1", "type=date")); + OpenSearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "date0", "type=date", "date1", "type=date")); ensureGreen("test"); indexRandom(true, client().prepareIndex("test", "doc", "1") @@ -173,7 +173,7 @@ public void testDateMethods() throws Exception { } public void testDateObjectMethods() throws Exception { - ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "date0", "type=date", "date1", "type=date")); + OpenSearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "date0", "type=date", "date1", "type=date")); ensureGreen("test"); indexRandom(true, client().prepareIndex("test", "doc", "1") @@ -203,7 +203,7 @@ public void testDateObjectMethods() throws Exception { } public void testMultiValueMethods() throws Exception { - ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", + OpenSearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "double0", "type=double", "double1", "type=double", "double2", "type=double")); @@ -307,7 +307,7 @@ public void testMultiValueMethods() throws Exception { } public void testInvalidDateMethodCall() throws Exception { - ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "double", "type=double")); + OpenSearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "double", "type=double")); ensureGreen("test"); indexRandom(true, client().prepareIndex("test", "doc", "1").setSource("double", "178000000.0")); try { @@ -322,13 +322,13 @@ public void testInvalidDateMethodCall() throws Exception { } public void testSparseField() throws Exception { - ElasticsearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "x", "type=long", "y", "type=long")); + OpenSearchAssertions.assertAcked(prepareCreate("test").addMapping("doc", "x", "type=long", "y", "type=long")); ensureGreen("test"); indexRandom(true, client().prepareIndex("test", "doc", "1").setSource("id", 1, "x", 4), client().prepareIndex("test", "doc","2").setSource("id", 2, "y", 2)); SearchResponse rsp = buildRequest("doc['x'] + 1").get(); - ElasticsearchAssertions.assertSearchResponse(rsp); + OpenSearchAssertions.assertSearchResponse(rsp); SearchHits hits = rsp.getHits(); assertEquals(2, rsp.getHits().getTotalHits().value); assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D); diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java index 6cbe91f37cc79..05dd410ee567a 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java @@ -27,7 +27,7 @@ import org.opensearch.script.ScriptType; import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.Collection; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; //TODO: please convert to unit tests! -public class StoredExpressionIT extends ESIntegTestCase { +public class StoredExpressionIT extends OpenSearchIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal)); diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java index 00f948767bc0b..14bdcee1563b5 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java @@ -27,7 +27,7 @@ import org.opensearch.script.FieldScript; import org.opensearch.script.ScriptException; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.text.ParseException; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ExpressionFieldScriptTests extends ESTestCase { +public class ExpressionFieldScriptTests extends OpenSearchTestCase { private ExpressionScriptEngine service; private SearchLookup lookup; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java index 75db24a551a47..a45db6a97a188 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java @@ -31,14 +31,14 @@ import org.opensearch.script.NumberSortScript; import org.opensearch.script.ScriptException; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ExpressionNumberSortScriptTests extends ESTestCase { +public class ExpressionNumberSortScriptTests extends OpenSearchTestCase { private ExpressionScriptEngine service; private SearchLookup lookup; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java index 4ec86fc9fb146..57381492446f5 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java @@ -31,14 +31,14 @@ import org.opensearch.script.ScriptException; import org.opensearch.script.TermsSetQueryScript; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ExpressionTermsSetQueryTests extends ESTestCase { +public class ExpressionTermsSetQueryTests extends OpenSearchTestCase { private ExpressionScriptEngine service; private SearchLookup lookup; diff --git a/modules/lang-expression/src/yamlRestTest/java/org/opensearch/script/expression/LangExpressionClientYamlTestSuiteIT.java b/modules/lang-expression/src/yamlRestTest/java/org/opensearch/script/expression/LangExpressionClientYamlTestSuiteIT.java index 6bd7e503a3402..09f4a84d4b735 100644 --- a/modules/lang-expression/src/yamlRestTest/java/org/opensearch/script/expression/LangExpressionClientYamlTestSuiteIT.java +++ b/modules/lang-expression/src/yamlRestTest/java/org/opensearch/script/expression/LangExpressionClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class LangExpressionClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class LangExpressionClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public LangExpressionClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public LangExpressionClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java index f7773c461b9d9..434f140c05ef8 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/MultiSearchTemplateIT.java @@ -25,7 +25,7 @@ import org.opensearch.index.IndexNotFoundException; import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.Arrays; import java.util.Collection; @@ -34,14 +34,14 @@ import java.util.Map; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.core.Is.is; -public class MultiSearchTemplateIT extends ESIntegTestCase { +public class MultiSearchTemplateIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java index fc4d7bc2a1980..cd8a432a24ecf 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java @@ -27,7 +27,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.Before; import java.io.IOException; @@ -37,15 +37,15 @@ import java.util.Map; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; /** * Full integration test of the template query plugin. */ -public class SearchTemplateIT extends ESSingleNodeTestCase { +public class SearchTemplateIT extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java b/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java index a4a03e7bb9a90..17e5f2c1a5997 100644 --- a/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java +++ b/modules/lang-mustache/src/javaRestTest/java/org/opensearch/script/mustache/SearchTemplateWithoutContentIT.java @@ -21,13 +21,13 @@ import org.opensearch.client.Request; import org.opensearch.client.ResponseException; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; -public class SearchTemplateWithoutContentIT extends ESRestTestCase { +public class SearchTemplateWithoutContentIT extends OpenSearchRestTestCase { public void testSearchTemplateMissingBody() throws IOException { ResponseException responseException = expectThrows(ResponseException.class, () -> client().performRequest( diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java index 9cc03e41477b1..b92c6205d651b 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/CustomMustacheFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptEngine; import org.opensearch.script.TemplateScript; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Map; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class CustomMustacheFactoryTests extends ESTestCase { +public class CustomMustacheFactoryTests extends OpenSearchTestCase { public void testCreateEncoder() { IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> CustomMustacheFactory.createEncoder(null)); diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java index d6d927e209ae0..33a54801c73bb 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java @@ -26,9 +26,9 @@ import org.opensearch.script.ScriptType; import org.opensearch.search.Scroll; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.StreamsUtils; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.StreamsUtils; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class MultiSearchTemplateRequestTests extends ESTestCase { +public class MultiSearchTemplateRequestTests extends OpenSearchTestCase { public void testParseRequest() throws Exception { byte[] data = StreamsUtils.copyToBytesFromClasspath("/org/opensearch/script/mustache/simple-msearch-template.json"); diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java index b198cb8bf743f..c45f7a7f4988e 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.search.internal.InternalSearchResponse; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.function.Predicate; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java index dbed646aba8f1..11f67a508f7b2 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheScriptEngineTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.script.TemplateScript; import org.opensearch.script.Script; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -38,7 +38,7 @@ /** * Mustache based templating test */ -public class MustacheScriptEngineTests extends ESTestCase { +public class MustacheScriptEngineTests extends OpenSearchTestCase { private MustacheScriptEngine qe; private MustacheFactory factory; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java index 1d9bc3efc7a4c..e06e63c55ca4a 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MustacheTests.java @@ -24,7 +24,7 @@ import org.opensearch.script.ScriptEngine; import org.opensearch.script.ScriptException; import org.opensearch.script.TemplateScript; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import java.net.URLEncoder; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class MustacheTests extends ESTestCase { +public class MustacheTests extends OpenSearchTestCase { private ScriptEngine engine = new MustacheScriptEngine(); diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestMultiSearchTemplateActionTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestMultiSearchTemplateActionTests.java index 29863952034a6..9b793452163fb 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestMultiSearchTemplateActionTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestMultiSearchTemplateActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.nio.charset.StandardCharsets; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestSearchTemplateActionTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestSearchTemplateActionTests.java index a2b9fb5078e73..b7e09fbc2fdd5 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestSearchTemplateActionTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/RestSearchTemplateActionTests.java @@ -20,8 +20,8 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java index c53a4aeb31161..49b5168cccac2 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java @@ -23,7 +23,7 @@ import org.opensearch.script.ScriptType; import org.opensearch.search.RandomSearchRequestGenerator; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java index e7daf08434865..409e184010b8e 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestXContentTests.java @@ -28,14 +28,14 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.nullValue; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateResponseTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateResponseTests.java index 72f050afb490e..0ab475f5329e1 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateResponseTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateResponseTests.java @@ -32,13 +32,13 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.internal.InternalSearchResponse; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.Collections; import java.util.function.Predicate; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; public class SearchTemplateResponseTests extends AbstractXContentTestCase { diff --git a/modules/lang-mustache/src/yamlRestTest/java/org/opensearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java b/modules/lang-mustache/src/yamlRestTest/java/org/opensearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java index e40e99fbd6e1f..4c45029643f3d 100644 --- a/modules/lang-mustache/src/yamlRestTest/java/org/opensearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java +++ b/modules/lang-mustache/src/yamlRestTest/java/org/opensearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class LangMustacheClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class LangMustacheClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public LangMustacheClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public LangMustacheClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate t @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java index 732e77b198787..ee1c6c47de72a 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java @@ -20,9 +20,9 @@ package org.opensearch.painless; import org.opensearch.painless.lookup.PainlessCast; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class AnalyzerCasterTests extends ESTestCase { +public class AnalyzerCasterTests extends OpenSearchTestCase { private static void assertCast(Class actual, Class expected, boolean mustBeExplicit) { Location location = new Location("dummy", 0); diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java index 4a4f09f05f82f..c0e50d4c9c1ba 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java @@ -23,7 +23,7 @@ import org.opensearch.painless.lookup.PainlessLookupBuilder; import org.opensearch.painless.spi.Whitelist; import org.opensearch.painless.symbol.FunctionTable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; @@ -33,7 +33,7 @@ import java.util.Collections; import java.util.HashMap; -public class DefBootstrapTests extends ESTestCase { +public class DefBootstrapTests extends OpenSearchTestCase { private final PainlessLookup painlessLookup = PainlessLookupBuilder.buildFromWhitelists(Whitelist.BASE_WHITELISTS); /** calls toString() on integers, twice */ diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java index 8cd36eaf1f069..6c9392a1bf05b 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static java.util.Collections.singletonMap; @@ -136,7 +136,7 @@ public void testBranchEquals() { public void testEqualsDefAndPrimitive() { /* This test needs an Integer that isn't cached by Integer.valueOf so we draw one randomly. We can't use any fixed integer because * we can never be sure that the JVM hasn't configured itself to cache that Integer. It is sneaky like that. */ - int uncachedAutoboxedInt = randomValueOtherThanMany(i -> Integer.valueOf(i) == Integer.valueOf(i), ESTestCase::randomInt); + int uncachedAutoboxedInt = randomValueOtherThanMany(i -> Integer.valueOf(i) == Integer.valueOf(i), OpenSearchTestCase::randomInt); assertEquals(true, exec("def x = params.i; int y = params.i; return x == y;", singletonMap("i", uncachedAutoboxedInt), true)); assertEquals(false, exec("def x = params.i; int y = params.i; return x === y;", singletonMap("i", uncachedAutoboxedInt), true)); assertEquals(true, exec("def x = params.i; int y = params.i; return y == x;", singletonMap("i", uncachedAutoboxedInt), true)); @@ -165,7 +165,7 @@ public void testBranchNotEquals() { public void testNotEqualsDefAndPrimitive() { /* This test needs an Integer that isn't cached by Integer.valueOf so we draw one randomly. We can't use any fixed integer because * we can never be sure that the JVM hasn't configured itself to cache that Integer. It is sneaky like that. */ - int uncachedAutoboxedInt = randomValueOtherThanMany(i -> Integer.valueOf(i) == Integer.valueOf(i), ESTestCase::randomInt); + int uncachedAutoboxedInt = randomValueOtherThanMany(i -> Integer.valueOf(i) == Integer.valueOf(i), OpenSearchTestCase::randomInt); assertEquals(false, exec("def x = params.i; int y = params.i; return x != y;", singletonMap("i", uncachedAutoboxedInt), true)); assertEquals(true, exec("def x = params.i; int y = params.i; return x !== y;", singletonMap("i", uncachedAutoboxedInt), true)); assertEquals(false, exec("def x = params.i; int y = params.i; return y != x;", singletonMap("i", uncachedAutoboxedInt), true)); diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java index 8977f1543f3ae..917459383f5a6 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java @@ -25,7 +25,7 @@ import org.opensearch.painless.spi.Whitelist; import org.opensearch.script.NumberSortScript; import org.opensearch.script.ScriptContext; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Collections; import java.util.HashMap; @@ -36,7 +36,7 @@ * Test that needsScores() is reported correctly depending on whether _score is used */ // TODO: can we test this better? this is a port of the ExpressionsTests method. -public class NeedsScoreTests extends ESSingleNodeTestCase { +public class NeedsScoreTests extends OpenSearchSingleNodeTestCase { public void testNeedsScores() { IndexService index = createIndex("test", Settings.EMPTY, "type", "d", "type=double"); diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java index 01844bb178a71..9b739404cae5b 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java @@ -26,7 +26,7 @@ import org.opensearch.painless.spi.WhitelistLoader; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.ArrayList; @@ -43,7 +43,7 @@ *

* Typically just asserts the output of {@code exec()} */ -public abstract class ScriptTestCase extends ESTestCase { +public abstract class ScriptTestCase extends OpenSearchTestCase { protected PainlessScriptEngine scriptEngine; @Before diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java index a09178078209b..48bbd8684a000 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java index c49d38df6cf05..8f11bfdc92e9b 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java @@ -31,7 +31,7 @@ import org.opensearch.script.ScriptException; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Collection; @@ -43,7 +43,7 @@ import static org.opensearch.painless.action.PainlessExecuteAction.TransportAction.innerShardOperation; import static org.hamcrest.Matchers.equalTo; -public class PainlessExecuteApiTests extends ESSingleNodeTestCase { +public class PainlessExecuteApiTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java index 2872064926e94..8c93a7d9a70f9 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteRequestTests.java @@ -36,7 +36,7 @@ import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptType; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteResponseTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteResponseTests.java index a912429378689..4760ab4510940 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteResponseTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteResponseTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/api/LimitedCharSequenceTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/api/LimitedCharSequenceTests.java index ddadf7664ec5e..cca71db1438ea 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/api/LimitedCharSequenceTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/api/LimitedCharSequenceTests.java @@ -20,11 +20,11 @@ package org.opensearch.painless.api; import org.opensearch.common.breaker.CircuitBreakingException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.regex.Pattern; -public class LimitedCharSequenceTests extends ESTestCase { +public class LimitedCharSequenceTests extends OpenSearchTestCase { public void testBadFactor() { IllegalArgumentException badArg = expectThrows(IllegalArgumentException.class, () -> new LimitedCharSequence("abc", null, -1) diff --git a/modules/lang-painless/src/yamlRestTest/java/org/opensearch/painless/LangPainlessClientYamlTestSuiteIT.java b/modules/lang-painless/src/yamlRestTest/java/org/opensearch/painless/LangPainlessClientYamlTestSuiteIT.java index d3c79f9d6fafd..5f7f284d4720e 100644 --- a/modules/lang-painless/src/yamlRestTest/java/org/opensearch/painless/LangPainlessClientYamlTestSuiteIT.java +++ b/modules/lang-painless/src/yamlRestTest/java/org/opensearch/painless/LangPainlessClientYamlTestSuiteIT.java @@ -21,11 +21,11 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; /** Runs yaml rest tests */ -public class LangPainlessClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class LangPainlessClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public LangPainlessClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public LangPainlessClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate t @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java b/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java index bc71aa9789bd2..0f886bd6131e4 100644 --- a/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java +++ b/modules/mapper-extras/src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java @@ -32,7 +32,7 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.ArrayList; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -public class TokenCountFieldMapperIntegrationIT extends ESIntegTestCase { +public class TokenCountFieldMapperIntegrationIT extends OpenSearchIntegTestCase { @ParametersFactory public static Iterable buildParameters() { List parameters = new ArrayList<>(); diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java index d6d36f1dee12d..3769dd03ebb31 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java @@ -21,17 +21,17 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Collection; -import static org.elasticsearch.test.StreamsUtils.copyToBytesFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath; /** * Rudimentary tests that the templates used by Logstash and Beats * prior to their 5.x releases work for newly created indices */ -public class BWCTemplateTests extends ESSingleNodeTestCase { +public class BWCTemplateTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { return pluginList(MapperExtrasPlugin.class); diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java index 94bc2051d7d9d..5e63102ec1e4e 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureMetaFieldMapperTests.java @@ -26,12 +26,12 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.IndexService; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.Before; import java.util.Collection; -public class RankFeatureMetaFieldMapperTests extends ESSingleNodeTestCase { +public class RankFeatureMetaFieldMapperTests extends OpenSearchSingleNodeTestCase { IndexService indexService; DocumentMapperParser parser; diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java index 310f496df61ca..d7019e134868b 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeAnalyzerTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.opensearch.index.mapper.SearchAsYouTypeFieldMapper.SearchAsYouTypeAnalyzer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -37,7 +37,7 @@ import static java.util.stream.Collectors.toList; import static org.hamcrest.Matchers.equalTo; -public class SearchAsYouTypeAnalyzerTests extends ESTestCase { +public class SearchAsYouTypeAnalyzerTests extends OpenSearchTestCase { private static final Analyzer SIMPLE = new SimpleAnalyzer(); diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java index 8f6f61d7c4940..e7d8a0141a65d 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/query/RankFeatureQueryBuilderTests.java @@ -29,8 +29,8 @@ import org.opensearch.index.mapper.MapperService; import org.opensearch.index.query.RankFeatureQueryBuilder.ScoreFunction; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java b/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java index 7b3dca48e6fad..c28811f25b3a2 100644 --- a/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java +++ b/modules/mapper-extras/src/yamlRestTest/java/org/opensearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java @@ -22,11 +22,11 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; /** Runs yaml rest tests */ -public class MapperExtrasClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class MapperExtrasClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public MapperExtrasClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -34,7 +34,7 @@ public MapperExtrasClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate t @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java index 7d78e580beda6..7024a42fce7e3 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java @@ -19,7 +19,7 @@ package org.opensearch.join.aggregations; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java index 7099569aa0deb..80a7515e52e7b 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java @@ -45,10 +45,10 @@ import static org.opensearch.search.aggregations.AggregationBuilders.sum; import static org.opensearch.search.aggregations.AggregationBuilders.terms; import static org.opensearch.search.aggregations.AggregationBuilders.topHits; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java index 6837df188384a..6b3c3820736ae 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java @@ -38,7 +38,7 @@ import static org.opensearch.join.aggregations.JoinAggregationBuilders.parent; import static org.opensearch.search.aggregations.AggregationBuilders.terms; import static org.opensearch.search.aggregations.AggregationBuilders.topHits; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.equalTo; public class ParentIT extends AbstractParentChildTestCase { diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java index c7b645d2c05ab..133d9b3a4ace9 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java @@ -74,12 +74,12 @@ import static org.opensearch.join.query.JoinQueryBuilders.hasChildQuery; import static org.opensearch.join.query.JoinQueryBuilders.hasParentQuery; import static org.opensearch.join.query.JoinQueryBuilders.parentId; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHit; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHit; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasId; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java index e129dd7f80644..c57f2d6e17fde 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java @@ -60,12 +60,12 @@ import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; import static org.opensearch.join.query.JoinQueryBuilders.hasChildQuery; import static org.opensearch.join.query.JoinQueryBuilders.hasParentQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHit; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHit; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.hasId; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java index d44283f3e1c2f..ae50f5e013936 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ParentChildTestCase.java @@ -27,8 +27,8 @@ import org.opensearch.index.IndexModule; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Arrays; @@ -37,8 +37,8 @@ import java.util.HashMap; import java.util.Map; -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) -public abstract class ParentChildTestCase extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE) +public abstract class ParentChildTestCase extends OpenSearchIntegTestCase { @Override protected boolean ignoreExternalCluster() { diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java index fae550ff421c8..ef5649ad76df1 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java @@ -22,7 +22,7 @@ import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import java.util.Arrays; import java.util.Collection; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java index dd7a3d6149e30..83fb6d8e65a17 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java @@ -25,7 +25,7 @@ import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; public class ParentTests extends BaseAggregationTestCase { diff --git a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java index 062bae413be4e..ca5e664e7376f 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java @@ -33,14 +33,14 @@ import org.elasticsearch.index.mapper.SourceToParse; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Collection; import java.util.Collections; import static org.hamcrest.Matchers.containsString; -public class ParentJoinFieldMapperTests extends ESSingleNodeTestCase { +public class ParentJoinFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { return Collections.singletonList(ParentJoinPlugin.class); diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java index 25a608607d6be..03fa19a3265d6 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java @@ -54,9 +54,9 @@ import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Arrays; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java index 44e3272333215..23e2b0043adf6 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java @@ -41,9 +41,9 @@ import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Arrays; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java index 57b8d142ddd19..a9bcb6734d98a 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java @@ -34,8 +34,8 @@ import org.elasticsearch.index.query.QueryShardException; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/modules/parent-join/src/yamlRestTest/java/org/opensearch/join/ParentChildClientYamlTestSuiteIT.java b/modules/parent-join/src/yamlRestTest/java/org/opensearch/join/ParentChildClientYamlTestSuiteIT.java index c5bd46614c0e2..40e37b40b4b47 100644 --- a/modules/parent-join/src/yamlRestTest/java/org/opensearch/join/ParentChildClientYamlTestSuiteIT.java +++ b/modules/parent-join/src/yamlRestTest/java/org/opensearch/join/ParentChildClientYamlTestSuiteIT.java @@ -22,10 +22,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class ParentChildClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class ParentChildClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public ParentChildClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } diff --git a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java index a1a42347bc64a..12d4d86250dc9 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -40,7 +40,7 @@ import org.opensearch.plugins.Plugin; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.Arrays; import java.util.Collection; @@ -62,16 +62,16 @@ import static org.elasticsearch.index.query.QueryBuilders.spanNotQuery; import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsNull.notNullValue; -public class PercolatorQuerySearchIT extends ESIntegTestCase { +public class PercolatorQuerySearchIT extends OpenSearchIntegTestCase { @Override protected boolean addMockGeoShapeFieldMapper() { diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java index 33d639441282b..82faaf64c8f49 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java @@ -97,7 +97,7 @@ import org.elasticsearch.index.mapper.ParseContext; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.After; import org.junit.Before; @@ -118,7 +118,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class CandidateQueryTests extends ESSingleNodeTestCase { +public class CandidateQueryTests extends OpenSearchSingleNodeTestCase { private Directory directory; private IndexWriter indexWriter; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java index 264c3a24ed88d..6e346705a6f63 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -41,8 +41,8 @@ import org.elasticsearch.index.query.Rewriteable; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryTests.java index 296375a867389..ea031735d5c94 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryTests.java @@ -44,7 +44,7 @@ import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.store.Directory; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class PercolateQueryTests extends ESTestCase { +public class PercolateQueryTests extends OpenSearchTestCase { private Directory directory; private IndexWriter indexWriter; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java index ebbdab904ead3..13ac9151bdcf2 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -88,8 +88,8 @@ import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import org.junit.Before; import java.io.ByteArrayInputStream; @@ -123,7 +123,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class PercolatorFieldMapperTests extends ESSingleNodeTestCase { +public class PercolatorFieldMapperTests extends OpenSearchSingleNodeTestCase { private String fieldName; private IndexService indexService; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhaseTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhaseTests.java index 78771bdce05a6..270cbd18a2df9 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhaseTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhaseTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.lucene.search.function.RandomScoreFunction; import org.opensearch.search.fetch.FetchContext; import org.opensearch.search.fetch.subphase.highlight.SearchHighlightContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; import java.util.Arrays; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; -public class PercolatorHighlightSubFetchPhaseTests extends ESTestCase { +public class PercolatorHighlightSubFetchPhaseTests extends OpenSearchTestCase { public void testHitsExecutionNeeded() { PercolateQuery percolateQuery = new PercolateQuery("_name", ctx -> null, Collections.singletonList(new BytesArray("{}")), diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java index bf106ede2480f..8fa1b5d3e7238 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java @@ -40,7 +40,7 @@ import org.opensearch.search.fetch.FetchSubPhase.HitContext; import org.opensearch.search.fetch.FetchSubPhaseProcessor; import org.opensearch.search.lookup.SourceLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.stream.IntStream; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class PercolatorMatchedSlotSubFetchPhaseTests extends ESTestCase { +public class PercolatorMatchedSlotSubFetchPhaseTests extends OpenSearchTestCase { public void testHitsExecute() throws Exception { try (Directory directory = newDirectory()) { diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java index c0895dffa44a8..16d361776262f 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -41,7 +41,7 @@ import org.opensearch.script.ScriptType; import org.opensearch.search.lookup.LeafDocLookup; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Arrays; @@ -57,11 +57,11 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.scriptQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.equalTo; -public class PercolatorQuerySearchTests extends ESSingleNodeTestCase { +public class PercolatorQuerySearchTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java index 499abd6ea4a6b..407f31560480b 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java @@ -64,7 +64,7 @@ import org.elasticsearch.index.search.ESToParentBlockJoinQuery; import org.opensearch.percolator.QueryAnalyzer.QueryExtraction; import org.opensearch.percolator.QueryAnalyzer.Result; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.sameInstance; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -public class QueryAnalyzerTests extends ESTestCase { +public class QueryAnalyzerTests extends OpenSearchTestCase { public void testExtractQueryMetadata_termQuery() { TermQuery termQuery = new TermQuery(new Term("_field", "_term")); diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java index 3b15d06856efd..2efa7bd9a7252 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java @@ -45,7 +45,7 @@ import org.elasticsearch.mock.orig.Mockito; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -53,7 +53,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class QueryBuilderStoreTests extends ESTestCase { +public class QueryBuilderStoreTests extends OpenSearchTestCase { @Override protected NamedWriteableRegistry writableRegistry() { diff --git a/modules/percolator/src/yamlRestTest/java/org/opensearch/percolator/PercolatorClientYamlTestSuiteIT.java b/modules/percolator/src/yamlRestTest/java/org/opensearch/percolator/PercolatorClientYamlTestSuiteIT.java index 51ebaf35f910c..6e23053ea7854 100644 --- a/modules/percolator/src/yamlRestTest/java/org/opensearch/percolator/PercolatorClientYamlTestSuiteIT.java +++ b/modules/percolator/src/yamlRestTest/java/org/opensearch/percolator/PercolatorClientYamlTestSuiteIT.java @@ -22,16 +22,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class PercolatorClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class PercolatorClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public PercolatorClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java index 9f2bd53a817f2..042c9e22cfa9d 100644 --- a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.indices.IndexClosedException; import org.opensearch.plugins.Plugin; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.junit.Before; import java.util.ArrayList; @@ -42,10 +42,10 @@ import java.util.Set; import static org.opensearch.index.rankeval.EvaluationMetric.filterUnratedDocuments; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.instanceOf; -public class RankEvalRequestIT extends ESIntegTestCase { +public class RankEvalRequestIT extends OpenSearchIntegTestCase { private static final String TEST_INDEX = "test"; private static final String INDEX_ALIAS = "alias0"; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java index 567c6448c5177..39d6e5df9ce2e 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -43,11 +43,11 @@ import java.util.List; import static org.opensearch.index.rankeval.EvaluationMetric.filterUnratedDocuments; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class DiscountedCumulativeGainTests extends ESTestCase { +public class DiscountedCumulativeGainTests extends OpenSearchTestCase { static final double EXPECTED_DCG = 13.84826362927298; static final double EXPECTED_IDCG = 14.595390756454922; @@ -312,7 +312,7 @@ public void testMetricDetails() { public void testSerialization() throws IOException { DiscountedCumulativeGain original = createTestItem(); - DiscountedCumulativeGain deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + DiscountedCumulativeGain deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), DiscountedCumulativeGain::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java index f874ad20f1b2f..3f416ddaf5e33 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -37,11 +37,11 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class EvalQueryQualityTests extends ESTestCase { +public class EvalQueryQualityTests extends OpenSearchTestCase { private static NamedWriteableRegistry namedWritableRegistry = new NamedWriteableRegistry(new RankEvalPlugin().getNamedWriteables()); @@ -121,7 +121,7 @@ public void testXContentParsing() throws IOException { } private static EvalQueryQuality copy(EvalQueryQuality original) throws IOException { - return ESTestCase.copyWriteable(original, namedWritableRegistry, EvalQueryQuality::new); + return OpenSearchTestCase.copyWriteable(original, namedWritableRegistry, EvalQueryQuality::new); } public void testEqualsAndHash() throws IOException { diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java index 82bfe8e4268ee..7b98435c8ac46 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java @@ -34,18 +34,18 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class ExpectedReciprocalRankTests extends ESTestCase { +public class ExpectedReciprocalRankTests extends OpenSearchTestCase { private static final double DELTA = 10E-14; @@ -190,7 +190,7 @@ public void testMetricDetails() { public void testSerialization() throws IOException { ExpectedReciprocalRank original = createTestItem(); - ExpectedReciprocalRank deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + ExpectedReciprocalRank deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), ExpectedReciprocalRank::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java index 164ca33329f4a..3920fc489d0cb 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -41,11 +41,11 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class MeanReciprocalRankTests extends ESTestCase { +public class MeanReciprocalRankTests extends OpenSearchTestCase { private static final int IRRELEVANT_RATING_0 = 0; private static final int RELEVANT_RATING_1 = 1; @@ -216,7 +216,7 @@ static MeanReciprocalRank createTestItem() { public void testSerialization() throws IOException { MeanReciprocalRank original = createTestItem(); - MeanReciprocalRank deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + MeanReciprocalRank deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), MeanReciprocalRank::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java index 3dc4321ac84d8..a4ca573aae5c5 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -42,11 +42,11 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class PrecisionAtKTests extends ESTestCase { +public class PrecisionAtKTests extends OpenSearchTestCase { private static final int IRRELEVANT_RATING = 0; private static final int RELEVANT_RATING = 1; @@ -216,7 +216,7 @@ public void testXContentParsingIsNotLenient() throws IOException { public void testSerialization() throws IOException { PrecisionAtK original = createTestItem(); - PrecisionAtK deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + PrecisionAtK deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), PrecisionAtK::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java index 3e02610a1e6f4..66a1c48c6f4bb 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalRequestTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.Writeable.Reader; import org.opensearch.common.util.ArrayUtils; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import org.junit.AfterClass; import java.io.IOException; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java index c83713801fb8d..592d9cabf80fe 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java @@ -43,7 +43,7 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchParseException; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -57,12 +57,12 @@ import static java.util.Collections.singleton; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.TestSearchContext.SHARD_TARGET; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.TestSearchContext.SHARD_TARGET; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.instanceOf; -public class RankEvalResponseTests extends ESTestCase { +public class RankEvalResponseTests extends OpenSearchTestCase { private static final Exception[] RANDOM_EXCEPTIONS = new Exception[] { new ClusterBlockException(singleton(NoMasterBlockService.NO_MASTER_BLOCK_WRITES)), diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java index 79013467583dc..7965dc959922d 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java @@ -35,7 +35,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -49,11 +49,11 @@ import java.util.Map.Entry; import java.util.function.Supplier; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.Matchers.containsString; -public class RankEvalSpecTests extends ESTestCase { +public class RankEvalSpecTests extends OpenSearchTestCase { @SuppressWarnings("resource") @Override @@ -154,7 +154,7 @@ private static RankEvalSpec copy(RankEvalSpec original) throws IOException { namedWriteables.add( new NamedWriteableRegistry.Entry(EvaluationMetric.class, DiscountedCumulativeGain.NAME, DiscountedCumulativeGain::new)); namedWriteables.add(new NamedWriteableRegistry.Entry(EvaluationMetric.class, MeanReciprocalRank.NAME, MeanReciprocalRank::new)); - return ESTestCase.copyWriteable(original, new NamedWriteableRegistry(namedWriteables), RankEvalSpec::new); + return OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(namedWriteables), RankEvalSpec::new); } public void testEqualsAndHash() throws IOException { diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedDocumentTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedDocumentTests.java index 875d94bd438f4..a156559c5d8b9 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedDocumentTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedDocumentTests.java @@ -27,16 +27,16 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class RatedDocumentTests extends ESTestCase { +public class RatedDocumentTests extends OpenSearchTestCase { public static RatedDocument createRatedDocument() { return new RatedDocument(randomAlphaOfLength(10), randomAlphaOfLength(10), randomInt()); @@ -67,7 +67,7 @@ public void testXContentParsingIsNotLenient() throws IOException { public void testSerialization() throws IOException { RatedDocument original = createRatedDocument(); - RatedDocument deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + RatedDocument deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), RatedDocument::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java index 946a56b49586a..7f41469b81d85 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java @@ -38,7 +38,7 @@ import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.suggest.SuggestBuilder; import org.opensearch.search.suggest.SuggestBuilders; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -53,11 +53,11 @@ import static java.util.Collections.emptyList; import static java.util.stream.Collectors.toList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.Matchers.containsString; -public class RatedRequestsTests extends ESTestCase { +public class RatedRequestsTests extends OpenSearchTestCase { private static NamedXContentRegistry xContentRegistry; @@ -157,7 +157,7 @@ public void testSerialization() throws IOException { private static RatedRequest copy(RatedRequest original) throws IOException { List namedWriteables = new ArrayList<>(); namedWriteables.add(new NamedWriteableRegistry.Entry(QueryBuilder.class, MatchAllQueryBuilder.NAME, MatchAllQueryBuilder::new)); - return ESTestCase.copyWriteable(original, new NamedWriteableRegistry(namedWriteables), RatedRequest::new); + return OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(namedWriteables), RatedRequest::new); } public void testEqualsAndHash() throws IOException { diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java index 991cc459a059b..43dff2397bead 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java @@ -27,15 +27,15 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService; import org.opensearch.search.SearchHit; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.OptionalInt; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public class RatedSearchHitTests extends ESTestCase { +public class RatedSearchHitTests extends OpenSearchTestCase { public static RatedSearchHit randomRatedSearchHit() { OptionalInt rating = randomBoolean() ? OptionalInt.empty() @@ -88,7 +88,7 @@ public void testEqualsAndHash() throws IOException { } private static RatedSearchHit copy(RatedSearchHit original) throws IOException { - return ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), RatedSearchHit::new); + return OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), RatedSearchHit::new); } } diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java index 51663a41b1888..c4276c43df07a 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java @@ -33,18 +33,18 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.CoreMatchers.containsString; -public class RecallAtKTests extends ESTestCase { +public class RecallAtKTests extends OpenSearchTestCase { private static final int IRRELEVANT_RATING = 0; private static final int RELEVANT_RATING = 1; @@ -200,7 +200,7 @@ public void testXContentParsingIsNotLenient() throws IOException { public void testSerialization() throws IOException { RecallAtK original = createTestItem(); - RecallAtK deserialized = ESTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), + RecallAtK deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()), RecallAtK::new); assertEquals(deserialized, original); assertEquals(deserialized.hashCode(), original.hashCode()); diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java index 48a2c1ced8ca6..56683aa587296 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.env.Environment; import org.opensearch.script.ScriptService; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.TransportService; import java.util.ArrayList; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.mock; -public class TransportRankEvalActionTests extends ESTestCase { +public class TransportRankEvalActionTests extends OpenSearchTestCase { private Settings settings = Settings.builder().put("path.home", createTempDir().toString()).put("node.name", "test-" + getTestName()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()).build(); diff --git a/modules/rank-eval/src/yamlRestTest/java/org/opensearch/index/rankeval/RankEvalYamlIT.java b/modules/rank-eval/src/yamlRestTest/java/org/opensearch/index/rankeval/RankEvalYamlIT.java index df54f2c214916..19469ccca38cf 100644 --- a/modules/rank-eval/src/yamlRestTest/java/org/opensearch/index/rankeval/RankEvalYamlIT.java +++ b/modules/rank-eval/src/yamlRestTest/java/org/opensearch/index/rankeval/RankEvalYamlIT.java @@ -22,16 +22,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class RankEvalYamlIT extends ESClientYamlSuiteTestCase { +public class RankEvalYamlIT extends OpenSearchClientYamlSuiteTestCase { public RankEvalYamlIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index 9c1d6b6a12b16..eadff333b1c50 100644 --- a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -47,7 +47,7 @@ import org.opensearch.search.sort.SortOrder; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.hamcrest.Matcher; import org.junit.Before; @@ -59,10 +59,10 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -public class ReindexDocumentationIT extends ESIntegTestCase { +public class ReindexDocumentationIT extends OpenSearchIntegTestCase { // Semaphore used to allow & block indexing operations during the test private static final Semaphore ALLOWED_OPERATIONS = new Semaphore(0); diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java index 7676524e3be7e..d29e3527ae35a 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ManyDocumentsIT.java @@ -20,7 +20,7 @@ package org.opensearch.index.reindex; import org.opensearch.client.Request; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import org.junit.Before; import java.io.IOException; @@ -34,7 +34,7 @@ * sure that we don't change the default behavior of touching all * documents in the request. */ -public class ManyDocumentsIT extends ESRestTestCase { +public class ManyDocumentsIT extends OpenSearchRestTestCase { private final int count = between(150, 2000); @Before diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java index 98765af02ddfb..d9227321fd9ab 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/ReindexWithoutContentIT.java @@ -21,13 +21,13 @@ import org.opensearch.client.Request; import org.opensearch.client.ResponseException; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; -public class ReindexWithoutContentIT extends ESRestTestCase { +public class ReindexWithoutContentIT extends OpenSearchRestTestCase { public void testReindexMissingBody() throws IOException { ResponseException responseException = expectThrows(ResponseException.class, () -> client().performRequest( diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java index 4708b709367ec..27b69f19d9ab0 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java @@ -26,13 +26,13 @@ import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.common.Booleans; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; -public class ReindexFromOldRemoteIT extends ESRestTestCase { +public class ReindexFromOldRemoteIT extends OpenSearchRestTestCase { /** * Number of documents to test when reindexing from an old version. */ diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java index d9745b2361b76..cf37ebf13803f 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java @@ -25,7 +25,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.Tuple; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser.ValueType; @@ -242,7 +242,7 @@ private Throwable buildWithoutCause() { switch (type) { // Make some effort to use the right exceptions case "es_rejected_execution_exception": - return new EsRejectedExecutionException(reason); + return new OpenSearchRejectedExecutionException(reason); case "parsing_exception": XContentLocation location = null; if (line != null && column != null) { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java index 3243ea7706fb8..417bc751ee236 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java @@ -19,7 +19,6 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollActionTestCase; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java index b9c9d5ca79f98..dd9636ce160c8 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java @@ -22,7 +22,6 @@ import org.opensearch.action.ActionRequest; import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; -import org.elasticsearch.index.reindex.AbstractAsyncBulkByScrollActionTestCase; import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.ScrollableHitSource; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java index f5e8bca21b07b..6771c649d115e 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java @@ -63,7 +63,7 @@ import org.opensearch.common.text.Text; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.Index; import org.opensearch.index.engine.VersionConflictEngineException; @@ -77,8 +77,8 @@ import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpClient; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpClient; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -124,7 +124,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class AsyncBulkByScrollActionTests extends ESTestCase { +public class AsyncBulkByScrollActionTests extends OpenSearchTestCase { private MyMockClient client; private DummyAbstractBulkByScrollRequest testRequest; private SearchRequest firstSearchRequest; @@ -203,7 +203,7 @@ public void testStartRetriesOnRejectionButFailsOnTooManyRejections() throws Exce assertBusy(() -> assertEquals(testRequest.getMaxRetries() + 1, client.searchAttempts.get())); assertBusy(() -> assertTrue(listener.isDone())); ExecutionException e = expectThrows(ExecutionException.class, () -> listener.get()); - assertThat(ExceptionsHelper.stackTrace(e), containsString(EsRejectedExecutionException.class.getSimpleName())); + assertThat(ExceptionsHelper.stackTrace(e), containsString(OpenSearchRejectedExecutionException.class.getSimpleName())); assertNull("There shouldn't be a search attempt pending that we didn't reject", client.lastSearch.get()); assertEquals(testRequest.getMaxRetries(), testTask.getStatus().getSearchRetries()); } @@ -233,7 +233,7 @@ public void testStartNextScrollRetriesOnRejectionButFailsOnTooManyRejections() t assertExactlyOnce( onFail -> { Consumer validingOnFail = e -> { - assertNotNull(ExceptionsHelper.unwrap(e, EsRejectedExecutionException.class)); + assertNotNull(ExceptionsHelper.unwrap(e, OpenSearchRejectedExecutionException.class)); onFail.run(); }; ClientScrollableHitSource hitSource = new ClientScrollableHitSource(logger, buildTestBackoffPolicy(), @@ -344,7 +344,7 @@ public ScheduledCancellable schedule(Runnable command, TimeValue delay, String n // While we're here we can check that the sleep made it through assertThat(delay.nanos(), greaterThan(0L)); assertThat(delay.seconds(), lessThanOrEqualTo(10L)); - final EsRejectedExecutionException exception = new EsRejectedExecutionException("test"); + final OpenSearchRejectedExecutionException exception = new OpenSearchRejectedExecutionException("test"); if (command instanceof AbstractRunnable) { ((AbstractRunnable) command).onRejection(exception); return null; @@ -356,7 +356,7 @@ public ScheduledCancellable schedule(Runnable command, TimeValue delay, String n ScrollableHitSource.Response response = new ScrollableHitSource.Response(false, emptyList(), 0, emptyList(), null); simulateScrollResponse(new DummyAsyncBulkByScrollAction(), System.nanoTime(), 10, response); ExecutionException e = expectThrows(ExecutionException.class, () -> listener.get()); - assertThat(e.getCause(), instanceOf(EsRejectedExecutionException.class)); + assertThat(e.getCause(), instanceOf(OpenSearchRejectedExecutionException.class)); assertThat(e.getCause(), hasToString(containsString("test"))); assertThat(client.scrollsCleared, contains(scrollId)); @@ -902,7 +902,7 @@ void doExecute(ActionType action, Request request, ActionListener action, Request request, ActionListener randomSearchSourceBuilder( () -> null, diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java index 47a843db59c48..6729ad2882da9 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -34,7 +34,7 @@ import static java.util.Collections.emptyList; import static org.opensearch.common.unit.TimeValue.timeValueMillis; -public class BulkIndexByScrollResponseTests extends ESTestCase { +public class BulkIndexByScrollResponseTests extends OpenSearchTestCase { public void testMergeConstructor() { int mergeCount = between(2, 10); List responses = new ArrayList<>(mergeCount); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 3368a956b9545..5613275777763 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -56,8 +56,8 @@ import java.util.stream.IntStream; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java index d357204eec7c9..5c6b3b74b13bb 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java @@ -36,14 +36,14 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.index.reindex.ClientScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.internal.InternalSearchResponse; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -63,7 +63,7 @@ import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.instanceOf; -public class ClientScrollableHitSourceTests extends ESTestCase { +public class ClientScrollableHitSourceTests extends OpenSearchTestCase { private ThreadPool threadPool; @@ -98,7 +98,7 @@ public void testRetryFail() { ExpectedException ex = expectThrows(ExpectedException.class, () -> { dotestBasicsWithRetry(retries, retries+1, retries+1, e -> { throw new ExpectedException(e); }); }); - assertThat(ex.getCause(), instanceOf(EsRejectedExecutionException.class)); + assertThat(ex.getCause(), instanceOf(OpenSearchRejectedExecutionException.class)); } private void dotestBasicsWithRetry(int retries, int minFailures, int maxFailures, @@ -115,7 +115,7 @@ private void dotestBasicsWithRetry(int retries, int minFailures, int maxFailures hitSource.start(); for (int retry = 0; retry < randomIntBetween(minFailures, maxFailures); ++retry) { - client.fail(SearchAction.INSTANCE, new EsRejectedExecutionException()); + client.fail(SearchAction.INSTANCE, new OpenSearchRejectedExecutionException()); client.awaitOperation(); ++expectedSearchRetries; } @@ -131,7 +131,7 @@ private void dotestBasicsWithRetry(int retries, int minFailures, int maxFailures asyncResponse.done(TimeValue.ZERO); for (int retry = 0; retry < randomIntBetween(minFailures, maxFailures); ++retry) { - client.fail(SearchScrollAction.INSTANCE, new EsRejectedExecutionException()); + client.fail(SearchScrollAction.INSTANCE, new OpenSearchRejectedExecutionException()); client.awaitOperation(); ++expectedSearchRetries; } diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java index 2277d2b7475ba..6b47160f48a4a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java @@ -33,8 +33,8 @@ import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.InternalSettingsPlugin; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalSettingsPlugin; +import org.opensearch.test.InternalTestCluster; import org.opensearch.threadpool.ThreadPool; import java.util.ArrayList; @@ -49,8 +49,8 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.hasSize; public class DeleteByQueryBasicTests extends ReindexTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java index 4cf3c3984d0a0..4f6ba74646eb0 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java @@ -31,7 +31,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; public class DeleteByQueryConcurrentTests extends ReindexTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java index be9387d33a595..3d6207cc83388 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java @@ -32,7 +32,7 @@ import java.util.stream.Collectors; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.lessThanOrEqualTo; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java index 8a5e8115b673f..5c329c49fdbfe 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.net.UnknownHostException; import java.util.ArrayList; @@ -38,7 +38,7 @@ /** * Tests the reindex-from-remote whitelist of remotes. */ -public class ReindexFromRemoteWhitelistTests extends ESTestCase { +public class ReindexFromRemoteWhitelistTests extends OpenSearchTestCase { private final BytesReference query = new BytesArray("{ \"foo\" : \"bar\" }"); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index ab3a441d35d16..f6ecba864389f 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -53,7 +53,7 @@ import org.opensearch.rest.RestStatus; import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Netty4Plugin; import org.elasticsearch.watcher.ResourceWatcherService; @@ -72,7 +72,7 @@ import static org.opensearch.index.reindex.ReindexTestCase.matcher; import static org.hamcrest.Matchers.containsString; -public class ReindexFromRemoteWithAuthTests extends ESSingleNodeTestCase { +public class ReindexFromRemoteWithAuthTests extends OpenSearchSingleNodeTestCase { private TransportAddress address; @Override diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index 3a9a309352266..e7bf5eee5b3ff 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -36,7 +36,7 @@ import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.mocksocket.MockHttpServer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.elasticsearch.watcher.ResourceWatcherService; import org.hamcrest.Matchers; import org.junit.AfterClass; @@ -70,7 +70,7 @@ * right SSL keys + trust settings. */ @SuppressForbidden(reason = "use http server") -public class ReindexRestClientSslTests extends ESTestCase { +public class ReindexRestClientSslTests extends OpenSearchTestCase { private static HttpsServer server; private static Consumer handler = ignore -> { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java index 290693085542d..558e5d0b6d2af 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java @@ -24,15 +24,15 @@ import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Arrays; import java.util.Collection; import static org.opensearch.index.reindex.ReindexTestCase.matcher; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; -public class ReindexSingleNodeTests extends ESSingleNodeTestCase { +public class ReindexSingleNodeTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { return Arrays.asList(ReindexPlugin.class); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java index b3078a38902c3..46392c41e92b3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java @@ -35,10 +35,9 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.opensearch.index.reindex.RemoteInfo; import org.opensearch.indices.SystemIndices; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; @@ -51,7 +50,7 @@ * from remote don't need to come from existing indexes. It'd be silly to fail requests if the source index didn't exist on the target * cluster.... */ -public class ReindexSourceTargetValidationTests extends ESTestCase { +public class ReindexSourceTargetValidationTests extends OpenSearchTestCase { private static final ClusterState STATE = ClusterState.builder(new ClusterName("test")).metadata(Metadata.builder() .put(index("target", "target_alias", "target_multi"), true) .put(index("target2", "target_multi"), true) diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java index 87be5d6e72969..c219d4ff4a5fe 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java @@ -27,8 +27,8 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; import java.util.Arrays; import java.util.Collection; @@ -36,13 +36,13 @@ import java.util.stream.Collectors; import static java.util.Collections.singleton; -import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; +import static org.opensearch.test.OpenSearchIntegTestCase.Scope.SUITE; /** * Base test case for integration tests against the reindex plugin. */ @ClusterScope(scope = SUITE) -public abstract class ReindexTestCase extends ESIntegTestCase { +public abstract class ReindexTestCase extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(ReindexPlugin.class); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java index a16944d56f8a2..81f1424b51619 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestDeleteByQueryActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java index 14719c8175547..fcc6f2ffdb1a3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestReindexActionTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java index 29aeb8f425440..8318f9c35f64a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RestUpdateByQueryActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.search.RestSearchAction; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index 7f36771cbed84..9e3cf83dcd86d 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.http.HttpInfo; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; @@ -44,7 +44,7 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Netty4Plugin; import org.junit.After; @@ -66,7 +66,7 @@ * Integration test for bulk retry behavior. Useful because retrying relies on the way that the * rest of OpenSearch throws exceptions and unit tests won't verify that. */ -public class RetryTests extends ESIntegTestCase { +public class RetryTests extends OpenSearchIntegTestCase { private static final int DOC_COUNT = 20; @@ -225,7 +225,7 @@ private void testCase( /** * Blocks the named executor by getting its only thread running a task blocked on a CyclicBarrier and fills the queue with a noop task. - * So requests to use this queue should get {@link EsRejectedExecutionException}s. + * So requests to use this queue should get {@link OpenSearchRejectedExecutionException}s. */ private CyclicBarrier blockExecutor(String name, String node) throws Exception { ThreadPool threadPool = internalCluster().getInstance(ThreadPool.class, node); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java index 71aeaba7ca44b..07639efa21e64 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java @@ -38,7 +38,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -51,7 +51,7 @@ /** * Round trip tests for all {@link Writeable} things declared in this plugin. */ -public class RoundTripTests extends ESTestCase { +public class RoundTripTests extends OpenSearchTestCase { public void testReindexRequest() throws IOException { ReindexRequest reindex = new ReindexRequest(); randomRequest(reindex); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java index 8d36f845621c0..478267b4e92da 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.reindex.BulkByScrollTask; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import org.junit.Before; import org.mockito.ArgumentCaptor; @@ -49,7 +49,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class TransportRethrottleActionTests extends ESTestCase { +public class TransportRethrottleActionTests extends OpenSearchTestCase { private int slices; private BulkByScrollTask task; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java index 67f0d2d43eea0..fba3b5cf7aa9b 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.hasSize; public class UpdateByQueryBasicTests extends ReindexTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java index aca5d880e1d88..b8330adb0e178 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java @@ -21,11 +21,11 @@ import org.opensearch.common.bytes.BytesArray; import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static java.util.Collections.emptyMap; -public class RemoteInfoTests extends ESTestCase { +public class RemoteInfoTests extends OpenSearchTestCase { private RemoteInfo newRemoteInfo(String scheme, String prefixPath, String username, String password) { return new RemoteInfo(scheme, "testhost", 12344, prefixPath,new BytesArray("{ \"foo\" : \"bar\" }"), username, password, emptyMap(), RemoteInfo.DEFAULT_SOCKET_TIMEOUT, RemoteInfo.DEFAULT_CONNECT_TIMEOUT); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java index dc9bd0de14b72..7fb571545eccc 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.Streams; import org.opensearch.common.unit.TimeValue; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.InputStreamReader; @@ -57,7 +57,7 @@ * for versions like {@code 2000099} for {@code 2.0.0-alpha1}. Do not drop support for * features from this file just because the version constants have been removed. */ -public class RemoteRequestBuildersTests extends ESTestCase { +public class RemoteRequestBuildersTests extends OpenSearchTestCase { public void testIntialSearchPath() { Version remoteVersion = Version.fromId(between(0, Version.CURRENT.id)); BytesReference query = new BytesArray("{}"); diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java index 7a118d260c234..37eb9710e1442 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteResponseParsersTests.java @@ -20,32 +20,32 @@ package org.opensearch.index.reindex.remote; import org.opensearch.action.search.ShardSearchFailure; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.index.reindex.ScrollableHitSource; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.io.IOException; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -public class RemoteResponseParsersTests extends ESTestCase { +public class RemoteResponseParsersTests extends OpenSearchTestCase { /** * Check that we can parse shard search failures without index information. */ public void testFailureWithoutIndex() throws IOException { - ShardSearchFailure failure = new ShardSearchFailure(new EsRejectedExecutionException("exhausted")); + ShardSearchFailure failure = new ShardSearchFailure(new OpenSearchRejectedExecutionException("exhausted")); XContentBuilder builder = jsonBuilder(); failure.toXContent(builder, ToXContent.EMPTY_PARAMS); try (XContentParser parser = createParser(builder)) { ScrollableHitSource.SearchFailure parsed = RemoteResponseParsers.SEARCH_FAILURE_PARSER.parse(parser, null); assertNotNull(parsed.getReason()); assertThat(parsed.getReason().getMessage(), Matchers.containsString("exhausted")); - assertThat(parsed.getReason(), Matchers.instanceOf(EsRejectedExecutionException.class)); + assertThat(parsed.getReason(), Matchers.instanceOf(OpenSearchRejectedExecutionException.class)); } } } diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index 2e9b83f136e25..17d9c5f0310fd 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -50,14 +50,14 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.index.reindex.RejectAwareActionListener; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource.Response; import org.opensearch.rest.RestStatus; import org.opensearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -90,7 +90,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class RemoteScrollableHitSourceTests extends ESTestCase { +public class RemoteScrollableHitSourceTests extends OpenSearchTestCase { private static final String FAKE_SCROLL_ID = "DnF1ZXJ5VGhlbkZldGNoBQAAAfakescroll"; private int retries; private ThreadPool threadPool; @@ -103,7 +103,7 @@ public class RemoteScrollableHitSourceTests extends ESTestCase { @Override public void setUp() throws Exception { super.setUp(); - final ExecutorService directExecutor = EsExecutors.newDirectExecutorService(); + final ExecutorService directExecutor = OpenSearchExecutors.newDirectExecutorService(); threadPool = new TestThreadPool(getTestName()) { @Override public ExecutorService executor(String name) { @@ -254,7 +254,7 @@ public void testParseRejection() throws Exception { assertEquals("test", r.getFailures().get(0).getIndex()); assertEquals((Integer) 0, r.getFailures().get(0).getShardId()); assertEquals("87A7NvevQxSrEwMbtRCecg", r.getFailures().get(0).getNodeId()); - assertThat(r.getFailures().get(0).getReason(), instanceOf(EsRejectedExecutionException.class)); + assertThat(r.getFailures().get(0).getReason(), instanceOf(OpenSearchRejectedExecutionException.class)); assertEquals("rejected execution of org.opensearch.transport.TransportService$5@52d06af2 on " + "EsThreadPoolExecutor[search, queue capacity = 1000, org.opensearch.common.util.concurrent." + "EsThreadPoolExecutor@778ea553[Running, pool size = 7, active threads = 7, queued tasks = 1000, " diff --git a/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java b/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java index ed7e83d535a5b..4e1c9decc2975 100644 --- a/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java +++ b/modules/reindex/src/yamlRestTest/java/org/opensearch/index/reindex/ReindexClientYamlTestSuiteIT.java @@ -22,16 +22,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class ReindexClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class ReindexClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public ReindexClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java index 04d9d23112b90..f3d45f5997a75 100644 --- a/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java +++ b/modules/repository-url/src/internalClusterTest/java/org/opensearch/repositories/url/URLSnapshotRestoreIT.java @@ -30,19 +30,19 @@ import org.opensearch.plugins.Plugin; import org.opensearch.repositories.fs.FsRepository; import org.opensearch.snapshots.SnapshotState; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.nio.file.Path; import java.util.Collection; import java.util.Collections; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) -public class URLSnapshotRestoreIT extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST) +public class URLSnapshotRestoreIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java index ceb86b81c88bc..07dd6fb4faa53 100644 --- a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java +++ b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.blobstore.BlobPath; import org.opensearch.common.settings.Settings; import org.elasticsearch.mocksocket.MockHttpServer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -40,7 +40,7 @@ import java.nio.file.NoSuchFileException; @SuppressForbidden(reason = "use http server") -public class URLBlobStoreTests extends ESTestCase { +public class URLBlobStoreTests extends OpenSearchTestCase { private static HttpServer httpServer; private static String blobName; diff --git a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java index f364034c1c735..a4e3e08196fa9 100644 --- a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java +++ b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java @@ -18,7 +18,7 @@ */ package org.opensearch.repositories.url; -import org.elasticsearch.test.fixture.AbstractHttpFixture; +import org.opensearch.test.fixture.AbstractHttpFixture; import org.opensearch.common.SuppressForbidden; import org.opensearch.rest.RestStatus; diff --git a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java index e5ef6c2b3ca3f..a421f11b1e557 100644 --- a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java +++ b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.RepositoryException; import org.opensearch.repositories.blobstore.BlobStoreTestUtil; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.Path; @@ -38,7 +38,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -public class URLRepositoryTests extends ESTestCase { +public class URLRepositoryTests extends OpenSearchTestCase { private URLRepository createRepository(Settings baseSettings, RepositoryMetadata repositoryMetadata) { return new URLRepository(repositoryMetadata, TestEnvironment.newEnvironment(baseSettings), diff --git a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java index ca6d7d57032fb..18ea55e8db422 100644 --- a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java +++ b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java @@ -34,8 +34,8 @@ import org.opensearch.common.xcontent.support.XContentMapValues; import org.opensearch.repositories.fs.FsRepository; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; import org.junit.Before; import java.io.IOException; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; -public class RepositoryURLClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class RepositoryURLClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public RepositoryURLClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -58,7 +58,7 @@ public RepositoryURLClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } /** diff --git a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java index 0485af0e9ed3b..4b57557dcb8c8 100644 --- a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java +++ b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java @@ -22,8 +22,8 @@ import org.opensearch.Build; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.hamcrest.OptionalMatchers; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.hamcrest.OptionalMatchers; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; @@ -44,7 +44,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class SystemdPluginTests extends ESTestCase { +public class SystemdPluginTests extends OpenSearchTestCase { private final Build.Type randomPackageBuildType = randomFrom(Build.Type.DEB, Build.Type.RPM); private final Build.Type randomNonPackageBuildType = diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java index 156e919b8f755..4b39ce416aac9 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java @@ -21,14 +21,14 @@ import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.netty4.Netty4Transport; import java.util.Collection; import java.util.Collections; -public abstract class OpenSearchNetty4IntegTestCase extends ESIntegTestCase { +public abstract class OpenSearchNetty4IntegTestCase extends OpenSearchIntegTestCase { @Override protected boolean ignoreExternalCluster() { diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java index 6f6bc6000e151..9947596266e38 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java @@ -30,8 +30,8 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.http.HttpServerTransport; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java index f3a764ddc2cbb..e83e8d0e1aff0 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4PipeliningIT.java @@ -24,8 +24,8 @@ import org.opensearch.OpenSearchNetty4IntegTestCase; import org.opensearch.common.transport.TransportAddress; import org.opensearch.http.HttpServerTransport; -import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import java.util.Collection; import java.util.Locale; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java index 6ba662da87972..f492236df9c6f 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java @@ -34,8 +34,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.http.HttpServerTransport; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.InternalTestCluster; import org.hamcrest.Matchers; import java.io.IOException; @@ -47,7 +47,7 @@ // These tests are here today so they have access to a proper REST client. They cannot be in :server:integTest since the REST client needs a // proper transport implementation, and they cannot be REST tests today since they need to restart nodes. When #35599 and friends land we // should be able to move these tests to run against a proper cluster instead. TODO do this. -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false) +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false) public class Zen2RestApiIT extends OpenSearchNetty4IntegTestCase { @Override diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java index 890a1bdab8e7a..72542302bfd56 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java @@ -30,9 +30,9 @@ import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.test.ESIntegTestCase.Scope; -import org.elasticsearch.test.junit.annotations.Network; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; +import org.opensearch.test.junit.annotations.Network; import org.opensearch.transport.MockTransportClient; import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.TransportInfo; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java index 0b6a158d40716..d6b68e4c4b69f 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportPublishAddressIT.java @@ -27,7 +27,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.TransportInfo; @@ -41,7 +41,7 @@ * Checks that OpenSearch produces a sane publish_address when it binds to * different ports on ipv4 and ipv6. */ -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0) public class Netty4TransportPublishAddressIT extends OpenSearchNetty4IntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java index b56a2cdfe0504..6e86a202e6b9f 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java @@ -24,16 +24,16 @@ import org.opensearch.OpenSearchNetty4IntegTestCase; import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest; import org.opensearch.common.logging.Loggers; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.transport.TcpTransport; import org.opensearch.transport.TransportLogger; import java.io.IOException; -@ESIntegTestCase.ClusterScope(numDataNodes = 2, scope = ESIntegTestCase.Scope.TEST) +@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 2, scope = OpenSearchIntegTestCase.Scope.TEST) public class OpenSearchLoggingHandlerIT extends OpenSearchNetty4IntegTestCase { private MockLogAppender appender; diff --git a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java index f96b13c877285..bf512658d5298 100644 --- a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java +++ b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4BadRequestIT.java @@ -27,20 +27,20 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.http.HttpTransportSettings; -import org.elasticsearch.test.rest.ESRestTestCase; -import org.elasticsearch.test.rest.yaml.ObjectPath; +import org.opensearch.test.rest.OpenSearchRestTestCase; +import org.opensearch.test.rest.yaml.ObjectPath; import java.io.IOException; import java.nio.charset.Charset; import java.util.Map; import static org.opensearch.rest.RestStatus.BAD_REQUEST; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; -public class Netty4BadRequestIT extends ESRestTestCase { +public class Netty4BadRequestIT extends OpenSearchRestTestCase { public void testBadRequest() throws IOException { final Response response = client().performRequest(new Request("GET", "/_nodes/settings")); diff --git a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java index 7cea4af302e1c..dd34943cb2967 100644 --- a/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java +++ b/modules/transport-netty4/src/javaRestTest/java/org/opensearch/rest/Netty4HeadBodyIsEmptyIT.java @@ -23,7 +23,7 @@ import org.opensearch.client.Response; import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import org.hamcrest.Matcher; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.opensearch.rest.RestStatus.OK; import static org.hamcrest.Matchers.greaterThan; -public class Netty4HeadBodyIsEmptyIT extends ESRestTestCase { +public class Netty4HeadBodyIsEmptyIT extends OpenSearchRestTestCase { public void testHeadRoot() throws IOException { headTestCase("/", emptyMap(), greaterThan(0)); headTestCase("/", singletonMap("pretty", ""), greaterThan(0)); diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java index a23c6eead41c3..d772847c4d5d7 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java @@ -50,7 +50,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.core.internal.net.NetUtils; @@ -149,7 +149,7 @@ public Netty4HttpServerTransport(Settings settings, NetworkService networkServic NamedXContentRegistry xContentRegistry, Dispatcher dispatcher, ClusterSettings clusterSettings, SharedGroupFactory sharedGroupFactory) { super(settings, networkService, bigArrays, threadPool, xContentRegistry, dispatcher, clusterSettings); - Netty4Utils.setAvailableProcessors(EsExecutors.NODE_PROCESSORS_SETTING.get(settings)); + Netty4Utils.setAvailableProcessors(OpenSearchExecutors.NODE_PROCESSORS_SETTING.get(settings)); NettyAllocator.logAllocatorDescriptionIfNeeded(); this.sharedGroupFactory = sharedGroupFactory; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java index b0ea495d60722..ddb67b9685cc9 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory; /** * Creates and returns {@link io.netty.channel.EventLoopGroup} instances. It will return a shared group for diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java index 01a625e734441..fbe335de4e1ba 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java @@ -48,7 +48,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.core.internal.net.NetUtils; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.threadpool.ThreadPool; @@ -79,7 +79,7 @@ public class Netty4Transport extends TcpTransport { public static final Setting WORKER_COUNT = new Setting<>("transport.netty.worker_count", - (s) -> Integer.toString(EsExecutors.allocatedProcessors(s)), + (s) -> Integer.toString(OpenSearchExecutors.allocatedProcessors(s)), (s) -> Setting.parseInt(s, 1, "transport.netty.worker_count"), Property.NodeScope); public static final Setting NETTY_RECEIVE_PREDICTOR_SIZE = Setting.byteSizeSetting( @@ -104,7 +104,7 @@ public Netty4Transport(Settings settings, Version version, ThreadPool threadPool PageCacheRecycler pageCacheRecycler, NamedWriteableRegistry namedWriteableRegistry, CircuitBreakerService circuitBreakerService, SharedGroupFactory sharedGroupFactory) { super(settings, version, threadPool, pageCacheRecycler, circuitBreakerService, namedWriteableRegistry, networkService); - Netty4Utils.setAvailableProcessors(EsExecutors.NODE_PROCESSORS_SETTING.get(settings)); + Netty4Utils.setAvailableProcessors(OpenSearchExecutors.NODE_PROCESSORS_SETTING.get(settings)); NettyAllocator.logAllocatorDescriptionIfNeeded(); this.sharedGroupFactory = sharedGroupFactory; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java index 8c67760f9a46a..f1acb71e1d408 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java @@ -36,7 +36,7 @@ import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -public class Netty4BadRequestTests extends ESTestCase { +public class Netty4BadRequestTests extends OpenSearchTestCase { private NetworkService networkService; private MockBigArrays bigArrays; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandlerTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandlerTests.java index 06034b16c418f..0579923796093 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandlerTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandlerTests.java @@ -35,7 +35,7 @@ import org.opensearch.http.HttpPipelinedResponse; import org.opensearch.http.HttpResponse; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import java.nio.channels.ClosedChannelException; @@ -55,7 +55,7 @@ import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; import static org.hamcrest.core.Is.is; -public class Netty4HttpPipeliningHandlerTests extends ESTestCase { +public class Netty4HttpPipeliningHandlerTests extends OpenSearchTestCase { private final ExecutorService handlerService = Executors.newFixedThreadPool(randomIntBetween(4, 8)); private final ExecutorService eventLoopService = Executors.newFixedThreadPool(1); diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java index 1b5150494a4f2..17cf639d74f4d 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java @@ -41,7 +41,7 @@ import org.opensearch.http.NullDispatcher; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; @@ -61,7 +61,7 @@ /** * This test just tests, if he pipelining works in general with out any connection the OpenSearch handler */ -public class Netty4HttpServerPipeliningTests extends ESTestCase { +public class Netty4HttpServerPipeliningTests extends OpenSearchTestCase { private NetworkService networkService; private ThreadPool threadPool; private MockBigArrays bigArrays; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java index 560365f340d30..f00bccb2fcf60 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java @@ -66,8 +66,8 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; @@ -95,7 +95,7 @@ /** * Tests for the {@link Netty4HttpServerTransport} class. */ -public class Netty4HttpServerTransportTests extends ESTestCase { +public class Netty4HttpServerTransportTests extends OpenSearchTestCase { private NetworkService networkService; private ThreadPool threadPool; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java index 54120439da487..4686b23f0f05b 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java @@ -31,7 +31,7 @@ import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.nio.NioEventLoopGroup; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.InetAddress; @@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -public class CopyBytesSocketChannelTests extends ESTestCase { +public class CopyBytesSocketChannelTests extends OpenSearchTestCase { private final UnpooledByteBufAllocator alloc = new UnpooledByteBufAllocator(false); private final AtomicReference accepted = new AtomicReference<>(); diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/SharedGroupFactoryTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/SharedGroupFactoryTests.java index 854fd93a90c9a..27883a304f4d1 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/SharedGroupFactoryTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/SharedGroupFactoryTests.java @@ -21,9 +21,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.http.netty4.Netty4HttpServerTransport; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public final class SharedGroupFactoryTests extends ESTestCase { +public final class SharedGroupFactoryTests extends OpenSearchTestCase { public void testSharedEventLoops() throws Exception { SharedGroupFactory sharedGroupFactory = new SharedGroupFactory(Settings.EMPTY); diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java index df9dab70aa143..745b5ff66d61a 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.mocksocket.MockSocket; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; import org.opensearch.transport.TransportSettings; @@ -48,7 +48,7 @@ * This test checks, if an HTTP look-alike request (starting with an HTTP method and a space) * actually returns text response instead of just dropping the connection */ -public class Netty4SizeHeaderFrameDecoderTests extends ESTestCase { +public class Netty4SizeHeaderFrameDecoderTests extends OpenSearchTestCase { private final Settings settings = Settings.builder() .put("node.name", "NettySizeHeaderFrameDecoderTests") diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java index 207595b8a672c..6e378875ab2f7 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java @@ -31,11 +31,11 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class Netty4UtilsTests extends ESTestCase { +public class Netty4UtilsTests extends OpenSearchTestCase { private static final int PAGE_SIZE = PageCacheRecycler.BYTE_PAGE_SIZE; private final BigArrays bigarrays = new BigArrays(null, new NoneCircuitBreakerService(), CircuitBreaker.REQUEST); diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java index fe5037e6c604f..d865c5b0ef689 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.SharedGroupFactory; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; -public class NettyTransportMultiPortTests extends ESTestCase { +public class NettyTransportMultiPortTests extends OpenSearchTestCase { private String host; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java index 00b8cf3565d72..4839934e28a0c 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java @@ -32,8 +32,8 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.core.internal.net.NetUtils; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.transport.MockTransportService; -import org.elasticsearch.test.transport.StubbableTransport; +import org.opensearch.test.transport.MockTransportService; +import org.opensearch.test.transport.StubbableTransport; import org.opensearch.transport.AbstractSimpleTransportTestCase; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.ConnectionProfile; diff --git a/modules/transport-netty4/src/yamlRestTest/java/org/opensearch/http/netty4/Netty4ClientYamlTestSuiteIT.java b/modules/transport-netty4/src/yamlRestTest/java/org/opensearch/http/netty4/Netty4ClientYamlTestSuiteIT.java index 98a844de297d3..fd89e165ac1ae 100644 --- a/modules/transport-netty4/src/yamlRestTest/java/org/opensearch/http/netty4/Netty4ClientYamlTestSuiteIT.java +++ b/modules/transport-netty4/src/yamlRestTest/java/org/opensearch/http/netty4/Netty4ClientYamlTestSuiteIT.java @@ -24,13 +24,13 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.TimeUnits; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; import org.junit.BeforeClass; //TODO: This is a *temporary* workaround to ensure a timeout does not mask other problems @TimeoutSuite(millis = 30 * TimeUnits.MINUTE) -public class Netty4ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class Netty4ClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { @BeforeClass public static void muteInFips() { assumeFalse("We run with DEFAULT distribution in FIPS mode and default to security4 instead of netty4", inFipsJvm()); @@ -41,7 +41,7 @@ public Netty4ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCan @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/plugins/analysis-icu/src/internalClusterTest/java/org/opensearch/index/mapper/ICUCollationKeywordFieldMapperIT.java b/plugins/analysis-icu/src/internalClusterTest/java/org/opensearch/index/mapper/ICUCollationKeywordFieldMapperIT.java index 58f48ee54970c..8b7cb350f907e 100644 --- a/plugins/analysis-icu/src/internalClusterTest/java/org/opensearch/index/mapper/ICUCollationKeywordFieldMapperIT.java +++ b/plugins/analysis-icu/src/internalClusterTest/java/org/opensearch/index/mapper/ICUCollationKeywordFieldMapperIT.java @@ -38,12 +38,12 @@ import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortMode; import org.opensearch.search.sort.SortOrder; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.Collection; import java.util.Collections; -public class ICUCollationKeywordFieldMapperIT extends ESIntegTestCase { +public class ICUCollationKeywordFieldMapperIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/plugins/analysis-nori/src/test/java/org/opensearch/index/analysis/NoriAnalysisTests.java b/plugins/analysis-nori/src/test/java/org/opensearch/index/analysis/NoriAnalysisTests.java index 21c2b68823869..c11af23d72b2d 100644 --- a/plugins/analysis-nori/src/test/java/org/opensearch/index/analysis/NoriAnalysisTests.java +++ b/plugins/analysis-nori/src/test/java/org/opensearch/index/analysis/NoriAnalysisTests.java @@ -30,7 +30,7 @@ import org.opensearch.env.Environment; import org.opensearch.plugin.analysis.nori.AnalysisNoriPlugin; import org.opensearch.test.OpenSearchTestCase.TestAnalysis; -import org.opensearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; import java.io.IOException; import java.io.InputStream; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -public class NoriAnalysisTests extends ESTokenStreamTestCase { +public class NoriAnalysisTests extends OpenSearchTokenStreamTestCase { public void testDefaultsNoriAnalysis() throws IOException { TestAnalysis analysis = createTestAnalysis(Settings.EMPTY); diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java index c7539330f5278..4769477e45d7e 100644 --- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java +++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java @@ -38,7 +38,7 @@ import org.opensearch.discovery.azure.classic.AzureSeedHostsProvider; import org.opensearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportService; import org.junit.After; @@ -53,7 +53,7 @@ import static org.opensearch.common.util.CollectionUtils.newSingletonArrayList; import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING; -public abstract class AbstractAzureComputeServiceTestCase extends ESIntegTestCase { +public abstract class AbstractAzureComputeServiceTestCase extends OpenSearchIntegTestCase { private static final Map nodes = new ConcurrentHashMap<>(); diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java index 2cb9b2062dec3..07a418edb91e2 100644 --- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java +++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java @@ -37,7 +37,7 @@ import org.opensearch.node.Node; import org.opensearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportSettings; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -70,9 +70,9 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; -@ESIntegTestCase.ClusterScope(numDataNodes = 2, numClientNodes = 0) +@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 2, numClientNodes = 0) @SuppressForbidden(reason = "use http server") -public class AzureDiscoveryClusterFormationTests extends ESIntegTestCase { +public class AzureDiscoveryClusterFormationTests extends OpenSearchIntegTestCase { public static class TestPlugin extends Plugin { @Override diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java index 29b5fc83838da..d8154ba1b85b3 100644 --- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java +++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java @@ -23,11 +23,11 @@ import org.opensearch.cloud.azure.classic.management.AzureComputeService.Discovery; import org.opensearch.cloud.azure.classic.management.AzureComputeService.Management; import org.opensearch.common.settings.Settings; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import static org.hamcrest.Matchers.containsString; -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java index aefa0b7ca5dcf..214c5578f1db5 100644 --- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java +++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java @@ -23,9 +23,9 @@ import org.opensearch.cloud.azure.classic.management.AzureComputeService.Discovery; import org.opensearch.cloud.azure.classic.management.AzureComputeService.Management; import org.opensearch.common.settings.Settings; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) diff --git a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java index e5d96b7870470..35e6a123b5cfc 100644 --- a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java +++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java @@ -25,8 +25,8 @@ import org.opensearch.common.settings.SettingsException; import org.opensearch.env.Environment; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; -import org.opensearch.test.ESIntegTestCase.ThirdParty; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase.ThirdParty; import java.io.IOException; import java.util.Arrays; @@ -39,7 +39,7 @@ * in order to run these tests. */ @ThirdParty -public abstract class AbstractAwsTestCase extends ESIntegTestCase { +public abstract class AbstractAwsTestCase extends OpenSearchIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java index d9d8fbe0361ae..5dbada67d4d48 100644 --- a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java +++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java @@ -24,8 +24,8 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; import org.opensearch.discovery.DiscoveryModule; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import static org.hamcrest.CoreMatchers.is; diff --git a/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java b/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java index 7734556f1d9e3..a2375ff3df278 100644 --- a/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java +++ b/plugins/discovery-gce/src/internalClusterTest/java/org/opensearch/discovery/gce/GceDiscoverTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.plugin.discovery.gce.GceDiscoveryPlugin; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.TransportService; import org.junit.After; @@ -45,8 +45,8 @@ import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoTimeout; -@ESIntegTestCase.ClusterScope(supportsDedicatedMasters = false, numDataNodes = 0, numClientNodes = 0) -public class GceDiscoverTests extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(supportsDedicatedMasters = false, numDataNodes = 0, numClientNodes = 0) +public class GceDiscoverTests extends OpenSearchIntegTestCase { /** Holds a list of the current discovery nodes started in tests **/ private static final Map nodes = new ConcurrentHashMap<>(); diff --git a/plugins/mapper-size/src/internalClusterTest/java/org/opensearch/index/mapper/size/SizeMappingIT.java b/plugins/mapper-size/src/internalClusterTest/java/org/opensearch/index/mapper/size/SizeMappingIT.java index f77738d56b165..21a79f5a1c0af 100644 --- a/plugins/mapper-size/src/internalClusterTest/java/org/opensearch/index/mapper/size/SizeMappingIT.java +++ b/plugins/mapper-size/src/internalClusterTest/java/org/opensearch/index/mapper/size/SizeMappingIT.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.plugin.mapper.MapperSizePlugin; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.Arrays; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class SizeMappingIT extends ESIntegTestCase { +public class SizeMappingIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java index de3a14d333f72..ffd17dc9e982a 100644 --- a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java +++ b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java @@ -83,7 +83,7 @@ import static org.opensearch.repositories.azure.AzureStorageSettings.KEY_SETTING; import static org.opensearch.repositories.azure.AzureStorageSettings.MAX_RETRIES_SETTING; import static org.opensearch.repositories.azure.AzureStorageSettings.TIMEOUT_SETTING; -import static org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.randomBytes; +import static org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase.randomBytes; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java index 1c2382960e2af..672f39c0c7573 100644 --- a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java +++ b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java @@ -71,7 +71,7 @@ import static fixture.gcs.GoogleCloudStorageHttpHandler.getContentRangeStart; import static fixture.gcs.GoogleCloudStorageHttpHandler.parseMultipartRequestBody; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.randomBytes; +import static org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase.randomBytes; import static org.opensearch.repositories.gcs.GoogleCloudStorageClientSettings.CREDENTIALS_FILE_SETTING; import static org.opensearch.repositories.gcs.GoogleCloudStorageClientSettings.ENDPOINT_SETTING; import static org.opensearch.repositories.gcs.GoogleCloudStorageClientSettings.READ_TIMEOUT_SETTING; diff --git a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java index fc406367eb539..56a12c94aa135 100644 --- a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java +++ b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HaHdfsFailoverTestSuiteIT.java @@ -33,7 +33,7 @@ import org.opensearch.client.Response; import org.opensearch.client.RestClient; import org.opensearch.common.io.PathUtils; -import org.opensearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import org.junit.Assert; import java.io.IOException; @@ -49,7 +49,7 @@ /** * Integration test that runs against an HA-Enabled HDFS instance */ -public class HaHdfsFailoverTestSuiteIT extends ESRestTestCase { +public class HaHdfsFailoverTestSuiteIT extends OpenSearchRestTestCase { public void testHAFailoverWithRepository() throws Exception { RestClient client = client(); diff --git a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreContainerTests.java b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreContainerTests.java index c55765192f90d..e03d4f42d84d2 100644 --- a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreContainerTests.java +++ b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreContainerTests.java @@ -43,9 +43,9 @@ import java.security.PrivilegedExceptionAction; import java.util.Collections; -import static org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.randomBytes; -import static org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.readBlobFully; -import static org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase.writeBlob; +import static org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase.randomBytes; +import static org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase.readBlobFully; +import static org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase.writeBlob; @ThreadLeakFilters(filters = {HdfsClientThreadLeakFilter.class}) public class HdfsBlobStoreContainerTests extends OpenSearchTestCase { diff --git a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java index 5274fdab6de93..ca70dec360321 100644 --- a/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java +++ b/plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/HdfsBlobStoreRepositoryTests.java @@ -21,16 +21,16 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; -import org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.Collection; import java.util.Collections; @ThreadLeakFilters(filters = HdfsClientThreadLeakFilter.class) // Ony using a single node here since the TestingFs only supports the single-node case -@ESIntegTestCase.ClusterScope(numDataNodes = 1, supportsDedicatedMasters = false) -public class HdfsBlobStoreRepositoryTests extends ESBlobStoreRepositoryIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 1, supportsDedicatedMasters = false) +public class HdfsBlobStoreRepositoryTests extends OpenSearchBlobStoreRepositoryIntegTestCase { @Override protected String repositoryType() { diff --git a/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java b/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java index 19b7f188bbd60..f1db5b094db8c 100644 --- a/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java +++ b/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java @@ -50,7 +50,7 @@ import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotsService; import org.opensearch.snapshots.mockstore.BlobStoreWrapper; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; @@ -68,7 +68,7 @@ @SuppressForbidden(reason = "this test uses a HttpServer to emulate an S3 endpoint") // Need to set up a new cluster for each test because cluster settings use randomized authentication settings -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST) public class S3BlobStoreRepositoryTests extends OpenSearchMockAPIBasedRepositoryIntegTestCase { private static final TimeValue TEST_COOLDOWN_PERIOD = TimeValue.timeValueSeconds(10L); diff --git a/plugins/store-smb/src/internalClusterTest/java/org/opensearch/index/store/AbstractAzureFsTestCase.java b/plugins/store-smb/src/internalClusterTest/java/org/opensearch/index/store/AbstractAzureFsTestCase.java index 1dac8832609c6..9aa050246972c 100644 --- a/plugins/store-smb/src/internalClusterTest/java/org/opensearch/index/store/AbstractAzureFsTestCase.java +++ b/plugins/store-smb/src/internalClusterTest/java/org/opensearch/index/store/AbstractAzureFsTestCase.java @@ -22,14 +22,14 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.plugin.store.smb.SMBStorePlugin; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.Arrays; import java.util.Collection; import static org.hamcrest.Matchers.is; -public abstract class AbstractAzureFsTestCase extends ESIntegTestCase { +public abstract class AbstractAzureFsTestCase extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(SMBStorePlugin.class); diff --git a/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbMMapDirectoryTests.java b/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbMMapDirectoryTests.java index e53fc2fccadb7..e63dc733c48fd 100644 --- a/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbMMapDirectoryTests.java +++ b/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbMMapDirectoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MMapDirectory; -public class SmbMMapDirectoryTests extends EsBaseDirectoryTestCase { +public class SmbMMapDirectoryTests extends OpenSearchBaseDirectoryTestCase { @Override protected Directory getDirectory(Path file) throws IOException { diff --git a/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbSimpleFSDirectoryTests.java b/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbSimpleFSDirectoryTests.java index 40167668ac37d..aee3c52532f81 100644 --- a/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbSimpleFSDirectoryTests.java +++ b/plugins/store-smb/src/test/java/org/opensearch/index/store/SmbSimpleFSDirectoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.SimpleFSDirectory; -public class SmbSimpleFSDirectoryTests extends EsBaseDirectoryTestCase { +public class SmbSimpleFSDirectoryTests extends OpenSearchBaseDirectoryTestCase { @Override protected Directory getDirectory(Path file) throws IOException { diff --git a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java index 77ca71ec4a2a4..43f53470d3762 100644 --- a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java +++ b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java @@ -21,13 +21,13 @@ import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.nio.NioTransportPlugin; import java.util.Collection; import java.util.Collections; -public abstract class NioIntegTestCase extends ESIntegTestCase { +public abstract class NioIntegTestCase extends OpenSearchIntegTestCase { @Override protected boolean ignoreExternalCluster() { diff --git a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/http/nio/NioPipeliningIT.java b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/http/nio/NioPipeliningIT.java index a730297fa5257..694908e487915 100644 --- a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/http/nio/NioPipeliningIT.java +++ b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/http/nio/NioPipeliningIT.java @@ -23,8 +23,8 @@ import org.opensearch.NioIntegTestCase; import org.opensearch.common.transport.TransportAddress; import org.opensearch.http.HttpServerTransport; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import java.util.Collection; import java.util.Locale; diff --git a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/transport/nio/NioTransportLoggingIT.java b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/transport/nio/NioTransportLoggingIT.java index 653904580df4b..bd3152167d723 100644 --- a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/transport/nio/NioTransportLoggingIT.java +++ b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/transport/nio/NioTransportLoggingIT.java @@ -25,7 +25,7 @@ import org.opensearch.NioIntegTestCase; import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest; import org.opensearch.common.logging.Loggers; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.InternalTestCluster; import org.opensearch.test.MockLogAppender; import org.opensearch.test.junit.annotations.TestLogging; @@ -34,7 +34,7 @@ import java.io.IOException; -@ESIntegTestCase.ClusterScope(numDataNodes = 2, scope = ESIntegTestCase.Scope.TEST) +@OpenSearchIntegTestCase.ClusterScope(numDataNodes = 2, scope = OpenSearchIntegTestCase.Scope.TEST) public class NioTransportLoggingIT extends NioIntegTestCase { private MockLogAppender appender; diff --git a/qa/evil-tests/src/test/java/org/opensearch/threadpool/EvilThreadPoolTests.java b/qa/evil-tests/src/test/java/org/opensearch/threadpool/EvilThreadPoolTests.java index 2dc17e09f3f7c..ee8deb49ee955 100644 --- a/qa/evil-tests/src/test/java/org/opensearch/threadpool/EvilThreadPoolTests.java +++ b/qa/evil-tests/src/test/java/org/opensearch/threadpool/EvilThreadPoolTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.test.OpenSearchTestCase; @@ -64,14 +64,14 @@ public void testExecutionErrorOnDefaultThreadPoolTypes() throws InterruptedExcep } public void testExecutionErrorOnDirectExecutorService() throws InterruptedException { - final ExecutorService directExecutorService = EsExecutors.newDirectExecutorService(); + final ExecutorService directExecutorService = OpenSearchExecutors.newDirectExecutorService(); checkExecutionError(getExecuteRunner(directExecutorService)); checkExecutionError(getSubmitRunner(directExecutorService)); } public void testExecutionErrorOnFixedESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor fixedExecutor = EsExecutors.newFixed("test", 1, 1, - EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor fixedExecutor = OpenSearchExecutors.newFixed("test", 1, 1, + OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { checkExecutionError(getExecuteRunner(fixedExecutor)); checkExecutionError(getSubmitRunner(fixedExecutor)); @@ -81,8 +81,8 @@ public void testExecutionErrorOnFixedESThreadPoolExecutor() throws InterruptedEx } public void testExecutionErrorOnScalingESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor scalingExecutor = EsExecutors.newScaling("test", 1, 1, - 10, TimeUnit.SECONDS, EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor scalingExecutor = OpenSearchExecutors.newScaling("test", 1, 1, + 10, TimeUnit.SECONDS, OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { checkExecutionError(getExecuteRunner(scalingExecutor)); checkExecutionError(getSubmitRunner(scalingExecutor)); @@ -92,8 +92,8 @@ public void testExecutionErrorOnScalingESThreadPoolExecutor() throws Interrupted } public void testExecutionErrorOnAutoQueueFixedESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor autoQueueFixedExecutor = EsExecutors.newAutoQueueFixed("test", 1, 1, - 1, 1, 1, TimeValue.timeValueSeconds(10), EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor autoQueueFixedExecutor = OpenSearchExecutors.newAutoQueueFixed("test", 1, 1, + 1, 1, 1, TimeValue.timeValueSeconds(10), OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { checkExecutionError(getExecuteRunner(autoQueueFixedExecutor)); checkExecutionError(getSubmitRunner(autoQueueFixedExecutor)); @@ -103,8 +103,8 @@ public void testExecutionErrorOnAutoQueueFixedESThreadPoolExecutor() throws Inte } public void testExecutionErrorOnSinglePrioritizingThreadPoolExecutor() throws InterruptedException { - final PrioritizedEsThreadPoolExecutor prioritizedExecutor = EsExecutors.newSinglePrioritizing("test", - EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext(), threadPool.scheduler()); + final PrioritizedEsThreadPoolExecutor prioritizedExecutor = OpenSearchExecutors.newSinglePrioritizing("test", + OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext(), threadPool.scheduler()); try { checkExecutionError(getExecuteRunner(prioritizedExecutor)); checkExecutionError(getSubmitRunner(prioritizedExecutor)); @@ -173,14 +173,14 @@ public void testExecutionExceptionOnDefaultThreadPoolTypes() throws InterruptedE } public void testExecutionExceptionOnDirectExecutorService() throws InterruptedException { - final ExecutorService directExecutorService = EsExecutors.newDirectExecutorService(); + final ExecutorService directExecutorService = OpenSearchExecutors.newDirectExecutorService(); checkExecutionException(getExecuteRunner(directExecutorService), true); checkExecutionException(getSubmitRunner(directExecutorService), false); } public void testExecutionExceptionOnFixedESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor fixedExecutor = EsExecutors.newFixed("test", 1, 1, - EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor fixedExecutor = OpenSearchExecutors.newFixed("test", 1, 1, + OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { checkExecutionException(getExecuteRunner(fixedExecutor), true); checkExecutionException(getSubmitRunner(fixedExecutor), false); @@ -190,8 +190,8 @@ public void testExecutionExceptionOnFixedESThreadPoolExecutor() throws Interrupt } public void testExecutionExceptionOnScalingESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor scalingExecutor = EsExecutors.newScaling("test", 1, 1, - 10, TimeUnit.SECONDS, EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor scalingExecutor = OpenSearchExecutors.newScaling("test", 1, 1, + 10, TimeUnit.SECONDS, OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { checkExecutionException(getExecuteRunner(scalingExecutor), true); checkExecutionException(getSubmitRunner(scalingExecutor), false); @@ -201,8 +201,8 @@ public void testExecutionExceptionOnScalingESThreadPoolExecutor() throws Interru } public void testExecutionExceptionOnAutoQueueFixedESThreadPoolExecutor() throws InterruptedException { - final EsThreadPoolExecutor autoQueueFixedExecutor = EsExecutors.newAutoQueueFixed("test", 1, 1, - 1, 1, 1, TimeValue.timeValueSeconds(10), EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + final EsThreadPoolExecutor autoQueueFixedExecutor = OpenSearchExecutors.newAutoQueueFixed("test", 1, 1, + 1, 1, 1, TimeValue.timeValueSeconds(10), OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); try { // fixed_auto_queue_size wraps stuff into TimedRunnable, which is an AbstractRunnable checkExecutionException(getExecuteRunner(autoQueueFixedExecutor), true); @@ -213,8 +213,8 @@ public void testExecutionExceptionOnAutoQueueFixedESThreadPoolExecutor() throws } public void testExecutionExceptionOnSinglePrioritizingThreadPoolExecutor() throws InterruptedException { - final PrioritizedEsThreadPoolExecutor prioritizedExecutor = EsExecutors.newSinglePrioritizing("test", - EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext(), threadPool.scheduler()); + final PrioritizedEsThreadPoolExecutor prioritizedExecutor = OpenSearchExecutors.newSinglePrioritizing("test", + OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext(), threadPool.scheduler()); try { checkExecutionException(getExecuteRunner(prioritizedExecutor), true); checkExecutionException(getSubmitRunner(prioritizedExecutor), false); diff --git a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/MixedClusterClientYamlTestSuiteIT.java b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/MixedClusterClientYamlTestSuiteIT.java index d9ea3ee104d9b..bf401f9b72f12 100644 --- a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/MixedClusterClientYamlTestSuiteIT.java +++ b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/MixedClusterClientYamlTestSuiteIT.java @@ -23,10 +23,10 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.TimeUnits; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // some of the windows test VMs are slow as hell -public class MixedClusterClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class MixedClusterClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public MixedClusterClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) { super(testCandidate); diff --git a/qa/multi-cluster-search/src/test/java/org/opensearch/search/MultiClusterSearchYamlTestSuiteIT.java b/qa/multi-cluster-search/src/test/java/org/opensearch/search/MultiClusterSearchYamlTestSuiteIT.java index f51b8371d3dad..de6acd87cd60f 100644 --- a/qa/multi-cluster-search/src/test/java/org/opensearch/search/MultiClusterSearchYamlTestSuiteIT.java +++ b/qa/multi-cluster-search/src/test/java/org/opensearch/search/MultiClusterSearchYamlTestSuiteIT.java @@ -24,10 +24,10 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.TimeUnits; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; @TimeoutSuite(millis = 5 * TimeUnits.MINUTE) // to account for slow as hell VMs -public class MultiClusterSearchYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class MultiClusterSearchYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { @Override protected boolean preserveIndicesUponCompletion() { diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java index cb5088418a7a3..063d48c6d2acf 100644 --- a/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java +++ b/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java @@ -25,10 +25,10 @@ import org.opensearch.common.settings.Settings; import org.opensearch.test.rest.OpenSearchRestTestCase; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; @TimeoutSuite(millis = 5 * TimeUnits.MINUTE) // to account for slow as hell VMs -public class UpgradeClusterClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class UpgradeClusterClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { @Override protected boolean preserveIndicesUponCompletion() { diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/ContextAndHeaderTransportIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/ContextAndHeaderTransportIT.java index e5afa515c550c..5bccf3dcb3087 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/ContextAndHeaderTransportIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/ContextAndHeaderTransportIT.java @@ -54,7 +54,7 @@ import org.opensearch.repositories.RepositoriesService; import org.opensearch.rest.RestHeaderDefinition; import org.opensearch.script.ScriptService; -import org.opensearch.test.ESIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; import org.opensearch.threadpool.ThreadPool; import org.opensearch.watcher.ResourceWatcherService; import org.junit.After; @@ -73,7 +73,7 @@ import static java.util.Collections.singletonList; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.opensearch.test.ESIntegTestCase.Scope.SUITE; +import static org.opensearch.test.OpenSearchIntegTestCase.Scope.SUITE; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/CorsRegexIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/CorsRegexIT.java index 14e188e32521f..f1da52b3a7f71 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/CorsRegexIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/CorsRegexIT.java @@ -23,8 +23,8 @@ import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.common.settings.Settings; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import java.io.IOException; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/DanglingIndicesRestIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/DanglingIndicesRestIT.java index 71f3289ce6d4d..920b3217269d3 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/DanglingIndicesRestIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/DanglingIndicesRestIT.java @@ -25,8 +25,8 @@ import org.opensearch.common.io.Streams; import org.opensearch.common.settings.Settings; import org.opensearch.indices.IndicesService; -import org.opensearch.test.ESIntegTestCase; -import org.opensearch.test.ESIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; import org.opensearch.test.InternalTestCluster; import org.opensearch.test.XContentTestUtils; @@ -59,7 +59,7 @@ * * @see org.opensearch.action.admin.indices.dangling */ -@ClusterScope(numDataNodes = 0, scope = ESIntegTestCase.Scope.TEST, autoManageMasterNodes = false) +@ClusterScope(numDataNodes = 0, scope = OpenSearchIntegTestCase.Scope.TEST, autoManageMasterNodes = false) public class DanglingIndicesRestIT extends HttpSmokeTestCase { private static final String INDEX_NAME = "test-idx-1"; private static final String OTHER_INDEX_NAME = INDEX_NAME + "-other"; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/DetailedErrorsDisabledIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/DetailedErrorsDisabledIT.java index bab6823fe5551..a719375b10075 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/DetailedErrorsDisabledIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/DetailedErrorsDisabledIT.java @@ -26,8 +26,8 @@ import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.common.settings.Settings; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java index f62e3d8a3673e..cb83e38eb8822 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/HttpSmokeTestCase.java @@ -21,7 +21,7 @@ import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.nio.MockNioTransportPlugin; import org.opensearch.transport.nio.NioTransportPlugin; @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.Collection; -public abstract class HttpSmokeTestCase extends ESIntegTestCase { +public abstract class HttpSmokeTestCase extends OpenSearchIntegTestCase { private static String nodeTransportTypeKey; private static String nodeHttpTypeKey; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/IndexingPressureRestIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/IndexingPressureRestIT.java index e1728c2b100b4..516f4bce3f4d1 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/IndexingPressureRestIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/IndexingPressureRestIT.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.index.IndexingPressure; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import org.opensearch.test.XContentTestUtils; import java.io.IOException; diff --git a/qa/smoke-test-http/src/test/java/org/opensearch/http/ResponseHeaderPluginIT.java b/qa/smoke-test-http/src/test/java/org/opensearch/http/ResponseHeaderPluginIT.java index cd6b9c523b615..2b5c12512fb5d 100644 --- a/qa/smoke-test-http/src/test/java/org/opensearch/http/ResponseHeaderPluginIT.java +++ b/qa/smoke-test-http/src/test/java/org/opensearch/http/ResponseHeaderPluginIT.java @@ -23,8 +23,8 @@ import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.plugins.Plugin; -import org.opensearch.test.ESIntegTestCase.ClusterScope; -import org.opensearch.test.ESIntegTestCase.Scope; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.OpenSearchIntegTestCase.Scope; import java.io.IOException; import java.util.ArrayList; diff --git a/qa/smoke-test-ingest-disabled/src/test/java/org/opensearch/smoketest/SmokeTestIngestDisabledClientYamlTestSuiteIT.java b/qa/smoke-test-ingest-disabled/src/test/java/org/opensearch/smoketest/SmokeTestIngestDisabledClientYamlTestSuiteIT.java index 3e8e562cd22a6..1fdd2981345d6 100644 --- a/qa/smoke-test-ingest-disabled/src/test/java/org/opensearch/smoketest/SmokeTestIngestDisabledClientYamlTestSuiteIT.java +++ b/qa/smoke-test-ingest-disabled/src/test/java/org/opensearch/smoketest/SmokeTestIngestDisabledClientYamlTestSuiteIT.java @@ -23,9 +23,9 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class SmokeTestIngestDisabledClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class SmokeTestIngestDisabledClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public SmokeTestIngestDisabledClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public SmokeTestIngestDisabledClientYamlTestSuiteIT(@Name("yaml") ClientYamlTest @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/qa/smoke-test-ingest-with-all-dependencies/src/test/java/org/opensearch/smoketest/SmokeTestIngestWithAllDepsClientYamlTestSuiteIT.java b/qa/smoke-test-ingest-with-all-dependencies/src/test/java/org/opensearch/smoketest/SmokeTestIngestWithAllDepsClientYamlTestSuiteIT.java index 21acaeb1beb94..d2e1d968da5fa 100644 --- a/qa/smoke-test-ingest-with-all-dependencies/src/test/java/org/opensearch/smoketest/SmokeTestIngestWithAllDepsClientYamlTestSuiteIT.java +++ b/qa/smoke-test-ingest-with-all-dependencies/src/test/java/org/opensearch/smoketest/SmokeTestIngestWithAllDepsClientYamlTestSuiteIT.java @@ -23,9 +23,9 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class SmokeTestIngestWithAllDepsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class SmokeTestIngestWithAllDepsClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public SmokeTestIngestWithAllDepsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public SmokeTestIngestWithAllDepsClientYamlTestSuiteIT(@Name("yaml") ClientYamlT @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/qa/smoke-test-multinode/src/test/java/org/opensearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java b/qa/smoke-test-multinode/src/test/java/org/opensearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java index 350bb28c21d16..537857c1a3a76 100644 --- a/qa/smoke-test-multinode/src/test/java/org/opensearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java +++ b/qa/smoke-test-multinode/src/test/java/org/opensearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java @@ -25,10 +25,10 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.TimeUnits; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // some of the windows test VMs are slow as hell -public class SmokeTestMultiNodeClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class SmokeTestMultiNodeClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -36,7 +36,7 @@ public SmokeTestMultiNodeClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandi @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/qa/smoke-test-plugins/src/test/java/org/opensearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java b/qa/smoke-test-plugins/src/test/java/org/opensearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java index 43fce345ad78d..20b85209e57e1 100644 --- a/qa/smoke-test-plugins/src/test/java/org/opensearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java +++ b/qa/smoke-test-plugins/src/test/java/org/opensearch/smoketest/SmokeTestPluginsClientYamlTestSuiteIT.java @@ -23,9 +23,9 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class SmokeTestPluginsClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class SmokeTestPluginsClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public SmokeTestPluginsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); @@ -33,7 +33,7 @@ public SmokeTestPluginsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandida @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/rest-api-spec/src/yamlRestTest/java/org/opensearch/test/rest/ClientYamlTestSuiteIT.java b/rest-api-spec/src/yamlRestTest/java/org/opensearch/test/rest/ClientYamlTestSuiteIT.java index 17a4d73f53710..927ad38215d00 100644 --- a/rest-api-spec/src/yamlRestTest/java/org/opensearch/test/rest/ClientYamlTestSuiteIT.java +++ b/rest-api-spec/src/yamlRestTest/java/org/opensearch/test/rest/ClientYamlTestSuiteIT.java @@ -24,13 +24,13 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.TimeUnits; import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; -import org.opensearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; /** Rest integration test. Runs against a cluster started by {@code gradle integTest} */ //The default 20 minutes timeout isn't always enough, but Darwin CI hosts are incredibly slow... @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) -public class ClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class ClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public ClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) { super(testCandidate); } diff --git a/server/build.gradle b/server/build.gradle index 79516edc92360..86300311fe775 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -120,7 +120,7 @@ dependencies { api "org.apache.logging.log4j:log4j-api:${versions.log4j}" api "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional - // repackaged jna with native bits linked against all elastic supported platforms + // repackaged jna with native bits linked against all supported platforms api "org.opensearch:jna:${versions.jna}" testImplementation(project(":test:framework")) { diff --git a/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java b/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java index b4a3caaa3b03f..abbdf060af19c 100644 --- a/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java @@ -25,7 +25,7 @@ import org.opensearch.action.search.SearchType; import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.query.QueryBuilders; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; @@ -99,7 +99,7 @@ public void onFailure(Exception e) { assertThat(failure.reason().toLowerCase(Locale.ENGLISH), anyOf(containsString("cancelled"), containsString("rejected"))); } - } else if ((unwrap instanceof EsRejectedExecutionException) == false) { + } else if ((unwrap instanceof OpenSearchRejectedExecutionException) == false) { throw new AssertionError("unexpected failure", (Throwable) response); } } diff --git a/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/stats/ClusterStatsIT.java b/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/stats/ClusterStatsIT.java index d24e9005cff3b..5518e475d26a7 100644 --- a/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/stats/ClusterStatsIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/stats/ClusterStatsIT.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.mapper.MapperService; import org.opensearch.monitor.os.OsStats; @@ -38,10 +38,6 @@ import org.opensearch.test.OpenSearchIntegTestCase.Scope; import org.hamcrest.Matchers; -import org.opensearch.action.admin.cluster.stats.ClusterStatsIndices; -import org.opensearch.action.admin.cluster.stats.ClusterStatsNodes; -import org.opensearch.action.admin.cluster.stats.ClusterStatsResponse; -import org.opensearch.action.admin.cluster.stats.IndexFeatureStats; import java.io.IOException; import java.util.HashMap; @@ -236,7 +232,7 @@ public void testValuesSmokeScreen() throws IOException, ExecutionException, Inte public void testAllocatedProcessors() throws Exception { // start one node with 7 processors. - internalCluster().startNode(Settings.builder().put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), 7).build()); + internalCluster().startNode(Settings.builder().put(OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 7).build()); waitForNodes(1); ClusterStatsResponse response = client().admin().cluster().prepareClusterStats().get(); diff --git a/server/src/internalClusterTest/java/org/opensearch/action/bulk/BulkRejectionIT.java b/server/src/internalClusterTest/java/org/opensearch/action/bulk/BulkRejectionIT.java index 60771fb1a8aa8..ef0b90e8a4c1f 100644 --- a/server/src/internalClusterTest/java/org/opensearch/action/bulk/BulkRejectionIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/action/bulk/BulkRejectionIT.java @@ -22,7 +22,7 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.WriteRequest; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.IndexService; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; @@ -88,7 +88,7 @@ public void testBulkRejectionAfterDynamicMappingUpdate() throws Exception { try { bulkFuture1.actionGet(); bulkFuture2.actionGet(); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { // ignored, one of the two bulk requests was rejected outright due to the write queue being full } internalCluster().assertSeqNos(); diff --git a/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java b/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java index b38f4367b98a6..409818dae9876 100644 --- a/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java @@ -33,7 +33,7 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.InternalSettingsPlugin; @@ -270,7 +270,7 @@ public void testWriteCanBeRejectedAtCoordinatingLevel() throws Exception { assertEquals(0, coordinatingWriteLimits.getCurrentReplicaBytes()); }); - expectThrows(EsRejectedExecutionException.class, () -> { + expectThrows(OpenSearchRejectedExecutionException.class, () -> { if (randomBoolean()) { client(coordinatingOnlyNode).bulk(bulkRequest).actionGet(); } else if (randomBoolean()) { @@ -336,7 +336,7 @@ public void testWriteCanBeRejectedAtPrimaryLevel() throws Exception { BulkResponse responses = client(coordinatingOnlyNode).bulk(bulkRequest).actionGet(); assertTrue(responses.hasFailures()); - assertThat(responses.getItems()[0].getFailure().getCause().getCause(), instanceOf(EsRejectedExecutionException.class)); + assertThat(responses.getItems()[0].getFailure().getCause().getCause(), instanceOf(OpenSearchRejectedExecutionException.class)); replicaRelease.close(); diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/recovery/IndexRecoveryIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/recovery/IndexRecoveryIT.java index 89242e9cd7d1d..5955cfec13fe2 100644 --- a/server/src/internalClusterTest/java/org/opensearch/indices/recovery/IndexRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/indices/recovery/IndexRecoveryIT.java @@ -66,7 +66,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.Index; import org.opensearch.index.IndexService; @@ -863,7 +863,7 @@ public void messageReceived(TransportRequestHandler handler, T String reason = randomFrom(rejected, circuit, network); if (reason.equals(rejected)) { logger.info("--> preventing {} response by throwing exception", actionName); - throw new EsRejectedExecutionException(); + throw new OpenSearchRejectedExecutionException(); } else if (reason.equals(circuit)) { logger.info("--> preventing {} response by throwing exception", actionName); throw new CircuitBreakingException("Broken", CircuitBreaker.Durability.PERMANENT); diff --git a/server/src/internalClusterTest/java/org/opensearch/nodesinfo/SimpleNodesInfoIT.java b/server/src/internalClusterTest/java/org/opensearch/nodesinfo/SimpleNodesInfoIT.java index f47077c882dc2..10604065d9a38 100644 --- a/server/src/internalClusterTest/java/org/opensearch/nodesinfo/SimpleNodesInfoIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/nodesinfo/SimpleNodesInfoIT.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.monitor.os.OsInfo; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; @@ -118,8 +118,8 @@ public void testNodesInfosTotalIndexingBuffer() throws Exception { public void testAllocatedProcessors() throws Exception { List nodesIds = internalCluster().startNodes( - Settings.builder().put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), 3).build(), - Settings.builder().put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), 6).build() + Settings.builder().put(OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 3).build(), + Settings.builder().put(OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 6).build() ); final String node_1 = nodesIds.get(0); diff --git a/server/src/internalClusterTest/java/org/opensearch/repositories/fs/FsBlobStoreRepositoryIT.java b/server/src/internalClusterTest/java/org/opensearch/repositories/fs/FsBlobStoreRepositoryIT.java index 4c5086a8d39b8..e617a481d8f00 100644 --- a/server/src/internalClusterTest/java/org/opensearch/repositories/fs/FsBlobStoreRepositoryIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/repositories/fs/FsBlobStoreRepositoryIT.java @@ -27,7 +27,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.core.internal.io.IOUtils; -import org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase; +import org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase; import java.io.IOException; import java.nio.file.Files; @@ -39,7 +39,7 @@ import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.instanceOf; -public class FsBlobStoreRepositoryIT extends ESBlobStoreRepositoryIntegTestCase { +public class FsBlobStoreRepositoryIT extends OpenSearchBlobStoreRepositoryIntegTestCase { @Override protected String repositoryType() { diff --git a/server/src/internalClusterTest/java/org/opensearch/search/functionscore/FunctionScoreIT.java b/server/src/internalClusterTest/java/org/opensearch/search/functionscore/FunctionScoreIT.java index d506e5e0b64d8..2d9489e6f8bcb 100644 --- a/server/src/internalClusterTest/java/org/opensearch/search/functionscore/FunctionScoreIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/search/functionscore/FunctionScoreIT.java @@ -32,7 +32,7 @@ import org.opensearch.script.ScriptType; import org.opensearch.search.aggregations.bucket.terms.Terms; import org.opensearch.test.OpenSearchIntegTestCase; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -132,8 +132,8 @@ public void testScriptScoresWithAgg() throws IOException { } public void testMinScoreFunctionScoreBasic() throws IOException { - float score = randomValueOtherThanMany((f) -> Float.compare(f, 0) < 0, ESTestCase::randomFloat); - float minScore = randomValueOtherThanMany((f) -> Float.compare(f, 0) < 0, ESTestCase::randomFloat); + float score = randomValueOtherThanMany((f) -> Float.compare(f, 0) < 0, OpenSearchTestCase::randomFloat); + float minScore = randomValueOtherThanMany((f) -> Float.compare(f, 0) < 0, OpenSearchTestCase::randomFloat); index(INDEX, TYPE, jsonBuilder().startObject() .field("num", 2) .field("random_score", score) // Pass the random score as a document field so that it can be extracted in the script diff --git a/server/src/main/java/org/opensearch/ExceptionsHelper.java b/server/src/main/java/org/opensearch/ExceptionsHelper.java index ffac79ad2a321..1ad24dd228eab 100644 --- a/server/src/main/java/org/opensearch/ExceptionsHelper.java +++ b/server/src/main/java/org/opensearch/ExceptionsHelper.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.IndexFormatTooOldException; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.common.Nullable; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.Index; import org.opensearch.rest.RestStatus; @@ -74,7 +74,7 @@ public static RestStatus status(Throwable t) { return RestStatus.BAD_REQUEST; } else if (t instanceof JsonParseException) { return RestStatus.BAD_REQUEST; - } else if (t instanceof EsRejectedExecutionException) { + } else if (t instanceof OpenSearchRejectedExecutionException) { return RestStatus.TOO_MANY_REQUESTS; } } diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java index 4c0a16748b987..25e4aac000ea3 100644 --- a/server/src/main/java/org/opensearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -844,7 +844,7 @@ private enum OpenSearchExceptionHandle { org.opensearch.indices.IndexTemplateMissingException::new, 57, UNKNOWN_VERSION_ADDED), SEND_REQUEST_TRANSPORT_EXCEPTION(org.opensearch.transport.SendRequestTransportException.class, org.opensearch.transport.SendRequestTransportException::new, 58, UNKNOWN_VERSION_ADDED), - // 59 used to be EsRejectedExecutionException + // 59 used to be OpenSearchRejectedExecutionException // 60 used to be for EarlyTerminationException // 61 used to be for RoutingValidationException NOT_SERIALIZABLE_EXCEPTION_WRAPPER(org.opensearch.common.io.stream.NotSerializableExceptionWrapper.class, diff --git a/server/src/main/java/org/opensearch/action/StepListener.java b/server/src/main/java/org/opensearch/action/StepListener.java index cc7e5ceda4c3c..a17bca6da41ca 100644 --- a/server/src/main/java/org/opensearch/action/StepListener.java +++ b/server/src/main/java/org/opensearch/action/StepListener.java @@ -20,7 +20,7 @@ package org.opensearch.action; import org.opensearch.common.CheckedConsumer; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.common.util.concurrent.ListenableFuture; @@ -75,7 +75,7 @@ protected void innerOnFailure(Exception e) { * @param onFailure is called when this step is completed with a failure */ public void whenComplete(CheckedConsumer onResponse, Consumer onFailure) { - delegate.addListener(ActionListener.wrap(onResponse, onFailure), EsExecutors.newDirectExecutorService(), null); + delegate.addListener(ActionListener.wrap(onResponse, onFailure), OpenSearchExecutors.newDirectExecutorService(), null); } /** diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java index 8ace116b79aa7..d5a1e78ba9c9b 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java +++ b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java @@ -79,7 +79,7 @@ private static Throwable deduplicateCause(Throwable cause, ShardSearchFailure[] @Override public RestStatus status() { if (shardFailures.length == 0) { - // if no successful shards, the failure can be due to EsRejectedExecutionException during fetch phase + // if no successful shards, the failure can be due to OpenSearchRejectedExecutionException during fetch phase // on coordinator node. so get the status from cause instead of returning SERVICE_UNAVAILABLE blindly return getCause() == null ? RestStatus.SERVICE_UNAVAILABLE : ExceptionsHelper.status(getCause()); } diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java index bb216b0eeaaaa..7dd3e0c936d0d 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java @@ -36,7 +36,7 @@ import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ReplicationGroup; import org.elasticsearch.index.shard.ShardId; @@ -254,7 +254,7 @@ public void onFinished() { public boolean shouldRetry(Exception e) { final Throwable cause = ExceptionsHelper.unwrapCause(e); return cause instanceof CircuitBreakingException || - cause instanceof EsRejectedExecutionException || + cause instanceof OpenSearchRejectedExecutionException || cause instanceof ConnectTransportException; } }; diff --git a/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java b/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java index 3db22295bf3a5..67896b83e99e4 100644 --- a/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java +++ b/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java @@ -23,7 +23,7 @@ import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import java.util.ArrayList; @@ -53,7 +53,7 @@ public TaskBatcher(Logger logger, PrioritizedEsThreadPoolExecutor threadExecutor this.threadExecutor = threadExecutor; } - public void submitTasks(List tasks, @Nullable TimeValue timeout) throws EsRejectedExecutionException { + public void submitTasks(List tasks, @Nullable TimeValue timeout) throws OpenSearchRejectedExecutionException { if (tasks.isEmpty()) { return; } diff --git a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java index 3b49430708cc7..1110e2f6dd4f7 100644 --- a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java +++ b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchLeafReader.java b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchLeafReader.java index 9f9410cd642bd..49e90e4798abe 100644 --- a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchLeafReader.java +++ b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchLeafReader.java @@ -21,7 +21,7 @@ import org.apache.lucene.codecs.StoredFieldsReader; import org.apache.lucene.index.FilterLeafReader; import org.apache.lucene.index.LeafReader; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; /** * A {@link org.apache.lucene.index.FilterLeafReader} that exposes diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java index 7599878bc520b..728f3d6eed59b 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -47,10 +47,10 @@ final String getName() { EsThreadPoolExecutor(String name, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory threadFactory, ThreadContext contextHolder) { - this(name, corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, new EsAbortPolicy(), contextHolder); + this(name, corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, new OpenSearchAbortPolicy(), contextHolder); } - @SuppressForbidden(reason = "properly rethrowing errors, see EsExecutors.rethrowErrors") + @SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors") EsThreadPoolExecutor(String name, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, ThreadFactory threadFactory, XRejectedExecutionHandler handler, ThreadContext contextHolder) { @@ -82,7 +82,7 @@ public void execute(Runnable command) { command = wrapRunnable(command); try { super.execute(command); - } catch (EsRejectedExecutionException ex) { + } catch (OpenSearchRejectedExecutionException ex) { if (command instanceof AbstractRunnable) { // If we are an abstract runnable we can handle the rejection // directly and don't need to rethrow it. @@ -101,7 +101,7 @@ public void execute(Runnable command) { @Override protected void afterExecute(Runnable r, Throwable t) { super.afterExecute(r, t); - EsExecutors.rethrowErrors(unwrap(r)); + OpenSearchExecutors.rethrowErrors(unwrap(r)); assert assertDefaultContext(r); } diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java b/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java index d8661ccfb3b6a..d51b82f1e482f 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java @@ -65,7 +65,7 @@ public void addListener(ActionListener listener, ExecutorService executor) { public void addListener(ActionListener listener, ExecutorService executor, ThreadContext threadContext) { if (done) { // run the callback directly, we don't hold the lock and don't need to fork! - notifyListener(listener, EsExecutors.newDirectExecutorService()); + notifyListener(listener, OpenSearchExecutors.newDirectExecutorService()); } else { final boolean run; // check done under lock since it could have been modified and protect modifications @@ -87,7 +87,7 @@ public void addListener(ActionListener listener, ExecutorService executor, Th if (run) { // run the callback directly, we don't hold the lock and don't need to fork! - notifyListener(listener, EsExecutors.newDirectExecutorService()); + notifyListener(listener, OpenSearchExecutors.newDirectExecutorService()); } } } diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsAbortPolicy.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchAbortPolicy.java similarity index 90% rename from server/src/main/java/org/opensearch/common/util/concurrent/EsAbortPolicy.java rename to server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchAbortPolicy.java index 90788f5ee2170..bdad73ede6a57 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsAbortPolicy.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchAbortPolicy.java @@ -24,7 +24,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; -public class EsAbortPolicy implements XRejectedExecutionHandler { +public class OpenSearchAbortPolicy implements XRejectedExecutionHandler { private final CounterMetric rejected = new CounterMetric(); @Override @@ -45,7 +45,7 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { } } rejected.inc(); - throw new EsRejectedExecutionException("rejected execution of " + r + " on " + executor, executor.isShutdown()); + throw new OpenSearchRejectedExecutionException("rejected execution of " + r + " on " + executor, executor.isShutdown()); } @Override diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java similarity index 96% rename from server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java rename to server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java index 733ec96295aeb..bf8add6158510 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java @@ -22,10 +22,10 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.common.SuppressForbidden; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Setting.Property; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.settings.Setting; +import org.opensearch.common.settings.Setting.Property; +import org.opensearch.common.settings.Settings; +import org.opensearch.common.unit.TimeValue; import org.opensearch.node.Node; import java.util.List; @@ -44,9 +44,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -public class EsExecutors { +public class OpenSearchExecutors { - private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(EsExecutors.class); + private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(OpenSearchExecutors.class); /** * Setting to manually set the number of available processors. This setting is used to adjust thread pool sizes per node. @@ -119,7 +119,7 @@ public static EsThreadPoolExecutor newFixed(String name, int size, int queueCapa queue = new SizeBlockingQueue<>(ConcurrentCollections.newBlockingQueue(), queueCapacity); } return new EsThreadPoolExecutor(name, size, size, 0, TimeUnit.MILLISECONDS, - queue, threadFactory, new EsAbortPolicy(), contextHolder); + queue, threadFactory, new OpenSearchAbortPolicy(), contextHolder); } /** @@ -142,7 +142,7 @@ public static EsThreadPoolExecutor newAutoQueueFixed(String name, int size, int new ResizableBlockingQueue<>(ConcurrentCollections.newBlockingQueue(), initialQueueCapacity); return new QueueResizingEsThreadPoolExecutor(name, size, size, 0, TimeUnit.MILLISECONDS, queue, minQueueSize, maxQueueSize, TimedRunnable::new, frameSize, targetedResponseTime, threadFactory, - new EsAbortPolicy(), contextHolder); + new OpenSearchAbortPolicy(), contextHolder); } /** @@ -189,7 +189,7 @@ public static Throwable rethrowErrors(Runnable runnable) { private static final class DirectExecutorService extends AbstractExecutorService { - @SuppressForbidden(reason = "properly rethrowing errors, see EsExecutors.rethrowErrors") + @SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors") DirectExecutorService() { super(); } @@ -292,7 +292,7 @@ public Thread newThread(Runnable r) { /** * Cannot instantiate. */ - private EsExecutors() { + private OpenSearchExecutors() { } static class ExecutorScalingQueue extends LinkedTransferQueue { diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsRejectedExecutionException.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchRejectedExecutionException.java similarity index 84% rename from server/src/main/java/org/opensearch/common/util/concurrent/EsRejectedExecutionException.java rename to server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchRejectedExecutionException.java index 3e399db4ae0bd..999edb8e82386 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsRejectedExecutionException.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchRejectedExecutionException.java @@ -21,20 +21,20 @@ import java.util.concurrent.RejectedExecutionException; -public class EsRejectedExecutionException extends RejectedExecutionException { +public class OpenSearchRejectedExecutionException extends RejectedExecutionException { private final boolean isExecutorShutdown; - public EsRejectedExecutionException(String message, boolean isExecutorShutdown) { + public OpenSearchRejectedExecutionException(String message, boolean isExecutorShutdown) { super(message); this.isExecutorShutdown = isExecutorShutdown; } - public EsRejectedExecutionException(String message) { + public OpenSearchRejectedExecutionException(String message) { this(message, false); } - public EsRejectedExecutionException() { + public OpenSearchRejectedExecutionException() { this(null, false); } diff --git a/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java b/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java index 6f0dfc78a2cb9..62df4d4fc8fd9 100644 --- a/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java +++ b/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java @@ -45,7 +45,7 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.DiscoveryModule; @@ -69,7 +69,7 @@ import java.util.function.Function; import java.util.function.UnaryOperator; -import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory; /** * Loads (and maybe upgrades) cluster metadata at startup, and persistently stores cluster metadata for future restarts. @@ -345,7 +345,7 @@ static class AsyncLucenePersistedState extends InMemoryPersistedState { AsyncLucenePersistedState(Settings settings, ThreadPool threadPool, PersistedState persistedState) { super(persistedState.getCurrentTerm(), persistedState.getLastAcceptedState()); final String nodeName = Objects.requireNonNull(Node.NODE_NAME_SETTING.get(settings)); - threadPoolExecutor = EsExecutors.newFixed( + threadPoolExecutor = OpenSearchExecutors.newFixed( nodeName + "/" + THREAD_NAME, 1, 1, daemonThreadFactory(nodeName, THREAD_NAME), diff --git a/server/src/main/java/org/opensearch/index/IndexingPressure.java b/server/src/main/java/org/opensearch/index/IndexingPressure.java index b98d5b2818eea..b8ded971628ea 100644 --- a/server/src/main/java/org/opensearch/index/IndexingPressure.java +++ b/server/src/main/java/org/opensearch/index/IndexingPressure.java @@ -25,7 +25,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.stats.IndexingPressureStats; import java.util.concurrent.atomic.AtomicBoolean; @@ -82,7 +82,7 @@ public Releasable markCoordinatingOperationStarted(long bytes, boolean forceExec long totalBytesWithoutOperation = totalBytes - bytes; this.currentCombinedCoordinatingAndPrimaryBytes.getAndAdd(-bytes); this.coordinatingRejections.getAndIncrement(); - throw new EsRejectedExecutionException("rejected execution of coordinating operation [" + + throw new OpenSearchRejectedExecutionException("rejected execution of coordinating operation [" + "coordinating_and_primary_bytes=" + bytesWithoutOperation + ", " + "replica_bytes=" + replicaWriteBytes + ", " + "all_bytes=" + totalBytesWithoutOperation + ", " + @@ -113,7 +113,7 @@ public Releasable markPrimaryOperationStarted(long bytes, boolean forceExecution long totalBytesWithoutOperation = totalBytes - bytes; this.currentCombinedCoordinatingAndPrimaryBytes.getAndAdd(-bytes); this.primaryRejections.getAndIncrement(); - throw new EsRejectedExecutionException("rejected execution of primary operation [" + + throw new OpenSearchRejectedExecutionException("rejected execution of primary operation [" + "coordinating_and_primary_bytes=" + bytesWithoutOperation + ", " + "replica_bytes=" + replicaWriteBytes + ", " + "all_bytes=" + totalBytesWithoutOperation + ", " + @@ -135,7 +135,7 @@ public Releasable markReplicaOperationStarted(long bytes, boolean forceExecution long replicaBytesWithoutOperation = replicaWriteBytes - bytes; this.currentReplicaBytes.getAndAdd(-bytes); this.replicaRejections.getAndIncrement(); - throw new EsRejectedExecutionException("rejected execution of replica operation [" + + throw new OpenSearchRejectedExecutionException("rejected execution of replica operation [" + "replica_bytes=" + replicaBytesWithoutOperation + ", " + "replica_operation_bytes=" + bytes + ", " + "max_replica_bytes=" + replicaLimits + "]", false); diff --git a/server/src/main/java/org/opensearch/index/MergePolicyConfig.java b/server/src/main/java/org/opensearch/index/MergePolicyConfig.java index 2397a5413354b..5d3e81cc66af2 100644 --- a/server/src/main/java/org/opensearch/index/MergePolicyConfig.java +++ b/server/src/main/java/org/opensearch/index/MergePolicyConfig.java @@ -116,7 +116,7 @@ */ public final class MergePolicyConfig { - private final EsTieredMergePolicy mergePolicy = new EsTieredMergePolicy(); + private final OpenSearchTieredMergePolicy mergePolicy = new OpenSearchTieredMergePolicy(); private final Logger logger; private final boolean mergesEnabled; diff --git a/server/src/main/java/org/opensearch/index/OpenSearchTieredMergePolicy.java b/server/src/main/java/org/opensearch/index/OpenSearchTieredMergePolicy.java index 5ebc4d137f792..f20eafb95dae8 100644 --- a/server/src/main/java/org/opensearch/index/OpenSearchTieredMergePolicy.java +++ b/server/src/main/java/org/opensearch/index/OpenSearchTieredMergePolicy.java @@ -32,12 +32,12 @@ * {@link TieredMergePolicy#setMaxMergedSegmentMB(double)} on forced merges. * See https://issues.apache.org/jira/browse/LUCENE-7976. */ -final class EsTieredMergePolicy extends FilterMergePolicy { +final class OpenSearchTieredMergePolicy extends FilterMergePolicy { final TieredMergePolicy regularMergePolicy; final TieredMergePolicy forcedMergePolicy; - EsTieredMergePolicy() { + OpenSearchTieredMergePolicy() { super(new TieredMergePolicy()); regularMergePolicy = (TieredMergePolicy) in; forcedMergePolicy = new TieredMergePolicy(); diff --git a/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java b/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java index fbf5fb4cecf6f..40f24ed482391 100644 --- a/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java +++ b/server/src/main/java/org/opensearch/index/reindex/ClientScrollableHitSource.java @@ -35,7 +35,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.document.DocumentField; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.mapper.RoutingFieldMapper; @@ -94,7 +94,7 @@ public void onResponse(SearchResponse searchResponse) { @Override public void onFailure(Exception e) { - if (ExceptionsHelper.unwrap(e, EsRejectedExecutionException.class) != null) { + if (ExceptionsHelper.unwrap(e, OpenSearchRejectedExecutionException.class) != null) { searchListener.onRejection(e); } else { searchListener.onFailure(e); diff --git a/server/src/main/java/org/opensearch/index/reindex/WorkerBulkByScrollTaskState.java b/server/src/main/java/org/opensearch/index/reindex/WorkerBulkByScrollTaskState.java index 235e129a189b3..ff96b0c867ce8 100644 --- a/server/src/main/java/org/opensearch/index/reindex/WorkerBulkByScrollTaskState.java +++ b/server/src/main/java/org/opensearch/index/reindex/WorkerBulkByScrollTaskState.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.concurrent.RunOnce; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; @@ -191,7 +191,7 @@ public void delayPrepareBulkRequest(ThreadPool threadPool, long lastBatchStartTi try { delayedPrepareBulkRequestReference.set(new DelayedPrepareBulkRequest(threadPool, getRequestsPerSecond(), delay, new RunOnce(prepareBulkRequestRunnable))); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { prepareBulkRequestRunnable.onRejection(e); } } diff --git a/server/src/main/java/org/opensearch/monitor/os/OsService.java b/server/src/main/java/org/opensearch/monitor/os/OsService.java index b55ae34ed5efe..ab3102c2f36e5 100644 --- a/server/src/main/java/org/opensearch/monitor/os/OsService.java +++ b/server/src/main/java/org/opensearch/monitor/os/OsService.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.SingleObjectCache; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.node.ReportingService; import java.io.IOException; @@ -46,7 +46,7 @@ public class OsService implements ReportingService { public OsService(Settings settings) throws IOException { this.probe = OsProbe.getInstance(); TimeValue refreshInterval = REFRESH_INTERVAL_SETTING.get(settings); - this.info = probe.osInfo(refreshInterval.millis(), EsExecutors.allocatedProcessors(settings)); + this.info = probe.osInfo(refreshInterval.millis(), OpenSearchExecutors.allocatedProcessors(settings)); this.osStatsCache = new OsStatsCache(refreshInterval, probe.osStats()); logger.debug("using refresh_interval [{}]", refreshInterval); } diff --git a/server/src/main/java/org/opensearch/search/SearchShardTarget.java b/server/src/main/java/org/opensearch/search/SearchShardTarget.java index c3569d5192e37..2e396736a692b 100644 --- a/server/src/main/java/org/opensearch/search/SearchShardTarget.java +++ b/server/src/main/java/org/opensearch/search/SearchShardTarget.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.text.Text; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.transport.RemoteClusterAware; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/search/aggregations/AbstractAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/AbstractAggregationBuilder.java index c43fb284ef355..e50f5f5398b1b 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/AbstractAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/AbstractAggregationBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java index d9929974621f9..dd5199e33e30c 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java +++ b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactory.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.internal.SearchContext; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java index 7c1f61e25bf21..bcd82b70bbf62 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/PipelineAggregationBuilder.java @@ -23,8 +23,8 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.NamedWriteable; import org.opensearch.common.xcontent.ToXContentFragment; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.Rewriteable; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.Rewriteable; import org.opensearch.search.aggregations.AggregatorFactories.Builder; import org.opensearch.search.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder; import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder; diff --git a/server/src/main/java/org/opensearch/search/internal/SearchContext.java b/server/src/main/java/org/opensearch/search/internal/SearchContext.java index 35e5dea670f42..50a148fb0ab5d 100644 --- a/server/src/main/java/org/opensearch/search/internal/SearchContext.java +++ b/server/src/main/java/org/opensearch/search/internal/SearchContext.java @@ -29,14 +29,14 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.index.cache.bitset.BitsetFilterCache; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ObjectMapper; -import org.elasticsearch.index.query.ParsedQuery; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.similarity.SimilarityService; +import org.opensearch.index.cache.bitset.BitsetFilterCache; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ObjectMapper; +import org.opensearch.index.query.ParsedQuery; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.similarity.SimilarityService; import org.opensearch.search.RescoreDocIds; import org.opensearch.search.SearchExtBuilder; import org.opensearch.search.SearchShardTarget; diff --git a/server/src/main/java/org/opensearch/threadpool/Scheduler.java b/server/src/main/java/org/opensearch/threadpool/Scheduler.java index f11da0fd6f107..386efa1b827a6 100644 --- a/server/src/main/java/org/opensearch/threadpool/Scheduler.java +++ b/server/src/main/java/org/opensearch/threadpool/Scheduler.java @@ -24,8 +24,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsAbortPolicy; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchAbortPolicy; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import java.util.concurrent.Delayed; @@ -53,7 +53,7 @@ public interface Scheduler { */ static ScheduledThreadPoolExecutor initScheduler(Settings settings) { final ScheduledThreadPoolExecutor scheduler = new SafeScheduledThreadPoolExecutor(1, - EsExecutors.daemonThreadFactory(settings, "scheduler"), new EsAbortPolicy()); + OpenSearchExecutors.daemonThreadFactory(settings, "scheduler"), new OpenSearchAbortPolicy()); scheduler.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); scheduler.setContinueExistingPeriodicTasksAfterShutdownPolicy(false); scheduler.setRemoveOnCancelPolicy(true); @@ -252,17 +252,17 @@ public String toString() { */ class SafeScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor { - @SuppressForbidden(reason = "properly rethrowing errors, see EsExecutors.rethrowErrors") + @SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors") public SafeScheduledThreadPoolExecutor(int corePoolSize, ThreadFactory threadFactory, RejectedExecutionHandler handler) { super(corePoolSize, threadFactory, handler); } - @SuppressForbidden(reason = "properly rethrowing errors, see EsExecutors.rethrowErrors") + @SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors") public SafeScheduledThreadPoolExecutor(int corePoolSize, ThreadFactory threadFactory) { super(corePoolSize, threadFactory); } - @SuppressForbidden(reason = "properly rethrowing errors, see EsExecutors.rethrowErrors") + @SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors") public SafeScheduledThreadPoolExecutor(int corePoolSize) { super(corePoolSize); } @@ -275,7 +275,7 @@ protected void afterExecute(Runnable r, Throwable t) { if (r instanceof RunnableFuture && ((RunnableFuture) r).isDone()) { // only check this if task is done, which it always is except for periodic tasks. Periodic tasks will hang on // RunnableFuture.get() - ExceptionsHelper.reThrowIfNotNull(EsExecutors.rethrowErrors(r)); + ExceptionsHelper.reThrowIfNotNull(OpenSearchExecutors.rethrowErrors(r)); } } } diff --git a/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java index a2824054855d2..dfd2bc54720b4 100644 --- a/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java +++ b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilterTests.java @@ -24,13 +24,13 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class DeDuplicatingTokenFilterTests extends ESTestCase { +public class DeDuplicatingTokenFilterTests extends OpenSearchTestCase { public void testSimple() throws IOException { DuplicateByteSequenceSpotter bytesDeDuper = new DuplicateByteSequenceSpotter(); Analyzer analyzer = new Analyzer() { diff --git a/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java index 145aaed3a5751..7db23b3b02acc 100644 --- a/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java +++ b/server/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java @@ -24,13 +24,13 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class TruncateTokenFilterTests extends ESTestCase { +public class TruncateTokenFilterTests extends OpenSearchTestCase { public void testSimple() throws IOException { Analyzer analyzer = new Analyzer() { @Override diff --git a/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java b/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java index b1d8ca3eb40d9..7df85ae5e47d0 100644 --- a/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java +++ b/server/src/test/java/org/apache/lucene/grouping/CollapsingTopDocsCollectorTests.java @@ -50,7 +50,7 @@ import org.apache.lucene.util.NumericUtils; import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.index.mapper.MockFieldMapper; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -60,7 +60,7 @@ import java.util.Set; -public class CollapsingTopDocsCollectorTests extends ESTestCase { +public class CollapsingTopDocsCollectorTests extends OpenSearchTestCase { private static class SegmentSearcher extends IndexSearcher { private final List ctx; diff --git a/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java index f9f334f9ecaf7..317dfb48392e8 100644 --- a/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java +++ b/server/src/test/java/org/apache/lucene/queries/BinaryDocValuesRangeQueryTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.index.mapper.RangeFieldMapper; import org.opensearch.index.mapper.RangeType; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.apache.lucene.queries.BinaryDocValuesRangeQuery.QueryType.INTERSECTS; import static org.apache.lucene.queries.BinaryDocValuesRangeQuery.QueryType.WITHIN; -public class BinaryDocValuesRangeQueryTests extends ESTestCase { +public class BinaryDocValuesRangeQueryTests extends OpenSearchTestCase { public void testBasics() throws Exception { String fieldName = "long_field"; diff --git a/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java b/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java index ed5d8c1a48ff2..8f8794d4ca9ca 100644 --- a/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java +++ b/server/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java @@ -43,7 +43,7 @@ import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; import org.opensearch.test.EqualsHashCodeTestUtils.MutateFunction; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.instanceOf; -public class BlendedTermQueryTests extends ESTestCase { +public class BlendedTermQueryTests extends OpenSearchTestCase { public void testDismaxQuery() throws IOException { Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))); diff --git a/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java index 87882e177ebbe..8c30d978d96c3 100644 --- a/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java +++ b/server/src/test/java/org/apache/lucene/queries/MinDocQueryTests.java @@ -27,11 +27,11 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; import org.apache.lucene.store.Directory; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class MinDocQueryTests extends ESTestCase { +public class MinDocQueryTests extends OpenSearchTestCase { public void testBasics() { MinDocQuery query1 = new MinDocQuery(42); diff --git a/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java b/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java index d13a82b6df42f..1a1494471ed57 100644 --- a/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java +++ b/server/src/test/java/org/apache/lucene/queries/SearchAfterSortedDocQueryTests.java @@ -40,13 +40,13 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class SearchAfterSortedDocQueryTests extends ESTestCase { +public class SearchAfterSortedDocQueryTests extends OpenSearchTestCase { public void testBasics() { Sort sort1 = new Sort( diff --git a/server/src/test/java/org/apache/lucene/queries/SpanMatchNoDocsQueryTests.java b/server/src/test/java/org/apache/lucene/queries/SpanMatchNoDocsQueryTests.java index 1ece9df67a57b..61ce47cdd78c5 100644 --- a/server/src/test/java/org/apache/lucene/queries/SpanMatchNoDocsQueryTests.java +++ b/server/src/test/java/org/apache/lucene/queries/SpanMatchNoDocsQueryTests.java @@ -36,11 +36,11 @@ import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.store.Directory; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class SpanMatchNoDocsQueryTests extends ESTestCase { +public class SpanMatchNoDocsQueryTests extends OpenSearchTestCase { public void testSimple() throws Exception { SpanMatchNoDocsQuery query = new SpanMatchNoDocsQuery("field", "a good reason"); assertEquals(query.toString(), "SpanMatchNoDocsQuery(\"a good reason\")"); diff --git a/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java index 259848e05b3e7..57e8127287663 100644 --- a/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java +++ b/server/src/test/java/org/apache/lucene/search/uhighlight/BoundedBreakIteratorScannerTests.java @@ -19,7 +19,7 @@ package org.apache.lucene.search.uhighlight; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.text.BreakIterator; import java.util.ArrayList; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class BoundedBreakIteratorScannerTests extends ESTestCase { +public class BoundedBreakIteratorScannerTests extends OpenSearchTestCase { private static final String[] WORD_BOUNDARIES = new String[] { " ", " ", "\t", "#", "\n" }; private static final String[] SENTENCE_BOUNDARIES = diff --git a/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java index ec03c2821f680..6ea9c55674ca6 100644 --- a/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java +++ b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomPassageFormatterTests.java @@ -22,13 +22,13 @@ import org.apache.lucene.search.highlight.DefaultEncoder; import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.apache.lucene.util.BytesRef; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -public class CustomPassageFormatterTests extends ESTestCase { +public class CustomPassageFormatterTests extends OpenSearchTestCase { public void testSimpleFormat() { String content = "This is a really cool highlighter. Unified highlighter gives nice snippets back. No matches here."; diff --git a/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java index 303b9f0dc49fd..8caedf221a82e 100644 --- a/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java +++ b/server/src/test/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java @@ -47,7 +47,7 @@ import org.apache.lucene.store.Directory; import org.opensearch.common.Strings; import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.text.BreakIterator; import java.util.Locale; @@ -55,7 +55,7 @@ import static org.apache.lucene.search.uhighlight.CustomUnifiedHighlighter.MULTIVAL_SEP_CHAR; import static org.hamcrest.CoreMatchers.equalTo; -public class CustomUnifiedHighlighterTests extends ESTestCase { +public class CustomUnifiedHighlighterTests extends OpenSearchTestCase { private void assertHighlightOneDoc(String fieldName, String[] inputs, Analyzer analyzer, Query query, Locale locale, BreakIterator breakIterator, int noMatchSize, String[] expectedPassages) throws Exception { diff --git a/server/src/test/java/org/apache/lucene/util/CombinedBitSetTests.java b/server/src/test/java/org/apache/lucene/util/CombinedBitSetTests.java index 0698f092e44e1..82c0bb311cbb9 100644 --- a/server/src/test/java/org/apache/lucene/util/CombinedBitSetTests.java +++ b/server/src/test/java/org/apache/lucene/util/CombinedBitSetTests.java @@ -20,9 +20,9 @@ package org.apache.lucene.util; import org.apache.lucene.search.DocIdSetIterator; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class CombinedBitSetTests extends ESTestCase { +public class CombinedBitSetTests extends OpenSearchTestCase { public void testEmpty() { for (float percent : new float[] {0f, 0.1f, 0.5f, 0.9f, 1f}) { testCase(randomIntBetween(1, 10000), 0f, percent); diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java index 32ce0dbce8bd6..6701e408822dc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterChangedEventTests.java @@ -34,8 +34,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.gateway.GatewayService; import org.opensearch.index.Index; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.TestCustomMetadata; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.TestCustomMetadata; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -55,7 +55,7 @@ /** * Tests for the {@link ClusterChangedEvent} class. */ -public class ClusterChangedEventTests extends ESTestCase { +public class ClusterChangedEventTests extends OpenSearchTestCase { private static final ClusterName TEST_CLUSTER_NAME = new ClusterName("test"); private static final String NODE_ID_PREFIX = "node_"; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java index 0c0c548cfeab4..e7608947f4f96 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterInfoTests.java @@ -24,11 +24,11 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.ClusterInfo; import org.opensearch.cluster.DiskUsage; -public class ClusterInfoTests extends ESTestCase { +public class ClusterInfoTests extends OpenSearchTestCase { public void testSerialization() throws Exception { ClusterInfo clusterInfo = new ClusterInfo( diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java index 6d277bd544e21..41e28f3f6f871 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterModuleTests.java @@ -54,7 +54,7 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.gateway.GatewayAllocator; import org.opensearch.plugins.ClusterPlugin; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import org.opensearch.cluster.ClusterInfoService; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java index 952a9fdc8e8a6..5074996918180 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateObserver; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ClusterStateObserverTests extends ESTestCase { +public class ClusterStateObserverTests extends OpenSearchTestCase { public void testClusterStateListenerToStringIncludesListenerToString() { final ClusterApplierService clusterApplierService = mock(ClusterApplierService.class); diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java index f62b325f82fc6..d3f0a8451bc7d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTaskExecutorTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.cluster; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.ClusterStateTaskExecutor; import java.util.Arrays; @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.equalTo; -public class ClusterStateTaskExecutorTests extends ESTestCase { +public class ClusterStateTaskExecutorTests extends OpenSearchTestCase { private class TestTask { private final String description; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java index 5a1308e2a8e17..b0f48fabd480e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java @@ -47,8 +47,8 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.cluster.ClusterState; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.TestCustomMetadata; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.TestCustomMetadata; import java.io.IOException; import java.net.InetAddress; @@ -66,7 +66,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class ClusterStateTests extends ESTestCase { +public class ClusterStateTests extends OpenSearchTestCase { public void testSupersedes() { final Version version = Version.CURRENT; diff --git a/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java index 143c6d2fb317d..a233770232742 100644 --- a/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.shard.ShardPath; import org.elasticsearch.index.store.StoreStats; import org.elasticsearch.monitor.fs.FsInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.ClusterInfo; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.DiskUsage; @@ -49,7 +49,7 @@ import static java.util.Collections.emptySet; import static org.hamcrest.Matchers.equalTo; -public class DiskUsageTests extends ESTestCase { +public class DiskUsageTests extends OpenSearchTestCase { public void testDiskUsageCalc() { DiskUsage du = new DiskUsage("node1", "n1", "random", 100, 40); assertThat(du.getFreeDiskAsPercentage(), equalTo(40.0)); diff --git a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java b/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java index b9769ae8c815f..211cf9ad3fa44 100644 --- a/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/FeatureAwareTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.cluster.Diff; import java.io.IOException; @@ -37,9 +37,9 @@ import java.util.HashSet; import java.util.Optional; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.opensearch.test.VersionUtils.randomVersionBetween; -public class FeatureAwareTests extends ESTestCase { +public class FeatureAwareTests extends OpenSearchTestCase { abstract static class Custom implements Metadata.Custom { diff --git a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java b/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java index aad5c445e56d2..a70c2b8e5e8ee 100644 --- a/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/InternalClusterInfoServiceSchedulingTests.java @@ -41,9 +41,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.node.Node; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpClient; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.InternalClusterInfoService; @@ -54,7 +54,7 @@ import static org.opensearch.cluster.InternalClusterInfoService.INTERNAL_CLUSTER_INFO_UPDATE_INTERVAL_SETTING; import static org.hamcrest.Matchers.equalTo; -public class InternalClusterInfoServiceSchedulingTests extends ESTestCase { +public class InternalClusterInfoServiceSchedulingTests extends OpenSearchTestCase { public void testScheduling() { final DiscoveryNode discoveryNode = new DiscoveryNode("test", buildNewFakeTransportAddress(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java index cb245226b2fcb..d79ca244c93d9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java @@ -37,9 +37,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.NodeConnectionsService; import org.opensearch.threadpool.TestThreadPool; @@ -75,7 +75,7 @@ import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.equalTo; -public class NodeConnectionsServiceTests extends ESTestCase { +public class NodeConnectionsServiceTests extends OpenSearchTestCase { private ThreadPool threadPool; private TransportService transportService; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java index ea58aec9aa53f..76a7089a70eb3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.mapper.Mapping; import org.elasticsearch.index.mapper.MetadataFieldMapper; import org.elasticsearch.index.mapper.RootObjectMapper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -53,7 +53,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class MappingUpdatedActionTests extends ESTestCase { +public class MappingUpdatedActionTests extends OpenSearchTestCase { public void testAdjustableSemaphore() { AdjustableSemaphore sem = new AdjustableSemaphore(1, randomBoolean()); diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java index 056fe3628f641..04d93ff7b90c3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardStateActionTests.java @@ -44,9 +44,9 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.NodeDisconnectedException; @@ -72,9 +72,9 @@ import java.util.function.LongConsumer; import java.util.function.Predicate; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; -import static org.elasticsearch.test.ClusterServiceUtils.setState; -import static org.elasticsearch.test.VersionUtils.randomCompatibleVersion; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.setState; +import static org.opensearch.test.VersionUtils.randomCompatibleVersion; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.Matchers.arrayWithSize; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class ShardStateActionTests extends ESTestCase { +public class ShardStateActionTests extends OpenSearchTestCase { private static ThreadPool THREAD_POOL; private TestShardStateAction shardStateAction; diff --git a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java index 51859b12c7f6f..40965f544979e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java @@ -29,16 +29,16 @@ import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.block.ClusterBlocks; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; import java.util.List; import static java.util.EnumSet.copyOf; -import static org.elasticsearch.test.VersionUtils.getPreviousVersion; -import static org.elasticsearch.test.VersionUtils.randomVersion; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.opensearch.test.VersionUtils.getPreviousVersion; +import static org.opensearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersionBetween; import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.oneOf; -public class ClusterBlockTests extends ESTestCase { +public class ClusterBlockTests extends OpenSearchTestCase { public void testSerialization() throws Exception { int iterations = randomIntBetween(5, 20); @@ -167,7 +167,7 @@ public void testGetIndexBlockWithId() { assertThat(builder.build().indices().get("index").size(), equalTo(clusterBlocks.length)); assertThat(builder.build().getIndexBlockWithId("index", blockId), is(oneOf(clusterBlocks))); - assertThat(builder.build().getIndexBlockWithId("index", randomValueOtherThan(blockId, ESTestCase::randomInt)), nullValue()); + assertThat(builder.build().getIndexBlockWithId("index", randomValueOtherThan(blockId, OpenSearchTestCase::randomInt)), nullValue()); } private ClusterBlock randomClusterBlock() { diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java index ea9104aadf38d..069b684fd2b3f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterBootstrapServiceTests.java @@ -25,8 +25,8 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.settings.Settings; import org.opensearch.discovery.DiscoveryModule; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransport; import org.opensearch.transport.TransportRequest; import org.opensearch.transport.TransportService; import org.junit.Before; @@ -53,7 +53,7 @@ import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING; import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; import static org.opensearch.node.Node.NODE_NAME_SETTING; -import static org.elasticsearch.test.NodeRoles.nonMasterNode; +import static org.opensearch.test.NodeRoles.nonMasterNode; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -public class ClusterBootstrapServiceTests extends ESTestCase { +public class ClusterBootstrapServiceTests extends OpenSearchTestCase { private DiscoveryNode localNode, otherNode1, otherNode2; private DeterministicTaskQueue deterministicTaskQueue; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java index c92e9ee847d14..3c2c790377f92 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ClusterFormationFailureHelperTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.gateway.GatewayMetaState; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.Coordinator; import org.opensearch.cluster.coordination.ElectionStrategy; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.oneOf; -public class ClusterFormationFailureHelperTests extends ESTestCase { +public class ClusterFormationFailureHelperTests extends OpenSearchTestCase { private static final ElectionStrategy electionStrategy = ElectionStrategy.DEFAULT_INSTANCE; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java index 13eb949fcf74b..e8fcae2b6dae7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationMetadataTests.java @@ -28,9 +28,9 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; -import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; import java.io.IOException; import java.util.Collections; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; -public class CoordinationMetadataTests extends ESTestCase { +public class CoordinationMetadataTests extends OpenSearchTestCase { public void testVotingConfiguration() { VotingConfiguration config0 = new VotingConfiguration(Sets.newHashSet()); @@ -88,7 +88,7 @@ public void testVotingConfigurationSerializationEqualsHashCode() { VotingConfiguration initialConfig = randomVotingConfig(); // Note: the explicit cast of the CopyFunction is needed for some IDE (specifically Eclipse 4.8.0) to infer the right type EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialConfig, - (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + (CopyFunction) orig -> OpenSearchTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfiguration::new), cfg -> randomlyChangeVotingConfiguration(cfg)); } @@ -101,7 +101,7 @@ public void testVotingTombstoneSerializationEqualsHashCode() { VotingConfigExclusion tombstone = new VotingConfigExclusion(randomAlphaOfLength(10), randomAlphaOfLength(10)); // Note: the explicit cast of the CopyFunction is needed for some IDE (specifically Eclipse 4.8.0) to infer the right type EqualsHashCodeTestUtils.checkEqualsAndHashCode(tombstone, - (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + (CopyFunction) orig -> OpenSearchTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), VotingConfigExclusion::new), orig -> randomlyChangeVotingTombstone(orig)); } @@ -156,13 +156,13 @@ public void testCoordinationMetadataSerializationEqualsHashCode() { randomVotingTombstones()); // Note: the explicit cast of the CopyFunction is needed for some IDE (specifically Eclipse 4.8.0) to infer the right type EqualsHashCodeTestUtils.checkEqualsAndHashCode(initialMetadata, - (CopyFunction) orig -> ESTestCase.copyWriteable(orig, + (CopyFunction) orig -> OpenSearchTestCase.copyWriteable(orig, new NamedWriteableRegistry(Collections.emptyList()), CoordinationMetadata::new), meta -> { CoordinationMetadata.Builder builder = CoordinationMetadata.builder(meta); switch (randomInt(3)) { case 0: - builder.term(randomValueOtherThan(meta.term(), ESTestCase::randomNonNegativeLong)); + builder.term(randomValueOtherThan(meta.term(), OpenSearchTestCase::randomNonNegativeLong)); break; case 1: builder.lastCommittedConfiguration(randomlyChangeVotingConfiguration(meta.getLastCommittedConfiguration())); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java index 5d171ae7b9acc..c4dc7736bc065 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinationStateTests.java @@ -35,8 +35,8 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.junit.Before; import org.opensearch.cluster.coordination.CoordinationStateRejectedException; import org.opensearch.cluster.coordination.ElectionStrategy; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class CoordinationStateTests extends ESTestCase { +public class CoordinationStateTests extends OpenSearchTestCase { private DiscoveryNode node1; private DiscoveryNode node2; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java index 4e2a625056b95..1b90f9d7d7e38 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java @@ -51,7 +51,7 @@ import org.opensearch.discovery.zen.PublishClusterStateStats; import org.opensearch.gateway.GatewayService; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.MockLogAppender; +import org.opensearch.test.MockLogAppender; import org.opensearch.cluster.coordination.DetachClusterCommand; import org.opensearch.cluster.coordination.FollowersChecker; import org.opensearch.cluster.coordination.JoinHelper; @@ -90,7 +90,7 @@ import static org.opensearch.discovery.PeerFinder.DISCOVERY_FIND_PEERS_INTERVAL_SETTING; import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; -import static org.elasticsearch.test.NodeRoles.nonMasterNode; +import static org.opensearch.test.NodeRoles.nonMasterNode; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java index dd3653aa72f61..023d74e9f2e75 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/DiscoveryUpgradeServiceTests.java @@ -21,13 +21,13 @@ import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.UUIDs; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.DiscoveryUpgradeService; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.lessThan; -public class DiscoveryUpgradeServiceTests extends ESTestCase { +public class DiscoveryUpgradeServiceTests extends OpenSearchTestCase { public void testCreateDiscoveryNodeWithImpossiblyHighId() { final DiscoveryNode discoveryNode = new DiscoveryNode(UUIDs.randomBase64UUID(random()), buildNewFakeTransportAddress(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java index bd506c82c7a8c..460b3aa33327b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.ElectionSchedulerFactory; import java.util.concurrent.atomic.AtomicBoolean; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -public class ElectionSchedulerFactoryTests extends ESTestCase { +public class ElectionSchedulerFactoryTests extends OpenSearchTestCase { private TimeValue randomGracePeriod() { return TimeValue.timeValueMillis(randomLongBetween(0, 10000)); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java index fa44593eb9770..9b1caec29a701 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/FollowersCheckerTests.java @@ -33,11 +33,11 @@ import org.opensearch.common.settings.Settings.Builder; import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; -import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; -import org.elasticsearch.test.transport.CapturingTransport; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; +import org.opensearch.test.transport.CapturingTransport; +import org.opensearch.test.transport.MockTransport; import org.opensearch.cluster.coordination.NodeHealthCheckFailureException; import org.opensearch.threadpool.ThreadPool.Names; import org.opensearch.transport.ConnectTransportException; @@ -80,7 +80,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsInstanceOf.instanceOf; -public class FollowersCheckerTests extends ESTestCase { +public class FollowersCheckerTests extends OpenSearchTestCase { public void testChecksExpectedNodes() { final DiscoveryNode localNode = new DiscoveryNode("local-node", buildNewFakeTransportAddress(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java index 976106f23dc01..811969b96d1a9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinHelperTests.java @@ -31,10 +31,10 @@ import org.opensearch.common.settings.Settings; import org.opensearch.discovery.zen.MembershipAction; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; -import org.elasticsearch.test.transport.CapturingTransport.CapturedRequest; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; +import org.opensearch.test.transport.CapturingTransport.CapturedRequest; +import org.opensearch.test.transport.MockTransport; import org.opensearch.transport.RemoteTransportException; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponse; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; -public class JoinHelperTests extends ESTestCase { +public class JoinHelperTests extends OpenSearchTestCase { public void testJoinDeduplication() { DeterministicTaskQueue deterministicTaskQueue = new DeterministicTaskQueue( diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java index e3d9640a44fe1..1668a75ce2841 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java @@ -31,25 +31,25 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.collect.List; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.cluster.coordination.JoinTaskExecutor; import java.util.HashSet; -import static org.elasticsearch.test.VersionUtils.getPreviousVersion; -import static org.elasticsearch.test.VersionUtils.incompatibleFutureVersion; -import static org.elasticsearch.test.VersionUtils.maxCompatibleVersion; -import static org.elasticsearch.test.VersionUtils.randomCompatibleVersion; -import static org.elasticsearch.test.VersionUtils.randomVersion; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.opensearch.test.VersionUtils.getPreviousVersion; +import static org.opensearch.test.VersionUtils.incompatibleFutureVersion; +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.mock; import static org.mockito.Mockito.when; -public class JoinTaskExecutorTests extends ESTestCase { +public class JoinTaskExecutorTests extends OpenSearchTestCase { public void testPreventJoinClusterWithNewerIndices() { Settings.builder().build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java index bbdd02565a0aa..3d3e1b7017f53 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.opensearch.cluster.coordination.LagDetector; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; -public class LagDetectorTests extends ESTestCase { +public class LagDetectorTests extends OpenSearchTestCase { private DeterministicTaskQueue deterministicTaskQueue; private Set failedNodes; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java index a560ea6c71a50..4421ec8db0dbd 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LeaderCheckerTests.java @@ -31,11 +31,11 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; -import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; -import org.elasticsearch.test.transport.CapturingTransport; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; +import org.opensearch.test.transport.CapturingTransport; +import org.opensearch.test.transport.MockTransport; import org.opensearch.cluster.coordination.NodeHealthCheckFailureException; import org.opensearch.threadpool.ThreadPool.Names; import org.opensearch.transport.ConnectTransportException; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.matchesRegex; import static org.hamcrest.Matchers.nullValue; -public class LeaderCheckerTests extends ESTestCase { +public class LeaderCheckerTests extends OpenSearchTestCase { public void testFollowerBehaviour() { final DiscoveryNode leader1 = new DiscoveryNode("leader-1", buildNewFakeTransportAddress(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java index 5bc934e6209d4..bcfb50dbf463f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java @@ -23,13 +23,13 @@ import org.opensearch.cluster.coordination.LinearizabilityChecker.KeyedSpec; import org.opensearch.cluster.coordination.LinearizabilityChecker.SequentialSpec; import org.opensearch.common.collect.Tuple; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Optional; import static org.hamcrest.Matchers.equalTo; -public class LinearizabilityCheckerTests extends ESTestCase { +public class LinearizabilityCheckerTests extends OpenSearchTestCase { final LinearizabilityChecker checker = new LinearizabilityChecker(); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java index f7b09d0a37a22..cfc73220cf64b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/MessagesTests.java @@ -22,9 +22,9 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; -import org.elasticsearch.test.EqualsHashCodeTestUtils.CopyFunction; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.EqualsHashCodeTestUtils.CopyFunction; import org.opensearch.cluster.coordination.ApplyCommitRequest; import org.opensearch.cluster.coordination.CoordinationMetadata; import org.opensearch.cluster.coordination.Join; @@ -38,7 +38,7 @@ import java.util.Optional; -public class MessagesTests extends ESTestCase { +public class MessagesTests extends OpenSearchTestCase { private DiscoveryNode createNode(String id) { return new DiscoveryNode(id, buildNewFakeTransportAddress(), Version.CURRENT); @@ -64,18 +64,18 @@ public void testJoinEqualsHashCodeSerialization() { case 2: // change term return new Join(join.getSourceNode(), join.getTargetNode(), - randomValueOtherThan(join.getTerm(), ESTestCase::randomNonNegativeLong), join.getLastAcceptedTerm(), + randomValueOtherThan(join.getTerm(), OpenSearchTestCase::randomNonNegativeLong), join.getLastAcceptedTerm(), join.getLastAcceptedVersion()); case 3: // change last accepted term return new Join(join.getSourceNode(), join.getTargetNode(), join.getTerm(), - randomValueOtherThan(join.getLastAcceptedTerm(), ESTestCase::randomNonNegativeLong), + randomValueOtherThan(join.getLastAcceptedTerm(), OpenSearchTestCase::randomNonNegativeLong), join.getLastAcceptedVersion()); case 4: // change version return new Join(join.getSourceNode(), join.getTargetNode(), join.getTerm(), join.getLastAcceptedTerm(), - randomValueOtherThan(join.getLastAcceptedVersion(), ESTestCase::randomNonNegativeLong)); + randomValueOtherThan(join.getLastAcceptedVersion(), OpenSearchTestCase::randomNonNegativeLong)); default: throw new AssertionError(); } @@ -98,12 +98,12 @@ public void testPublishResponseEqualsHashCodeSerialization() { switch (randomInt(1)) { case 0: // change term - return new PublishResponse(randomValueOtherThan(publishResponse.getTerm(), ESTestCase::randomNonNegativeLong), + return new PublishResponse(randomValueOtherThan(publishResponse.getTerm(), OpenSearchTestCase::randomNonNegativeLong), publishResponse.getVersion()); case 1: // change version return new PublishResponse(publishResponse.getTerm(), - randomValueOtherThan(publishResponse.getVersion(), ESTestCase::randomNonNegativeLong)); + randomValueOtherThan(publishResponse.getVersion(), OpenSearchTestCase::randomNonNegativeLong)); default: throw new AssertionError(); } @@ -153,7 +153,7 @@ public void testStartJoinRequestEqualsHashCodeSerialization() { case 1: // change term return new StartJoinRequest(startJoinRequest.getSourceNode(), - randomValueOtherThan(startJoinRequest.getTerm(), ESTestCase::randomNonNegativeLong)); + randomValueOtherThan(startJoinRequest.getTerm(), OpenSearchTestCase::randomNonNegativeLong)); default: throw new AssertionError(); } @@ -174,11 +174,11 @@ public void testApplyCommitEqualsHashCodeSerialization() { case 1: // change term return new ApplyCommitRequest(applyCommit.getSourceNode(), - randomValueOtherThan(applyCommit.getTerm(), ESTestCase::randomNonNegativeLong), applyCommit.getVersion()); + randomValueOtherThan(applyCommit.getTerm(), OpenSearchTestCase::randomNonNegativeLong), applyCommit.getVersion()); case 2: // change version return new ApplyCommitRequest(applyCommit.getSourceNode(), applyCommit.getTerm(), - randomValueOtherThan(applyCommit.getVersion(), ESTestCase::randomNonNegativeLong)); + randomValueOtherThan(applyCommit.getVersion(), OpenSearchTestCase::randomNonNegativeLong)); default: throw new AssertionError(); } @@ -199,7 +199,7 @@ public void testJoinRequestEqualsHashCodeSerialization() { joinRequest.getMinimumTerm(), joinRequest.getOptionalJoin()); } else if (randomBoolean()) { return new JoinRequest(joinRequest.getSourceNode(), - randomValueOtherThan(joinRequest.getMinimumTerm(), ESTestCase::randomNonNegativeLong), + randomValueOtherThan(joinRequest.getMinimumTerm(), OpenSearchTestCase::randomNonNegativeLong), joinRequest.getOptionalJoin()); } else { // change OptionalJoin @@ -263,7 +263,7 @@ public void testPreVoteResponseEqualsHashCodeSerialization() { return new PreVoteResponse( preVoteResponse.getCurrentTerm(), preVoteResponse.getLastAcceptedTerm(), - randomValueOtherThan(preVoteResponse.getLastAcceptedVersion(), ESTestCase::randomNonNegativeLong)); + randomValueOtherThan(preVoteResponse.getLastAcceptedVersion(), OpenSearchTestCase::randomNonNegativeLong)); default: throw new AssertionError(); } diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java index cc41f7b7c492e..c12899b469df3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/NoMasterBlockServiceTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.NoMasterBlockService; import static org.opensearch.cluster.coordination.NoMasterBlockService.NO_MASTER_BLOCK_ALL; @@ -31,7 +31,7 @@ import static org.opensearch.common.settings.ClusterSettings.BUILT_IN_CLUSTER_SETTINGS; import static org.hamcrest.Matchers.sameInstance; -public class NoMasterBlockServiceTests extends ESTestCase { +public class NoMasterBlockServiceTests extends OpenSearchTestCase { private NoMasterBlockService noMasterBlockService; private ClusterSettings clusterSettings; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java index e3ff9fb980871..7bca36c44d71e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeJoinTests.java @@ -43,9 +43,9 @@ import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.monitor.StatusInfo; import org.opensearch.node.Node; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.cluster.coordination.CoordinationStateRejectedException; import org.opensearch.cluster.coordination.Coordinator; import org.opensearch.cluster.coordination.ElectionStrategy; @@ -93,7 +93,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class NodeJoinTests extends ESTestCase { +public class NodeJoinTests extends OpenSearchTestCase { private static ThreadPool threadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java index 89e9d98523fc8..50e699fc67cc6 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/NodeRemovalClusterStateTaskExecutorTests.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.allocation.AllocationService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.NodeRemovalClusterStateTaskExecutor; import java.util.ArrayList; @@ -42,7 +42,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class NodeRemovalClusterStateTaskExecutorTests extends ESTestCase { +public class NodeRemovalClusterStateTaskExecutorTests extends OpenSearchTestCase { public void testRemovingNonExistentNodes() throws Exception { final NodeRemovalClusterStateTaskExecutor executor = diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java index f7a88076f669e..e94d13b1a0027 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.Index; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.coordination.OpenSearchNodeCommand; import java.io.IOException; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; -public class OpenSearchNodeCommandTests extends ESTestCase { +public class OpenSearchNodeCommandTests extends OpenSearchTestCase { public void testLoadStateWithoutMissingCustoms() throws IOException { runLoadStateTest(false, false); diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java index c77f19a3f3ed6..6ad9e68a2be60 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PreVoteCollectorTests.java @@ -28,8 +28,8 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.elasticsearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransport; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.RemoteTransportException; import org.opensearch.transport.TransportException; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -public class PreVoteCollectorTests extends ESTestCase { +public class PreVoteCollectorTests extends OpenSearchTestCase { private DeterministicTaskQueue deterministicTaskQueue; private PreVoteCollector preVoteCollector; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java index ebbc052131022..51e8e6de0133b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; import org.opensearch.discovery.Discovery; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponse; import org.opensearch.cluster.coordination.CoordinationState; @@ -75,7 +75,7 @@ import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; -public class PublicationTests extends ESTestCase { +public class PublicationTests extends OpenSearchTestCase { class MockNode { diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java index 1ff166ae8ffdb..9dd681ccfafed 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTransportHandlerTests.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.opensearch.node.Node; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.transport.TransportService; import org.opensearch.cluster.coordination.PublicationTransportHandler; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -public class PublicationTransportHandlerTests extends ESTestCase { +public class PublicationTransportHandlerTests extends OpenSearchTestCase { public void testDiffSerializationFailure() { DeterministicTaskQueue deterministicTaskQueue = diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java index 304fb316d1323..4c9a584754e8c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ReconfiguratorTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.opensearch.cluster.coordination.Reconfigurator; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -public class ReconfiguratorTests extends ESTestCase { +public class ReconfiguratorTests extends OpenSearchTestCase { @Before public void resetPortCounterBeforeTest() { diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java index aea128b62fb02..7ba31c91a14f2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/health/ClusterIndexHealthTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java index 5f29654c1e0d7..b88961bbbf97a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/health/ClusterShardHealthTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.health.ClusterShardHealth; diff --git a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java index d6d13fdc6d339..c676db70799f5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/health/ClusterStateHealthTests.java @@ -51,9 +51,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.gateway.TestGatewayAllocator; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; @@ -72,15 +72,15 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; -import static org.elasticsearch.test.ClusterServiceUtils.setState; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.setState; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class ClusterStateHealthTests extends ESTestCase { +public class ClusterStateHealthTests extends OpenSearchTestCase { private final IndexNameExpressionResolver indexNameExpressionResolver = new IndexNameExpressionResolver(new ThreadContext(Settings.EMPTY)); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java index 319acbb3a2c6e..37fc33b25cbdf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasMetadataTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.util.set.Sets; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.function.Predicate; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java index 060ef8aa28d4b..36b884f2113aa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/AliasValidatorTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.indices.InvalidAliasNameException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasValidator; import static org.hamcrest.Matchers.startsWith; -public class AliasValidatorTests extends ESTestCase { +public class AliasValidatorTests extends OpenSearchTestCase { public void testValidatesAliasNames() { AliasValidator validator = new AliasValidator(); Exception e = expectThrows(InvalidAliasNameException.class, () -> validator.validateAliasStandalone(".", null)); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java index 2e63cade6aa43..e56c6e3f40465 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/AutoExpandReplicasTests.java @@ -34,8 +34,8 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.cluster.ClusterStateChanges; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.in; import static org.hamcrest.Matchers.is; -public class AutoExpandReplicasTests extends ESTestCase { +public class AutoExpandReplicasTests extends OpenSearchTestCase { public void testParseSettings() { AutoExpandReplicas autoExpandReplicas = AutoExpandReplicas.SETTING diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java index c26328066ef97..a74d855c3cd13 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ClusterNameExpressionResolverTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.metadata; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.ClusterNameExpressionResolver; import java.util.Arrays; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Set; -public class ClusterNameExpressionResolverTests extends ESTestCase { +public class ClusterNameExpressionResolverTests extends OpenSearchTestCase { private ClusterNameExpressionResolver clusterNameResolver = new ClusterNameExpressionResolver(); private static final Set remoteClusters = new HashSet<>(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java index 09c6c921b168b..c9f69e96cbeb7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadataTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.test.AbstractNamedWriteableTestCase; +import org.opensearch.test.AbstractNamedWriteableTestCase; import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.cluster.metadata.ComponentTemplateMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java index aa51ef269461a..4d8d9eeec8143 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java @@ -24,8 +24,8 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractDiffableSerializationTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractDiffableSerializationTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.cluster.metadata.IndexMetadata; @@ -160,7 +160,7 @@ public static ComponentTemplate mutateTemplate(ComponentTemplate orig) { throw new IllegalStateException("illegal randomization branch"); } case 1: - return new ComponentTemplate(orig.template(), randomValueOtherThan(orig.version(), ESTestCase::randomNonNegativeLong), + return new ComponentTemplate(orig.template(), randomValueOtherThan(orig.version(), OpenSearchTestCase::randomNonNegativeLong), orig.metadata()); case 2: return new ComponentTemplate(orig.template(), orig.version(), diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java index 02f1f1f5da32d..6d9863070ac0a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadataTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.test.AbstractNamedWriteableTestCase; +import org.opensearch.test.AbstractNamedWriteableTestCase; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.cluster.metadata.ComposableIndexTemplateMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java index e274b7c43d964..33da7eaa5d9a2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java @@ -24,8 +24,8 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractDiffableSerializationTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractDiffableSerializationTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.cluster.metadata.IndexMetadata; @@ -191,7 +191,7 @@ public static ComposableIndexTemplate mutateTemplate(ComposableIndexTemplate ori return new ComposableIndexTemplate(orig.indexPatterns(), orig.template(), orig.composedOf(), - randomValueOtherThan(orig.priority(), ESTestCase::randomNonNegativeLong), + randomValueOtherThan(orig.priority(), OpenSearchTestCase::randomNonNegativeLong), orig.version(), orig.metadata(), orig.getDataStreamTemplate()); @@ -200,7 +200,7 @@ public static ComposableIndexTemplate mutateTemplate(ComposableIndexTemplate ori orig.template(), orig.composedOf(), orig.priority(), - randomValueOtherThan(orig.version(), ESTestCase::randomNonNegativeLong), + randomValueOtherThan(orig.version(), OpenSearchTestCase::randomNonNegativeLong), orig.metadata(), orig.getDataStreamTemplate()); case 5: diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java index 26977969025bf..d0aa9b791faa1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamMetadataTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.metadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.test.AbstractNamedWriteableTestCase; +import org.opensearch.test.AbstractNamedWriteableTestCase; import org.opensearch.cluster.metadata.DataStream; import org.opensearch.cluster.metadata.DataStreamMetadata; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java index d1f7b9f3b7dcc..a076f1f0be6e1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; import org.elasticsearch.index.Index; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import org.opensearch.cluster.metadata.DataStream; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java index f2488b6e7efca..8aea9f4ccbfdb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver.Context; import org.opensearch.cluster.metadata.IndexNameExpressionResolver.DateMathExpressionResolver; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.joda.time.DateTimeZone.UTC; -public class DateMathExpressionResolverTests extends ESTestCase { +public class DateMathExpressionResolverTests extends OpenSearchTestCase { private final DateMathExpressionResolver expressionResolver = new DateMathExpressionResolver(); private final Context context = new Context( diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java index 6ea41e6608355..dac77e36c3b55 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/DiffableStringMapTests.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.Diff; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.DiffableStringMap; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class DiffableStringMapTests extends ESTestCase { +public class DiffableStringMapTests extends OpenSearchTestCase { public void testDiffableStringMapDiff() { Map m = new HashMap<>(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java index f5a55f50c705b..033a6f8d3f13f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java @@ -21,16 +21,16 @@ import org.opensearch.Version; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexMetadata; import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; -public class HumanReadableIndexSettingsTests extends ESTestCase { +public class HumanReadableIndexSettingsTests extends OpenSearchTestCase { public void testHumanReadableSettings() { Version versionCreated = randomVersion(random()); Version versionUpgraded = randomVersion(random()); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java index 8b5d8dd1ff3a5..1485e643987e4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.common.Nullable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexAbstraction; import org.opensearch.cluster.metadata.IndexMetadata; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; -public class IndexAbstractionTests extends ESTestCase { +public class IndexAbstractionTests extends OpenSearchTestCase { public void testHiddenAliasValidation() { final String hiddenAliasName = "hidden_alias"; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java index 828dfaface469..a3450cc771f36 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexGraveyardTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexGraveyard; import java.io.IOException; @@ -48,7 +48,7 @@ /** * Tests for the {@link IndexGraveyard} class */ -public class IndexGraveyardTests extends ESTestCase { +public class IndexGraveyardTests extends OpenSearchTestCase { public void testEquals() { final IndexGraveyard graveyard = createRandom(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java index b5351fd792f4b..df4d263ad8482 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java @@ -42,7 +42,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.opensearch.cluster.metadata.DiffableStringMap; import org.opensearch.cluster.metadata.IndexMetadata; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class IndexMetadataTests extends ESTestCase { +public class IndexMetadataTests extends OpenSearchTestCase { private IndicesModule INDICES_MODULE = new IndicesModule(Collections.emptyList()); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java index 57b78e20be9c9..c310fb135428f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java @@ -43,7 +43,7 @@ import org.opensearch.index.IndexSettings; import org.opensearch.indices.IndexClosedException; import org.opensearch.indices.InvalidIndexNameException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; @@ -74,7 +74,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class IndexNameExpressionResolverTests extends ESTestCase { +public class IndexNameExpressionResolverTests extends OpenSearchTestCase { private IndexNameExpressionResolver indexNameExpressionResolver; private ThreadContext threadContext; @@ -2059,7 +2059,7 @@ public void testDataStreamsWithRegularIndexAndAlias() { IndexMetadata index1 = createBackingIndex(dataStream1, 1).build(); IndexMetadata index2 = createBackingIndex(dataStream1, 2).build(); IndexMetadata justAnIndex = IndexMetadata.builder("logs-foobarbaz-0") - .settings(ESTestCase.settings(Version.CURRENT)) + .settings(OpenSearchTestCase.settings(Version.CURRENT)) .numberOfShards(1) .numberOfReplicas(1) .putAlias(new AliasMetadata.Builder("logs-foobarbaz")) @@ -2088,7 +2088,7 @@ public void testDataStreamsNames() { IndexMetadata index1 = createBackingIndex(dataStream1, 1).build(); IndexMetadata index2 = createBackingIndex(dataStream1, 2).build(); IndexMetadata justAnIndex = IndexMetadata.builder("logs-foobarbaz-0") - .settings(ESTestCase.settings(Version.CURRENT)) + .settings(OpenSearchTestCase.settings(Version.CURRENT)) .numberOfShards(1) .numberOfReplicas(1) .putAlias(new AliasMetadata.Builder("logs-foobarbaz")) diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java index a066ca39c5452..3c5ec7d03a0fa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexTemplateMetadataTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexTemplateMetadata; @@ -42,7 +42,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.contains; -public class IndexTemplateMetadataTests extends ESTestCase { +public class IndexTemplateMetadataTests extends OpenSearchTestCase { public void testIndexTemplateMetadataXContentRoundTrip() throws Exception { ToXContent.Params params = new ToXContent.MapParams(singletonMap("reduce_mappings", "true")); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java index e69ad17461056..fd38f8a89d9b9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java @@ -26,17 +26,17 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.Manifest; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.equalTo; -public class ManifestTests extends ESTestCase { +public class ManifestTests extends OpenSearchTestCase { private Manifest copyState(Manifest state, boolean introduceErrors) { long currentTerm = state.getCurrentTerm(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java index 6c528a0fc13f2..c9707c608ed28 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java @@ -31,7 +31,7 @@ import org.opensearch.cluster.metadata.MetadataCreateDataStreamService.CreateDataStreamClusterStateUpdateRequest; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.MetadataCreateIndexService; import java.util.Collections; @@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MetadataCreateDataStreamServiceTests extends ESTestCase { +public class MetadataCreateDataStreamServiceTests extends OpenSearchTestCase { public void testCreateDataStream() throws Exception { final MetadataCreateIndexService metadataCreateIndexService = getMetadataCreateIndexService(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java index 74c96f753807f..824a6e9a3cd4f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java @@ -68,10 +68,10 @@ import org.elasticsearch.indices.SystemIndexDescriptor; import org.elasticsearch.indices.SystemIndices; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.gateway.TestGatewayAllocator; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.Matchers; @@ -125,7 +125,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; -public class MetadataCreateIndexServiceTests extends ESTestCase { +public class MetadataCreateIndexServiceTests extends OpenSearchTestCase { private AliasValidator aliasValidator; private CreateIndexClusterStateUpdateRequest request; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java index 5f6af05984b32..db4a67334290f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java @@ -40,8 +40,8 @@ import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInProgressException; import org.opensearch.snapshots.SnapshotInfoTests; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.hamcrest.core.IsNull; import org.junit.Before; @@ -63,7 +63,7 @@ import static org.mockito.Mockito.when; -public class MetadataDeleteIndexServiceTests extends ESTestCase { +public class MetadataDeleteIndexServiceTests extends OpenSearchTestCase { private AllocationService allocationService; private MetadataDeleteIndexService service; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java index a546e3a562fca..74b9e23fe4455 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexAliasesServiceTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.index.Index; import org.opensearch.index.IndexNotFoundException; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.cluster.metadata.AliasAction; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.AliasValidator; @@ -58,7 +58,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MetadataIndexAliasesServiceTests extends ESTestCase { +public class MetadataIndexAliasesServiceTests extends OpenSearchTestCase { private final AliasValidator aliasValidator = new AliasValidator(); private final MetadataDeleteIndexService deleteIndexService = mock(MetadataDeleteIndexService.class); private final MetadataIndexAliasesService service = new MetadataIndexAliasesService(null, null, aliasValidator, diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java index fbc6c74255a9f..e1d382d944d70 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java @@ -57,8 +57,8 @@ import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInProgressException; import org.opensearch.snapshots.SnapshotInfoTests; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.hamcrest.CoreMatchers; import java.util.ArrayList; @@ -91,7 +91,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class MetadataIndexStateServiceTests extends ESTestCase { +public class MetadataIndexStateServiceTests extends OpenSearchTestCase { public void testCloseRoutingTable() { final Set nonBlockedIndices = new HashSet<>(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index ba10539e84017..900d83e476edf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -67,7 +67,7 @@ import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.cluster.metadata.Template; import java.io.IOException; @@ -102,7 +102,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.matchesRegex; -public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { +public class MetadataIndexTemplateServiceTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java index d5a03ae7d44e8..4f34b7c0976c0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexUpgradeServiceTests.java @@ -25,8 +25,8 @@ import org.elasticsearch.indices.SystemIndices; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MetadataIndexUpgradeService; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; -public class MetadataIndexUpgradeServiceTests extends ESTestCase { +public class MetadataIndexUpgradeServiceTests extends OpenSearchTestCase { public void testArchiveBrokenIndexSettings() { MetadataIndexUpgradeService service = getMetadataIndexUpgradeService(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java index 654ffd48e5b9e..6ad6de9b69559 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataMappingServiceTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.MetadataMappingService; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class MetadataMappingServiceTests extends ESSingleNodeTestCase { +public class MetadataMappingServiceTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java index 35c9e565282af..1f088b09f8b2e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java @@ -41,7 +41,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.index.Index; import org.opensearch.plugins.MapperPlugin; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.DataStream; import org.opensearch.cluster.metadata.DataStreamMetadata; @@ -74,7 +74,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -public class MetadataTests extends ESTestCase { +public class MetadataTests extends OpenSearchTestCase { public void testFindAliases() { Metadata metadata = Metadata.builder().put(IndexMetadata.builder("index") @@ -1223,7 +1223,7 @@ public void testValidateDataStreamsAllowsPrefixedBackingIndices() { IndexMetadata idx; if (i % 2 == 0 && i < generations) { idx = IndexMetadata.builder("shrink-" + DataStream.getDefaultBackingIndexName(dataStreamName, i)) - .settings(ESTestCase.settings(Version.CURRENT).put("index.hidden", true)) + .settings(OpenSearchTestCase.settings(Version.CURRENT).put("index.hidden", true)) .numberOfShards(1) .numberOfReplicas(1) .build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java index 9221573965783..198453e74009a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java @@ -42,7 +42,7 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -64,8 +64,8 @@ import java.util.stream.IntStream; import static java.util.Collections.emptyMap; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; -import static org.elasticsearch.test.ClusterServiceUtils.setState; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.setState; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.Matchers.containsString; @@ -79,7 +79,7 @@ import static org.mockito.Mockito.when; -public class TemplateUpgradeServiceTests extends ESTestCase { +public class TemplateUpgradeServiceTests extends OpenSearchTestCase { private ThreadPool threadPool; private ClusterService clusterService; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java index 4f8d79c093d14..9e5b2fdd1c53d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetadataTests.java @@ -28,8 +28,8 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.TestCustomMetadata; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.TestCustomMetadata; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.cluster.metadata.ComposableIndexTemplate; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class ToAndFromJsonMetadataTests extends ESTestCase { +public class ToAndFromJsonMetadataTests extends OpenSearchTestCase { public void testSimpleJsonFromAndTo() throws IOException { IndexMetadata idx1 = createFirstBackingIndex("data-stream1").build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java index 0d61f599aa1dd..316026119cf08 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexMetadata.State; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.equalTo; -public class WildcardExpressionResolverTests extends ESTestCase { +public class WildcardExpressionResolverTests extends OpenSearchTestCase { public void testConvertWildcardsJustIndicesTests() { Metadata.Builder mdBuilder = Metadata.builder() .put(indexBuilder("testXXX")) diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java index cc437e357c2ff..d99f5ab5e6c9b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.opensearch.cluster.node.DiscoveryNode; @@ -44,7 +44,7 @@ import static org.opensearch.cluster.node.DiscoveryNodeFilters.OpType.OR; import static org.hamcrest.Matchers.equalTo; -public class DiscoveryNodeFiltersTests extends ESTestCase { +public class DiscoveryNodeFiltersTests extends OpenSearchTestCase { private static TransportAddress localAddress; diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java index bd0ade7ecbe88..7831167e558c1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleSettingTests.java @@ -21,20 +21,20 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import java.util.Collections; import java.util.function.Predicate; -import static org.elasticsearch.test.NodeRoles.onlyRole; -import static org.elasticsearch.test.NodeRoles.removeRoles; +import static org.opensearch.test.NodeRoles.onlyRole; +import static org.opensearch.test.NodeRoles.removeRoles; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -public class DiscoveryNodeRoleSettingTests extends ESTestCase { +public class DiscoveryNodeRoleSettingTests extends OpenSearchTestCase { public void testIsDataNode() { runRoleTest(DiscoveryNode::isDataNode, DiscoveryNodeRole.DATA_ROLE); diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java index 94751844ec717..19959b7775419 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java @@ -20,8 +20,8 @@ package org.elasticsearch.cluster.node; import org.opensearch.common.settings.Setting; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; -public class DiscoveryNodeRoleTests extends ESTestCase { +public class DiscoveryNodeRoleTests extends OpenSearchTestCase { public void testDiscoveryNodeSetPossibleRolesRejectsDuplicateRoleNames() { final IllegalStateException e = expectThrows( diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java index 1008c2db736fd..5e2efbea26dc5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; @@ -37,14 +37,14 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.elasticsearch.test.NodeRoles.nonRemoteClusterClientNode; -import static org.elasticsearch.test.NodeRoles.remoteClusterClientNode; +import static org.opensearch.test.NodeRoles.nonRemoteClusterClientNode; +import static org.opensearch.test.NodeRoles.remoteClusterClientNode; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; -public class DiscoveryNodeTests extends ESTestCase { +public class DiscoveryNodeTests extends OpenSearchTestCase { public void testRolesAreSorted() { final Set roles = new HashSet<>(randomSubsetOf(DiscoveryNodeRole.BUILT_IN_ROLES)); diff --git a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java index b107be529437a..7fbd0f68c02ff 100644 --- a/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodesTests.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.common.settings.Setting; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.oneOf; -public class DiscoveryNodesTests extends ESTestCase { +public class DiscoveryNodesTests extends OpenSearchTestCase { public void testResolveNodeByIdOrName() { DiscoveryNodes discoveryNodes = buildDiscoveryNodes(); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java index 53f2183b3f2ce..91fadf6f91c51 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class AllocationIdTests extends ESTestCase { +public class AllocationIdTests extends OpenSearchTestCase { public void testShardToStarted() { logger.info("-- create unassigned shard"); ShardRouting shard = ShardRouting.newUnassigned(new ShardId("test","_na_", 0), true, diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java index c4f25e2514481..af660ac2ba23b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/BatchedRerouteServiceTests.java @@ -28,8 +28,8 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.Randomness; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.lessThan; -public class BatchedRerouteServiceTests extends ESTestCase { +public class BatchedRerouteServiceTests extends OpenSearchTestCase { private ThreadPool threadPool; private ClusterService clusterService; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java index 2d688daba41af..89c9172745f87 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.NodeRoles; +import org.opensearch.test.NodeRoles; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java index 530c3995dd3e6..b8b9988a1b843 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/GroupShardsIteratorTests.java @@ -24,7 +24,7 @@ import org.opensearch.action.search.SearchShardIterator; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.GroupShardsIterator; import org.opensearch.cluster.routing.PlainShardIterator; import org.opensearch.cluster.routing.ShardIterator; @@ -38,7 +38,7 @@ import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; -public class GroupShardsIteratorTests extends ESTestCase { +public class GroupShardsIteratorTests extends OpenSearchTestCase { public static List randomShardRoutings(ShardId shardId) { return randomShardRoutings(shardId, randomIntBetween(0, 2)); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java index 989595837d633..cf16a5dfe53b8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/IndexShardRoutingTableTests.java @@ -21,14 +21,14 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.IndexShardRoutingTable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class IndexShardRoutingTableTests extends ESTestCase { +public class IndexShardRoutingTableTests extends OpenSearchTestCase { public void testEqualsAttributesKey() { List attr1 = Arrays.asList("a"); List attr2 = Arrays.asList("b"); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java index a45fbf3d93df4..92af6f4059626 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java @@ -37,8 +37,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.opensearch.node.ResponseCollectorService; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import java.io.IOException; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.object.HasToString.hasToString; -public class OperationRoutingTests extends ESTestCase { +public class OperationRoutingTests extends OpenSearchTestCase { public void testGenerateShardId() { int[][] possibleValues = new int[][] { {8,4,2}, {20, 10, 2}, {36, 12, 3}, {15,5,1} diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java index 83b9907b53436..1c8f334cd4b9a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/PlainShardIteratorTests.java @@ -20,8 +20,8 @@ package org.elasticsearch.cluster.routing; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.hamcrest.Matchers; import org.opensearch.cluster.routing.PlainShardIterator; @@ -29,7 +29,7 @@ import java.util.Arrays; import java.util.List; -public class PlainShardIteratorTests extends ESTestCase { +public class PlainShardIteratorTests extends OpenSearchTestCase { public void testEqualsAndHashCode() { EqualsHashCodeTestUtils.checkEqualsAndHashCode(randomPlainShardIterator(), diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java b/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java index f36412dbeebf5..1f4355ec68bb5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/RandomShardRoutingMutator.java @@ -24,9 +24,9 @@ import java.util.Set; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomInt; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomInt; /** * Utility class the makes random modifications to ShardRouting diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java index a44f3fa1bdaf1..f25a1a47d0598 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/RecoverySourceTests.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.RecoverySource; import java.io.IOException; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class RecoverySourceTests extends ESTestCase { +public class RecoverySourceTests extends OpenSearchTestCase { public void testSerialization() throws IOException { RecoverySource recoverySource = TestShardRouting.randomRecoverySource(); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java index 3fecebb6db9c1..b529f9fc8bd5c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/RoutingNodeTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.transport.TransportAddress; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.RoutingNode; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class RoutingNodeTests extends ESTestCase { +public class RoutingNodeTests extends OpenSearchTestCase { private ShardRouting unassignedShard0 = TestShardRouting.newShardRouting("test", 0, "node-1", false, ShardRoutingState.STARTED); private ShardRouting initializingShard0 = diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java index 173c2ff449e4e..a58609808cb59 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java @@ -33,11 +33,11 @@ import org.opensearch.snapshots.SnapshotId; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.snapshots.Snapshot; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ShardRoutingTests extends ESTestCase { +public class ShardRoutingTests extends OpenSearchTestCase { public void testIsSameAllocation() { ShardRouting unassignedShard0 = TestShardRouting.newShardRouting("test", 0, null, false, ShardRoutingState.UNASSIGNED); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java index 17e7f4c056c85..cea9677f66e14 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java @@ -49,7 +49,7 @@ import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java index 6a97185b3f6ca..0f96e0d92d51c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocateUnassignedDecisionTests.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.routing.allocation.NodeAllocationResult; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -43,7 +43,7 @@ /** * Unit tests for the {@link AllocateUnassignedDecision} class. */ -public class AllocateUnassignedDecisionTests extends ESTestCase { +public class AllocateUnassignedDecisionTests extends OpenSearchTestCase { private DiscoveryNode node1 = new DiscoveryNode("node1", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT); private DiscoveryNode node2 = new DiscoveryNode("node2", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java index 331f7dcb69008..14120fb66187c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationDecisionTests.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.routing.allocation.AllocationDecision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -32,7 +32,7 @@ /** * Tests for the {@link AllocationDecision} enum. */ -public class AllocationDecisionTests extends ESTestCase { +public class AllocationDecisionTests extends OpenSearchTestCase { /** * Tests serialization and deserialization. diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java index a186b81f48224..7202fa635c051 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationServiceTests.java @@ -51,8 +51,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.gateway.GatewayAllocator; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.Arrays; import java.util.Collections; @@ -72,7 +72,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class AllocationServiceTests extends ESTestCase { +public class AllocationServiceTests extends OpenSearchTestCase { public void testFirstListElementsToCommaDelimitedStringReportsAllElementsIfShort() { List strings = IntStream.range(0, between(0, 10)).mapToObj(i -> randomAlphaOfLength(10)).collect(Collectors.toList()); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index 4dfb03ac420c3..fb63440f251dd 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -45,7 +45,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import org.hamcrest.Matchers; import java.util.stream.Collectors; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index ea4786f17b7e6..b50bffdad6ebe 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java @@ -35,7 +35,7 @@ import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java index 4ee35bd3cde88..5fe740af7523a 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DecisionsImpactOnClusterHealthTests.java @@ -42,7 +42,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java index 782612a63b225..2a38d219d7df5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorTests.java @@ -42,8 +42,8 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.routing.allocation.DiskThresholdMonitor; import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java index 256a4cf8ebbe8..eb306a411d2fc 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdSettingsTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import java.util.Locale; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.instanceOf; -public class DiskThresholdSettingsTests extends ESTestCase { +public class DiskThresholdSettingsTests extends OpenSearchTestCase { public void testDefaults() { ClusterSettings nss = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index acff5e481b5a8..0965ee883f91b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -43,7 +43,7 @@ import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.cluster.ClusterStateChanges; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java index 10709375a5b86..78d73db10e738 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.util.ArrayList; import java.util.HashSet; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java index 52a0203bf0707..2b8dadc63e10c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MaxRetryAllocationDeciderTests.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider; import org.opensearch.common.settings.Settings; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.Collections; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java index 9d80d88eb2478..f68d46c5faf99 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/MoveDecisionTests.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -39,7 +39,7 @@ /** * Unit tests for the {@link MoveDecision} class. */ -public class MoveDecisionTests extends ESTestCase { +public class MoveDecisionTests extends OpenSearchTestCase { public void testCachedDecisions() { // cached stay decision diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java index b0120a29d8408..9ccbdab60bdd3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeAllocationResultTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.routing.allocation.NodeAllocationResult.ShardStoreInfo; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -35,7 +35,7 @@ /** * Unit tests for the {@link NodeAllocationResult} class. */ -public class NodeAllocationResultTests extends ESTestCase { +public class NodeAllocationResultTests extends OpenSearchTestCase { public void testSerialization() throws IOException { DiscoveryNode node = new DiscoveryNode("node1", buildNewFakeTransportAddress(), emptyMap(), emptySet(), Version.CURRENT); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java index c81fc389a4bc3..aedffd010656c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java @@ -62,8 +62,8 @@ import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotShardSizeInfo; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.ArrayList; import java.util.Arrays; @@ -75,7 +75,7 @@ import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; import static org.opensearch.cluster.routing.ShardRoutingState.UNASSIGNED; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index 05eadf5bac8f7..b1ff6ff98c9a3 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java @@ -42,7 +42,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import org.hamcrest.Matchers; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java index 0d09093cbebcc..cbd0acd93d30d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java index d6a58b1265510..bfcd82499fd91 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java @@ -53,7 +53,7 @@ import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotShardSizeInfo; import org.opensearch.snapshots.SnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java index 6665d19aa61fe..250f088516f64 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/AllocationDecidersTests.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.opensearch.cluster.routing.allocation.decider.AllocationDecider; @@ -40,7 +40,7 @@ import java.util.Collection; import java.util.Collections; -public class AllocationDecidersTests extends ESTestCase { +public class AllocationDecidersTests extends OpenSearchTestCase { public void testDebugMode() { verifyDebugMode(RoutingAllocation.DebugMode.ON, Matchers.hasSize(1)); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java index ed2bc484aef1e..986f3a2615fa4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DecisionTests.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.cluster.routing.allocation.decider.Decision.Type.NO; import static org.opensearch.cluster.routing.allocation.decider.Decision.Type.THROTTLE; @@ -30,7 +30,7 @@ /** * A class for unit testing the {@link Decision} class. */ -public class DecisionTests extends ESTestCase { +public class DecisionTests extends OpenSearchTestCase { /** * Tests {@link Type#higherThan(Type)} diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index b16ad31882fc9..3b9fcb2fd72b0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -70,7 +70,7 @@ import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotShardSizeInfo; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.Arrays; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java index db375d9171388..33b5e20585513 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationShortCircuitTests.java @@ -42,7 +42,7 @@ import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java index 9fa6b9f49276d..ba58ca7d8c7d9 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java @@ -43,7 +43,7 @@ import org.opensearch.cluster.routing.allocation.decider.ReplicaAfterPrimaryActiveAllocationDecider; import org.opensearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.Arrays; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java index d563079b62fa1..69a310ed1a794 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java @@ -20,9 +20,9 @@ package org.elasticsearch.cluster.routing.operation.hash.murmur3; import org.opensearch.cluster.routing.Murmur3HashFunction; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class Murmur3HashFunctionTests extends ESTestCase { +public class Murmur3HashFunctionTests extends OpenSearchTestCase { public void testKnownValues() { assertHash(0x5a0cb7c3, "hell"); diff --git a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java index 5c9f44cf871d5..77b3dce31e2bb 100644 --- a/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java @@ -47,7 +47,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java index 76131b4d42d27..4187a6494430d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.HashMap; @@ -43,7 +43,7 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; -public class DiffableTests extends ESTestCase { +public class DiffableTests extends OpenSearchTestCase { public void testJKDMapDiff() throws IOException { new JdkMapDriver() { diff --git a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java index 3c7ebb79a3d8e..c5a312531fa44 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java @@ -39,9 +39,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -59,12 +59,12 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.elasticsearch.test.ClusterServiceUtils.createNoOpNodeConnectionsService; -import static org.elasticsearch.test.ClusterServiceUtils.setState; +import static org.opensearch.test.ClusterServiceUtils.createNoOpNodeConnectionsService; +import static org.opensearch.test.ClusterServiceUtils.setState; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class ClusterApplierServiceTests extends ESTestCase { +public class ClusterApplierServiceTests extends OpenSearchTestCase { private static ThreadPool threadPool; private TimedClusterApplierService clusterApplierService; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java index e17d922ed54cf..4f86708f803be 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java @@ -48,9 +48,9 @@ import org.opensearch.common.util.concurrent.BaseFuture; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.node.Node; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.cluster.service.MasterService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasKey; -public class MasterServiceTests extends ESTestCase { +public class MasterServiceTests extends OpenSearchTestCase { private static ThreadPool threadPool; private static long relativeTimeInMillis; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java index edc860b41752b..f77894aaa9257 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java @@ -25,9 +25,9 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.cluster.service.SourcePrioritizedRunnable; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -43,11 +43,11 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.Is.is; -public class TaskExecutorTests extends ESTestCase { +public class TaskExecutorTests extends OpenSearchTestCase { protected static ThreadPool threadPool; protected PrioritizedEsThreadPoolExecutor threadExecutor; @@ -67,7 +67,7 @@ public static void stopThreadPool() { @Before public void setUpExecutor() { - threadExecutor = EsExecutors.newSinglePrioritizing(getClass().getName() + "/" + getTestName(), + threadExecutor = OpenSearchExecutors.newSinglePrioritizing(getClass().getName() + "/" + getTestName(), daemonThreadFactory(Settings.EMPTY, "test_thread"), threadPool.getThreadContext(), threadPool.scheduler()); } diff --git a/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java b/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java index 4df5ddd99c81f..7d7571117c770 100644 --- a/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java +++ b/server/src/test/java/org/elasticsearch/cluster/shards/ShardCounts.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.shards; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -48,20 +48,20 @@ private ShardCounts(int shardsPerNode, public static ShardCounts forDataNodeCount(int dataNodes) { Assert.assertThat("this method will not work reliably with this many data nodes due to the limit of shards in a single index," + "use fewer data nodes or multiple indices", dataNodes, lessThanOrEqualTo(90)); - int mainIndexReplicas = ESTestCase.between(0, dataNodes - 1); - int mainIndexShards = ESTestCase.between(1, 10); + int mainIndexReplicas = OpenSearchTestCase.between(0, dataNodes - 1); + int mainIndexShards = OpenSearchTestCase.between(1, 10); int totalShardsInIndex = (mainIndexReplicas + 1) * mainIndexShards; // Sometimes add some headroom to the limit to check that it works even if you're not already right up against the limit - int shardsPerNode = (int) Math.ceil((double) totalShardsInIndex / dataNodes) + ESTestCase.between(0, 10); + int shardsPerNode = (int) Math.ceil((double) totalShardsInIndex / dataNodes) + OpenSearchTestCase.between(0, 10); int totalCap = shardsPerNode * dataNodes; int failingIndexShards; int failingIndexReplicas; - if (dataNodes > 1 && ESTestCase.frequently()) { + if (dataNodes > 1 && OpenSearchTestCase.frequently()) { failingIndexShards = Math.max(1, totalCap - totalShardsInIndex); - failingIndexReplicas = ESTestCase.between(1, dataNodes - 1); + failingIndexReplicas = OpenSearchTestCase.between(1, dataNodes - 1); } else { - failingIndexShards = totalCap - totalShardsInIndex + ESTestCase.between(1, 10); + failingIndexShards = totalCap - totalShardsInIndex + OpenSearchTestCase.between(1, 10); failingIndexReplicas = 0; } diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index e628563410dc7..50fbacc688057 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -47,7 +47,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.PageCacheRecycler; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; @@ -86,10 +86,10 @@ import org.opensearch.plugins.IndexStorePlugin; import org.opensearch.script.ScriptService; import org.opensearch.search.internal.ReaderContext; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.engine.MockEngineFactory; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.engine.MockEngineFactory; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.Matchers; @@ -112,7 +112,7 @@ import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.mock; -public class IndexModuleTests extends ESTestCase { +public class IndexModuleTests extends OpenSearchTestCase { private Index index; private Settings settings; private IndexSettings indexSettings; @@ -432,7 +432,7 @@ public void testCustomQueryCacheCleanedUpIfIndexServiceCreationFails() { return customQueryCache; }); threadPool.shutdown(); // causes index service creation to fail - expectThrows(EsRejectedExecutionException.class, () -> newIndexService(module)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> newIndexService(module)); assertThat(liveQueryCaches, empty()); } @@ -476,7 +476,7 @@ public void close() { singletonMap("test", analysisProvider), emptyMap(), emptyMap(), emptyMap(), emptyMap(), emptyMap()); IndexModule module = createIndexModule(indexSettings, analysisRegistry); threadPool.shutdown(); // causes index service creation to fail - expectThrows(EsRejectedExecutionException.class, () -> newIndexService(module)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> newIndexService(module)); assertThat(openAnalyzers, empty()); } diff --git a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java index 4731563a0dc53..357986844218b 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java @@ -34,12 +34,12 @@ import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; @@ -49,13 +49,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.index.shard.IndexShardTestCase.getEngine; -import static org.elasticsearch.test.InternalSettingsPlugin.TRANSLOG_RETENTION_CHECK_INTERVAL_SETTING; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.index.shard.IndexShardTestCase.getEngine; +import static org.opensearch.test.InternalSettingsPlugin.TRANSLOG_RETENTION_CHECK_INTERVAL_SETTING; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.core.IsEqual.equalTo; /** Unit test(s) for IndexService */ -public class IndexServiceTests extends ESSingleNodeTestCase { +public class IndexServiceTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java index de9936ee9b4b2..eb87c5a777a79 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java @@ -30,8 +30,8 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.util.Arrays; import java.util.Collections; @@ -45,7 +45,7 @@ import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.object.HasToString.hasToString; -public class IndexSettingsTests extends ESTestCase { +public class IndexSettingsTests extends OpenSearchTestCase { public void testRunListener() { Version version = VersionUtils.getPreviousVersion(); diff --git a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java index b6218bd5451f3..f39306859c2b6 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java @@ -22,14 +22,14 @@ import org.opensearch.common.settings.Settings; import org.opensearch.search.MultiValueMode; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.common.settings.Settings.Builder.EMPTY_SETTINGS; import static org.elasticsearch.index.IndexSettingsTests.newIndexMeta; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class IndexSortSettingsTests extends ESTestCase { +public class IndexSortSettingsTests extends OpenSearchTestCase { private static IndexSettings indexSettings(Settings settings) { return new IndexSettings(newIndexMeta("test", settings), Settings.EMPTY); } diff --git a/server/src/test/java/org/elasticsearch/index/IndexTests.java b/server/src/test/java/org/elasticsearch/index/IndexTests.java index b916eade3e75f..4c0d5fab6de5e 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class IndexTests extends ESTestCase { +public class IndexTests extends OpenSearchTestCase { public void testToString() { assertEquals("[name/uuid]", new Index("name", "uuid").toString()); assertEquals("[name]", new Index("name", ClusterState.UNKNOWN_UUID).toString()); diff --git a/server/src/test/java/org/elasticsearch/index/IndexingPressureTests.java b/server/src/test/java/org/elasticsearch/index/IndexingPressureTests.java index 80feb1fcccacd..b4bb81ed09ca3 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexingPressureTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexingPressureTests.java @@ -21,11 +21,11 @@ import org.opensearch.common.lease.Releasable; import org.elasticsearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.stats.IndexingPressureStats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class IndexingPressureTests extends ESTestCase { +public class IndexingPressureTests extends OpenSearchTestCase { private final Settings settings = Settings.builder().put(IndexingPressure.MAX_INDEXING_BYTES.getKey(), "10KB").build(); @@ -78,12 +78,12 @@ public void testCoordinatingPrimaryRejections() { Releasable primary = indexingPressure.markPrimaryOperationStarted(1024 * 3, false); Releasable replica = indexingPressure.markReplicaOperationStarted(1024 * 3, false)) { if (randomBoolean()) { - expectThrows(EsRejectedExecutionException.class, () -> indexingPressure.markCoordinatingOperationStarted(1024 * 2, false)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markCoordinatingOperationStarted(1024 * 2, false)); IndexingPressureStats stats = indexingPressure.stats(); assertEquals(1, stats.getCoordinatingRejections()); assertEquals(1024 * 6, stats.getCurrentCombinedCoordinatingAndPrimaryBytes()); } else { - expectThrows(EsRejectedExecutionException.class, () -> indexingPressure.markPrimaryOperationStarted(1024 * 2, false)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markPrimaryOperationStarted(1024 * 2, false)); IndexingPressureStats stats = indexingPressure.stats(); assertEquals(1, stats.getPrimaryRejections()); assertEquals(1024 * 6, stats.getCurrentCombinedCoordinatingAndPrimaryBytes()); @@ -116,7 +116,7 @@ public void testReplicaRejections() { Releasable replica2 = indexingPressure.markReplicaOperationStarted(1024 * 11, false); assertEquals(1024 * 14, indexingPressure.stats().getCurrentReplicaBytes()); // Replica will be rejected once we cross 15KB - expectThrows(EsRejectedExecutionException.class, () -> indexingPressure.markReplicaOperationStarted(1024 * 2, false)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markReplicaOperationStarted(1024 * 2, false)); IndexingPressureStats stats = indexingPressure.stats(); assertEquals(1, stats.getReplicaRejections()); assertEquals(1024 * 14, stats.getCurrentReplicaBytes()); @@ -134,7 +134,7 @@ public void testReplicaRejections() { public void testForceExecutionOnCoordinating() { IndexingPressure indexingPressure = new IndexingPressure(settings); - expectThrows(EsRejectedExecutionException.class, () -> indexingPressure.markCoordinatingOperationStarted(1024 * 11, false)); + expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markCoordinatingOperationStarted(1024 * 11, false)); try (Releasable ignore = indexingPressure.markCoordinatingOperationStarted(1024 * 11, true)) { assertEquals(1024 * 11, indexingPressure.stats().getCurrentCoordinatingBytes()); } diff --git a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java index 8b2f9d62779af..39759fa0e2c8a 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java @@ -43,7 +43,7 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.mockito.Mockito; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -public class IndexingSlowLogTests extends ESTestCase { +public class IndexingSlowLogTests extends OpenSearchTestCase { static MockAppender appender; static Logger testLogger1 = LogManager.getLogger(IndexingSlowLog.INDEX_INDEXING_SLOWLOG_PREFIX + ".index"); diff --git a/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java index f2276543861eb..cd90de5d36f4c 100644 --- a/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class MergePolicySettingsTests extends ESTestCase { +public class MergePolicySettingsTests extends OpenSearchTestCase { protected final ShardId shardId = new ShardId("index", "_na_", 1); public void testCompoundFileSettings() throws IOException { @@ -82,60 +82,60 @@ public void testUpdateSettings() throws IOException { public void testTieredMergePolicySettingsUpdate() throws IOException { IndexSettings indexSettings = indexSettings(Settings.EMPTY); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), MergePolicyConfig.DEFAULT_EXPUNGE_DELETES_ALLOWED, 0.0d); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_EXPUNGE_DELETES_ALLOWED_SETTING.getKey(), MergePolicyConfig.DEFAULT_EXPUNGE_DELETES_ALLOWED + 1.0d).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), MergePolicyConfig.DEFAULT_EXPUNGE_DELETES_ALLOWED + 1.0d, 0.0d); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), MergePolicyConfig.DEFAULT_FLOOR_SEGMENT.getMbFrac(), 0); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_FLOOR_SEGMENT_SETTING.getKey(), new ByteSizeValue(MergePolicyConfig.DEFAULT_FLOOR_SEGMENT.getMb() + 1, ByteSizeUnit.MB)).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_FLOOR_SEGMENT.getMb() + 1, ByteSizeUnit.MB).getMbFrac(), 0.001); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING.getKey(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE - 1).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE - 1); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING.getKey(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT - 1).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT-1); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getMbFrac(), 0.0001); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING.getKey(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1)).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1).getMbFrac(), 0.0001); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER, 0); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING.getKey(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER + 1).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER + 1, 0); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), MergePolicyConfig.DEFAULT_DELETES_PCT_ALLOWED, 0); indexSettings.updateIndexMetadata(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_DELETES_PCT_ALLOWED_SETTING.getKey(), 22).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), 22, 0); + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), 22, 0); IllegalArgumentException exc = expectThrows(IllegalArgumentException.class, () -> indexSettings.updateIndexMetadata(newIndexMeta("index", @@ -143,19 +143,19 @@ public void testTieredMergePolicySettingsUpdate() throws IOException { final Throwable cause = exc.getCause(); assertThat(cause.getMessage(), containsString("must be <= 50.0")); indexSettings.updateIndexMetadata(newIndexMeta("index", EMPTY_SETTINGS)); // see if defaults are restored - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getForceMergeDeletesPctAllowed(), MergePolicyConfig.DEFAULT_EXPUNGE_DELETES_ALLOWED, 0.0d); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getFloorSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_FLOOR_SEGMENT.getMb(), ByteSizeUnit.MB).getMbFrac(), 0.00); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1).getMbFrac(), 0.0001); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER, 0); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), + assertEquals(((OpenSearchTieredMergePolicy) indexSettings.getMergePolicy()).getDeletesPctAllowed(), MergePolicyConfig.DEFAULT_DELETES_PCT_ALLOWED, 0); } diff --git a/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java index 88e1758e6771e..9eff05f7ea32a 100644 --- a/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java @@ -29,15 +29,15 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -import static org.opensearch.common.util.concurrent.EsExecutors.NODE_PROCESSORS_SETTING; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.NODE_PROCESSORS_SETTING; import static org.elasticsearch.index.IndexSettingsTests.newIndexMeta; import static org.opensearch.index.MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING; import static org.opensearch.index.MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING; import static org.hamcrest.core.StringContains.containsString; -public class MergeSchedulerSettingsTests extends ESTestCase { +public class MergeSchedulerSettingsTests extends OpenSearchTestCase { private static class MockAppender extends AbstractAppender { public boolean sawUpdateMaxThreadCount; public boolean sawUpdateAutoThrottle; diff --git a/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/OpenSearchTieredMergePolicyTests.java similarity index 77% rename from server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java rename to server/src/test/java/org/elasticsearch/index/OpenSearchTieredMergePolicyTests.java index ab9d24a7bb4c3..fe1ab625b6a2a 100644 --- a/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/OpenSearchTieredMergePolicyTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.index; import org.apache.lucene.index.TieredMergePolicy; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class EsTieredMergePolicyTests extends ESTestCase { +public class OpenSearchTieredMergePolicyTests extends OpenSearchTestCase { public void testDefaults() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); assertEquals( new TieredMergePolicy().getMaxMergedSegmentMB(), policy.regularMergePolicy.getMaxMergedSegmentMB(), 0d); @@ -33,45 +33,45 @@ public void testDefaults() { } public void testSetMaxMergedSegmentMB() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setMaxMergedSegmentMB(10 * 1024); assertEquals(10 * 1024, policy.regularMergePolicy.getMaxMergedSegmentMB(), 0d); assertEquals(Long.MAX_VALUE / 1024.0 / 1024.0, policy.forcedMergePolicy.getMaxMergedSegmentMB(), 0d); } public void testSetForceMergeDeletesPctAllowed() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setForceMergeDeletesPctAllowed(42); assertEquals(42, policy.forcedMergePolicy.getForceMergeDeletesPctAllowed(), 0); } public void testSetFloorSegmentMB() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setFloorSegmentMB(42); assertEquals(42, policy.regularMergePolicy.getFloorSegmentMB(), 0); assertEquals(42, policy.forcedMergePolicy.getFloorSegmentMB(), 0); } public void testSetMaxMergeAtOnce() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setMaxMergeAtOnce(42); assertEquals(42, policy.regularMergePolicy.getMaxMergeAtOnce()); } public void testSetMaxMergeAtOnceExplicit() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setMaxMergeAtOnceExplicit(42); assertEquals(42, policy.forcedMergePolicy.getMaxMergeAtOnceExplicit()); } public void testSetSegmentsPerTier() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setSegmentsPerTier(42); assertEquals(42, policy.regularMergePolicy.getSegmentsPerTier(), 0); } public void testSetDeletesPctAllowed() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); + OpenSearchTieredMergePolicy policy = new OpenSearchTieredMergePolicy(); policy.setDeletesPctAllowed(42); assertEquals(42, policy.regularMergePolicy.getDeletesPctAllowed(), 0); } diff --git a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java index 0ef47e127059c..a44bd464fee9d 100644 --- a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java @@ -37,8 +37,8 @@ import org.opensearch.search.internal.SearchContext; import org.opensearch.search.internal.ShardSearchRequest; import org.opensearch.tasks.Task; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.TestSearchContext; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.TestSearchContext; import org.hamcrest.Matchers; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -public class SearchSlowLogTests extends ESSingleNodeTestCase { +public class SearchSlowLogTests extends OpenSearchSingleNodeTestCase { static MockAppender appender; static Logger queryLog = LogManager.getLogger(SearchSlowLog.INDEX_SEARCH_SLOWLOG_PREFIX + ".query"); static Logger fetchLog = LogManager.getLogger(SearchSlowLog.INDEX_SEARCH_SLOWLOG_PREFIX + ".fetch"); diff --git a/server/src/test/java/org/elasticsearch/index/SlowLogLevelTests.java b/server/src/test/java/org/elasticsearch/index/SlowLogLevelTests.java index 7d86553adc1b9..7839221c72eb7 100644 --- a/server/src/test/java/org/elasticsearch/index/SlowLogLevelTests.java +++ b/server/src/test/java/org/elasticsearch/index/SlowLogLevelTests.java @@ -19,10 +19,10 @@ package org.elasticsearch.index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class SlowLogLevelTests extends ESTestCase { +public class SlowLogLevelTests extends OpenSearchTestCase { public void testTracePrecedence() { assertTrue(SlowLogLevel.TRACE.isLevelEnabledFor(SlowLogLevel.TRACE)); diff --git a/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java index 8d275e60c7704..ad81d2b31d738 100644 --- a/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/VersionTypeTests.java @@ -20,11 +20,11 @@ package org.elasticsearch.index; import org.opensearch.common.lucene.uid.Versions; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class VersionTypeTests extends ESTestCase { +public class VersionTypeTests extends OpenSearchTestCase { public void testInternalVersionConflict() throws Exception { assertFalse(VersionType.INTERNAL.isVersionConflictForWrites(10, Versions.MATCH_ANY, randomBoolean())); assertFalse(VersionType.INTERNAL.isVersionConflictForReads(10, Versions.MATCH_ANY)); diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java index 2738a49ba7ebd..591adb1a48823 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java @@ -41,9 +41,9 @@ import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; import org.elasticsearch.plugins.AnalysisPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Collections; @@ -59,7 +59,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class AnalysisRegistryTests extends ESTestCase { +public class AnalysisRegistryTests extends OpenSearchTestCase { private AnalysisRegistry emptyRegistry; private AnalysisRegistry nonEmptyRegistry; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java index e7d27c0697ddc..286bb7a7eb019 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.BufferedWriter; import java.io.FileNotFoundException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.is; -public class AnalysisTests extends ESTestCase { +public class AnalysisTests extends OpenSearchTestCase { public void testParseStemExclusion() { /* Comma separated list */ Settings settings = Settings.builder().put("stem_exclusion", "foo,bar").build(); diff --git a/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java index db478aa5ce221..8345c5b547e65 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/CustomNormalizerTests.java @@ -26,8 +26,9 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.index.analysis.AnalysisTestsHelper; import java.io.IOException; import java.io.Reader; @@ -38,7 +39,7 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -public class CustomNormalizerTests extends ESTokenStreamTestCase { +public class CustomNormalizerTests extends OpenSearchTokenStreamTestCase { private static final AnalysisPlugin MOCK_ANALYSIS_PLUGIN = new MockAnalysisPlugin(); public void testBasics() throws IOException { @@ -46,7 +47,7 @@ public void testBasics() throws IOException { .putList("index.analysis.normalizer.my_normalizer.filter", "lowercase") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, MOCK_ANALYSIS_PLUGIN); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, MOCK_ANALYSIS_PLUGIN); assertNull(analysis.indexAnalyzers.get("my_normalizer")); NamedAnalyzer normalizer = analysis.indexAnalyzers.getNormalizer("my_normalizer"); assertNotNull(normalizer); @@ -88,7 +89,7 @@ public void testCharFilters() throws IOException { .putList("index.analysis.normalizer.my_normalizer.char_filter", "my_mapping") .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, MOCK_ANALYSIS_PLUGIN); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings, MOCK_ANALYSIS_PLUGIN); assertNull(analysis.indexAnalyzers.get("my_normalizer")); NamedAnalyzer normalizer = analysis.indexAnalyzers.getNormalizer("my_normalizer"); assertNotNull(normalizer); diff --git a/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java index 81d077ceb1d4d..1d1b1682dbd38 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java @@ -20,14 +20,15 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.index.analysis.AnalysisTestsHelper; import java.io.IOException; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class HunspellTokenFilterFactoryTests extends ESTestCase { +public class HunspellTokenFilterFactoryTests extends OpenSearchTestCase { public void testDedup() throws IOException { Settings settings = Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) diff --git a/server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java b/server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java index 6bd2112fca759..7a2d8e8c861cb 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/IndexAnalyzersTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -30,7 +30,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -public class IndexAnalyzersTests extends ESTestCase { +public class IndexAnalyzersTests extends OpenSearchTestCase { /** * test the checks in the constructor diff --git a/server/src/test/java/org/elasticsearch/index/analysis/NamedAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/NamedAnalyzerTests.java index b1e53bed96e18..c5a587882fc99 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/NamedAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/NamedAnalyzerTests.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.index.mapper.TextFieldMapper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class NamedAnalyzerTests extends ESTestCase { +public class NamedAnalyzerTests extends OpenSearchTestCase { public void testCheckAllowedInMode() { try (NamedAnalyzer testAnalyzer = new NamedAnalyzer("my_analyzer", AnalyzerScope.INDEX, diff --git a/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java index c9adb4f071fa8..b9687d9327d66 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java @@ -28,18 +28,18 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Collection; import java.util.Locale; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class PreBuiltAnalyzerTests extends ESSingleNodeTestCase { +public class PreBuiltAnalyzerTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java index 3fb6e11281195..f3a4367f6cdb9 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java @@ -25,13 +25,13 @@ import org.elasticsearch.env.Environment; import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import java.io.IOException; -public class PreConfiguredTokenFilterTests extends ESTestCase { +public class PreConfiguredTokenFilterTests extends OpenSearchTestCase { private final Settings emptyNodeSettings = Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) diff --git a/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java index 8088a1ae417a7..a39f617f98172 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/ReloadableCustomAnalyzerTests.java @@ -27,8 +27,8 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.BeforeClass; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.elasticsearch.index.analysis.AnalyzerComponents.createComponents; -public class ReloadableCustomAnalyzerTests extends ESTestCase { +public class ReloadableCustomAnalyzerTests extends OpenSearchTestCase { private static TestAnalysis testAnalysis; private static Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build(); diff --git a/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java index 3af58d4ef73af..9562664555586 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java @@ -28,8 +28,9 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.index.analysis.AnalysisTestsHelper; import java.io.IOException; import java.io.StringReader; @@ -37,11 +38,11 @@ import static org.hamcrest.Matchers.instanceOf; @ThreadLeakScope(Scope.NONE) -public class ShingleTokenFilterFactoryTests extends ESTokenStreamTestCase { +public class ShingleTokenFilterFactoryTests extends OpenSearchTokenStreamTestCase { private static final String RESOURCE = "/org/elasticsearch/index/analysis/shingle_analysis.json"; public void testDefault() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("shingle"); String source = "the quick brown fox"; String[] expected = new String[]{"the", "the quick", "quick", "quick brown", "brown", "brown fox", "fox"}; @@ -51,7 +52,7 @@ public void testDefault() throws IOException { } public void testInverseMapping() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("shingle_inverse"); assertThat(tokenFilter, instanceOf(ShingleTokenFilterFactory.class)); String source = "the quick brown fox"; @@ -62,7 +63,7 @@ public void testInverseMapping() throws IOException { } public void testInverseMappingNoShingles() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("shingle_inverse"); assertThat(tokenFilter, instanceOf(ShingleTokenFilterFactory.class)); String source = "the quick"; @@ -73,7 +74,7 @@ public void testInverseMappingNoShingles() throws IOException { } public void testFillerToken() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("shingle_filler"); String source = "simon the sorcerer"; String[] expected = new String[]{"simon FILLER", "simon FILLER sorcerer", "FILLER sorcerer"}; @@ -84,7 +85,7 @@ public void testFillerToken() throws IOException { } public void testDisableGraph() throws IOException { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE); TokenFilterFactory shingleFiller = analysis.tokenFilter.get("shingle_filler"); TokenFilterFactory shingleInverse = analysis.tokenFilter.get("shingle_inverse"); @@ -113,7 +114,7 @@ public void testMaxShingleDiffException() throws Exception{ int maxAllowedShingleDiff = 3; int shingleDiff = 8; try { - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE2); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromClassPath(createTempDir(), RESOURCE2); analysis.tokenFilter.get("shingle"); fail(); } catch (IllegalArgumentException ex) { diff --git a/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java index f14ae2337f7ea..2cf0110ac8437 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java @@ -24,12 +24,12 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTokenStreamTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.test.IndexSettingsModule; -import static org.elasticsearch.test.ESTestCase.createTestAnalysis; +import static org.opensearch.test.OpenSearchTestCase.createTestAnalysis; -public class StopAnalyzerTests extends ESTokenStreamTestCase { +public class StopAnalyzerTests extends OpenSearchTokenStreamTestCase { public void testDefaultsCompoundAnalysis() throws Exception { String json = "/org/elasticsearch/index/analysis/stop.json"; Settings settings = Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java index ac6d5d92ff18a..ae8e5ae2cfda3 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java @@ -28,8 +28,9 @@ import org.opensearch.common.settings.Settings.Builder; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.ESTokenStreamTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.OpenSearchTokenStreamTestCase; +import org.opensearch.index.analysis.AnalysisTestsHelper; import java.io.IOException; import java.io.StringReader; @@ -38,7 +39,7 @@ import static org.hamcrest.Matchers.instanceOf; -public class StopTokenFilterTests extends ESTokenStreamTestCase { +public class StopTokenFilterTests extends OpenSearchTokenStreamTestCase { public void testPositionIncrementSetting() throws IOException { Builder builder = Settings.builder().put("index.analysis.filter.my_stop.type", "stop") .put("index.analysis.filter.my_stop.enable_position_increments", false); @@ -63,7 +64,7 @@ public void testCorrectPositionIncrementSetting() throws IOException { // don't specify } builder.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(builder.build()); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(builder.build()); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_stop"); assertThat(tokenFilter, instanceOf(StopTokenFilterFactory.class)); Tokenizer tokenizer = new WhitespaceTokenizer(); @@ -78,7 +79,7 @@ public void testThatSuggestStopFilterWorks() throws Exception { .put("index.analysis.filter.my_stop.remove_trailing", false) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); - ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings); + OpenSearchTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(settings); TokenFilterFactory tokenFilter = analysis.tokenFilter.get("my_stop"); assertThat(tokenFilter, instanceOf(StopTokenFilterFactory.class)); Tokenizer tokenizer = new WhitespaceTokenizer(); diff --git a/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java index 0398f766f6df3..dd7c4365fc681 100644 --- a/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java @@ -42,8 +42,8 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.equalTo; -public class BitSetFilterCacheTests extends ESTestCase { +public class BitSetFilterCacheTests extends OpenSearchTestCase { private static final IndexSettings INDEX_SETTINGS = IndexSettingsModule.newIndexSettings("test", Settings.EMPTY); diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index 03b2eb225f8ca..68d5269975be5 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -39,8 +39,8 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.util.Collections; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.instanceOf; @SuppressCodecs("*") // we test against default codec so never get a random one here! -public class CodecTests extends ESTestCase { +public class CodecTests extends OpenSearchTestCase { public void testResolveDefaultCodecs() throws Exception { CodecService codecService = createCodecService(); diff --git a/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java index a2508ee3ec8f0..985d4debfbb01 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CombinedDeletionPolicyTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogDeletionPolicy; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicLong; import static org.elasticsearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED; -import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; +import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -47,7 +47,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class CombinedDeletionPolicyTests extends ESTestCase { +public class CombinedDeletionPolicyTests extends OpenSearchTestCase { public void testKeepCommitsAfterGlobalCheckpoint() throws Exception { final AtomicLong globalCheckpoint = new AtomicLong(); diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 7802247db9bd3..f02f8d2318667 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -32,7 +32,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.suggest.completion.CompletionStats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.concurrent.BrokenBarrierException; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class CompletionStatsCacheTests extends ESTestCase { +public class CompletionStatsCacheTests extends OpenSearchTestCase { public void testExceptionsAreNotCached() { final AtomicInteger openCount = new AtomicInteger(); diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java index aec54494ca4ae..d14c4c33383aa 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java @@ -23,13 +23,13 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.EngineAccess; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.is; -public class InternalEngineSettingsTests extends ESSingleNodeTestCase { +public class InternalEngineSettingsTests extends OpenSearchSingleNodeTestCase { public void testSettingsUpdate() { final IndexService service = createIndex("foo"); diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 3b8389fd6455b..7be71338253aa 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -107,6 +107,9 @@ import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; import org.opensearch.index.codec.CodecService; +import org.opensearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.InternalTestEngine; import org.opensearch.index.fieldvisitor.FieldsVisitor; import org.opensearch.index.mapper.ContentPath; import org.opensearch.index.mapper.IdFieldMapper; @@ -136,8 +139,8 @@ import org.opensearch.index.translog.Translog; import org.opensearch.index.translog.TranslogConfig; import org.opensearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -190,7 +193,7 @@ import static org.opensearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM; import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; -import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; +import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.Matchers.contains; diff --git a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java index af8d69f90078c..d49e3aad61421 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/LiveVersionMapTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.util.TestUtil; import org.opensearch.common.lease.Releasable; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.nullValue; -public class LiveVersionMapTests extends ESTestCase { +public class LiveVersionMapTests extends OpenSearchTestCase { public void testRamBytesUsed() throws Exception { LiveVersionMap map = new LiveVersionMap(); diff --git a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java index 3ef43b3f7de65..275819b92b783 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java @@ -26,8 +26,11 @@ import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.translog.SnapshotMatchers; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import org.junit.Before; +import org.opensearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.TranslogHandler; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineRecoveryTests.java index ef81095691fca..e5d8726edbaea 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineRecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineRecoveryTests.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java index a394356fa3b0e..eb9d6d65b16d5 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java @@ -39,7 +39,8 @@ import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.index.engine.EngineTestCase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/test/java/org/elasticsearch/index/engine/PrunePostingsMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/PrunePostingsMergePolicyTests.java index eb15b64ae1a76..5b12e62c94fba 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/PrunePostingsMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/PrunePostingsMergePolicyTests.java @@ -40,11 +40,11 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class PrunePostingsMergePolicyTests extends ESTestCase { +public class PrunePostingsMergePolicyTests extends OpenSearchTestCase { public void testPrune() throws IOException { try (Directory dir = newDirectory()) { diff --git a/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java index 23c31e9b195ee..2eee5918bd216 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java @@ -30,6 +30,9 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.TranslogStats; +import org.opensearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.TranslogHandler; import java.io.IOException; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java index 0017c2c6e3300..8d6f0dd9d8b71 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/RecoverySourcePruneMergePolicyTests.java @@ -44,14 +44,14 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.InfoStream; import org.apache.lucene.util.NullInfoStream; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.Set; import java.util.stream.Collectors; -public class RecoverySourcePruneMergePolicyTests extends ESTestCase { +public class RecoverySourcePruneMergePolicyTests extends OpenSearchTestCase { public void testPruneAll() throws IOException { try (Directory dir = newDirectory()) { diff --git a/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java b/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java index d42e352c361de..6a512bdfac96a 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/SegmentTests.java @@ -28,13 +28,13 @@ import org.apache.lucene.util.Version; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.Objects; -public class SegmentTests extends ESTestCase { +public class SegmentTests extends OpenSearchTestCase { static SortField randomSortField() { if (randomBoolean()) { SortedNumericSortField field = diff --git a/server/src/test/java/org/elasticsearch/index/engine/SoftDeletesPolicyTests.java b/server/src/test/java/org/elasticsearch/index/engine/SoftDeletesPolicyTests.java index 3eadee3264a84..fd25b3eca1006 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/SoftDeletesPolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/SoftDeletesPolicyTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.lease.Releasable; import org.elasticsearch.index.seqno.RetentionLease; import org.elasticsearch.index.seqno.RetentionLeases; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class SoftDeletesPolicyTests extends ESTestCase { +public class SoftDeletesPolicyTests extends OpenSearchTestCase { /** * Makes sure we won't advance the retained seq# if the retention lock is held diff --git a/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java index 242a568295dd6..1de089ee97aa9 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/VersionValueTests.java @@ -21,9 +21,9 @@ import org.apache.lucene.util.RamUsageTester; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class VersionValueTests extends ESTestCase { +public class VersionValueTests extends OpenSearchTestCase { public void testIndexRamBytesUsed() { Translog.Location translogLoc = null; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java index 0c754b3a1759e..03b67a68bdd8f 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTestCase.java @@ -50,8 +50,8 @@ import org.opensearch.indices.IndicesService; import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import org.junit.After; import org.junit.Before; @@ -63,7 +63,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public abstract class AbstractFieldDataTestCase extends ESSingleNodeTestCase { +public abstract class AbstractFieldDataTestCase extends OpenSearchSingleNodeTestCase { protected IndexService indexService; protected MapperService mapperService; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java index 38de41d27cb7f..8e1bbc052ba0d 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataCacheTests.java @@ -38,12 +38,12 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.FieldMaskingReader; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.FieldMaskingReader; import static org.hamcrest.Matchers.equalTo; -public class FieldDataCacheTests extends ESTestCase { +public class FieldDataCacheTests extends OpenSearchTestCase { public void testLoadGlobal_neverCacheIfFieldIsMissing() throws Exception { Directory dir = newDirectory(); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java index e32a597ecec5e..a5bf52f8b004d 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataStatsTests.java @@ -22,11 +22,11 @@ import org.opensearch.common.FieldMemoryStatsTests; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class FieldDataStatsTests extends ESTestCase { +public class FieldDataStatsTests extends OpenSearchTestCase { public void testSerialize() throws IOException { FieldMemoryStats map = randomBoolean() ? null : FieldMemoryStatsTests.randomFieldMemoryStats(); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java index ac924aa83e45a..ddefd4b7458f1 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java @@ -23,11 +23,11 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class FieldDataTests extends ESTestCase { +public class FieldDataTests extends OpenSearchTestCase { private static class DummyValues extends AbstractNumericDocValues { @@ -142,18 +142,18 @@ private static NumericDocValues asNumericDocValues(Long... values) { return new AbstractNumericDocValues() { int docID = -1; - + @Override public int docID() { return docID; } - + @Override public boolean advanceExact(int target) throws IOException { docID = target; return target < values.length && values[target] != null; } - + @Override public long longValue() throws IOException { return values[docID]; @@ -188,13 +188,13 @@ private static NumericDoubleValues asNumericDoubleValues(Double... values) { return new NumericDoubleValues() { int docID = -1; - + @Override public boolean advanceExact(int target) throws IOException { docID = target; return target < values.length && values[target] != null; } - + @Override public double doubleValue() throws IOException { return values[docID]; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java index 01e1e40fa00ae..32ac58c85496d 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java @@ -48,9 +48,9 @@ import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; import org.opensearch.plugins.Plugin; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.InternalSettingsPlugin; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.mockito.Matchers; @@ -65,7 +65,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class IndexFieldDataServiceTests extends ESSingleNodeTestCase { +public class IndexFieldDataServiceTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java index 90d4387a6fe50..ec98b4e5c8747 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesGeoPointsTests.java @@ -22,12 +22,12 @@ import org.elasticsearch.index.fielddata.ScriptDocValues.GeoPoints; import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.geo.GeoUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; -public class ScriptDocValuesGeoPointsTests extends ESTestCase { +public class ScriptDocValuesGeoPointsTests extends OpenSearchTestCase { private static MultiGeoPointValues wrap(GeoPoint[][] points) { return new MultiGeoPointValues() { diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java index c74725d3774b7..2b6e5bdfb96f9 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesLongsTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.index.fielddata; import org.elasticsearch.index.fielddata.ScriptDocValues.Longs; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ScriptDocValuesLongsTests extends ESTestCase { +public class ScriptDocValuesLongsTests extends OpenSearchTestCase { public void testLongs() throws IOException { long[][] values = new long[between(3, 10)][]; for (int d = 0; d < values.length; d++) { diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java index 65c6335ebbc2d..0bb6c893f5784 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java @@ -28,9 +28,9 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class ReplaceMissingTests extends ESTestCase { +public class ReplaceMissingTests extends OpenSearchTestCase { public void test() throws Exception { Directory dir = newDirectory(); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java index b897359d6dd37..cb5e82ae61b4c 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.util.packed.PackedInts; import org.opensearch.search.MultiValueMode; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; -public class MultiOrdinalsTests extends ESTestCase { +public class MultiOrdinalsTests extends OpenSearchTestCase { protected Ordinals creationMultiOrdinals(OrdinalsBuilder builder) { return builder.build(); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java index 6fd6a17670635..e7d415fb7f3ab 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedSetDocValues; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.HashMap; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; -public class SingleOrdinalsTests extends ESTestCase { +public class SingleOrdinalsTests extends OpenSearchTestCase { public void testSvValues() throws IOException { int numDocs = 1000000; int numOrdinals = numDocs / 4; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java index 0cb32c07b967d..a750cab505a9c 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java @@ -31,11 +31,11 @@ import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class HalfFloatFielddataTests extends ESTestCase { +public class HalfFloatFielddataTests extends OpenSearchTestCase { public void testSingleValued() throws IOException { Directory dir = newDirectory(); diff --git a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java index ae584010a6f34..8aa446f30ef7a 100644 --- a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java +++ b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java @@ -28,14 +28,14 @@ import org.opensearch.index.query.QueryBuilders; import org.opensearch.indices.IndicesRequestCache; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; -public class FieldStatsProviderRefreshTests extends ESSingleNodeTestCase { +public class FieldStatsProviderRefreshTests extends OpenSearchSingleNodeTestCase { public void testQueryRewriteOnRefresh() throws Exception { assertAcked(client().admin().indices().prepareCreate("index").addMapping("type", "s", "type=text") diff --git a/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java index d22f50c5d3696..d2a85509f258f 100644 --- a/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java +++ b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java @@ -29,8 +29,8 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.IgnoredFieldMapper; import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.RandomObjects; import java.util.ArrayList; import java.util.Arrays; @@ -40,10 +40,10 @@ import java.util.function.Supplier; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class DocumentFieldTests extends ESTestCase { +public class DocumentFieldTests extends OpenSearchTestCase { public void testToXContent() { DocumentField documentField = new DocumentField("field", Arrays.asList("value1", "value2")); @@ -130,7 +130,7 @@ public static Tuple randomDocumentField(XContentTy DocumentField expected = new DocumentField(fieldName, tuple.v2()); return Tuple.tuple(input, expected); case 1: - List listValues = randomList(1, 5, () -> randomList(1, 5, ESTestCase::randomInt)); + List listValues = randomList(1, 5, () -> randomList(1, 5, OpenSearchTestCase::randomInt)); DocumentField listField = new DocumentField(randomAlphaOfLength(5), listValues); return Tuple.tuple(listField, listField); case 2: diff --git a/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java index b8198a5a7241e..c9e98d97f1534 100644 --- a/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java +++ b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.mapper.SourceFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.RandomObjects; import java.io.IOException; import java.util.ArrayList; @@ -54,10 +54,10 @@ import static org.elasticsearch.index.get.DocumentFieldTests.randomDocumentField; import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM; import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class GetResultTests extends ESTestCase { +public class GetResultTests extends OpenSearchTestCase { public void testToAndFromXContent() throws Exception { XContentType xContentType = randomFrom(XContentType.values()); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java index c5588e49ce0c9..c2fae51302e04 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/AllFieldMapperTests.java @@ -27,12 +27,12 @@ import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.VersionUtils; import static org.hamcrest.CoreMatchers.containsString; -public class AllFieldMapperTests extends ESSingleNodeTestCase { +public class AllFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java index bfee96e7af614..91134701ee150 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/BinaryFieldMapperTests.java @@ -25,6 +25,7 @@ import org.opensearch.common.compress.CompressorFactory; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; import java.io.OutputStream; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java index fd80bf82653a2..ff6e6e560a3d5 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/BinaryRangeUtilTests.java @@ -20,14 +20,14 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.network.InetAddresses; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.List; import static java.util.Collections.singleton; -public class BinaryRangeUtilTests extends ESTestCase { +public class BinaryRangeUtilTests extends OpenSearchTestCase { public void testBasics() { BytesRef encoded1 = new BytesRef(BinaryRangeUtil.encodeLong(Long.MIN_VALUE)); @@ -187,7 +187,7 @@ public void testDecodeFloatRanges() throws IOException { int iters = randomIntBetween(32, 1024); for (int i = 0; i < iters; i++) { float start = randomFloat(); - // for some reason, ESTestCase doesn't provide randomFloatBetween + // for some reason, OpenSearchTestCase doesn't provide randomFloatBetween float end = randomFloat(); if (start > end) { float temp = start; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java index 99be1443452f4..fd42082ef2e75 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldMapperTests.java @@ -32,6 +32,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.ParseContext.Document; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java index 6745d7536facd..c37471ae711be 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/BooleanFieldTypeTests.java @@ -20,6 +20,7 @@ import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java index 11453471b2872..3c16d64828d83 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CamelCaseFieldNameTests.java @@ -19,6 +19,8 @@ package org.elasticsearch.index.mapper; +import org.opensearch.index.mapper.MapperServiceTestCase; + public class CamelCaseFieldNameTests extends MapperServiceTestCase { public void testCamelCaseFieldNameStaysAsIs() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java index 6426069c690ba..e018f90fe3fc4 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldMapperTests.java @@ -47,6 +47,7 @@ import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.hamcrest.core.CombinableMatcher; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java index 9d8cc98c02087..90c63469dd551 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CompletionFieldTypeTests.java @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java index 612be5e700981..c9c3f4ec8558c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/CopyToMapperTests.java @@ -27,6 +27,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.ParseContext.Document; import org.hamcrest.Matchers; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java index a190e79c92e6a..0ccbab77dae7f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java @@ -26,6 +26,7 @@ import org.opensearch.common.time.DateFormatter; import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.termvectors.TermVectorsService; +import org.opensearch.index.mapper.MapperTestCase; import org.opensearch.search.DocValueFormat; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java index 68f253243d08d..4a267a745046c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java @@ -52,6 +52,7 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; import org.joda.time.DateTimeZone; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.time.Instant; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DefaultAnalyzersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DefaultAnalyzersTests.java index 2c07bc95124ba..767725bcca91f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DefaultAnalyzersTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DefaultAnalyzersTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java index 5ea68bbbd0995..957ec35aa124c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperParserTests.java @@ -19,6 +19,8 @@ package org.elasticsearch.index.mapper; +import org.opensearch.index.mapper.MapperServiceTestCase; + public class DocumentMapperParserTests extends MapperServiceTestCase { public void testFieldNameWithDots() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java index 279170d6eb0c7..96835c4b6c96a 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentMapperTests.java @@ -28,6 +28,7 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.MapperService.MergeReason; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java index 30d1cc0040027..fd7da9c21ad2b 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java @@ -31,6 +31,8 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.ParseContext.Document; +import org.opensearch.index.mapper.MapperServiceTestCase; +import org.opensearch.index.mapper.MockFieldMapper; import org.opensearch.plugins.Plugin; import java.io.IOException; @@ -43,8 +45,8 @@ import java.util.List; import static java.util.Collections.singletonList; -import static org.elasticsearch.test.StreamsUtils.copyToBytesFromClasspath; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java index 8e1d35395d1bc..a100d682f5c1a 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DoubleIndexingDocTests.java @@ -21,6 +21,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TopDocs; import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.mapper.MapperServiceTestCase; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java index 38162f8ccb425..514b8aac9d26f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java @@ -23,6 +23,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.io.IOException; import java.time.Instant; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java index 166ff898627ea..b115598d968a1 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplateTests.java @@ -25,13 +25,13 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.DynamicTemplate.XContentFieldType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; import java.util.Map; -public class DynamicTemplateTests extends ESTestCase { +public class DynamicTemplateTests extends OpenSearchTestCase { public void testParseUnknownParam() throws Exception { Map templateDef = new HashMap<>(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java index 4ba6aa01cbd2d..daf12c8882dfc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicTemplatesTests.java @@ -23,8 +23,9 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.util.BytesRef; import org.elasticsearch.index.mapper.ParseContext.Document; +import org.opensearch.index.mapper.MapperServiceTestCase; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java index df3af9cb41155..7ab65aa03aa98 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalFieldMapperTests.java @@ -23,6 +23,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.geo.GeoPoint; import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.util.Collection; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperTests.java index 2056fd19076ac..eceac9d55fadf 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperTests.java @@ -21,6 +21,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperValidationTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperValidationTests.java index 5f1a6d92927f4..454edfff6ba92 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperValidationTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldAliasMapperValidationTests.java @@ -23,7 +23,8 @@ import org.opensearch.common.Explicit; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.index.mapper.MockFieldMapper; import java.util.Arrays; import java.util.Collections; @@ -32,7 +33,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; -public class FieldAliasMapperValidationTests extends ESTestCase { +public class FieldAliasMapperValidationTests extends OpenSearchTestCase { public void testDuplicateFieldAliasAndObject() { ObjectMapper objectMapper = createObjectMapper("some.path"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java index 1756011e42c36..c104cbf4f636e 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldFilterMapperPluginTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.Before; import java.util.ArrayList; @@ -48,9 +48,9 @@ import static org.elasticsearch.cluster.metadata.MetadataTests.assertLeafs; import static org.elasticsearch.cluster.metadata.MetadataTests.assertMultiField; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; -public class FieldFilterMapperPluginTests extends ESSingleNodeTestCase { +public class FieldFilterMapperPluginTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java index 7a01700452faa..1cb5b65b26d19 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldMapperTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -36,7 +36,7 @@ import java.util.SortedSet; import java.util.TreeSet; -public class FieldNamesFieldMapperTests extends ESSingleNodeTestCase { +public class FieldNamesFieldMapperTests extends OpenSearchSingleNodeTestCase { private static SortedSet extract(String path) { SortedSet set = new TreeSet<>(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java index df4168219c623..3432da35ba133 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldNamesFieldTypeTests.java @@ -27,14 +27,14 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.index.IndexSettings; import org.opensearch.index.query.QueryShardContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class FieldNamesFieldTypeTests extends ESTestCase { +public class FieldNamesFieldTypeTests extends OpenSearchTestCase { public void testTermQuery() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java index 4fa1cf26ea32f..0343034b89666 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java @@ -20,7 +20,8 @@ package org.elasticsearch.index.mapper; import org.opensearch.common.collect.Set; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.index.mapper.MockFieldMapper; import java.util.Arrays; import java.util.Collection; @@ -30,7 +31,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -public class FieldTypeLookupTests extends ESTestCase { +public class FieldTypeLookupTests extends OpenSearchTestCase { public void testEmpty() { FieldTypeLookup lookup = new FieldTypeLookup(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java index 48cb7a7f31382..5da5c3b296888 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GenericStoreDynamicTemplateTests.java @@ -24,13 +24,13 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -import static org.elasticsearch.test.StreamsUtils.copyToBytesFromClasspath; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.equalTo; -public class GenericStoreDynamicTemplateTests extends ESSingleNodeTestCase { +public class GenericStoreDynamicTemplateTests extends OpenSearchSingleNodeTestCase { public void testSimple() throws Exception { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/genericstore/test-mapping.json"); IndexService index = createIndex("test"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java index 633d5a2a400c6..bfc68210032b9 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldMapperTests.java @@ -24,6 +24,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.hamcrest.CoreMatchers; +import org.opensearch.index.mapper.FieldMapperTestCase2; import java.io.IOException; import java.util.Set; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java index 353b7764b305d..0406944857d78 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoPointFieldTypeTests.java @@ -22,6 +22,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java index b076c96ccc02d..223c48ab4b3ec 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java @@ -25,8 +25,9 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.junit.Before; +import org.opensearch.index.mapper.FieldMapperTestCase2; import java.io.IOException; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java index 7665fd0f90594..9f3308b067731 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldTypeTests.java @@ -22,6 +22,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java index f339bec5b5aaa..912e9ff3b1535 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.indices.IndicesService; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Collection; @@ -42,7 +42,7 @@ import static org.elasticsearch.index.mapper.IdFieldMapper.ID_FIELD_DATA_DEPRECATION_MESSAGE; import static org.hamcrest.Matchers.containsString; -public class IdFieldMapperTests extends ESSingleNodeTestCase { +public class IdFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java index fbd6872470f63..22c9c66348ae4 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java @@ -26,13 +26,13 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; import java.util.Collection; import java.util.Collections; -public class IdFieldTypeTests extends ESTestCase { +public class IdFieldTypeTests extends OpenSearchTestCase { public void testRangeQuery() { MappedFieldType ft = new IdFieldMapper.IdFieldType(() -> false); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java index 43bc208d7cc48..3d247743e1cc8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IgnoredFieldTypeTests.java @@ -26,6 +26,7 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchException; +import org.opensearch.index.mapper.FieldTypeTestCase; public class IgnoredFieldTypeTests extends FieldTypeTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java index 972bb15c46749..2e6a9edf101fa 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldMapperTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -34,7 +34,7 @@ import java.io.IOException; import java.util.Collection; -public class IndexFieldMapperTests extends ESSingleNodeTestCase { +public class IndexFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java index 0c05d82f088ef..ac09efcc57f63 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IndexFieldTypeTests.java @@ -27,13 +27,13 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.function.Predicate; import static org.hamcrest.Matchers.containsString; -public class IndexFieldTypeTests extends ESTestCase { +public class IndexFieldTypeTests extends OpenSearchTestCase { public void testPrefixQuery() { MappedFieldType ft = IndexFieldMapper.IndexFieldType.INSTANCE; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java index 9895999908f50..44d1ce6139002 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java @@ -29,6 +29,7 @@ import org.opensearch.common.network.InetAddresses; import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.termvectors.TermVectorsService; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java index 38f887092060a..bf8fa5c0faf10 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldTypeTests.java @@ -28,6 +28,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.settings.Settings; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java index adeb69b004011..104da5049ed6f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.Before; import java.util.HashMap; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; -public class IpRangeFieldMapperTests extends ESSingleNodeTestCase { +public class IpRangeFieldMapperTests extends OpenSearchSingleNodeTestCase { private IndexService indexService; private DocumentMapperParser parser; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldTypeTests.java index e2a57a4b81eaf..7fbb93db5c7ac 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldTypeTests.java @@ -22,6 +22,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java index ae0c60e01d93d..a37c3e1bb4177 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/JavaMultiFieldMergeTests.java @@ -25,14 +25,14 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class JavaMultiFieldMergeTests extends ESSingleNodeTestCase { +public class JavaMultiFieldMergeTests extends OpenSearchSingleNodeTestCase { public void testMergeMultiField() throws Exception { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/merge/test-mapping1.json"); MapperService mapperService = createIndex("test").mapperService(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java index 2fa72a86f60dc..edb38ec0be6fd 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java @@ -47,6 +47,7 @@ import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.plugins.AnalysisPlugin; import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java index 7d6ae368c8768..3f4fcd40528f2 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldTypeTests.java @@ -51,6 +51,7 @@ import org.opensearch.index.analysis.NamedAnalyzer; import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.index.analysis.TokenizerFactory; +import org.opensearch.index.mapper.FieldTypeTestCase; import org.opensearch.index.mapper.KeywordFieldMapper.KeywordFieldType; import org.opensearch.index.mapper.MappedFieldType.Relation; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyDynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyDynamicMappingTests.java index eb68a283b6a15..fd8707ee467d7 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyDynamicMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyDynamicMappingTests.java @@ -24,13 +24,13 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -public class LegacyDynamicMappingTests extends ESSingleNodeTestCase { +public class LegacyDynamicMappingTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java index 7e2ba789ea24c..5796728be78a9 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java @@ -36,7 +36,8 @@ import org.opensearch.geometry.Point; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.index.mapper.FieldMapperTestCase2; import java.io.IOException; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldTypeTests.java index e9517b907ab1f..fe610522d9bdd 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldTypeTests.java @@ -23,6 +23,7 @@ import org.opensearch.common.geo.SpatialStrategy; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.LegacyGeoShapeFieldMapper.GeoShapeFieldType; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyMapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyMapperServiceTests.java index 2c6a4b7a9a368..504cb3932b372 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyMapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyMapperServiceTests.java @@ -29,11 +29,11 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; -public class LegacyMapperServiceTests extends ESSingleNodeTestCase { +public class LegacyMapperServiceTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapperTests.java index 65be9e1f4568a..0ffca49466c06 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyTypeFieldMapperTests.java @@ -22,9 +22,9 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -public class LegacyTypeFieldMapperTests extends ESSingleNodeTestCase { +public class LegacyTypeFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index 81bb548345c14..2b2d691d8e987 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -45,8 +45,8 @@ import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.elasticsearch.plugins.AnalysisPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Arrays; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class MapperServiceTests extends ESSingleNodeTestCase { +public class MapperServiceTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java index c73424f8932be..091aa4d5a6a42 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperTests.java @@ -22,10 +22,10 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class MapperTests extends ESTestCase { +public class MapperTests extends OpenSearchTestCase { public void testSuccessfulBuilderContext() { Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java index 2eea9b9e04d20..e21c06f142ccf 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldCopyToMapperTests.java @@ -20,6 +20,8 @@ package org.elasticsearch.index.mapper; +import org.opensearch.index.mapper.MapperServiceTestCase; + import static org.hamcrest.core.IsEqual.equalTo; public class MultiFieldCopyToMapperTests extends MapperServiceTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java index 3a3a9fcd2fb80..7527ad99345e1 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MultiFieldTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Arrays; @@ -42,13 +42,13 @@ import java.util.Set; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.StreamsUtils.copyToBytesFromClasspath; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.notNullValue; -public class MultiFieldTests extends ESSingleNodeTestCase { +public class MultiFieldTests extends OpenSearchSingleNodeTestCase { public void testMultiFieldMultiFields() throws Exception { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/multifield/test-multi-fields.json"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java index deb5e12f13167..05b723bc92941 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NestedObjectMapperTests.java @@ -32,9 +32,9 @@ import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.ObjectMapper.Dynamic; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.UncheckedIOException; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class NestedObjectMapperTests extends ESSingleNodeTestCase { +public class NestedObjectMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java index d628c8db38abb..9992e84f41a47 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NullValueObjectMappingTests.java @@ -24,13 +24,13 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class NullValueObjectMappingTests extends ESSingleNodeTestCase { +public class NullValueObjectMappingTests extends OpenSearchSingleNodeTestCase { public void testNullValueObject() throws IOException { String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type") .startObject("properties").startObject("obj1").field("type", "object").endObject().endObject() diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java index 5149b1b6fd4aa..61dc83a56d687 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NullValueTests.java @@ -23,6 +23,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.index.mapper.MapperServiceTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java index aa011a38eda2a..2d2bfe2aa0c61 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java @@ -28,6 +28,7 @@ import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.elasticsearch.index.mapper.NumberFieldTypeTests.OutOfRangeSpec; import org.elasticsearch.index.termvectors.TermVectorsService; +import org.opensearch.index.mapper.AbstractNumericFieldMapperTestCase; import java.io.IOException; import java.math.BigInteger; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java index 92b6535f7c45e..6e412d8ca56d0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java @@ -49,6 +49,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.mapper.FieldTypeTestCase; import org.opensearch.index.mapper.MappedFieldType.Relation; import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.opensearch.index.mapper.NumberFieldMapper.NumberType; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java index 031dd5642d043..f4533da7df918 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperMergeTests.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.common.Explicit; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.notNullValue; -public class ObjectMapperMergeTests extends ESTestCase { +public class ObjectMapperMergeTests extends OpenSearchTestCase { private final FieldMapper barFieldMapper = createTextFieldMapper("bar"); private final FieldMapper bazFieldMapper = createTextFieldMapper("baz"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java index 95f13d6bccbfe..5d7a1576ffd86 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ObjectMapperTests.java @@ -27,15 +27,15 @@ import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.ObjectMapper.Dynamic; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Collection; import static org.hamcrest.Matchers.containsString; -public class ObjectMapperTests extends ESSingleNodeTestCase { +public class ObjectMapperTests extends OpenSearchSingleNodeTestCase { public void testDifferentInnerObjectTokenFailure() throws Exception { String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type") .endObject().endObject()); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java index e072e5edd3d84..9885e27b1d5f0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ParametrizedMapperTests.java @@ -32,6 +32,7 @@ import org.opensearch.index.analysis.AnalyzerScope; import org.opensearch.index.analysis.IndexAnalyzers; import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.MapperServiceTestCase; import org.opensearch.index.mapper.ParametrizedFieldMapper.Parameter; import org.opensearch.plugins.MapperPlugin; import org.opensearch.plugins.Plugin; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java index 4059a5b885f99..59d9b91856a57 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/PathMapperTests.java @@ -20,15 +20,15 @@ package org.elasticsearch.index.mapper; import org.opensearch.common.compress.CompressedXContent; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class PathMapperTests extends ESSingleNodeTestCase { +public class PathMapperTests extends OpenSearchSingleNodeTestCase { public void testPathMapping() throws IOException { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/path/test-mapping.json"); DocumentMapper docMapper = createIndex("test").mapperService().documentMapperParser() diff --git a/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java b/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java index b6ef87af19b57..d8f03828ff733 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/PathMatchDynamicTemplateTests.java @@ -24,13 +24,13 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -import static org.elasticsearch.test.StreamsUtils.copyToBytesFromClasspath; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.equalTo; -public class PathMatchDynamicTemplateTests extends ESSingleNodeTestCase { +public class PathMatchDynamicTemplateTests extends OpenSearchSingleNodeTestCase { public void testSimple() throws Exception { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/test-mapping.json"); IndexService index = createIndex("test"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java index 305b6b4af69f7..143ed2069c3ec 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java @@ -28,6 +28,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.index.mapper.AbstractNumericFieldMapperTestCase; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java index 70af9d17df105..b5c57ae18e56c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java @@ -37,7 +37,7 @@ import org.opensearch.common.time.DateMathParser; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryStringQueryBuilder; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java index b723096e16ff3..d9d5cc9e09306 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldTypeTests.java @@ -43,9 +43,10 @@ import org.elasticsearch.index.mapper.RangeFieldMapper.RangeFieldType; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import org.joda.time.DateTime; import org.junit.Before; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java index 19ec21030227c..a0283ecd26f04 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java @@ -27,15 +27,15 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Arrays; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.opensearch.test.VersionUtils.randomVersionBetween; import static org.hamcrest.Matchers.containsString; -public class RootObjectMapperTests extends ESSingleNodeTestCase { +public class RootObjectMapperTests extends OpenSearchSingleNodeTestCase { public void testNumericDetection() throws Exception { MergeReason reason = randomFrom(MergeReason.MAPPING_UPDATE, MergeReason.INDEX_TEMPLATE); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java index fe3d2d41c8dc3..38954df126bd0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldMapperTests.java @@ -24,12 +24,12 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class RoutingFieldMapperTests extends ESSingleNodeTestCase { +public class RoutingFieldMapperTests extends OpenSearchSingleNodeTestCase { public void testRoutingMapper() throws Exception { String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java index 93d747753cff3..a8456545c0a24 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RoutingFieldTypeTests.java @@ -25,6 +25,7 @@ import org.apache.lucene.search.WildcardQuery; import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchException; +import org.opensearch.index.mapper.FieldTypeTestCase; public class RoutingFieldTypeTests extends FieldTypeTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java index 3ba130108eca3..67c17b633de32 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/SourceFieldMapperTests.java @@ -30,16 +30,16 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.util.Collection; import java.util.Map; -import static org.elasticsearch.index.MapperTestUtils.assertConflicts; +import static org.opensearch.index.MapperTestUtils.assertConflicts; import static org.hamcrest.Matchers.equalTo; -public class SourceFieldMapperTests extends ESSingleNodeTestCase { +public class SourceFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java b/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java index c5b4541625228..fec01303a8331 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/StoredNumericValuesTests.java @@ -33,13 +33,13 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.fieldvisitor.CustomFieldsVisitor; import org.opensearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class StoredNumericValuesTests extends ESSingleNodeTestCase { +public class StoredNumericValuesTests extends OpenSearchSingleNodeTestCase { public void testBytesAndNumericRepresentation() throws Exception { IndexWriter writer = new IndexWriter(new ByteBuffersDirectory(), new IndexWriterConfig(Lucene.STANDARD_ANALYZER)); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldAnalyzerModeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldAnalyzerModeTests.java index 2d81c90d3afe2..34522fa7fc034 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldAnalyzerModeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldAnalyzerModeTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class TextFieldAnalyzerModeTests extends ESTestCase { +public class TextFieldAnalyzerModeTests extends OpenSearchTestCase { private static Map defaultAnalyzers() { Map analyzers = new HashMap<>(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java index 8dc4c7fce1115..4c64df0db216c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java @@ -68,6 +68,7 @@ import org.elasticsearch.index.query.MatchPhraseQueryBuilder; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.search.MatchQuery; +import org.opensearch.index.mapper.MapperTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java index 5b44ca7e33d3c..1df0c2338cfdc 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TextFieldTypeTests.java @@ -40,6 +40,7 @@ import org.opensearch.common.lucene.search.AutomatonQueries; import org.opensearch.common.unit.Fuzziness; import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; +import org.opensearch.index.mapper.FieldTypeTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java index 5c7c69c758a39..93550af6bd096 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Arrays; @@ -45,7 +45,7 @@ import java.util.Collections; import java.util.function.Function; -public class TypeFieldMapperTests extends ESSingleNodeTestCase { +public class TypeFieldMapperTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java index b759c1db25d30..c9d503f172c25 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeFieldTypeTests.java @@ -22,12 +22,12 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; import java.util.Arrays; -public class TypeFieldTypeTests extends ESTestCase { +public class TypeFieldTypeTests extends OpenSearchTestCase { public void testTermsQuery() { QueryShardContext context = Mockito.mock(QueryShardContext.class); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java index 360d60c5e04bc..b1121d5cc297c 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/TypeParsersTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.io.IOException; @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class TypeParsersTests extends ESTestCase { +public class TypeParsersTests extends OpenSearchTestCase { private static Map defaultAnalyzers() { Map analyzers = new HashMap<>(); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java index 35e54d6caa8b5..04c977a520f30 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/UidTests.java @@ -20,12 +20,12 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Base64; -public class UidTests extends ESTestCase { +public class UidTests extends OpenSearchTestCase { public static BytesRef[] splitUidIntoTypeAndId(BytesRef uid) { int loc = -1; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java index 287209eca645a..97217af914cbd 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/UpdateMappingTests.java @@ -30,8 +30,8 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import org.hamcrest.Matchers; import java.io.IOException; @@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class UpdateMappingTests extends ESSingleNodeTestCase { +public class UpdateMappingTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { return pluginList(InternalSettingsPlugin.class); diff --git a/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java index b607bbb6a96dc..a2a43ba16f018 100644 --- a/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/AbstractQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,7 +34,7 @@ import static java.util.Collections.emptyList; import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; -public class AbstractQueryBuilderTests extends ESTestCase { +public class AbstractQueryBuilderTests extends OpenSearchTestCase { private static NamedXContentRegistry xContentRegistry; diff --git a/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java b/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java index 1f58e7852192b..e313d7f1f3d56 100644 --- a/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/query/AbstractTermQueryTestCase.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.query; import com.fasterxml.jackson.core.io.JsonStringEncoder; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java index 8e8d4482d2691..6e0c41df29b2e 100644 --- a/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/BoolQueryBuilderTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java index 1fbdb2d01429e..27114bd183c02 100644 --- a/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/BoostingQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.queries.function.FunctionScoreQuery; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java b/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java index f6d21311a1088..4f379afca20be 100644 --- a/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/CombineFunctionTests.java @@ -22,11 +22,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lucene.search.function.CombineFunction; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class CombineFunctionTests extends ESTestCase { +public class CombineFunctionTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(CombineFunction.MULTIPLY.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/elasticsearch/index/query/CombineIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/CombineIntervalsSourceProviderTests.java index 8c1f85fa1024f..958ce2dd65519 100644 --- a/server/src/test/java/org/elasticsearch/index/query/CombineIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/CombineIntervalsSourceProviderTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java index eaa117b31a4c3..ec64c002e0b8c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryBuilderTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.queries.ExtendedCommonTermsQuery; import org.apache.lucene.search.Query; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.HashMap; @@ -31,7 +31,7 @@ import java.util.Map; import static org.elasticsearch.index.query.QueryBuilders.commonTermsQuery; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; diff --git a/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java index 6a4a89d164e88..ecb10b0a318c9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java @@ -20,9 +20,9 @@ package org.elasticsearch.index.query; import org.opensearch.action.search.SearchResponse; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; -public class CommonTermsQueryParserTests extends ESSingleNodeTestCase { +public class CommonTermsQueryParserTests extends OpenSearchSingleNodeTestCase { public void testWhenParsedQueryIsNullNoNullPointerExceptionIsThrown() { final String index = "test-index"; final String type = "test-type"; diff --git a/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java index 4fe2d976455c3..f10df3977d16f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ConstantScoreQueryBuilderTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java index c37a4de803d5e..2d0a8c2df7bd0 100644 --- a/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/DisMaxQueryBuilderTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.DisjunctionMaxQuery; import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/query/DisjunctionIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/DisjunctionIntervalsSourceProviderTests.java index 88284abb9e57d..f37531d7f98d0 100644 --- a/server/src/test/java/org/elasticsearch/index/query/DisjunctionIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/DisjunctionIntervalsSourceProviderTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java index 1a7d21740dfb9..22bf51edd50e9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.DistanceFeatureQueryBuilder.Origin; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.joda.time.DateTime; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java index 786945df82e39..995dbe9915531 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ExistsQueryBuilderTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.opensearch.Version; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java index f564972b2a438..ff3caeeb4432a 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FieldMaskingSpanQueryBuilderTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.spans.FieldMaskingSpanQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java index e7d1c264ff008..b4a11ec56d3f8 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FilterIntervalsSourceProviderTests.java @@ -25,7 +25,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/query/FuzzyIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/FuzzyIntervalsSourceProviderTests.java index 971e668e4ec9c..7bda8bc5ad76a 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FuzzyIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FuzzyIntervalsSourceProviderTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.unit.Fuzziness; import org.opensearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.IntervalsSourceProvider.Fuzzy; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java index 147534cdf9b73..08e21ca4e0c57 100644 --- a/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/FuzzyQueryBuilderTests.java @@ -26,7 +26,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.ParsingException; import org.opensearch.common.unit.Fuzziness; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java index ae260cf2e2200..2c0f891dff5ad 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoBoundingBoxQueryBuilderTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.geo.GeoUtils; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.locationtech.spatial4j.io.GeohashUtils; import org.locationtech.spatial4j.shape.Rectangle; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java index e50b66baea1cb..dead8e33221ed 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoDistanceQueryBuilderTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.geo.GeoDistance; import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.unit.DistanceUnit; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.locationtech.spatial4j.shape.Point; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java index c5248608bd160..5f5a6ca8f5b17 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoPolygonQueryBuilderTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType; import org.locationtech.jts.geom.Coordinate; @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.StreamsUtils.copyToStringFromClasspath; +import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java index e5fc2935fbc09..3d61b2dfc4fe1 100644 --- a/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java @@ -39,8 +39,8 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.VersionUtils; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType; import org.junit.After; diff --git a/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java index 47b233c5204c3..5d6ba4c3396ed 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java index 83a6d963faf62..eef03905281fe 100644 --- a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java @@ -39,7 +39,7 @@ import org.opensearch.search.sort.SortBuilder; import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -54,12 +54,12 @@ import java.util.function.Supplier; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public class InnerHitBuilderTests extends ESTestCase { +public class InnerHitBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static NamedWriteableRegistry namedWriteableRegistry; @@ -291,7 +291,7 @@ static List randomListStuff(int minSize, int maxSize, Supplier valueSu } private static InnerHitBuilder serializedCopy(InnerHitBuilder original) throws IOException { - return ESTestCase.copyWriteable(original, namedWriteableRegistry, InnerHitBuilder::new); + return OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, InnerHitBuilder::new); } public void testSetDocValueFormat() { diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java index 8c14fead82429..798cf7a9b617c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IntervalBuilderTests.java @@ -25,11 +25,11 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.queries.intervals.Intervals; import org.apache.lucene.queries.intervals.IntervalsSource; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class IntervalBuilderTests extends ESTestCase { +public class IntervalBuilderTests extends OpenSearchTestCase { private static final IntervalBuilder BUILDER = new IntervalBuilder("field1", new StandardAnalyzer()); diff --git a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java index aa55fe1fafdc1..bf50dc06a4952 100644 --- a/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/IntervalQueryBuilderTests.java @@ -40,7 +40,7 @@ import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/query/LegacyGeoShapeFieldQueryTests.java b/server/src/test/java/org/elasticsearch/index/query/LegacyGeoShapeFieldQueryTests.java index f7559114e2d96..0b136f53582c8 100644 --- a/server/src/test/java/org/elasticsearch/index/query/LegacyGeoShapeFieldQueryTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/LegacyGeoShapeFieldQueryTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.geo.SpatialStrategy; import org.opensearch.common.geo.builders.ShapeBuilder; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.elasticsearch.test.geo.RandomShapeGenerator.ShapeType; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java index 9195fc83ecc60..873823d771a29 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchAllQueryBuilderTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchBoolPrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchBoolPrefixQueryBuilderTests.java index b8a4fc18c41f6..66047b3a113c5 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchBoolPrefixQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchBoolPrefixQueryBuilderTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.lucene.search.Queries; import org.elasticsearch.index.search.MatchQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchIntervalsSourceProviderTests.java index c6f4fde841be1..eff0dbac46311 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchIntervalsSourceProviderTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java index 26265d1b5a2e6..35193b8095022 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchNoneQueryBuilderTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java index 021af00a01da1..76c24ae2df33f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchPhrasePrefixQueryBuilderTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery; import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java index a3c1bd037be3f..cac87092b0122 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchPhraseQueryBuilderTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.TermQuery; import org.opensearch.common.ParsingException; import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java index b89e8a0435709..c65e2e62244fd 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MatchQueryBuilderTests.java @@ -50,7 +50,7 @@ import org.elasticsearch.index.search.MatchQuery; import org.elasticsearch.index.search.MatchQuery.Type; import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.hamcrest.Matcher; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java index 5687a2ba4df0b..f6cb82ea52fdf 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilderTests.java @@ -45,7 +45,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.index.VersionType; import org.opensearch.index.query.MoreLikeThisQueryBuilder.Item; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java index 35f0def952977..03a2c2c85011a 100644 --- a/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/MultiMatchQueryBuilderTests.java @@ -41,7 +41,7 @@ import org.opensearch.common.unit.Fuzziness; import org.opensearch.index.query.MultiMatchQueryBuilder.Type; import org.opensearch.index.search.MatchQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Arrays; @@ -50,8 +50,8 @@ import java.util.Map; import static org.opensearch.index.query.QueryBuilders.multiMatchQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertDisjunctionSubQuery; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBooleanSubQuery; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertDisjunctionSubQuery; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java index 52a94793e3d3e..39be88054aa3e 100644 --- a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java @@ -38,8 +38,8 @@ import org.opensearch.search.internal.SearchContext; import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.VersionUtils; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java b/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java index 044ec9661c20a..30cdc24894c99 100644 --- a/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/OperatorTests.java @@ -23,11 +23,11 @@ import org.apache.lucene.search.BooleanClause; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class OperatorTests extends ESTestCase { +public class OperatorTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(Operator.OR.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/elasticsearch/index/query/PrefixIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/PrefixIntervalsSourceProviderTests.java index e2ae8a0f021e3..a3baf613a4f13 100644 --- a/server/src/test/java/org/elasticsearch/index/query/PrefixIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/PrefixIntervalsSourceProviderTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java index 3106d228b8f25..a4f7acea648c1 100644 --- a/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/PrefixQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.Query; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java index 62d050268a7da..60d09baba1464 100644 --- a/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java @@ -57,7 +57,7 @@ import org.opensearch.search.lookup.LeafDocLookup; import org.opensearch.search.lookup.LeafSearchLookup; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -76,7 +76,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class QueryShardContextTests extends ESTestCase { +public class QueryShardContextTests extends OpenSearchTestCase { public void testFailIfFieldMappingNotFound() { QueryShardContext context = createQueryShardContext(IndexMetadata.INDEX_UUID_NA_VALUE, null); diff --git a/server/src/test/java/org/elasticsearch/index/query/QueryShardExceptionTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryShardExceptionTests.java index 8557f568e078f..83b4981abcc1f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/QueryShardExceptionTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/QueryShardExceptionTests.java @@ -20,11 +20,11 @@ package org.elasticsearch.index.query; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.CoreMatchers.equalTo; -public class QueryShardExceptionTests extends ESTestCase { +public class QueryShardExceptionTests extends OpenSearchTestCase { public void testCreateFromQueryShardContext() { String indexUuid = randomAlphaOfLengthBetween(5, 10); diff --git a/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java index 615e360678928..c2602bc6d8355 100644 --- a/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/QueryStringQueryBuilderTests.java @@ -65,7 +65,7 @@ import org.elasticsearch.index.mapper.FieldNamesFieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.search.QueryStringQueryParser; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; @@ -82,8 +82,8 @@ import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertDisjunctionSubQuery; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBooleanSubQuery; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertDisjunctionSubQuery; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.Matchers.containsString; diff --git a/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java b/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java index 86211cef326ce..a6f25cd544876 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java +++ b/server/src/test/java/org/elasticsearch/index/query/RandomQueryBuilder.java @@ -25,9 +25,9 @@ import java.util.Random; -import static org.elasticsearch.test.AbstractBuilderTestCase.TEXT_ALIAS_FIELD_NAME; -import static org.elasticsearch.test.AbstractBuilderTestCase.TEXT_FIELD_NAME; -import static org.elasticsearch.test.ESTestCase.randomFrom; +import static org.opensearch.test.AbstractBuilderTestCase.TEXT_ALIAS_FIELD_NAME; +import static org.opensearch.test.AbstractBuilderTestCase.TEXT_FIELD_NAME; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; /** * Utility class for creating random QueryBuilders. diff --git a/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java index 61a5a01593ab3..2b662e263fd20 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/RangeQueryBuilderTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MappedFieldType.Relation; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.joda.time.DateTime; import org.joda.time.chrono.ISOChronology; diff --git a/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java b/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java index 7009060b53c45..472fb56bc8b9c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/RangeQueryRewriteTests.java @@ -29,12 +29,12 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MappedFieldType.Relation; import org.elasticsearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; // The purpose of this test case is to test RangeQueryBuilder.getRelation() // Whether it should return INTERSECT/DISJOINT/WITHIN is already tested in // RangeQueryBuilderTests -public class RangeQueryRewriteTests extends ESSingleNodeTestCase { +public class RangeQueryRewriteTests extends OpenSearchSingleNodeTestCase { public void testRewriteMissingField() throws Exception { IndexService indexService = createIndex("test"); diff --git a/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java index 47b7f80c6fb7a..185fbbf7d6b8f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/RegexpQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.RegexpQuery; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java b/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java index 060a57079b7ca..e049d609afeb9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/RewriteableTests.java @@ -20,7 +20,7 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException; import java.util.function.Supplier; -public class RewriteableTests extends ESTestCase { +public class RewriteableTests extends OpenSearchTestCase { public void testRewrite() throws IOException { QueryRewriteContext context = new QueryRewriteContext(null, null, null, null); diff --git a/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java b/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java index edb1df75c4b3f..eae15cd871292 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScoreModeTests.java @@ -22,11 +22,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class ScoreModeTests extends ESTestCase { +public class ScoreModeTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(FunctionScoreQuery.ScoreMode.FIRST.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java index 3cfa4ce128a8c..ab1bfd4148dbd 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java index 538d5f84c35a0..c598b2a5a6d1e 100644 --- a/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/ScriptScoreQueryBuilderTests.java @@ -27,7 +27,7 @@ import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/query/SearchIndexNameMatcherTests.java b/server/src/test/java/org/elasticsearch/index/query/SearchIndexNameMatcherTests.java index 32ad14f37d80e..d6b08faa603f9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SearchIndexNameMatcherTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SearchIndexNameMatcherTests.java @@ -29,13 +29,13 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class SearchIndexNameMatcherTests extends ESTestCase { +public class SearchIndexNameMatcherTests extends OpenSearchTestCase { private SearchIndexNameMatcher matcher; private SearchIndexNameMatcher remoteMatcher; diff --git a/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java index 8306b737d3a2d..b28d60d8dd940 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SimpleQueryStringBuilderTests.java @@ -42,7 +42,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.search.SimpleQueryStringQueryParser; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java index b3014cc05ad05..af0e40927c854 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanContainingQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.spans.SpanContainingQuery; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java index 67a179f1c1f18..7babb160e21c0 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanFirstQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanGapQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanGapQueryBuilderTests.java index 815fc08aa8825..0a045a5e7281b 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanGapQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanGapQueryBuilderTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java index 58d1d4859ddec..ed28babf6934b 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanMultiTermQueryBuilderTests.java @@ -45,7 +45,7 @@ import org.opensearch.common.lucene.search.SpanBooleanQueryRewriteWithMaxClause; import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java index 155c1b2559493..b7bb4e551a575 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanNearQueryBuilderTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java index 32ba2031c91d0..969017822971c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanNotQueryBuilderTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java index 74ee75f508bc5..17de256a554c3 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanOrQueryBuilderTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.spans.SpanOrQuery; import org.apache.lucene.search.spans.SpanQuery; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java index 0ade50442f8da..a59027e6bfeda 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SpanWithinQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.spans.SpanWithinQuery; import org.opensearch.common.ParsingException; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java index f80bfb0ec8e07..92608772c3197 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TermsQueryBuilderTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.indices.TermsLookup; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import org.hamcrest.CoreMatchers; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java index cea4b05437bb1..6a178c88cb2da 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TermsSetQueryBuilderTests.java @@ -48,9 +48,9 @@ import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; -import org.elasticsearch.test.rest.yaml.ObjectPath; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.rest.yaml.ObjectPath; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java index c824af4e4f28a..5155a3d0b1dc6 100644 --- a/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/TypeQueryBuilderTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.opensearch.common.lucene.search.Queries; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/WildcardIntervalsSourceProviderTests.java b/server/src/test/java/org/elasticsearch/index/query/WildcardIntervalsSourceProviderTests.java index b8c076de44eaf..327cba17d1ff3 100644 --- a/server/src/test/java/org/elasticsearch/index/query/WildcardIntervalsSourceProviderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/WildcardIntervalsSourceProviderTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java index ca895c8090c0a..aaf0cda4b7cbf 100644 --- a/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/WildcardQueryBuilderTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.WildcardQuery; import org.opensearch.common.ParsingException; import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java index ff6eb46dba47b..3b34ddf3226b9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/WrapperQueryBuilderTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java index 383ca02b76d1b..0571f0a20117c 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FieldValueFactorFunctionModifierTests.java @@ -22,11 +22,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lucene.search.function.FieldValueFactorFunction; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class FieldValueFactorFunctionModifierTests extends ESTestCase { +public class FieldValueFactorFunctionModifierTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(FieldValueFactorFunction.Modifier.NONE.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java index 7b77c5c8e6f51..650a4a6a68341 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreEquivalenceTests.java @@ -30,7 +30,7 @@ public class FunctionScoreEquivalenceTests extends SearchEquivalenceTestBase { static { try { - Class.forName("org.elasticsearch.test.ESTestCase"); + Class.forName("org.opensearch.test.OpenSearchTestCase"); } catch (ClassNotFoundException e) { throw new AssertionError(e); } diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java index 086cda778aa17..0d7c3d75f7778 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java @@ -54,8 +54,8 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.MultiValueMode; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; import org.joda.time.DateTime; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java index 2a9a384b02110..c3d6124d18e20 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java @@ -66,7 +66,7 @@ import org.opensearch.search.aggregations.support.ValuesSourceType; import org.opensearch.search.sort.BucketedSort; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -79,7 +79,7 @@ import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNot.not; -public class FunctionScoreTests extends ESTestCase { +public class FunctionScoreTests extends OpenSearchTestCase { private static final String UNSUPPORTED = "Method not implemented. This is just a stub for testing."; @@ -441,7 +441,7 @@ private static float[] randomPositiveFloats(int size) { private static double[] randomPositiveDoubles(int size) { double[] values = new double[size]; for (int i = 0; i < values.length; i++) { - double rand = randomValueOtherThanMany((d) -> Double.compare(d, 0) < 0, ESTestCase::randomDouble); + double rand = randomValueOtherThanMany((d) -> Double.compare(d, 0) < 0, OpenSearchTestCase::randomDouble); values[i] = rand * randomInt(100) + 1.e-5d; } return values; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java index 2005b6ff613b0..4217c11dc78b0 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java @@ -29,10 +29,10 @@ import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.script.Script; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; -public class ScoreFunctionBuilderTests extends ESTestCase { +public class ScoreFunctionBuilderTests extends OpenSearchTestCase { public void testIllegalArguments() { expectThrows(IllegalArgumentException.class, () -> new RandomScoreFunctionBuilder().seed(null)); diff --git a/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java b/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java index 1cb64bf2f8593..eb7188e0b28e3 100644 --- a/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/refresh/RefreshStatsTests.java @@ -21,11 +21,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class RefreshStatsTests extends ESTestCase { +public class RefreshStatsTests extends OpenSearchTestCase { public void testSerialize() throws IOException { RefreshStats stats = new RefreshStats(randomNonNegativeLong(), randomNonNegativeLong(), randomNonNegativeLong(), diff --git a/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java index 1d057a3dc3ef0..a63bcda98b011 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java @@ -23,8 +23,8 @@ import org.opensearch.action.support.ActiveShardCount; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.AbstractXContentTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractXContentTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.common.unit.TimeValue.parseTimeValue; @@ -45,7 +45,7 @@ public void testForSlice() { original.setRetryBackoffInitialTime(parseTimeValue(randomPositiveTimeValue(), "retry_backoff_initial_time")); original.setMaxRetries(between(0, 1000)); original.setRequestsPerSecond( - randomBoolean() ? Float.POSITIVE_INFINITY : randomValueOtherThanMany(r -> r < 0, ESTestCase::randomFloat)); + randomBoolean() ? Float.POSITIVE_INFINITY : randomValueOtherThanMany(r -> r < 0, OpenSearchTestCase::randomFloat)); if (randomBoolean()) { if (randomBoolean()) { original.setMaxDocs(between(0, Integer.MAX_VALUE)); diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index 9d6339aaf6b6c..d36795bd64cd4 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; import org.elasticsearch.index.reindex.BulkByScrollTask.Status; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java index 2ab74e47df05e..d3556201e9179 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import org.elasticsearch.index.reindex.BulkByScrollTask.StatusOrException; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java index eca669e4dfab1..ff3d352e94dab 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import org.hamcrest.Matchers; import org.elasticsearch.index.reindex.BulkByScrollTask.Status; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java index d1fd99bb16d06..3b0b1d4064ec5 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -35,7 +35,7 @@ import static org.opensearch.common.unit.TimeValue.timeValueNanos; import static org.hamcrest.Matchers.containsString; -public class BulkByScrollTaskTests extends ESTestCase { +public class BulkByScrollTaskTests extends OpenSearchTestCase { public void testStatusHatesNegatives() { checkStatusNegatives(-1 , 0, 0, 0, 0, 0, 0, 0, 0, 0, "sliceId"); checkStatusNegatives(null, -1, 0, 0, 0, 0, 0, 0, 0, 0, "total"); diff --git a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java index da2ec38669802..0514033468cfd 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.mockito.ArgumentCaptor; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class LeaderBulkByScrollTaskStateTests extends ESTestCase { +public class LeaderBulkByScrollTaskStateTests extends OpenSearchTestCase { private int slices; private BulkByScrollTask task; private LeaderBulkByScrollTaskState taskState; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java index 2ec82dc5086c1..fd12c5e1fdff9 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.Before; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class WorkerBulkByScrollTaskStateTests extends ESTestCase { +public class WorkerBulkByScrollTaskStateTests extends OpenSearchTestCase { private BulkByScrollTask task; private WorkerBulkByScrollTaskState workerState; diff --git a/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java index 2212e5feaf986..3bcb8febdd59e 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.EngineFactory; -import org.elasticsearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.EngineTestCase; import org.elasticsearch.index.engine.InternalEngine; import org.elasticsearch.index.engine.InternalEngineTests; import org.elasticsearch.index.engine.SegmentsStats; @@ -53,6 +53,7 @@ import org.elasticsearch.index.translog.SnapshotMatchers; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.recovery.RecoveryTarget; +import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.Matcher; @@ -81,7 +82,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.Is.is; -public class IndexLevelReplicationTests extends ESIndexLevelReplicationTestCase { +public class IndexLevelReplicationTests extends OpenSearchIndexLevelReplicationTestCase { public void testSimpleReplication() throws Exception { try (ReplicationGroup shards = createGroup(randomInt(2))) { diff --git a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index f39c4fcac7488..e2de7bbc870d2 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -41,19 +41,20 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; -import org.elasticsearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.DocIdSeqNoAndSource; import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.EngineConfig; import org.opensearch.index.engine.EngineFactory; -import org.elasticsearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.EngineTestCase; import org.opensearch.index.engine.InternalEngineFactory; import org.elasticsearch.index.engine.InternalEngineTests; import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; import org.opensearch.index.seqno.RetentionLease; import org.opensearch.index.seqno.RetentionLeases; import org.opensearch.index.seqno.SequenceNumbers; import org.opensearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.index.shard.PrimaryReplicaSyncer; import org.opensearch.index.store.Store; import org.opensearch.index.translog.Translog; @@ -88,7 +89,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.not; -public class RecoveryDuringReplicationTests extends ESIndexLevelReplicationTestCase { +public class RecoveryDuringReplicationTests extends OpenSearchIndexLevelReplicationTestCase { public void testIndexingDuringFileRecovery() throws Exception { try (ReplicationGroup shards = createGroup(randomInt(1))) { diff --git a/server/src/test/java/org/elasticsearch/index/replication/RetentionLeasesReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RetentionLeasesReplicationTests.java index aece79522cb30..be0fa845c4b79 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RetentionLeasesReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RetentionLeasesReplicationTests.java @@ -27,13 +27,14 @@ import org.opensearch.common.Randomness; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; import org.opensearch.index.seqno.RetentionLease; import org.opensearch.index.seqno.RetentionLeaseSyncAction; -import org.elasticsearch.index.seqno.RetentionLeaseUtils; +import org.opensearch.index.seqno.RetentionLeaseUtils; import org.opensearch.index.seqno.RetentionLeases; import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.util.ArrayList; import java.util.List; @@ -43,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -public class RetentionLeasesReplicationTests extends ESIndexLevelReplicationTestCase { +public class RetentionLeasesReplicationTests extends OpenSearchIndexLevelReplicationTestCase { public void testSimpleSyncRetentionLeases() throws Exception { Settings settings = Settings.builder().put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); diff --git a/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java index 0877b3b170e88..972bc17f521fd 100644 --- a/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/MultiMatchQueryTests.java @@ -40,13 +40,13 @@ import org.opensearch.index.IndexService; import org.opensearch.index.engine.Engine; import org.opensearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.MockFieldMapper.FakeFieldType; +import org.opensearch.index.mapper.MockFieldMapper.FakeFieldType; import org.opensearch.index.query.MultiMatchQueryBuilder; import org.opensearch.index.query.QueryShardContext; import org.opensearch.index.search.MultiMatchQuery.FieldAndBoost; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.MockKeywordPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.MockKeywordPlugin; import org.junit.Before; import java.io.IOException; @@ -61,7 +61,7 @@ import static org.opensearch.index.query.QueryBuilders.multiMatchQuery; import static org.hamcrest.Matchers.equalTo; -public class MultiMatchQueryTests extends ESSingleNodeTestCase { +public class MultiMatchQueryTests extends OpenSearchSingleNodeTestCase { private IndexService indexService; diff --git a/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java b/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java index 5a817ee0a6f69..ebeafab42c78b 100644 --- a/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/NestedHelperTests.java @@ -38,12 +38,12 @@ import org.elasticsearch.index.query.NestedQueryBuilder; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.TermQueryBuilder; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Collections; -public class NestedHelperTests extends ESSingleNodeTestCase { +public class NestedHelperTests extends OpenSearchSingleNodeTestCase { IndexService indexService; MapperService mapperService; diff --git a/server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java b/server/src/test/java/org/elasticsearch/index/search/OpenSearchToParentBlockJoinQueryTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java rename to server/src/test/java/org/elasticsearch/index/search/OpenSearchToParentBlockJoinQueryTests.java index 82293ea1f9e85..f09a18c3fb321 100644 --- a/server/src/test/java/org/elasticsearch/index/search/ESToParentBlockJoinQueryTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/OpenSearchToParentBlockJoinQueryTests.java @@ -26,11 +26,11 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.join.QueryBitSetProducer; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ESToParentBlockJoinQueryTests extends ESTestCase { +public class OpenSearchToParentBlockJoinQueryTests extends OpenSearchTestCase { public void testEquals() { Query q1 = new OpenSearchToParentBlockJoinQuery( diff --git a/server/src/test/java/org/elasticsearch/index/search/SimpleQueryStringQueryParserTests.java b/server/src/test/java/org/elasticsearch/index/search/SimpleQueryStringQueryParserTests.java index b89d7d056c026..2a9a4786b6d84 100644 --- a/server/src/test/java/org/elasticsearch/index/search/SimpleQueryStringQueryParserTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/SimpleQueryStringQueryParserTests.java @@ -19,9 +19,9 @@ package org.elasticsearch.index.search; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class SimpleQueryStringQueryParserTests extends ESTestCase { +public class SimpleQueryStringQueryParserTests extends OpenSearchTestCase { public void testEqualsSettings() { SimpleQueryStringQueryParser.Settings settings1 = new SimpleQueryStringQueryParser.Settings(); diff --git a/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java index ebf4cfa447027..19e9d426e0638 100644 --- a/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java @@ -26,17 +26,17 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.elasticsearch.test.geo.RandomGeoGenerator; import java.io.IOException; import java.util.function.DoubleSupplier; import static org.opensearch.geometry.utils.Geohash.stringEncode; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.is; -public class GeoPointParsingTests extends ESTestCase { +public class GeoPointParsingTests extends OpenSearchTestCase { private static final double TOLERANCE = 1E-5; public void testGeoPointReset() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java index acc8de3d8c4b4..5625c6510fa47 100644 --- a/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser.Token; import org.opensearch.geometry.utils.Geohash; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.locationtech.spatial4j.context.SpatialContext; import org.locationtech.spatial4j.distance.DistanceUtils; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; -public class GeoUtilsTests extends ESTestCase { +public class GeoUtilsTests extends OpenSearchTestCase { private static final char[] BASE_32 = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'}; diff --git a/server/src/test/java/org/elasticsearch/index/search/stats/SearchStatsTests.java b/server/src/test/java/org/elasticsearch/index/search/stats/SearchStatsTests.java index 5ec7aeaa0b2be..7ae823bb8dc07 100644 --- a/server/src/test/java/org/elasticsearch/index/search/stats/SearchStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/stats/SearchStatsTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.index.search.stats; import org.elasticsearch.index.search.stats.SearchStats.Stats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; -public class SearchStatsTests extends ESTestCase { +public class SearchStatsTests extends OpenSearchTestCase { // https://github.com/elastic/elasticsearch/issues/7644 public void testShardLevelSearchGroupStats() throws Exception { diff --git a/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java b/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java index bc4f58034d1dc..184f1810f112c 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/CountedBitSetTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.seqno; import org.apache.lucene.util.FixedBitSet; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.List; import java.util.stream.Collectors; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; -public class CountedBitSetTests extends ESTestCase { +public class CountedBitSetTests extends OpenSearchTestCase { public void testCompareToFixedBitset() { int numBits = (short) randomIntBetween(8, 4096); diff --git a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java index 73df7909e0382..2e49568b909b5 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java @@ -31,8 +31,8 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; @@ -41,11 +41,11 @@ import static org.elasticsearch.mock.orig.Mockito.never; import static org.elasticsearch.mock.orig.Mockito.when; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class GlobalCheckpointSyncActionTests extends ESTestCase { +public class GlobalCheckpointSyncActionTests extends OpenSearchTestCase { private ThreadPool threadPool; private CapturingTransport transport; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java index b7329a5b19e94..71a6b415afcca 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/LocalCheckpointTrackerTests.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.Randomness; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.ArrayList; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.oneOf; -public class LocalCheckpointTrackerTests extends ESTestCase { +public class LocalCheckpointTrackerTests extends OpenSearchTestCase { private LocalCheckpointTracker tracker; @@ -140,7 +140,7 @@ public void testLazyInitialization() { tracker.markSeqNoAsProcessed(seqNo); assertThat(tracker.processedSeqNo.size(), equalTo(1)); assertThat(tracker.hasProcessed(seqNo), equalTo(true)); - assertThat(tracker.hasProcessed(randomValueOtherThan(seqNo, ESTestCase::randomNonNegativeLong)), equalTo(false)); + assertThat(tracker.hasProcessed(randomValueOtherThan(seqNo, OpenSearchTestCase::randomNonNegativeLong)), equalTo(false)); assertThat(tracker.processedSeqNo.size(), equalTo(1)); } @@ -162,7 +162,7 @@ public void testSimpleOverFlow() { assertThat(tracker.processedSeqNo.keys().iterator().next().value, equalTo(tracker.processedCheckpoint.get() / BIT_SET_SIZE)); } assertThat(tracker.hasProcessed(randomFrom(seqNoList)), equalTo(true)); - final long notCompletedSeqNo = randomValueOtherThanMany(seqNoList::contains, ESTestCase::randomNonNegativeLong); + final long notCompletedSeqNo = randomValueOtherThanMany(seqNoList::contains, OpenSearchTestCase::randomNonNegativeLong); assertThat(tracker.hasProcessed(notCompletedSeqNo), equalTo(false)); } diff --git a/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java b/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java index 4e7aeb8473eec..ed50b4aca5fce 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java @@ -29,7 +29,7 @@ import org.opensearch.index.IndexSettings; import org.opensearch.index.engine.SafeCommitInfo; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import org.junit.Before; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java index 09b52eea7bd76..dd7e4c97e32aa 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java @@ -30,7 +30,7 @@ import org.opensearch.gateway.WriteStateException; import org.opensearch.index.IndexSettings; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.nio.file.Path; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTestCase.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTestCase.java index 656f51b13b1ed..e37ca9bc1dc36 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTestCase.java @@ -27,8 +27,8 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.engine.SafeCommitInfo; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.util.Set; import java.util.function.LongConsumer; @@ -37,7 +37,7 @@ import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; -public abstract class ReplicationTrackerTestCase extends ESTestCase { +public abstract class ReplicationTrackerTestCase extends OpenSearchTestCase { ReplicationTracker newTracker( final AllocationId allocationId, diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java index 31bd2a2218242..e738478d5d707 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.index.IndexSettings; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java index 83d6e9d66e6b8..bcd0b0e6341f9 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.opensearch.node.Node; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import java.util.concurrent.CountDownLatch; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasToString; -public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { +public class RetentionLeaseActionsTests extends OpenSearchSingleNodeTestCase { public void testAddAction() { final Settings settings = Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java index b5217a5469d57..246ec662bda28 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; @@ -46,12 +46,12 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.mock.orig.Mockito.when; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class RetentionLeaseBackgroundSyncActionTests extends ESTestCase { +public class RetentionLeaseBackgroundSyncActionTests extends OpenSearchTestCase { private ThreadPool threadPool; private CapturingTransport transport; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java index b393f8c974679..cbe6467f5b351 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java @@ -27,7 +27,8 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.index.seqno.RetentionLeaseUtils; import java.util.HashMap; import java.util.Map; @@ -36,7 +37,7 @@ import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.equalTo; -public class RetentionLeaseStatsTests extends ESSingleNodeTestCase { +public class RetentionLeaseStatsTests extends OpenSearchSingleNodeTestCase { public void testRetentionLeaseStats() throws InterruptedException { final Settings settings = Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsWireSerializingTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsWireSerializingTests.java index fc62783f22c3c..97715a6691fb4 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsWireSerializingTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsWireSerializingTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.seqno; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java index b252bd6bc2608..078c52ea5a2ea 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.SystemIndices; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.CapturingTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.CapturingTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; @@ -46,12 +46,12 @@ import static java.util.Collections.emptyMap; import static org.elasticsearch.mock.orig.Mockito.when; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class RetentionLeaseSyncActionTests extends ESTestCase { +public class RetentionLeaseSyncActionTests extends OpenSearchTestCase { private ThreadPool threadPool; private CapturingTransport transport; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseTests.java index 3f0977bd18082..9bcb3e74c33df 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; -public class RetentionLeaseTests extends ESTestCase { +public class RetentionLeaseTests extends OpenSearchTestCase { public void testEmptyId() { final IllegalArgumentException e = expectThrows( diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseXContentTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseXContentTests.java index 4a44c8307303e..12bf96dbf454f 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseXContentTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseXContentTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.seqno; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesTests.java index 485dc1031f814..e935bc06806b6 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.seqno; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.Path; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; -public class RetentionLeasesTests extends ESTestCase { +public class RetentionLeasesTests extends OpenSearchTestCase { public void testPrimaryTermOutOfRange() { final long primaryTerm = randomLongBetween(Long.MIN_VALUE, 0); diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesXContentTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesXContentTests.java index e85598993321c..c1ad92a7d2900 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesXContentTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeasesXContentTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.seqno; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java b/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java index 9a279feddb973..90aae035a7dd7 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/SequenceNumbersTests.java @@ -19,14 +19,14 @@ package org.elasticsearch.index.seqno; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; -public class SequenceNumbersTests extends ESTestCase { +public class SequenceNumbersTests extends OpenSearchTestCase { public void testMin() { final long seqNo = randomNonNegativeLong(); diff --git a/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java b/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java index 52a655e79b128..1ddf42c19ee68 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/DocsStatsTests.java @@ -22,11 +22,11 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class DocsStatsTests extends ESTestCase { +public class DocsStatsTests extends OpenSearchTestCase { public void testCalculateAverageDocSize() throws Exception { DocsStats stats = new DocsStats(10, 2, 120); diff --git a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java index 6f633b76c2ecb..2af3f30bf3d26 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java @@ -24,9 +24,9 @@ import org.opensearch.Assertions; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.Scheduler; import org.junit.After; import org.mockito.ArgumentCaptor; @@ -65,7 +65,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class GlobalCheckpointListenersTests extends ESTestCase { +public class GlobalCheckpointListenersTests extends OpenSearchTestCase { @FunctionalInterface interface TestGlobalCheckpointListener extends GlobalCheckpointListeners.GlobalCheckpointListener { @@ -78,7 +78,7 @@ default Executor executor() { private final ShardId shardId = new ShardId(new Index("index", "uuid"), 0); private final ScheduledThreadPoolExecutor scheduler = - new Scheduler.SafeScheduledThreadPoolExecutor(1, EsExecutors.daemonThreadFactory(Settings.EMPTY, "scheduler")); + new Scheduler.SafeScheduledThreadPoolExecutor(1, OpenSearchExecutors.daemonThreadFactory(Settings.EMPTY, "scheduler")); @After public void shutdownScheduler() { diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java index 2324f2d7e918a..3e7edcc955a8a 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java @@ -37,7 +37,7 @@ import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -45,7 +45,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public class IndexReaderWrapperTests extends ESTestCase { +public class IndexReaderWrapperTests extends OpenSearchTestCase { public void testReaderCloseListenerIsCalled() throws IOException { Directory dir = newDirectory(); diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java index ffa50d49c4437..4b758072ccc40 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java @@ -23,10 +23,10 @@ import org.opensearch.common.CheckedRunnable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolStats; @@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.instanceOf; -public class IndexShardOperationPermitsTests extends ESTestCase { +public class IndexShardOperationPermitsTests extends OpenSearchTestCase { private static ThreadPool threadPool; @@ -165,10 +165,10 @@ public void run() { assertNotNull(future.get(1, TimeUnit.MINUTES)); } catch (ExecutionException e) { if (closeAfterBlocking) { - assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(EsRejectedExecutionException.class)) + assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(OpenSearchRejectedExecutionException.class)) .or(instanceOf(IndexShardClosedException.class))); } else { - assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(EsRejectedExecutionException.class))); + assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(OpenSearchRejectedExecutionException.class))); } } } diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java index de51c570c74cc..52ac9b639c2da 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java @@ -32,6 +32,7 @@ import org.elasticsearch.index.seqno.RetentionLeaseStats; import org.elasticsearch.index.seqno.RetentionLeases; import org.elasticsearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index e4e26ad283497..191c17f6d9980 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -111,6 +111,8 @@ import org.opensearch.index.seqno.RetentionLeases; import org.opensearch.index.seqno.SeqNoStats; import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.RestoreOnlyRepository; import org.opensearch.index.store.Store; import org.opensearch.index.store.StoreStats; import org.elasticsearch.index.store.StoreUtils; @@ -125,11 +127,11 @@ import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; -import org.elasticsearch.test.CorruptionUtils; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.FieldMaskingReader; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.store.MockFSDirectoryFactory; +import org.opensearch.test.CorruptionUtils; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.FieldMaskingReader; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.store.MockFSDirectoryFactory; import org.opensearch.threadpool.ThreadPool; import org.junit.Assert; @@ -174,7 +176,7 @@ import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.either; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java index 7baae06b67151..c17dbf0d7557b 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexingOperationListenerTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.is; -public class IndexingOperationListenerTests extends ESTestCase{ +public class IndexingOperationListenerTests extends OpenSearchTestCase { // this test also tests if calls are correct if one or more listeners throw exceptions public void testListenersAreExecuted() { diff --git a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java index 2b87094c35dbf..407ce65198f3a 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java @@ -29,8 +29,8 @@ import org.elasticsearch.env.NodeEnvironment.NodePath; import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** Separate test class from ShardPathTests because we need static (BeforeClass) setup to install mock filesystems... */ -public class NewPathForShardTests extends ESTestCase { +public class NewPathForShardTests extends OpenSearchTestCase { private static final IndexSettings INDEX_SETTINGS = IndexSettingsModule.newIndexSettings("index", Settings.EMPTY); diff --git a/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java index 1d5b666b58209..37e83e5ec7e1f 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/PrimaryReplicaSyncerTests.java @@ -45,6 +45,7 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.translog.TestTranslog; import org.elasticsearch.index.translog.Translog; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskManager; diff --git a/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java index 61524feeefdaf..ee31daabccf04 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.codec.CodecService; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.EngineTestCase; import org.elasticsearch.index.engine.InternalEngine; import org.elasticsearch.index.mapper.IdFieldMapper; import org.elasticsearch.index.mapper.ParseContext.Document; @@ -57,9 +57,9 @@ import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -85,7 +85,7 @@ /** * Tests how {@linkplain RefreshListeners} interacts with {@linkplain InternalEngine}. */ -public class RefreshListenersTests extends ESTestCase { +public class RefreshListenersTests extends OpenSearchTestCase { private RefreshListeners listeners; private Engine engine; private volatile int maxListeners; diff --git a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java index 7b8467b924ec4..2c12bdd137fd7 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -48,11 +48,12 @@ import org.opensearch.index.engine.EngineException; import org.opensearch.index.engine.InternalEngineFactory; import org.opensearch.index.seqno.RetentionLeaseSyncer; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.index.store.Store; import org.elasticsearch.index.translog.TestTranslog; import org.opensearch.index.translog.TranslogCorruptedException; -import org.elasticsearch.test.CorruptionUtils; -import org.elasticsearch.test.DummyShardLock; +import org.opensearch.test.CorruptionUtils; +import org.opensearch.test.DummyShardLock; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java index 1f356dc56e515..bef1fe356e51f 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/SearchOperationListenerTests.java @@ -20,8 +20,8 @@ import org.opensearch.search.internal.ReaderContext; import org.opensearch.search.internal.SearchContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.TestSearchContext; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.TestSearchContext; import org.opensearch.transport.TransportRequest; import org.opensearch.transport.TransportRequest.Empty; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.sameInstance; import static org.mockito.Mockito.mock; -public class SearchOperationListenerTests extends ESTestCase { +public class SearchOperationListenerTests extends OpenSearchTestCase { // this test also tests if calls are correct if one or more listeners throw exceptions public void testListenersAreExecuted() { diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java index 5a3aa0eb87095..7a323574aa4a0 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java @@ -27,6 +27,7 @@ import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.mapper.RoutingFieldMapper; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.search.fetch.subphase.FetchSourceContext; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java index c7b99257a5fae..2e039d562cd91 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardIdTests.java @@ -21,9 +21,9 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class ShardIdTests extends ESTestCase { +public class ShardIdTests extends OpenSearchTestCase { public void testShardIdFromString() { String indexName = randomAlphaOfLengthBetween(3,50); diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java index 91fdaf263daaf..62e148a7f9312 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.Path; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class ShardPathTests extends ESTestCase { +public class ShardPathTests extends OpenSearchTestCase { public void testLoadShardPath() throws IOException { try (NodeEnvironment env = newNodeEnvironment(Settings.builder().build())) { ShardId shardId = new ShardId("foo", "0xDEADBEEF", 0); diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java index 5b1d558fa8c61..a164ee913eba6 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardSplittingQueryTests.java @@ -43,14 +43,14 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class ShardSplittingQueryTests extends ESTestCase { +public class ShardSplittingQueryTests extends OpenSearchTestCase { public void testSplitOnID() throws IOException { SeqNoFieldMapper.SequenceIDFields sequenceIDFields = SeqNoFieldMapper.SequenceIDFields.emptySeqID(); diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java index 54b163ea1b2c2..ccfecbdaac676 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java @@ -28,11 +28,11 @@ import org.apache.lucene.store.BaseDirectoryWrapper; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ShardUtilsTests extends ESTestCase { +public class ShardUtilsTests extends OpenSearchTestCase { public void testExtractShardId() throws IOException { BaseDirectoryWrapper dir = newDirectory(); diff --git a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java index 32b7aaf0b4330..8d35c708c0252 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java @@ -49,7 +49,7 @@ import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.Files; @@ -62,7 +62,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class StoreRecoveryTests extends ESTestCase { +public class StoreRecoveryTests extends OpenSearchTestCase { public void testAddIndices() throws IOException { Directory[] dirs = new Directory[randomIntBetween(1, 10)]; diff --git a/server/src/test/java/org/elasticsearch/index/similarity/LegacySimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/LegacySimilarityTests.java index 0ba09a7cd12c7..42311bf787f6b 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/LegacySimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/LegacySimilarityTests.java @@ -28,14 +28,14 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class LegacySimilarityTests extends ESSingleNodeTestCase { +public class LegacySimilarityTests extends OpenSearchSingleNodeTestCase { @Override protected boolean forbidPrivateIndexSettings() { diff --git a/server/src/test/java/org/elasticsearch/index/similarity/NonNegativeScoresSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/NonNegativeScoresSimilarityTests.java index 33528c2190051..37cd4fd6fc88e 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/NonNegativeScoresSimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/NonNegativeScoresSimilarityTests.java @@ -24,10 +24,10 @@ import org.apache.lucene.search.TermStatistics; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.Similarity.SimScorer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -public class NonNegativeScoresSimilarityTests extends ESTestCase { +public class NonNegativeScoresSimilarityTests extends OpenSearchTestCase { public void testBasics() { Similarity negativeScoresSim = new Similarity() { diff --git a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java index 6e7b047fd9d4f..a5e1371da812b 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/ScriptedSimilarityTests.java @@ -43,13 +43,13 @@ import org.apache.lucene.util.Version; import org.opensearch.script.SimilarityScript; import org.opensearch.script.SimilarityWeightScript; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -public class ScriptedSimilarityTests extends ESTestCase { +public class ScriptedSimilarityTests extends OpenSearchTestCase { public void testSameNormsAsBM25CountOverlaps() { doTestSameNormsAsBM25(false); diff --git a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java index d4ae16542bc70..1eb69652b2cc6 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityServiceTests.java @@ -27,15 +27,15 @@ import org.opensearch.Version; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.hamcrest.Matchers; import java.util.Collections; import static org.hamcrest.Matchers.instanceOf; -public class SimilarityServiceTests extends ESTestCase { +public class SimilarityServiceTests extends OpenSearchTestCase { public void testDefaultSimilarity() { Settings settings = Settings.builder().build(); IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("test", settings); diff --git a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java index e4d83ed91649f..22d42d8697512 100644 --- a/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java +++ b/server/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java @@ -42,8 +42,8 @@ import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.InternalSettingsPlugin; import java.io.IOException; import java.util.Collection; @@ -51,7 +51,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class SimilarityTests extends ESSingleNodeTestCase { +public class SimilarityTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { diff --git a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java index b9b2b2c42694f..35d867772f5d3 100644 --- a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java +++ b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo; import org.elasticsearch.index.store.StoreFileMetadata; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class FileInfoTests extends ESTestCase { +public class FileInfoTests extends OpenSearchTestCase { private static final org.apache.lucene.util.Version MIN_SUPPORTED_LUCENE_VERSION = org.opensearch.Version.CURRENT .minimumIndexCompatibilityVersion().luceneVersion; diff --git a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java index d7469df406745..0c602bc85cd59 100644 --- a/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java +++ b/server/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.snapshots.blobstore; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; -public class SlicedInputStreamTests extends ESTestCase { +public class SlicedInputStreamTests extends OpenSearchTestCase { public void testReadRandom() throws IOException { int parts = randomIntBetween(1, 20); ByteArrayOutputStream stream = new ByteArrayOutputStream(); diff --git a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java index 4a790714f906c..d8296bf19fd11 100644 --- a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java @@ -25,13 +25,13 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Set; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class ByteSizeCachingDirectoryTests extends ESTestCase { +public class ByteSizeCachingDirectoryTests extends OpenSearchTestCase { private static class LengthCountingDirectory extends FilterDirectory { diff --git a/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java index a1604ff7ee2b8..be8495df59c7d 100644 --- a/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/FsDirectoryFactoryTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.hamcrest.Matchers; import java.io.IOException; @@ -45,7 +45,7 @@ import java.util.Arrays; import java.util.Locale; -public class FsDirectoryFactoryTests extends ESTestCase { +public class FsDirectoryFactoryTests extends OpenSearchTestCase { public void testPreload() throws IOException { doTestPreload(); diff --git a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java index 1d7c6986854e2..88efa3b3c2a89 100644 --- a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java @@ -68,9 +68,9 @@ import org.opensearch.index.seqno.RetentionLease; import org.opensearch.index.shard.ShardId; import org.opensearch.indices.store.TransportNodesListShardStoreMetadata; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.hamcrest.Matchers; import java.io.ByteArrayInputStream; @@ -90,7 +90,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static java.util.Collections.unmodifiableMap; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; @@ -103,7 +103,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -public class StoreTests extends ESTestCase { +public class StoreTests extends OpenSearchTestCase { private static final IndexSettings INDEX_SETTINGS = IndexSettingsModule.newIndexSettings("index", Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, org.opensearch.Version.CURRENT).build()); diff --git a/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java b/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java index 5fcb0ca1d2634..9c69d293caf1a 100644 --- a/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/suggest/stats/CompletionsStatsTests.java @@ -23,11 +23,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.search.suggest.completion.CompletionStats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class CompletionsStatsTests extends ESTestCase { +public class CompletionsStatsTests extends OpenSearchTestCase { public void testSerialize() throws IOException { FieldMemoryStats map = randomBoolean() ? null : FieldMemoryStatsTests.randomFieldMemoryStats(); diff --git a/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java index e6c2ea1de3d0f..5e014dc2b477d 100644 --- a/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/termvectors/TermVectorsServiceTests.java @@ -29,7 +29,7 @@ import org.opensearch.index.IndexService; import org.opensearch.index.shard.IndexShard; import org.opensearch.indices.IndicesService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.List; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class TermVectorsServiceTests extends ESSingleNodeTestCase { +public class TermVectorsServiceTests extends OpenSearchSingleNodeTestCase { public void testTook() throws Exception { XContentBuilder mapping = jsonBuilder() diff --git a/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java index 9b223f6bd30f3..b59046066f783 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/MultiSnapshotTests.java @@ -22,7 +22,7 @@ import com.carrotsearch.hppc.LongHashSet; import com.carrotsearch.hppc.LongSet; import org.opensearch.common.Randomness; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.List; import java.util.stream.Collectors; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class MultiSnapshotTests extends ESTestCase { +public class MultiSnapshotTests extends OpenSearchTestCase { public void testTrackSeqNoSimpleRange() throws Exception { final MultiSnapshot.SeqNoSet bitSet = new MultiSnapshot.SeqNoSet(); diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java index f3b18330393db..8a2565a6828df 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; -public class TranslogDeletionPolicyTests extends ESTestCase { +public class TranslogDeletionPolicyTests extends OpenSearchTestCase { public void testNoRetention() throws IOException { long now = System.currentTimeMillis(); diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogHeaderTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogHeaderTests.java index f087dd5d99348..7585998be186e 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogHeaderTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogHeaderTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.channels.Channels; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.not; -public class TranslogHeaderTests extends ESTestCase { +public class TranslogHeaderTests extends OpenSearchTestCase { public void testCurrentHeaderVersion() throws Exception { final String translogUUID = UUIDs.randomBase64UUID(); diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 1b84379dad7e6..20a20dc607c9e 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -72,9 +72,9 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.translog.Translog.Location; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; @@ -128,7 +128,7 @@ import static org.opensearch.common.util.BigArrays.NON_RECYCLING_INSTANCE; import static org.elasticsearch.index.translog.SnapshotMatchers.containsOperationsInAnyOrder; -import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; +import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; @@ -148,7 +148,7 @@ import static org.mockito.Mockito.stub; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class TranslogTests extends ESTestCase { +public class TranslogTests extends OpenSearchTestCase { protected final ShardId shardId = new ShardId("index", "_na_", 1); diff --git a/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java b/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java index fb157ee8a0b51..0b342e20405fd 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndexingMemoryControllerTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.engine.InternalEngine; import org.elasticsearch.index.refresh.RefreshStats; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.indices.recovery.RecoveryState; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java index 844a579781deb..59748d7f6b621 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java @@ -32,11 +32,11 @@ import org.elasticsearch.index.seqno.RetentionLeaseSyncer; import org.elasticsearch.index.shard.IndexEventListener; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; @@ -46,9 +46,9 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason.DELETED; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; -public class IndicesLifecycleListenerSingleNodeTests extends ESSingleNodeTestCase { +public class IndicesLifecycleListenerSingleNodeTests extends OpenSearchSingleNodeTestCase { public void testStartDeleteIndexEventCallback() throws Throwable { IndicesService indicesService = getInstanceFromNode(IndicesService.class); diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java index dadb699016366..69df80215c65f 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.mapper.VersionFieldMapper; import org.elasticsearch.indices.mapper.MapperRegistry; import org.opensearch.plugins.MapperPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThan; -public class IndicesModuleTests extends ESTestCase { +public class IndicesModuleTests extends OpenSearchTestCase { private static class FakeMapperParser implements Mapper.TypeParser { @Override diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java index 8e9d45d101075..f6103301e219a 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java @@ -42,12 +42,12 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.cache.query.QueryCacheStats; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Set; -public class IndicesQueryCacheTests extends ESTestCase { +public class IndicesQueryCacheTests extends OpenSearchTestCase { private static class DummyQuery extends Query { diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java index 72c712c430a5a..c74dffc06a08f 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java @@ -45,13 +45,13 @@ import org.opensearch.index.cache.request.ShardRequestCache; import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; -public class IndicesRequestCacheTests extends ESTestCase { +public class IndicesRequestCacheTests extends OpenSearchTestCase { public void testBasicOperationsCache() throws Exception { ShardRequestCache requestCacheStats = new ShardRequestCache(); diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java index eeed36db4764e..2eb84fd97b004 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.cache.RemovalNotification; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.IndexModule; @@ -39,11 +39,11 @@ import org.opensearch.node.MockNode; import org.opensearch.node.Node; import org.opensearch.node.NodeValidationException; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalSettingsPlugin; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.MockHttpTransport; -import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalSettingsPlugin; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.MockHttpTransport; +import org.opensearch.test.hamcrest.OpenSearchAssertions; import org.opensearch.transport.nio.MockNioTransportPlugin; import java.nio.file.Path; @@ -55,10 +55,10 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; -import static org.elasticsearch.test.NodeRoles.dataNode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.NodeRoles.dataNode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; -public class IndicesServiceCloseTests extends ESTestCase { +public class IndicesServiceCloseTests extends OpenSearchTestCase { private Node startNode() throws NodeValidationException { final Path tempDir = createTempDir(); @@ -69,7 +69,7 @@ private Node startNode() throws NodeValidationException { .put(Environment.PATH_REPO_SETTING.getKey(), tempDir.resolve("repo")) .put(Environment.PATH_SHARED_DATA_SETTING.getKey(), createTempDir().getParent()) .put(Node.NODE_NAME_SETTING.getKey(), nodeName) - .put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created + .put(OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created .put("transport.type", getTestTransportType()) .put(dataNode()) .put(NodeEnvironment.NODE_ID_SEED_SETTING.getKey(), random().nextLong()) @@ -149,7 +149,7 @@ public void testCloseWhileOngoingRequest() throws Exception { assertAcked(node.client().admin().indices().prepareCreate("test") .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0))); node.client().prepareIndex("test", "_doc", "1").setSource(Collections.emptyMap()).get(); - ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); + OpenSearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); assertEquals(2, indicesService.indicesRefCount.refCount()); @@ -175,7 +175,7 @@ public void testCloseAfterRequestHasUsedQueryCache() throws Exception { .put(SETTING_NUMBER_OF_REPLICAS, 0) .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true))); node.client().prepareIndex("test", "_doc", "1").setSource(Collections.singletonMap("foo", 3L)).get(); - ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); + OpenSearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); assertEquals(2, indicesService.indicesRefCount.refCount()); @@ -210,7 +210,7 @@ public void testCloseWhileOngoingRequestUsesQueryCache() throws Exception { .put(SETTING_NUMBER_OF_REPLICAS, 0) .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true))); node.client().prepareIndex("test", "_doc", "1").setSource(Collections.singletonMap("foo", 3L)).get(); - ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); + OpenSearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); assertEquals(2, indicesService.indicesRefCount.refCount()); @@ -244,7 +244,7 @@ public void testCloseWhileOngoingRequestUsesRequestCache() throws Exception { .put(SETTING_NUMBER_OF_REPLICAS, 0) .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true))); node.client().prepareIndex("test", "_doc", "1").setSource(Collections.singletonMap("foo", 3L)).get(); - ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); + OpenSearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); assertEquals(2, indicesService.indicesRefCount.refCount()); diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 6a567240140b1..8fcaaeb56a662 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -63,10 +63,10 @@ import org.elasticsearch.plugins.EnginePlugin; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.hamcrest.RegexMatcher; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.hamcrest.RegexMatcher; import java.io.IOException; import java.util.ArrayList; @@ -81,8 +81,8 @@ import java.util.stream.Stream; import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasToString; @@ -91,7 +91,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class IndicesServiceTests extends ESSingleNodeTestCase { +public class IndicesServiceTests extends OpenSearchSingleNodeTestCase { public IndicesService getIndicesService() { return getInstanceFromNode(IndicesService.class); diff --git a/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java b/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java index e6f480cdb3e46..34e3579ee935a 100644 --- a/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java +++ b/server/src/test/java/org/elasticsearch/indices/NodeIndicesStatsTests.java @@ -20,14 +20,14 @@ package org.elasticsearch.indices; import org.opensearch.common.xcontent.ToXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.object.HasToString.hasToString; -public class NodeIndicesStatsTests extends ESTestCase { +public class NodeIndicesStatsTests extends OpenSearchTestCase { public void testInvalidLevel() { final NodeIndicesStats stats = new NodeIndicesStats(null, Collections.emptyMap()); diff --git a/server/src/test/java/org/elasticsearch/indices/ShardLimitValidatorTests.java b/server/src/test/java/org/elasticsearch/indices/ShardLimitValidatorTests.java index 2ace79171cd24..3177227857a57 100644 --- a/server/src/test/java/org/elasticsearch/indices/ShardLimitValidatorTests.java +++ b/server/src/test/java/org/elasticsearch/indices/ShardLimitValidatorTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Optional; @@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ShardLimitValidatorTests extends ESTestCase { +public class ShardLimitValidatorTests extends OpenSearchTestCase { public void testOverShardLimit() { int nodesInCluster = randomIntBetween(1, 90); diff --git a/server/src/test/java/org/elasticsearch/indices/SystemIndexDescriptorTests.java b/server/src/test/java/org/elasticsearch/indices/SystemIndexDescriptorTests.java index 35d7a928be384..2714f13be2ee8 100644 --- a/server/src/test/java/org/elasticsearch/indices/SystemIndexDescriptorTests.java +++ b/server/src/test/java/org/elasticsearch/indices/SystemIndexDescriptorTests.java @@ -19,11 +19,11 @@ package org.elasticsearch.indices; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; -public class SystemIndexDescriptorTests extends ESTestCase { +public class SystemIndexDescriptorTests extends OpenSearchTestCase { public void testValidation() { { diff --git a/server/src/test/java/org/elasticsearch/indices/SystemIndicesTests.java b/server/src/test/java/org/elasticsearch/indices/SystemIndicesTests.java index dc0e7c4ab028b..6aa0bb2926a3b 100644 --- a/server/src/test/java/org/elasticsearch/indices/SystemIndicesTests.java +++ b/server/src/test/java/org/elasticsearch/indices/SystemIndicesTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.indices; import org.opensearch.tasks.TaskResultsService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collection; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class SystemIndicesTests extends ESTestCase { +public class SystemIndicesTests extends OpenSearchTestCase { public void testBasicOverlappingPatterns() { SystemIndexDescriptor broadPattern = new SystemIndexDescriptor(".a*c*", "test"); diff --git a/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java b/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java index 0806ab3090033..32a6380101eee 100644 --- a/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java +++ b/server/src/test/java/org/elasticsearch/indices/TermsLookupTests.java @@ -24,13 +24,13 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; -public class TermsLookupTests extends ESTestCase { +public class TermsLookupTests extends OpenSearchTestCase { public void testTermsLookup() { String index = randomAlphaOfLengthBetween(1, 10); String type = randomAlphaOfLengthBetween(1, 10); diff --git a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java index 6a7a17ff39f50..107b4aa1f93b9 100644 --- a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java +++ b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java @@ -50,13 +50,13 @@ import org.elasticsearch.index.analysis.StandardTokenizerFactory; import org.elasticsearch.index.analysis.StopTokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.MyFilterTokenFilterFactory; +import org.opensearch.index.analysis.MyFilterTokenFilterFactory; import org.elasticsearch.index.analysis.TokenizerFactory; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.hamcrest.MatcherAssert; import java.io.BufferedWriter; @@ -81,7 +81,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class AnalysisModuleTests extends ESTestCase { +public class AnalysisModuleTests extends OpenSearchTestCase { private final Settings emptyNodeSettings = Settings.builder() .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .build(); diff --git a/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java index a49c4a44cf97a..5770bc1cd6683 100644 --- a/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.indices.analysis.HunspellService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.file.Path; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.notNullValue; -public class HunspellServiceTests extends ESTestCase { +public class HunspellServiceTests extends OpenSearchTestCase { public void testLocaleDirectoryWithNodeLevelConfig() throws Exception { Settings settings = Settings.builder() .put(HUNSPELL_LAZY_LOAD.getKey(), randomBoolean()) diff --git a/server/src/test/java/org/elasticsearch/indices/breaker/BreakerSettingsTests.java b/server/src/test/java/org/elasticsearch/indices/breaker/BreakerSettingsTests.java index c96d1965faa48..9634ded2dd5eb 100644 --- a/server/src/test/java/org/elasticsearch/indices/breaker/BreakerSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/indices/breaker/BreakerSettingsTests.java @@ -21,11 +21,11 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class BreakerSettingsTests extends ESTestCase { +public class BreakerSettingsTests extends OpenSearchTestCase { public void testFromSettings() { Settings clusterSettings = Settings.builder() diff --git a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java index e63cae3c4877f..19e1680bdb076 100644 --- a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.unit.TimeValue; import org.elasticsearch.monitor.jvm.JvmInfo; import org.opensearch.search.aggregations.MultiBucketConsumerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -public class HierarchyCircuitBreakerServiceTests extends ESTestCase { +public class HierarchyCircuitBreakerServiceTests extends OpenSearchTestCase { public void testThreadedUpdatesToChildBreaker() throws Exception { final int NUM_THREADS = scaledRandomIntBetween(3, 15); diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java index dd7dff065db5b..ba790659bd6b3 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java @@ -45,7 +45,7 @@ import org.elasticsearch.indices.recovery.PeerRecoveryTargetService; import org.elasticsearch.indices.recovery.RecoveryState; import org.opensearch.repositories.RepositoriesService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -67,7 +67,7 @@ /** * Abstract base class for tests against {@link IndicesClusterStateService} */ -public abstract class AbstractIndicesClusterStateServiceTestCase extends ESTestCase { +public abstract class AbstractIndicesClusterStateServiceTestCase extends OpenSearchTestCase { private boolean enableRandomFailures; diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index 06f5e798a8de7..c1b7b39e63b12 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -93,7 +93,7 @@ import org.opensearch.indices.ShardLimitValidator; import org.opensearch.indices.SystemIndices; import org.opensearch.snapshots.EmptySnapshotsInfoService; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.gateway.TestGatewayAllocator; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; diff --git a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java index cb21c2dff2fc5..d3a90a2c4c60b 100644 --- a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java +++ b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java @@ -33,15 +33,15 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardNotFoundException; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import java.util.List; import java.util.Map; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; -public class SyncedFlushSingleNodeTests extends ESSingleNodeTestCase { +public class SyncedFlushSingleNodeTests extends OpenSearchSingleNodeTestCase { public void testModificationPreventsFlushing() throws InterruptedException { createIndex("test"); diff --git a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java index bb024d17d2418..da9f7efdd2219 100644 --- a/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java +++ b/server/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUtil.java @@ -24,14 +24,14 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.routing.ShardRouting; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.test.ESTestCase.assertBusy; +import static org.opensearch.test.OpenSearchTestCase.assertBusy; /** Utils for SyncedFlush */ public class SyncedFlushUtil { diff --git a/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java index 4661dcb02aa51..988309258591a 100644 --- a/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java +++ b/server/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java @@ -23,14 +23,14 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.BreakerSettings; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; /** * Unit tests for the circuit breaker */ -public class CircuitBreakerUnitTests extends ESTestCase { +public class CircuitBreakerUnitTests extends OpenSearchTestCase { public static long pctBytes(String percentString) { return Settings.EMPTY.getAsMemory("", percentString).getBytes(); } diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java index 6495d16f99b96..86eb6b41e1a27 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoverySourceServiceTests.java @@ -24,10 +24,10 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.store.Store; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.NodeRoles; +import org.opensearch.test.NodeRoles; import org.opensearch.transport.TransportService; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java index 98a27c8eb6e4a..4eb9ef61b07d1 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.store.StoreFileMetadata; import org.elasticsearch.index.translog.Translog; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java index eb6d93f4726cc..90158d943d36f 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryRequestTrackerTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import java.util.Collection; @@ -31,7 +31,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentMap; -public class RecoveryRequestTrackerTests extends ESTestCase { +public class RecoveryRequestTrackerTests extends OpenSearchTestCase { private TestThreadPool threadPool; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java index 3391b6914e208..57502d886b728 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java @@ -23,11 +23,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; -public class RecoverySettingsDynamicUpdateTests extends ESTestCase { +public class RecoverySettingsDynamicUpdateTests extends OpenSearchTestCase { private final ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); private final RecoverySettings recoverySettings = new RecoverySettings(Settings.EMPTY, clusterSettings); diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index 2faffe8d9a29b..4519322f60c04 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -78,11 +78,11 @@ import org.opensearch.index.store.Store; import org.opensearch.index.store.StoreFileMetadata; import org.opensearch.index.translog.Translog; -import org.elasticsearch.test.CorruptionUtils; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.CorruptionUtils; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.opensearch.indices.recovery.AsyncRecoveryTarget; import org.opensearch.threadpool.FixedExecutorBuilder; import org.opensearch.threadpool.TestThreadPool; @@ -129,7 +129,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RecoverySourceHandlerTests extends ESTestCase { +public class RecoverySourceHandlerTests extends OpenSearchTestCase { private static final IndexSettings INDEX_SETTINGS = IndexSettingsModule.newIndexSettings("index", Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, org.opensearch.Version.CURRENT).build()); private final ShardId shardId = new ShardId(INDEX_SETTINGS.getIndex(), 1); @@ -936,7 +936,7 @@ private static List generateOperations(int numOps) { final byte[] source = "{}".getBytes(StandardCharsets.UTF_8); final Set seqNos = new HashSet<>(); for (int i = 0; i < numOps; i++) { - final long seqNo = randomValueOtherThanMany(n -> seqNos.add(n) == false, ESTestCase::randomNonNegativeLong); + final long seqNo = randomValueOtherThanMany(n -> seqNos.add(n) == false, OpenSearchTestCase::randomNonNegativeLong); final Translog.Operation op; if (randomBoolean()) { op = new Translog.Index("_doc", "id", seqNo, randomNonNegativeLong(), randomNonNegativeLong(), source, null, -1); diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java index 4faaa0fe97ade..ffd3f19c75171 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java @@ -24,13 +24,13 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.store.StoreFileMetadata; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.Set; import java.util.regex.Pattern; -public class RecoveryStatusTests extends ESSingleNodeTestCase { +public class RecoveryStatusTests extends OpenSearchSingleNodeTestCase { private static final org.apache.lucene.util.Version MIN_SUPPORTED_LUCENE_VERSION = org.opensearch.Version.CURRENT .minimumIndexCompatibilityVersion().luceneVersion; public void testRenameTempFiles() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java index ffb5e111387da..8ea41b4ff2c9a 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTargetTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.indices.recovery.RecoveryState.Timer; import org.elasticsearch.indices.recovery.RecoveryState.Translog; import org.elasticsearch.indices.recovery.RecoveryState.VerifyIndex; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -45,7 +45,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.either; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.startsWith; -public class RecoveryTargetTests extends ESTestCase { +public class RecoveryTargetTests extends OpenSearchTestCase { abstract class Streamer extends Thread { private T lastRead; private final AtomicBoolean shouldStop; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java index 59702b93527a5..2b06fcd7b6e25 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoveryTests.java @@ -42,13 +42,13 @@ import org.opensearch.index.IndexSettings; import org.opensearch.index.MergePolicyConfig; import org.opensearch.index.VersionType; -import org.elasticsearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.DocIdSeqNoAndSource; import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.EngineFactory; import org.opensearch.index.engine.InternalEngineFactory; import org.elasticsearch.index.engine.InternalEngineTests; import org.opensearch.index.mapper.SourceToParse; -import org.elasticsearch.index.replication.ESIndexLevelReplicationTestCase; +import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; import org.elasticsearch.index.replication.RecoveryDuringReplicationTests; import org.opensearch.index.seqno.SequenceNumbers; import org.opensearch.index.shard.IndexShard; @@ -69,7 +69,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.not; -public class RecoveryTests extends ESIndexLevelReplicationTestCase { +public class RecoveryTests extends OpenSearchIndexLevelReplicationTestCase { public void testTranslogHistoryTransferred() throws Exception { try (ReplicationGroup shards = createGroup(0)) { diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java index e641eefab92d8..3778c968b9109 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -36,10 +36,10 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.equalTo; -public class StartRecoveryRequestTests extends ESTestCase { +public class StartRecoveryRequestTests extends OpenSearchTestCase { public void testSerialization() throws Exception { final Version targetNodeVersion = randomVersion(random()); diff --git a/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java index 03d760f5769a5..9e0db1d276486 100644 --- a/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java +++ b/server/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Arrays; @@ -36,7 +36,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -public class IndicesStoreTests extends ESTestCase { +public class IndicesStoreTests extends OpenSearchTestCase { private static final ShardRoutingState[] NOT_STARTED_STATES; static { diff --git a/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java index 85aeed9485f9c..c0439a435b64e 100644 --- a/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/fs/DeviceStatsTests.java @@ -19,11 +19,11 @@ package org.elasticsearch.monitor.fs; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.CoreMatchers.equalTo; -public class DeviceStatsTests extends ESTestCase { +public class DeviceStatsTests extends OpenSearchTestCase { public void testDeviceStats() { final int majorDeviceNumber = randomIntBetween(1, 1 << 8); diff --git a/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java index 72d4afe0d8b3f..51c7c85ed1fc3 100644 --- a/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java @@ -31,9 +31,9 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.env.NodeEnvironment; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.Before; @@ -55,7 +55,7 @@ import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.is; -public class FsHealthServiceTests extends ESTestCase { +public class FsHealthServiceTests extends OpenSearchTestCase { private DeterministicTaskQueue deterministicTaskQueue; diff --git a/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java index 922ab24cef32b..f88de80b2e911 100644 --- a/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.collect.Tuple; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment.NodePath; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.file.FileStore; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.not; -public class FsProbeTests extends ESTestCase { +public class FsProbeTests extends OpenSearchTestCase { public void testFsInfo() throws IOException { diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java index 5b42c7481f4bc..8e2078ddcf763 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -37,7 +37,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class JvmGcMonitorServiceSettingsTests extends ESTestCase { +public class JvmGcMonitorServiceSettingsTests extends OpenSearchTestCase { public void testEmptySettingsAreOkay() throws InterruptedException { AtomicBoolean scheduled = new AtomicBoolean(); diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java index 4ff5ba025b659..b45e07f57211b 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java @@ -22,14 +22,14 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -public class JvmGcMonitorServiceTests extends ESTestCase { +public class JvmGcMonitorServiceTests extends OpenSearchTestCase { public void testSlowGcLogging() { final Logger logger = mock(Logger.class); diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java index bd9147ea2e36c..d7f9260cfa609 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java @@ -21,9 +21,9 @@ import org.apache.lucene.util.Constants; import org.opensearch.bootstrap.JavaVersion; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class JvmInfoTests extends ESTestCase { +public class JvmInfoTests extends OpenSearchTestCase { public void testUseG1GC() { // if we are running on HotSpot, and the test JVM was started diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java index 75019061b2b90..60ccf26676446 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.jvm; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.HashMap; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class JvmMonitorTests extends ESTestCase { +public class JvmMonitorTests extends OpenSearchTestCase { private static final JvmGcMonitorService.GcOverheadThreshold IGNORE = new JvmGcMonitorService.GcOverheadThreshold(0, 0, 0); diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java index ce68753254aaa..085374eff2256 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmStatsTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class JvmStatsTests extends ESTestCase { +public class JvmStatsTests extends OpenSearchTestCase { public void testJvmStats() throws IOException { JvmStats stats = JvmStats.jvmStats(); assertNotNull(stats); diff --git a/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java index 9408fa31d19fd..f3e16c6e5cc1d 100644 --- a/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java @@ -38,9 +38,9 @@ import java.util.stream.Collectors; import org.apache.lucene.util.Constants; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class OsProbeTests extends ESTestCase { +public class OsProbeTests extends OpenSearchTestCase { public void testOsInfo() throws IOException { final int allocatedProcessors = randomIntBetween(1, Runtime.getRuntime().availableProcessors()); diff --git a/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java b/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java index f59570e66ff46..886e6f05f3da3 100644 --- a/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/os/OsStatsTests.java @@ -21,13 +21,13 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class OsStatsTests extends ESTestCase { +public class OsStatsTests extends OpenSearchTestCase { public void testSerialization() throws IOException { int numLoadAverages = randomIntBetween(1, 5); diff --git a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java index 0d07c222b9196..7e744e3a20a46 100644 --- a/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.Constants; import org.opensearch.bootstrap.BootstrapInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.elasticsearch.monitor.jvm.JvmInfo.jvmInfo; import static org.hamcrest.Matchers.allOf; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class ProcessProbeTests extends ESTestCase { +public class ProcessProbeTests extends OpenSearchTestCase { private final ProcessProbe probe = ProcessProbe.getInstance(); public void testProcessInfo() { diff --git a/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java index 328bbf6aab7b0..199991ef55f17 100644 --- a/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/CancelPersistentTaskRequestTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.persistent.RemovePersistentTaskAction.Request; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import static com.carrotsearch.randomizedtesting.RandomizedTest.randomAsciiOfLength; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java index 755e8cfc9b7b5..d2cbb53e96527 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java @@ -42,8 +42,8 @@ import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestParams; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor; import org.elasticsearch.persistent.decider.EnableAssignmentDecider; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -66,8 +66,8 @@ import static org.elasticsearch.persistent.PersistentTasksClusterService.needsReassignment; import static org.elasticsearch.persistent.PersistentTasksClusterService.persistentTasksChanged; import static org.elasticsearch.persistent.PersistentTasksExecutor.NO_NODE_FOUND; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; -import static org.elasticsearch.test.ClusterServiceUtils.setState; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.setState; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -80,7 +80,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class PersistentTasksClusterServiceTests extends ESTestCase { +public class PersistentTasksClusterServiceTests extends OpenSearchTestCase { /** Needed by {@link ClusterService} **/ private static ThreadPool threadPool; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java index 702fee65dc45b..c185bffda5275 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksCustomMetadataTests.java @@ -51,7 +51,7 @@ import org.elasticsearch.persistent.TestPersistentTasksPlugin.State; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestParams; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor; -import org.elasticsearch.test.AbstractDiffableSerializationTestCase; +import org.opensearch.test.AbstractDiffableSerializationTestCase; import java.io.IOException; import java.util.ArrayList; @@ -65,11 +65,11 @@ import static org.opensearch.cluster.metadata.Metadata.CONTEXT_MODE_GATEWAY; import static org.opensearch.cluster.metadata.Metadata.CONTEXT_MODE_SNAPSHOT; import static org.elasticsearch.persistent.PersistentTasksExecutor.NO_NODE_FOUND; -import static org.elasticsearch.test.VersionUtils.allReleasedVersions; -import static org.elasticsearch.test.VersionUtils.compatibleFutureVersion; -import static org.elasticsearch.test.VersionUtils.getFirstVersion; -import static org.elasticsearch.test.VersionUtils.getPreviousVersion; -import static org.elasticsearch.test.VersionUtils.randomVersionBetween; +import static org.opensearch.test.VersionUtils.allReleasedVersions; +import static org.opensearch.test.VersionUtils.compatibleFutureVersion; +import static org.opensearch.test.VersionUtils.getFirstVersion; +import static org.opensearch.test.VersionUtils.getPreviousVersion; +import static org.opensearch.test.VersionUtils.randomVersionBetween; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksDecidersTestCase.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksDecidersTestCase.java index fc4306817ae4b..a88185b867137 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksDecidersTestCase.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksDecidersTestCase.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -38,9 +38,9 @@ import java.util.function.Predicate; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; +import static org.opensearch.test.ClusterServiceUtils.createClusterService; -public abstract class PersistentTasksDecidersTestCase extends ESTestCase { +public abstract class PersistentTasksDecidersTestCase extends OpenSearchTestCase { /** Needed by {@link ClusterService} **/ private static ThreadPool threadPool; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksExecutorResponseTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksExecutorResponseTests.java index b4fd769309d14..2481641394a0a 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksExecutorResponseTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksExecutorResponseTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceStatusTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceStatusTests.java index ec817096bb4be..0ccd1e5be5af1 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceStatusTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceStatusTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.persistent; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import org.elasticsearch.persistent.PersistentTasksNodeService.Status; import static org.hamcrest.Matchers.containsString; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java index ebf925b81f79f..b12f71d78f582 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksNodeServiceTests.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.persistent.PersistentTasksCustomMetadata.Assignment; import org.opensearch.persistent.PersistentTasksCustomMetadata.PersistentTask; @@ -41,7 +41,7 @@ import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -68,7 +68,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class PersistentTasksNodeServiceTests extends ESTestCase { +public class PersistentTasksNodeServiceTests extends OpenSearchTestCase { private ThreadPool threadPool; @@ -320,7 +320,7 @@ public void testRegisterTaskFails() throws InterruptedException { final Client mockClient = mock(Client.class); final ThreadPool threadPool = mock(ThreadPool.class); when(threadPool.getThreadContext()).thenReturn(new ThreadContext(Settings.EMPTY)); - when(threadPool.generic()).thenReturn(EsExecutors.newDirectExecutorService()); + when(threadPool.generic()).thenReturn(OpenSearchExecutors.newDirectExecutorService()); when(mockClient.threadPool()).thenReturn(threadPool); when(mockClient.settings()).thenReturn(Settings.EMPTY); diff --git a/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java index fe209505bba9f..af7067748510f 100644 --- a/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/RestartPersistentTaskRequestTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.persistent.CompletionPersistentTaskAction.Request; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; public class RestartPersistentTaskRequestTests extends AbstractWireSerializingTestCase { diff --git a/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java index fa208cf20537b..97ad5216b0586 100644 --- a/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/StartPersistentActionRequestTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.persistent.StartPersistentTaskAction.Request; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestParams; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java b/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java index 6e7f614d4c3fb..db4e945cc3459 100644 --- a/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java +++ b/server/src/test/java/org/elasticsearch/persistent/TestPersistentTasksPlugin.java @@ -76,8 +76,8 @@ import static java.util.Objects.requireNonNull; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg; -import static org.elasticsearch.test.ESTestCase.assertBusy; -import static org.elasticsearch.test.ESTestCase.randomBoolean; +import static org.opensearch.test.OpenSearchTestCase.assertBusy; +import static org.opensearch.test.OpenSearchTestCase.randomBoolean; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java b/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java index fb2b5d9d603df..4727901f58161 100644 --- a/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/UpdatePersistentTaskRequestTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.persistent.TestPersistentTasksPlugin.State; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestPersistentTasksExecutor; import org.elasticsearch.persistent.UpdatePersistentTaskStatusAction.Request; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/persistent/decider/AssignmentDecisionTests.java b/server/src/test/java/org/elasticsearch/persistent/decider/AssignmentDecisionTests.java index 3fa580e726a83..ae8233c3309f6 100644 --- a/server/src/test/java/org/elasticsearch/persistent/decider/AssignmentDecisionTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/decider/AssignmentDecisionTests.java @@ -18,9 +18,9 @@ */ package org.elasticsearch.persistent.decider; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class AssignmentDecisionTests extends ESTestCase { +public class AssignmentDecisionTests extends OpenSearchTestCase { public void testConstantsTypes() { assertEquals(AssignmentDecision.Type.YES, AssignmentDecision.YES.getType()); diff --git a/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java b/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java index 1d337183e1905..5d02f4f13715b 100644 --- a/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java @@ -27,17 +27,17 @@ import org.elasticsearch.index.store.FsDirectoryFactory; import org.elasticsearch.indices.recovery.RecoveryState; import org.opensearch.node.MockNode; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; import java.util.Map; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; -public class IndexStorePluginTests extends ESTestCase { +public class IndexStorePluginTests extends OpenSearchTestCase { public static class BarStorePlugin extends Plugin implements IndexStorePlugin { diff --git a/server/src/test/java/org/elasticsearch/plugins/PlatformsTests.java b/server/src/test/java/org/elasticsearch/plugins/PlatformsTests.java index b23475a8c4c7d..4c7bfd5ec6424 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PlatformsTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PlatformsTests.java @@ -19,11 +19,11 @@ package org.elasticsearch.plugins; import org.apache.lucene.util.Constants; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.file.Path; -public class PlatformsTests extends ESTestCase { +public class PlatformsTests extends OpenSearchTestCase { public void testNativeControllerPath() { diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java index 4569596454cd9..c86d6760bbb77 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; import org.opensearch.common.io.stream.ByteBufferStreamInput; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.plugins.PluginTestUtil; import java.nio.ByteBuffer; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class PluginInfoTests extends ESTestCase { +public class PluginInfoTests extends OpenSearchTestCase { public void testReadFromProperties() throws Exception { Path pluginDir = createTempDir().resolve("fake-plugin"); diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index 569b9ee4057ea..f3c3a2720e81a 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.env.Environment; import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import org.opensearch.plugins.PluginTestUtil; @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.sameInstance; @LuceneTestCase.SuppressFileSystems(value = "ExtrasFS") -public class PluginsServiceTests extends ESTestCase { +public class PluginsServiceTests extends OpenSearchTestCase { public static class AdditionalSettingsPlugin1 extends Plugin { @Override public Settings additionalSettings() { diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java index a26bcb1991e4f..3c1a797935b04 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginsTests.java @@ -20,11 +20,11 @@ package org.elasticsearch.plugins; import org.apache.lucene.util.Constants; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; -public class PluginsTests extends ESTestCase { +public class PluginsTests extends OpenSearchTestCase { public void testMakePlatformName() { final String platformName = Platforms.platformName(Constants.OS_NAME, Constants.OS_ARCH); diff --git a/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java b/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java index b83d4baffd292..7094b288a5d05 100644 --- a/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/spi/NamedXContentProviderTests.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.pipeline.ParsedSimpleValue; import org.opensearch.search.suggest.Suggest; import org.opensearch.search.suggest.term.TermSuggestion; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.InputStream; @@ -36,7 +36,7 @@ import java.util.ServiceLoader; import java.util.function.Predicate; -public class NamedXContentProviderTests extends ESTestCase { +public class NamedXContentProviderTests extends OpenSearchTestCase { public void testSpiFileExists() throws IOException { String serviceFile = "/META-INF/services/" + NamedXContentProvider.class.getName(); diff --git a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java index febb8eeab63b5..6eeb9ed59914e 100644 --- a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java +++ b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.replication.ESIndexLevelReplicationTestCase; +import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; -public class RecoveriesCollectionTests extends ESIndexLevelReplicationTestCase { +public class RecoveriesCollectionTests extends OpenSearchIndexLevelReplicationTestCase { static final PeerRecoveryTargetService.RecoveryListener listener = new PeerRecoveryTargetService.RecoveryListener() { @Override public void onRecoveryDone(RecoveryState state) { diff --git a/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java index c2c306994770c..cc648fb8c2f74 100644 --- a/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java +++ b/server/src/test/java/org/elasticsearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java @@ -26,8 +26,8 @@ import org.opensearch.search.aggregations.bucket.terms.SignificantTerms; import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import java.util.ArrayList; @@ -35,9 +35,9 @@ import java.util.Map; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.test.ESIntegTestCase.client; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.OpenSearchIntegTestCase.client; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.equalTo; import static org.opensearch.search.aggregations.AggregationBuilders.significantTerms; import static org.opensearch.search.aggregations.AggregationBuilders.terms; @@ -48,8 +48,8 @@ public class SharedSignificantTermsTestMethods { public static final String TEXT_FIELD = "text"; public static final String CLASS_FIELD = "class"; - public static void aggregateAndCheckFromSeveralShards(ESIntegTestCase testCase) throws ExecutionException, InterruptedException { - String type = ESTestCase.randomBoolean() ? "text" : "keyword"; + public static void aggregateAndCheckFromSeveralShards(OpenSearchIntegTestCase testCase) throws ExecutionException, InterruptedException { + String type = OpenSearchTestCase.randomBoolean() ? "text" : "keyword"; String settings = "{\"index.number_of_shards\": 7, \"index.number_of_routing_shards\": 7, \"index.number_of_replicas\": 0}"; index01Docs(type, settings, testCase); testCase.ensureGreen(); @@ -57,7 +57,7 @@ public static void aggregateAndCheckFromSeveralShards(ESIntegTestCase testCase) checkSignificantTermsAggregationCorrect(testCase); } - private static void checkSignificantTermsAggregationCorrect(ESIntegTestCase testCase) { + private static void checkSignificantTermsAggregationCorrect(OpenSearchIntegTestCase testCase) { SearchResponse response = client().prepareSearch(INDEX_NAME).setTypes(DOC_TYPE).addAggregation( terms("class").field(CLASS_FIELD).subAggregation(significantTerms("sig_terms").field(TEXT_FIELD))) .execute().actionGet(); @@ -76,7 +76,7 @@ private static void checkSignificantTermsAggregationCorrect(ESIntegTestCase test } } - public static void index01Docs(String type, String settings, ESIntegTestCase testCase) throws ExecutionException, InterruptedException { + public static void index01Docs(String type, String settings, OpenSearchIntegTestCase testCase) throws ExecutionException, InterruptedException { String textMappings = "type=" + type; if (type.equals("text")) { textMappings += ",fielddata=true"; diff --git a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java index 22bdac78edbb4..c69790b1e4eeb 100644 --- a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java +++ b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java @@ -20,7 +20,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.BufferedWriter; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.hasSize; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class FileWatcherTests extends ESTestCase { +public class FileWatcherTests extends OpenSearchTestCase { private class RecordingChangeListener implements FileChangesListener { private Path rootDir; diff --git a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java index 36b9cf5a32d7f..75cf6429e584f 100644 --- a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java +++ b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.watcher; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class ResourceWatcherServiceTests extends ESTestCase { +public class ResourceWatcherServiceTests extends OpenSearchTestCase { public void testSettings() throws Exception { ThreadPool threadPool = new TestThreadPool("test"); diff --git a/server/src/test/java/org/opensearch/BuildTests.java b/server/src/test/java/org/opensearch/BuildTests.java index 6ffc6ad5fe7dd..22d2919507a15 100644 --- a/server/src/test/java/org/opensearch/BuildTests.java +++ b/server/src/test/java/org/opensearch/BuildTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.sameInstance; -public class BuildTests extends ESTestCase { +public class BuildTests extends OpenSearchTestCase { /** Asking for the jar metadata should not throw exception in tests, no matter how configured */ public void testJarMetadata() throws IOException { diff --git a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java index 6fecac1efc6d9..ca99fd5ae1d06 100644 --- a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java +++ b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java @@ -86,7 +86,7 @@ import org.opensearch.snapshots.SnapshotException; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInProgressException; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; import org.opensearch.transport.ActionNotFoundTransportException; import org.opensearch.transport.ActionTransportException; @@ -127,7 +127,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class ExceptionSerializationTests extends ESTestCase { +public class ExceptionSerializationTests extends OpenSearchTestCase { public void testExceptionRegistration() throws ClassNotFoundException, IOException, URISyntaxException { @@ -733,7 +733,7 @@ public void testIds() { ids.put(56, org.opensearch.common.settings.SettingsException.class); ids.put(57, org.opensearch.indices.IndexTemplateMissingException.class); ids.put(58, org.opensearch.transport.SendRequestTransportException.class); - ids.put(59, null); // was EsRejectedExecutionException, which is no longer an instance of OpenSearchException + ids.put(59, null); // was OpenSearchRejectedExecutionException, which is no longer an instance of OpenSearchException ids.put(60, null); // EarlyTerminationException was removed in 6.0 ids.put(61, null); // RoutingValidationException was removed in 5.0 ids.put(62, org.opensearch.common.io.stream.NotSerializableExceptionWrapper.class); diff --git a/server/src/test/java/org/opensearch/ExceptionsHelperTests.java b/server/src/test/java/org/opensearch/ExceptionsHelperTests.java index 785b9264775d1..cbb0f5ecab351 100644 --- a/server/src/test/java/org/opensearch/ExceptionsHelperTests.java +++ b/server/src/test/java/org/opensearch/ExceptionsHelperTests.java @@ -27,13 +27,13 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.ParsingException; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.Index; import org.opensearch.index.query.QueryShardException; import org.opensearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; import org.opensearch.search.SearchShardTarget; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.RemoteClusterAware; import java.io.IOException; @@ -44,7 +44,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.nullValue; -public class ExceptionsHelperTests extends ESTestCase { +public class ExceptionsHelperTests extends OpenSearchTestCase { public void testMaybeError() { final Error outOfMemoryError = new OutOfMemoryError(); @@ -97,7 +97,7 @@ private void assertError(final Throwable cause, final Error error) { public void testStatus() { assertThat(ExceptionsHelper.status(new IllegalArgumentException("illegal")), equalTo(RestStatus.BAD_REQUEST)); assertThat(ExceptionsHelper.status(new JsonParseException(null, "illegal")), equalTo(RestStatus.BAD_REQUEST)); - assertThat(ExceptionsHelper.status(new EsRejectedExecutionException("rejected")), equalTo(RestStatus.TOO_MANY_REQUESTS)); + assertThat(ExceptionsHelper.status(new OpenSearchRejectedExecutionException("rejected")), equalTo(RestStatus.TOO_MANY_REQUESTS)); } public void testGroupBy() { diff --git a/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java b/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java index fcaefb589babf..722484dc7ec2e 100644 --- a/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java +++ b/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java @@ -58,7 +58,7 @@ import org.opensearch.search.SearchParseException; import org.opensearch.search.SearchShardTarget; import org.opensearch.search.internal.ShardSearchContextId; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.RemoteTransportException; import java.io.EOFException; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.startsWith; -public class OpenSearchExceptionTests extends ESTestCase { +public class OpenSearchExceptionTests extends OpenSearchTestCase { public void testStatus() { OpenSearchException exception = new OpenSearchException("test"); diff --git a/server/src/test/java/org/opensearch/SpecialPermissionTests.java b/server/src/test/java/org/opensearch/SpecialPermissionTests.java index b2601e0511c3b..eabe3f2740e04 100644 --- a/server/src/test/java/org/opensearch/SpecialPermissionTests.java +++ b/server/src/test/java/org/opensearch/SpecialPermissionTests.java @@ -19,12 +19,12 @@ package org.opensearch; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.security.AllPermission; /** Very simple sanity checks for {@link SpecialPermission} */ -public class SpecialPermissionTests extends ESTestCase { +public class SpecialPermissionTests extends OpenSearchTestCase { public void testEquals() { assertEquals(new SpecialPermission(), new SpecialPermission()); diff --git a/server/src/test/java/org/opensearch/VersionTests.java b/server/src/test/java/org/opensearch/VersionTests.java index 3fcbdec1dca51..12b3aa737492c 100644 --- a/server/src/test/java/org/opensearch/VersionTests.java +++ b/server/src/test/java/org/opensearch/VersionTests.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.settings.Settings; -import org.opensearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; import org.hamcrest.Matchers; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.sameInstance; -public class VersionTests extends ESTestCase { +public class VersionTests extends OpenSearchTestCase { public void testVersionComparison() throws Exception { assertThat(V_6_3_0.before(V_7_0_0), is(true)); diff --git a/server/src/test/java/org/opensearch/action/bulk/RetryTests.java b/server/src/test/java/org/opensearch/action/bulk/RetryTests.java index 52db269d36ed8..3d297d3f6f27d 100644 --- a/server/src/test/java/org/opensearch/action/bulk/RetryTests.java +++ b/server/src/test/java/org/opensearch/action/bulk/RetryTests.java @@ -26,17 +26,12 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.update.UpdateRequest; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.client.NoOpClient; import org.junit.After; import org.junit.Before; -import org.opensearch.action.bulk.BackoffPolicy; -import org.opensearch.action.bulk.BulkItemResponse; -import org.opensearch.action.bulk.BulkRequest; -import org.opensearch.action.bulk.BulkResponse; -import org.opensearch.action.bulk.Retry; import java.util.HashMap; import java.util.Map; @@ -239,7 +234,7 @@ private BulkItemResponse successfulResponse() { private BulkItemResponse failedResponse() { return new BulkItemResponse(1, OpType.INDEX, new BulkItemResponse.Failure("test", "test", "1", - new EsRejectedExecutionException("pool full"))); + new OpenSearchRejectedExecutionException("pool full"))); } } } diff --git a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java index 305316703397e..40362eeb4060e 100644 --- a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java +++ b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIndicesThatCannotBeCreatedTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AtomicArray; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.VersionType; import org.opensearch.index.IndexingPressure; @@ -44,10 +44,6 @@ import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; -import org.opensearch.action.bulk.BulkItemResponse; -import org.opensearch.action.bulk.BulkRequest; -import org.opensearch.action.bulk.BulkResponse; -import org.opensearch.action.bulk.TransportBulkAction; import java.util.Arrays; import java.util.HashSet; @@ -126,7 +122,7 @@ private void indicesThatCannotBeCreatedTestCase(Set expected, when(clusterService.localNode()).thenReturn(localNode); when(localNode.isIngestNode()).thenReturn(randomBoolean()); final ThreadPool threadPool = mock(ThreadPool.class); - final ExecutorService direct = EsExecutors.newDirectExecutorService(); + final ExecutorService direct = OpenSearchExecutors.newDirectExecutorService(); when(threadPool.executor(anyString())).thenReturn(direct); TransportBulkAction action = new TransportBulkAction(threadPool, mock(TransportService.class), clusterService, null, null, null, mock(ActionFilters.class), null, null, new IndexingPressure(Settings.EMPTY), new SystemIndices(emptyMap())) { diff --git a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIngestTests.java b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIngestTests.java index a2970985badc4..816a607d01d79 100644 --- a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIngestTests.java +++ b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionIngestTests.java @@ -50,7 +50,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AtomicArray; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.IndexSettings; @@ -68,12 +68,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; -import org.opensearch.action.bulk.BulkAction; -import org.opensearch.action.bulk.BulkItemResponse; -import org.opensearch.action.bulk.BulkRequest; -import org.opensearch.action.bulk.BulkResponse; -import org.opensearch.action.bulk.TransportBulkAction; -import org.opensearch.action.bulk.TransportSingleItemBulkWriteAction; import java.util.Arrays; import java.util.Collections; @@ -189,7 +183,7 @@ class TestSingleItemBulkWriteAction extends TransportSingleItemBulkWriteAction future = PlainActionFuture.newFuture(); ActionTestUtils.execute(bulkAction, null, bulkRequest, future); - expectThrows(EsRejectedExecutionException.class, future::actionGet); + expectThrows(OpenSearchRejectedExecutionException.class, future::actionGet); } finally { threadPool.stopForcingRejections(); } diff --git a/server/src/test/java/org/opensearch/action/bulk/TransportShardBulkActionTests.java b/server/src/test/java/org/opensearch/action/bulk/TransportShardBulkActionTests.java index 478b37a2bd2db..cec1ad80ed952 100644 --- a/server/src/test/java/org/opensearch/action/bulk/TransportShardBulkActionTests.java +++ b/server/src/test/java/org/opensearch/action/bulk/TransportShardBulkActionTests.java @@ -40,7 +40,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; import org.opensearch.index.engine.Engine; @@ -57,13 +57,6 @@ import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; -import org.opensearch.action.bulk.BulkItemRequest; -import org.opensearch.action.bulk.BulkItemResponse; -import org.opensearch.action.bulk.BulkPrimaryExecutionContext; -import org.opensearch.action.bulk.BulkShardRequest; -import org.opensearch.action.bulk.BulkShardResponse; -import org.opensearch.action.bulk.MappingUpdatePerformer; -import org.opensearch.action.bulk.TransportShardBulkAction; import java.io.IOException; import java.util.Collections; @@ -875,7 +868,7 @@ public void testForceExecutionOnRejectionAfterMappingUpdate() throws Exception { when(shard.shardId()).thenReturn(shardId); when(shard.applyIndexOperationOnPrimary(anyLong(), any(), any(), anyLong(), anyLong(), anyLong(), anyBoolean())) .thenReturn(success1, mappingUpdate, success2); - when(shard.getFailedIndexResult(any(EsRejectedExecutionException.class), anyLong())).thenCallRealMethod(); + when(shard.getFailedIndexResult(any(OpenSearchRejectedExecutionException.class), anyLong())).thenCallRealMethod(); when(shard.mapperService()).thenReturn(mock(MapperService.class)); randomlySetIgnoredPrimaryResponse(items[0]); @@ -924,7 +917,7 @@ public void testForceExecutionOnRejectionAfterMappingUpdate() throws Exception { assertTrue(primaryResponse2.isFailed()); assertNull(primaryResponse2.getResponse()); assertEquals(primaryResponse2.status(), RestStatus.TOO_MANY_REQUESTS); - assertThat(primaryResponse2.getFailure().getCause(), instanceOf(EsRejectedExecutionException.class)); + assertThat(primaryResponse2.getFailure().getCause(), instanceOf(OpenSearchRejectedExecutionException.class)); closeShards(shard); } finally { diff --git a/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java b/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java index 52c48317d0ab1..2aca033f5f789 100644 --- a/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java +++ b/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.GroupShardsIterator; import org.opensearch.common.Strings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchPhaseResult; import org.opensearch.search.SearchService; @@ -93,7 +93,7 @@ public void sendCanMatch(Transport.Connection connection, ShardSearchRequest req searchTransportService, (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), - Collections.emptyMap(), Collections.emptyMap(), EsExecutors.newDirectExecutorService(), + Collections.emptyMap(), Collections.emptyMap(), OpenSearchExecutors.newDirectExecutorService(), searchRequest, null, shardsIter, timeProvider, ClusterState.EMPTY_STATE, null, (iter) -> new SearchPhase("test") { @Override @@ -161,7 +161,7 @@ public void sendCanMatch(Transport.Connection connection, ShardSearchRequest req searchTransportService, (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), - Collections.emptyMap(), Collections.emptyMap(), EsExecutors.newDirectExecutorService(), + Collections.emptyMap(), Collections.emptyMap(), OpenSearchExecutors.newDirectExecutorService(), searchRequest, null, shardsIter, timeProvider, ClusterState.EMPTY_STATE, null, (iter) -> new SearchPhase("test") { @Override @@ -224,7 +224,7 @@ public void sendCanMatch( Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), Collections.emptyMap(), Collections.emptyMap(), - EsExecutors.newDirectExecutorService(), + OpenSearchExecutors.newDirectExecutorService(), searchRequest, null, shardsIter, @@ -328,7 +328,7 @@ public void sendCanMatch(Transport.Connection connection, ShardSearchRequest req searchTransportService, (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), - Collections.emptyMap(), Collections.emptyMap(), EsExecutors.newDirectExecutorService(), + Collections.emptyMap(), Collections.emptyMap(), OpenSearchExecutors.newDirectExecutorService(), searchRequest, null, shardsIter, timeProvider, ClusterState.EMPTY_STATE, null, (iter) -> new SearchPhase("test") { @Override @@ -405,7 +405,7 @@ public void sendCanMatch(Transport.Connection connection, ShardSearchRequest req searchTransportService, (clusterAlias, node) -> lookup.get(node), Collections.singletonMap("_na_", new AliasFilter(null, Strings.EMPTY_ARRAY)), - Collections.emptyMap(), Collections.emptyMap(), EsExecutors.newDirectExecutorService(), + Collections.emptyMap(), Collections.emptyMap(), OpenSearchExecutors.newDirectExecutorService(), searchRequest, null, shardsIter, timeProvider, ClusterState.EMPTY_STATE, null, (iter) -> new SearchPhase("test") { @Override diff --git a/server/src/test/java/org/opensearch/action/search/DfsQueryPhaseTests.java b/server/src/test/java/org/opensearch/action/search/DfsQueryPhaseTests.java index faf299d13985c..562d25b5edbb9 100644 --- a/server/src/test/java/org/opensearch/action/search/DfsQueryPhaseTests.java +++ b/server/src/test/java/org/opensearch/action/search/DfsQueryPhaseTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.util.concurrent.AtomicArray; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; import org.opensearch.search.SearchPhaseResult; @@ -92,7 +92,7 @@ public void sendExecuteQuery(Transport.Connection connection, QuerySearchRequest SearchPhaseController searchPhaseController = searchPhaseController(); MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); mockSearchPhaseContext.searchTransport = searchTransportService; - QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.searchRequest, results.length(), exc -> {}); DfsQueryPhase phase = new DfsQueryPhase(results.asList(), null, consumer, @@ -151,7 +151,7 @@ public void sendExecuteQuery(Transport.Connection connection, QuerySearchRequest SearchPhaseController searchPhaseController = searchPhaseController(); MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); mockSearchPhaseContext.searchTransport = searchTransportService; - QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.searchRequest, results.length(), exc -> {}); DfsQueryPhase phase = new DfsQueryPhase(results.asList(), null, consumer, @@ -212,7 +212,7 @@ public void sendExecuteQuery(Transport.Connection connection, QuerySearchRequest SearchPhaseController searchPhaseController = searchPhaseController(); MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); mockSearchPhaseContext.searchTransport = searchTransportService; - QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer consumer = searchPhaseController.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.searchRequest, results.length(), exc -> {}); DfsQueryPhase phase = new DfsQueryPhase(results.asList(), null, consumer, diff --git a/server/src/test/java/org/opensearch/action/search/FetchSearchPhaseTests.java b/server/src/test/java/org/opensearch/action/search/FetchSearchPhaseTests.java index 78b0638ae2ffa..109e8742e64c9 100644 --- a/server/src/test/java/org/opensearch/action/search/FetchSearchPhaseTests.java +++ b/server/src/test/java/org/opensearch/action/search/FetchSearchPhaseTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; import org.opensearch.search.SearchHit; @@ -51,7 +51,7 @@ public void testShortcutQueryAndFetchOptimization() { SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(1); - QueryPhaseResultConsumer results = controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer results = controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), 1, exc -> {}); boolean hasHits = randomBoolean(); @@ -96,7 +96,7 @@ public void testFetchTwoDocument() { MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); - QueryPhaseResultConsumer results = controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer results = controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), 2, exc -> {}); int resultSetSize = randomIntBetween(2, 10); @@ -158,7 +158,7 @@ public void testFailFetchOneDoc() { MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); - QueryPhaseResultConsumer results = controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer results = controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), 2, exc -> {}); int resultSetSize = randomIntBetween(2, 10); @@ -223,7 +223,7 @@ public void testFetchDocsConcurrently() throws InterruptedException { SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(numHits); - QueryPhaseResultConsumer results = controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer results = controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), numHits, exc -> {}); for (int i = 0; i < numHits; i++) { @@ -282,7 +282,7 @@ public void testExceptionFailsPhase() { SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); QueryPhaseResultConsumer results = - controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), 2, exc -> {}); int resultSetSize = randomIntBetween(2, 10); @@ -341,7 +341,7 @@ public void testCleanupIrrelevantContexts() { // contexts that are not fetched s MockSearchPhaseContext mockSearchPhaseContext = new MockSearchPhaseContext(2); SearchPhaseController controller = new SearchPhaseController( writableRegistry(), s -> InternalAggregationTestCase.emptyReduceContextBuilder()); - QueryPhaseResultConsumer results = controller.newSearchPhaseResults(EsExecutors.newDirectExecutorService(), + QueryPhaseResultConsumer results = controller.newSearchPhaseResults(OpenSearchExecutors.newDirectExecutorService(), new NoopCircuitBreaker(CircuitBreaker.REQUEST), SearchProgressListener.NOOP, mockSearchPhaseContext.getRequest(), 2, exc -> {}); int resultSetSize = 1; diff --git a/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java b/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java index 042066d3d9d23..bc174cf4603d9 100644 --- a/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java +++ b/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; @@ -72,7 +72,7 @@ public InternalAggregation.ReduceContext forFinalReduction() { }; }); threadPool = new TestThreadPool(SearchPhaseControllerTests.class.getName()); - executor = EsExecutors.newFixed("test", 1, 10, EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + executor = OpenSearchExecutors.newFixed("test", 1, 10, OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); } @After diff --git a/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java index b8f1be500b661..a7bf73d3cbc64 100644 --- a/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java +++ b/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java @@ -43,7 +43,7 @@ import org.opensearch.common.text.Text; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.AtomicArray; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; @@ -132,8 +132,8 @@ public ReduceContext forFinalReduction() { }; }); threadPool = new TestThreadPool(SearchPhaseControllerTests.class.getName()); - fixedExecutor = EsExecutors.newFixed("test", 1, 10, - EsExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); + fixedExecutor = OpenSearchExecutors.newFixed("test", 1, 10, + OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext()); } @After diff --git a/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java b/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java index 535ff6a701a82..ac3d508a4ddec 100644 --- a/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java +++ b/server/src/test/java/org/opensearch/action/search/SearchPhaseExecutionExceptionTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContentHelper; @@ -133,7 +133,7 @@ public void testPhaseFailureWithoutSearchShardFailure() { final ShardSearchFailure[] searchShardFailures = new ShardSearchFailure[0]; final String phase = randomFrom("fetch", "search", "other"); SearchPhaseExecutionException actual = new SearchPhaseExecutionException(phase, "unexpected failures", - new EsRejectedExecutionException("OpenSearch rejected execution of fetch phase"), searchShardFailures); + new OpenSearchRejectedExecutionException("OpenSearch rejected execution of fetch phase"), searchShardFailures); assertEquals(actual.status(), RestStatus.TOO_MANY_REQUESTS); } @@ -159,7 +159,7 @@ public void testPhaseFailureWithSearchShardFailure() { final String phase = randomFrom("fetch", "search", "other"); SearchPhaseExecutionException actual = new SearchPhaseExecutionException(phase, "unexpected failures", - new EsRejectedExecutionException("OpenSearch rejected execution of fetch phase"), shardSearchFailures); + new OpenSearchRejectedExecutionException("OpenSearch rejected execution of fetch phase"), shardSearchFailures); assertEquals(actual.status(), RestStatus.BAD_REQUEST); } diff --git a/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java index 81518ce942c5c..e29b016090c5e 100644 --- a/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java +++ b/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; import org.opensearch.search.SearchPhaseResult; @@ -147,7 +147,7 @@ public void sendExecuteQuery(Transport.Connection connection, ShardSearchRequest searchRequest.source().collapse(new CollapseBuilder("collapse_field")); } searchRequest.allowPartialSearchResults(false); - Executor executor = EsExecutors.newDirectExecutorService(); + Executor executor = OpenSearchExecutors.newDirectExecutorService(); SearchPhaseController controller = new SearchPhaseController( writableRegistry(), r -> InternalAggregationTestCase.emptyReduceContextBuilder()); SearchTask task = new SearchTask(0, "n/a", "n/a", () -> "test", null, Collections.emptyMap()); diff --git a/server/src/test/java/org/opensearch/action/support/DefaultShardOperationFailedExceptionTests.java b/server/src/test/java/org/opensearch/action/support/DefaultShardOperationFailedExceptionTests.java index 8eec4f07db65c..c58d2f023f7c3 100644 --- a/server/src/test/java/org/opensearch/action/support/DefaultShardOperationFailedExceptionTests.java +++ b/server/src/test/java/org/opensearch/action/support/DefaultShardOperationFailedExceptionTests.java @@ -30,14 +30,13 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.index.Index; import org.opensearch.index.shard.ShardId; -import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; @@ -170,7 +169,7 @@ private static Exception randomException() { () -> new LockObtainFailedException(randomAlphaOfLengthBetween(1, 5), randomExceptionOrNull()), () -> new InterruptedException(randomAlphaOfLengthBetween(1, 5)), () -> new IOException(randomAlphaOfLengthBetween(1, 5), randomExceptionOrNull()), - () -> new EsRejectedExecutionException(randomAlphaOfLengthBetween(1, 5), randomBoolean()), + () -> new OpenSearchRejectedExecutionException(randomAlphaOfLengthBetween(1, 5), randomBoolean()), () -> new IndexFormatTooNewException(randomAlphaOfLengthBetween(1, 10), randomInt(), randomInt(), randomInt()), () -> new IndexFormatTooOldException(randomAlphaOfLengthBetween(1, 5), randomAlphaOfLengthBetween(1, 5)) ); diff --git a/server/src/test/java/org/opensearch/action/support/RetryableActionTests.java b/server/src/test/java/org/opensearch/action/support/RetryableActionTests.java index 4bc72574dff46..1e0b5265ceed5 100644 --- a/server/src/test/java/org/opensearch/action/support/RetryableActionTests.java +++ b/server/src/test/java/org/opensearch/action/support/RetryableActionTests.java @@ -24,11 +24,9 @@ import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.action.support.PlainActionFuture; -import org.opensearch.action.support.RetryableAction; import java.util.concurrent.atomic.AtomicInteger; @@ -84,9 +82,9 @@ public void tryAction(ActionListener listener) { listener.onResponse(true); } else { if (randomBoolean()) { - listener.onFailure(new EsRejectedExecutionException()); + listener.onFailure(new OpenSearchRejectedExecutionException()); } else { - throw new EsRejectedExecutionException(); + throw new OpenSearchRejectedExecutionException(); } } } @@ -94,7 +92,7 @@ public void tryAction(ActionListener listener) { @Override public boolean shouldRetry(Exception e) { retryCount.getAndIncrement(); - return e instanceof EsRejectedExecutionException; + return e instanceof OpenSearchRejectedExecutionException; } }; retryableAction.run(); @@ -123,16 +121,16 @@ public void testRetryableActionTimeout() { @Override public void tryAction(ActionListener listener) { if (randomBoolean()) { - listener.onFailure(new EsRejectedExecutionException()); + listener.onFailure(new OpenSearchRejectedExecutionException()); } else { - throw new EsRejectedExecutionException(); + throw new OpenSearchRejectedExecutionException(); } } @Override public boolean shouldRetry(Exception e) { retryCount.getAndIncrement(); - return e instanceof EsRejectedExecutionException; + return e instanceof OpenSearchRejectedExecutionException; } }; retryableAction.run(); @@ -148,7 +146,7 @@ public boolean shouldRetry(Exception e) { assertFalse(taskQueue.hasDeferredTasks()); assertFalse(taskQueue.hasRunnableTasks()); - expectThrows(EsRejectedExecutionException.class, future::actionGet); + expectThrows(OpenSearchRejectedExecutionException.class, future::actionGet); } public void testTimeoutOfZeroMeansNoRetry() { @@ -160,19 +158,19 @@ public void testTimeoutOfZeroMeansNoRetry() { @Override public void tryAction(ActionListener listener) { executedCount.getAndIncrement(); - throw new EsRejectedExecutionException(); + throw new OpenSearchRejectedExecutionException(); } @Override public boolean shouldRetry(Exception e) { - return e instanceof EsRejectedExecutionException; + return e instanceof OpenSearchRejectedExecutionException; } }; retryableAction.run(); taskQueue.runAllRunnableTasks(); assertEquals(1, executedCount.get()); - expectThrows(EsRejectedExecutionException.class, future::actionGet); + expectThrows(OpenSearchRejectedExecutionException.class, future::actionGet); } public void testFailedBecauseNotRetryable() { @@ -189,7 +187,7 @@ public void tryAction(ActionListener listener) { @Override public boolean shouldRetry(Exception e) { - return e instanceof EsRejectedExecutionException; + return e instanceof OpenSearchRejectedExecutionException; } }; retryableAction.run(); @@ -208,7 +206,7 @@ public void testRetryableActionCancelled() { @Override public void tryAction(ActionListener listener) { if (executedCount.incrementAndGet() == 1) { - throw new EsRejectedExecutionException(); + throw new OpenSearchRejectedExecutionException(); } else { listener.onResponse(true); } @@ -216,7 +214,7 @@ public void tryAction(ActionListener listener) { @Override public boolean shouldRetry(Exception e) { - return e instanceof EsRejectedExecutionException; + return e instanceof OpenSearchRejectedExecutionException; } }; retryableAction.run(); diff --git a/server/src/test/java/org/opensearch/action/support/replication/ReplicationOperationTests.java b/server/src/test/java/org/opensearch/action/support/replication/ReplicationOperationTests.java index 39e15a0c4e3af..8c7d02fc1559c 100644 --- a/server/src/test/java/org/opensearch/action/support/replication/ReplicationOperationTests.java +++ b/server/src/test/java/org/opensearch/action/support/replication/ReplicationOperationTests.java @@ -40,7 +40,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.set.Sets; import org.opensearch.index.shard.IndexShardNotStartedException; import org.opensearch.index.shard.IndexShardState; @@ -203,7 +203,7 @@ public void testRetryTransientReplicationFailure() throws Exception { if (randomBoolean()) { cause = new CircuitBreakingException("broken", CircuitBreaker.Durability.PERMANENT); } else { - cause = new EsRejectedExecutionException("rejected"); + cause = new OpenSearchRejectedExecutionException("rejected"); } exception = new RemoteTransportException("remote", cause); } else { diff --git a/server/src/test/java/org/opensearch/action/termvectors/AbstractTermVectorsTestCase.java b/server/src/test/java/org/opensearch/action/termvectors/AbstractTermVectorsTestCase.java index 5349932f82fdb..f5de0a5c14e56 100644 --- a/server/src/test/java/org/opensearch/action/termvectors/AbstractTermVectorsTestCase.java +++ b/server/src/test/java/org/opensearch/action/termvectors/AbstractTermVectorsTestCase.java @@ -50,7 +50,7 @@ import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; -import org.opensearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.IOException; import java.util.ArrayList; @@ -64,7 +64,7 @@ import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public abstract class AbstractTermVectorsTestCase extends ESIntegTestCase { +public abstract class AbstractTermVectorsTestCase extends OpenSearchIntegTestCase { protected static class TestFieldSetting { public final String name; public final boolean storedOffset; diff --git a/server/src/test/java/org/opensearch/common/BooleansTests.java b/server/src/test/java/org/opensearch/common/BooleansTests.java index 7095d5d0c7231..5fb46789a3ce3 100644 --- a/server/src/test/java/org/opensearch/common/BooleansTests.java +++ b/server/src/test/java/org/opensearch/common/BooleansTests.java @@ -19,14 +19,14 @@ package org.opensearch.common; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class BooleansTests extends ESTestCase { +public class BooleansTests extends OpenSearchTestCase { private static final String[] NON_BOOLEANS = new String[]{"11", "00", "sdfsdfsf", "F", "T", "on", "off", "yes", "no", "0", "1", "True", "False"}; private static final String[] BOOLEANS = new String[]{"true", "false"}; diff --git a/server/src/test/java/org/opensearch/common/ChannelsTests.java b/server/src/test/java/org/opensearch/common/ChannelsTests.java index ef5604a3a658f..ed689c0b4f858 100644 --- a/server/src/test/java/org/opensearch/common/ChannelsTests.java +++ b/server/src/test/java/org/opensearch/common/ChannelsTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.Channels; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.containsString; -public class ChannelsTests extends ESTestCase { +public class ChannelsTests extends OpenSearchTestCase { byte[] randomBytes; FileChannel fileChannel; diff --git a/server/src/test/java/org/opensearch/common/ExponentiallyWeightedMovingAverageTests.java b/server/src/test/java/org/opensearch/common/ExponentiallyWeightedMovingAverageTests.java index cb1b1595174d0..7d3d8ad81e670 100644 --- a/server/src/test/java/org/opensearch/common/ExponentiallyWeightedMovingAverageTests.java +++ b/server/src/test/java/org/opensearch/common/ExponentiallyWeightedMovingAverageTests.java @@ -19,8 +19,7 @@ package org.opensearch.common; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.ExponentiallyWeightedMovingAverage; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; @@ -28,7 +27,7 @@ /** * Implements exponentially weighted moving averages (commonly abbreviated EWMA) for a single value. */ -public class ExponentiallyWeightedMovingAverageTests extends ESTestCase { +public class ExponentiallyWeightedMovingAverageTests extends OpenSearchTestCase { public void testEWMA() { final ExponentiallyWeightedMovingAverage ewma = new ExponentiallyWeightedMovingAverage(0.5, 10); diff --git a/server/src/test/java/org/opensearch/common/FieldMemoryStatsTests.java b/server/src/test/java/org/opensearch/common/FieldMemoryStatsTests.java index 354703cea3253..13f2bd3f6c14e 100644 --- a/server/src/test/java/org/opensearch/common/FieldMemoryStatsTests.java +++ b/server/src/test/java/org/opensearch/common/FieldMemoryStatsTests.java @@ -21,12 +21,11 @@ import com.carrotsearch.hppc.ObjectLongHashMap; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.FieldMemoryStats; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class FieldMemoryStatsTests extends ESTestCase { +public class FieldMemoryStatsTests extends OpenSearchTestCase { public void testSerialize() throws IOException { FieldMemoryStats stats = randomFieldMemoryStats(); diff --git a/server/src/test/java/org/opensearch/common/LocalTimeOffsetTests.java b/server/src/test/java/org/opensearch/common/LocalTimeOffsetTests.java index 72b7a25e5ef47..53772447b5954 100644 --- a/server/src/test/java/org/opensearch/common/LocalTimeOffsetTests.java +++ b/server/src/test/java/org/opensearch/common/LocalTimeOffsetTests.java @@ -20,11 +20,10 @@ package org.opensearch.common; import org.opensearch.bootstrap.JavaVersion; -import org.opensearch.common.LocalTimeOffset; import org.opensearch.common.LocalTimeOffset.Gap; import org.opensearch.common.LocalTimeOffset.Overlap; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.time.Instant; import java.time.ZoneId; @@ -41,7 +40,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -public class LocalTimeOffsetTests extends ESTestCase { +public class LocalTimeOffsetTests extends OpenSearchTestCase { public void testRangeTooLarge() { ZoneId zone = ZoneId.of("America/New_York"); assertThat(LocalTimeOffset.lookup(zone, Long.MIN_VALUE, Long.MAX_VALUE), nullValue()); @@ -70,7 +69,7 @@ private void assertFixedOffset(ZoneId zone, long offsetMillis) { assertThat(lookup.anyMoveBackToPreviousDay(), equalTo(false)); long min = randomLong(); - long max = randomValueOtherThan(min, ESTestCase::randomLong); + long max = randomValueOtherThan(min, OpenSearchTestCase::randomLong); if (min > max) { long s = min; min = max; diff --git a/server/src/test/java/org/opensearch/common/NumbersTests.java b/server/src/test/java/org/opensearch/common/NumbersTests.java index 83b722d8c289b..0ac8d78abafe7 100644 --- a/server/src/test/java/org/opensearch/common/NumbersTests.java +++ b/server/src/test/java/org/opensearch/common/NumbersTests.java @@ -20,14 +20,13 @@ package org.opensearch.common; import com.carrotsearch.randomizedtesting.annotations.Timeout; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.Numbers; +import org.opensearch.test.OpenSearchTestCase; import java.math.BigDecimal; import java.math.BigInteger; import java.util.concurrent.atomic.AtomicInteger; -public class NumbersTests extends ESTestCase { +public class NumbersTests extends OpenSearchTestCase { @Timeout(millis = 10000) public void testToLong() { diff --git a/server/src/test/java/org/opensearch/common/PidFileTests.java b/server/src/test/java/org/opensearch/common/PidFileTests.java index 85dfca3bc7027..f0f4bfb53c17e 100644 --- a/server/src/test/java/org/opensearch/common/PidFileTests.java +++ b/server/src/test/java/org/opensearch/common/PidFileTests.java @@ -19,8 +19,7 @@ package org.opensearch.common; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.PidFile; +import org.opensearch.test.OpenSearchTestCase; import java.io.BufferedWriter; import java.io.IOException; @@ -34,7 +33,7 @@ /** * UnitTest for {@link org.opensearch.common.PidFile} */ -public class PidFileTests extends ESTestCase { +public class PidFileTests extends OpenSearchTestCase { public void testParentIsFile() throws IOException { Path dir = createTempDir(); Path parent = dir.resolve("foo"); diff --git a/server/src/test/java/org/opensearch/common/PriorityTests.java b/server/src/test/java/org/opensearch/common/PriorityTests.java index 2deb9fb1c3470..79cef21423167 100644 --- a/server/src/test/java/org/opensearch/common/PriorityTests.java +++ b/server/src/test/java/org/opensearch/common/PriorityTests.java @@ -19,15 +19,14 @@ package org.opensearch.common; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.Priority; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.List; -public class PriorityTests extends ESTestCase { +public class PriorityTests extends OpenSearchTestCase { public void testValueOf() { for (Priority p : Priority.values()) { diff --git a/server/src/test/java/org/opensearch/common/ReleasablesTests.java b/server/src/test/java/org/opensearch/common/ReleasablesTests.java index a484a63d473f4..98e28eac802a1 100644 --- a/server/src/test/java/org/opensearch/common/ReleasablesTests.java +++ b/server/src/test/java/org/opensearch/common/ReleasablesTests.java @@ -20,11 +20,11 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.atomic.AtomicInteger; -public class ReleasablesTests extends ESTestCase { +public class ReleasablesTests extends OpenSearchTestCase { public void testReleaseOnce() { AtomicInteger count = new AtomicInteger(0); diff --git a/server/src/test/java/org/opensearch/common/RoundingTests.java b/server/src/test/java/org/opensearch/common/RoundingTests.java index 2db1d75aa427d..89bd4bab6f4ad 100644 --- a/server/src/test/java/org/opensearch/common/RoundingTests.java +++ b/server/src/test/java/org/opensearch/common/RoundingTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateFormatters; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class RoundingTests extends ESTestCase { +public class RoundingTests extends OpenSearchTestCase { public void testUTCTimeUnitRounding() { Rounding tzRounding = Rounding.builder(Rounding.DateTimeUnit.MONTH_OF_YEAR).build(); diff --git a/server/src/test/java/org/opensearch/common/RoundingWireTests.java b/server/src/test/java/org/opensearch/common/RoundingWireTests.java index 43f5bbe13f579..56f7817d6b41e 100644 --- a/server/src/test/java/org/opensearch/common/RoundingWireTests.java +++ b/server/src/test/java/org/opensearch/common/RoundingWireTests.java @@ -19,11 +19,10 @@ package org.opensearch.common; -import org.opensearch.common.Rounding; import org.opensearch.common.Rounding.DateTimeUnit; import org.opensearch.common.io.stream.Writeable.Reader; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; public class RoundingWireTests extends AbstractWireSerializingTestCase { @Override diff --git a/server/src/test/java/org/opensearch/common/StringsTests.java b/server/src/test/java/org/opensearch/common/StringsTests.java index 30eff76f4bac7..969c5e79a6cee 100644 --- a/server/src/test/java/org/opensearch/common/StringsTests.java +++ b/server/src/test/java/org/opensearch/common/StringsTests.java @@ -22,15 +22,14 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContentObject; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.Strings; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class StringsTests extends ESTestCase { +public class StringsTests extends OpenSearchTestCase { public void testIsAllOrWildCardString() { assertThat(Strings.isAllOrWildcard("_all"), is(true)); diff --git a/server/src/test/java/org/opensearch/common/TableTests.java b/server/src/test/java/org/opensearch/common/TableTests.java index a9204e3404e2b..870cd07f1a0b3 100644 --- a/server/src/test/java/org/opensearch/common/TableTests.java +++ b/server/src/test/java/org/opensearch/common/TableTests.java @@ -19,8 +19,7 @@ package org.opensearch.common; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.Table; +import org.opensearch.test.OpenSearchTestCase; import java.util.List; import java.util.Map; @@ -28,7 +27,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class TableTests extends ESTestCase { +public class TableTests extends OpenSearchTestCase { public void testFailOnStartRowWithoutHeader() { Table table = new Table(); diff --git a/server/src/test/java/org/opensearch/common/UUIDTests.java b/server/src/test/java/org/opensearch/common/UUIDTests.java index c5f4753fc062e..a47be648d8f44 100644 --- a/server/src/test/java/org/opensearch/common/UUIDTests.java +++ b/server/src/test/java/org/opensearch/common/UUIDTests.java @@ -34,14 +34,14 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.HashSet; import java.util.Random; import java.util.Set; -public class UUIDTests extends ESTestCase { +public class UUIDTests extends OpenSearchTestCase { static UUIDGenerator timeUUIDGen = new TimeBasedUUIDGenerator(); static UUIDGenerator randomUUIDGen = new RandomBasedUUIDGenerator(); diff --git a/server/src/test/java/org/opensearch/common/blobstore/BlobPathTests.java b/server/src/test/java/org/opensearch/common/blobstore/BlobPathTests.java index d7e07c548ac9e..49805ee461129 100644 --- a/server/src/test/java/org/opensearch/common/blobstore/BlobPathTests.java +++ b/server/src/test/java/org/opensearch/common/blobstore/BlobPathTests.java @@ -19,12 +19,11 @@ package org.opensearch.common.blobstore; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.blobstore.BlobPath; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.is; -public class BlobPathTests extends ESTestCase { +public class BlobPathTests extends OpenSearchTestCase { public void testBuildAsString() { BlobPath path = new BlobPath(); diff --git a/server/src/test/java/org/opensearch/common/blobstore/fs/FsBlobContainerTests.java b/server/src/test/java/org/opensearch/common/blobstore/fs/FsBlobContainerTests.java index f2876976259d2..09bb0ce862efd 100644 --- a/server/src/test/java/org/opensearch/common/blobstore/fs/FsBlobContainerTests.java +++ b/server/src/test/java/org/opensearch/common/blobstore/fs/FsBlobContainerTests.java @@ -26,11 +26,9 @@ import org.opensearch.common.io.PathUtilsForTesting; import org.opensearch.common.io.Streams; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; -import org.opensearch.common.blobstore.fs.FsBlobContainer; -import org.opensearch.common.blobstore.fs.FsBlobStore; import java.io.FilterInputStream; import java.io.IOException; @@ -54,7 +52,7 @@ import static org.hamcrest.Matchers.startsWith; @LuceneTestCase.SuppressFileSystems("*") // we do our own mocking -public class FsBlobContainerTests extends ESTestCase { +public class FsBlobContainerTests extends OpenSearchTestCase { final AtomicLong totalBytesRead = new AtomicLong(0); FileSystem fileSystem = null; @@ -63,7 +61,7 @@ public class FsBlobContainerTests extends ESTestCase { public void setupMockFileSystems() { FileSystemProvider fileSystemProvider = new MockFileSystemProvider(PathUtils.getDefaultFileSystem(), totalBytesRead::addAndGet); fileSystem = fileSystemProvider.getFileSystem(null); - PathUtilsForTesting.installMock(fileSystem); // restored by restoreFileSystem in ESTestCase + PathUtilsForTesting.installMock(fileSystem); // restored by restoreFileSystem in OpenSearchTestCase } @After diff --git a/server/src/test/java/org/opensearch/common/bytes/RecyclingBytesStreamOutputTests.java b/server/src/test/java/org/opensearch/common/bytes/RecyclingBytesStreamOutputTests.java index d24326868bf7e..e4a71069f0742 100644 --- a/server/src/test/java/org/opensearch/common/bytes/RecyclingBytesStreamOutputTests.java +++ b/server/src/test/java/org/opensearch/common/bytes/RecyclingBytesStreamOutputTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -public class RecyclingBytesStreamOutputTests extends ESTestCase { +public class RecyclingBytesStreamOutputTests extends OpenSearchTestCase { public void testReturnsWrittenBytesAndRecyclesBufferIfPossible() throws IOException { diff --git a/server/src/test/java/org/opensearch/common/cache/CacheBuilderTests.java b/server/src/test/java/org/opensearch/common/cache/CacheBuilderTests.java index 55bf9cb50aaf4..035c736f918b1 100644 --- a/server/src/test/java/org/opensearch/common/cache/CacheBuilderTests.java +++ b/server/src/test/java/org/opensearch/common/cache/CacheBuilderTests.java @@ -20,13 +20,11 @@ package org.opensearch.common.cache; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.cache.Cache; -import org.opensearch.common.cache.CacheBuilder; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; -public class CacheBuilderTests extends ESTestCase { +public class CacheBuilderTests extends OpenSearchTestCase { public void testSettingExpireAfterAccess() { IllegalArgumentException iae = diff --git a/server/src/test/java/org/opensearch/common/cache/CacheTests.java b/server/src/test/java/org/opensearch/common/cache/CacheTests.java index 55c99477121e7..812aa795dd2e7 100644 --- a/server/src/test/java/org/opensearch/common/cache/CacheTests.java +++ b/server/src/test/java/org/opensearch/common/cache/CacheTests.java @@ -20,11 +20,8 @@ package org.opensearch.common.cache; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.cache.Cache; -import org.opensearch.common.cache.CacheBuilder; -import org.opensearch.common.cache.RemovalNotification; import java.lang.management.ManagementFactory; import java.lang.management.ThreadMXBean; @@ -53,7 +50,7 @@ import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; -public class CacheTests extends ESTestCase { +public class CacheTests extends OpenSearchTestCase { private int numberOfEntries; @Before diff --git a/server/src/test/java/org/opensearch/common/collect/CopyOnWriteHashMapTests.java b/server/src/test/java/org/opensearch/common/collect/CopyOnWriteHashMapTests.java index 22b4fc343b931..f3fb98a5c3e05 100644 --- a/server/src/test/java/org/opensearch/common/collect/CopyOnWriteHashMapTests.java +++ b/server/src/test/java/org/opensearch/common/collect/CopyOnWriteHashMapTests.java @@ -19,15 +19,14 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.collect.CopyOnWriteHashMap; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; import static java.util.Collections.emptyMap; -public class CopyOnWriteHashMapTests extends ESTestCase { +public class CopyOnWriteHashMapTests extends OpenSearchTestCase { private static class O { diff --git a/server/src/test/java/org/opensearch/common/collect/EvictingQueueTests.java b/server/src/test/java/org/opensearch/common/collect/EvictingQueueTests.java index 3f8080027d8c7..c2951e5eca502 100644 --- a/server/src/test/java/org/opensearch/common/collect/EvictingQueueTests.java +++ b/server/src/test/java/org/opensearch/common/collect/EvictingQueueTests.java @@ -17,13 +17,12 @@ package org.opensearch.common.collect; import org.opensearch.common.util.CollectionUtils; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.collect.EvictingQueue; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.NoSuchElementException; -public class EvictingQueueTests extends ESTestCase { +public class EvictingQueueTests extends OpenSearchTestCase { public void testCreateWithNegativeSize() throws Exception { try { new EvictingQueue<>(-1); diff --git a/server/src/test/java/org/opensearch/common/collect/IteratorsTests.java b/server/src/test/java/org/opensearch/common/collect/IteratorsTests.java index cf78c12f9293c..1d9700c9cb591 100644 --- a/server/src/test/java/org/opensearch/common/collect/IteratorsTests.java +++ b/server/src/test/java/org/opensearch/common/collect/IteratorsTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.collect; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.collect.Iterators; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -29,7 +28,7 @@ import java.util.List; import java.util.NoSuchElementException; -public class IteratorsTests extends ESTestCase { +public class IteratorsTests extends OpenSearchTestCase { public void testConcatentation() { List threeTwoOne = Arrays.asList(3, 2, 1); List fourFiveSix = Arrays.asList(4, 5, 6); diff --git a/server/src/test/java/org/opensearch/common/compress/DeflateCompressTests.java b/server/src/test/java/org/opensearch/common/compress/DeflateCompressTests.java index 876bf5f860728..3661316a8c669 100644 --- a/server/src/test/java/org/opensearch/common/compress/DeflateCompressTests.java +++ b/server/src/test/java/org/opensearch/common/compress/DeflateCompressTests.java @@ -21,9 +21,7 @@ import org.apache.lucene.util.LineFileDocs; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.compress.Compressor; -import org.opensearch.common.compress.DeflateCompressor; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -37,7 +35,7 @@ /** * Test streaming compression (e.g. used for recovery) */ -public class DeflateCompressTests extends ESTestCase { +public class DeflateCompressTests extends OpenSearchTestCase { private final Compressor compressor = new DeflateCompressor(); diff --git a/server/src/test/java/org/opensearch/common/compress/DeflateCompressedXContentTests.java b/server/src/test/java/org/opensearch/common/compress/DeflateCompressedXContentTests.java index 1f90f7a8ab60b..ea844a3d97851 100644 --- a/server/src/test/java/org/opensearch/common/compress/DeflateCompressedXContentTests.java +++ b/server/src/test/java/org/opensearch/common/compress/DeflateCompressedXContentTests.java @@ -22,11 +22,8 @@ import org.apache.lucene.util.TestUtil; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; -import org.opensearch.common.compress.CompressedXContent; -import org.opensearch.common.compress.Compressor; -import org.opensearch.common.compress.DeflateCompressor; import java.io.IOException; import java.io.OutputStream; @@ -35,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class DeflateCompressedXContentTests extends ESTestCase { +public class DeflateCompressedXContentTests extends OpenSearchTestCase { private final Compressor compressor = new DeflateCompressor(); diff --git a/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java b/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java index ec27f73f87425..70996fbfa1f12 100644 --- a/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java +++ b/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java @@ -18,14 +18,12 @@ */ package org.opensearch.common.geo; -import org.opensearch.common.geo.GeoJson; -import org.opensearch.common.geo.GeometryParser; import org.opensearch.common.geo.parsers.ShapeParser; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.geometry.utils.GeographyValidator; import org.elasticsearch.index.mapper.GeoShapeIndexer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; @@ -42,7 +40,7 @@ import static org.opensearch.common.geo.builders.ShapeBuilder.SPATIAL_CONTEXT; /** Base class for all geo parsing tests */ -abstract class BaseGeoParsingTestCase extends ESTestCase { +abstract class BaseGeoParsingTestCase extends OpenSearchTestCase { protected static final GeometryFactory GEOMETRY_FACTORY = SPATIAL_CONTEXT.getGeometryFactory(); public abstract void testParsePoint() throws IOException, ParseException; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java b/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java index ec35abc1e4dd5..0418a02ad59ef 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -37,7 +37,7 @@ /** * Tests for {@link GeoBoundingBox} */ -public class GeoBoundingBoxTests extends ESTestCase { +public class GeoBoundingBoxTests extends OpenSearchTestCase { public void testInvalidParseInvalidWKT() throws IOException { XContentBuilder bboxBuilder = XContentFactory.jsonBuilder() diff --git a/server/src/test/java/org/opensearch/common/geo/GeoDistanceTests.java b/server/src/test/java/org/opensearch/common/geo/GeoDistanceTests.java index b63da60e7e814..13cd8a81d2496 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoDistanceTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoDistanceTests.java @@ -21,9 +21,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.unit.DistanceUnit; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.geo.GeoDistance; -import org.opensearch.common.geo.GeoPoint; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -35,7 +33,7 @@ /** * Basic Tests for {@link GeoDistance} */ -public class GeoDistanceTests extends ESTestCase { +public class GeoDistanceTests extends OpenSearchTestCase { public void testGeoDistanceSerialization() throws IOException { // make sure that ordinals don't change, because we rely on then in serialization diff --git a/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java b/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java index 0b839d11981fb..3d45833193f21 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java @@ -32,8 +32,8 @@ import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.utils.GeographyValidator; -import org.elasticsearch.test.AbstractXContentTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractXContentTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Map; @@ -50,7 +50,7 @@ import static org.opensearch.geo.GeometryTestUtils.randomPolygon; import static org.hamcrest.Matchers.equalTo; -public class GeoJsonSerializationTests extends ESTestCase { +public class GeoJsonSerializationTests extends OpenSearchTestCase { private static class GeometryWrapper implements ToXContentObject { diff --git a/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java b/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java index 23883e0f20be3..2ea84cdc41d6f 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.GeoShapeIndexer; import org.elasticsearch.index.mapper.LegacyGeoShapeFieldMapper; import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoUtilTests.java b/server/src/test/java/org/opensearch/common/geo/GeoUtilTests.java index 89dfb900d9eb3..f4d30aba2b5b1 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoUtilTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoUtilTests.java @@ -23,14 +23,13 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.geo.GeoUtils; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -public class GeoUtilTests extends ESTestCase { +public class GeoUtilTests extends OpenSearchTestCase { public void testPrecisionParser() throws IOException { assertEquals(10, parsePrecision(builder -> builder.field("test", 10))); diff --git a/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java b/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java index cac77f02ba8f6..e19d2acc82723 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java @@ -27,12 +27,12 @@ import org.opensearch.geometry.Geometry; import org.opensearch.geometry.GeometryCollection; import org.opensearch.geometry.ShapeType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.geo.GeometryTestUtils.randomGeometry; import static org.elasticsearch.index.query.LegacyGeoShapeQueryProcessor.geometryToShapeBuilder; -public class GeometryIOTests extends ESTestCase { +public class GeometryIOTests extends OpenSearchTestCase { public void testRandomSerialization() throws Exception { for (int i = 0; i < randomIntBetween(1, 20); i++) { diff --git a/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java b/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java index b76ca048c0eba..8fa46153fdeee 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java @@ -47,10 +47,10 @@ import org.opensearch.geometry.Polygon; import org.opensearch.geometry.Rectangle; import org.elasticsearch.index.mapper.GeoShapeIndexer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.locationtech.spatial4j.exception.InvalidShapeException; -public class GeometryIndexerTests extends ESTestCase { +public class GeometryIndexerTests extends OpenSearchTestCase { GeoShapeIndexer indexer = new GeoShapeIndexer(true, "test"); diff --git a/server/src/test/java/org/opensearch/common/geo/GeometryParserTests.java b/server/src/test/java/org/opensearch/common/geo/GeometryParserTests.java index f05594197a0ab..8e03eaf2a77a4 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryParserTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryParserTests.java @@ -26,15 +26,13 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; -import org.opensearch.common.geo.GeometryFormat; -import org.opensearch.common.geo.GeometryParser; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.GeometryCollection; import org.opensearch.geometry.Line; import org.opensearch.geometry.LinearRing; import org.opensearch.geometry.Point; import org.opensearch.geometry.Polygon; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashMap; @@ -43,7 +41,7 @@ /** * Tests for {@link GeometryParser} */ -public class GeometryParserTests extends ESTestCase { +public class GeometryParserTests extends OpenSearchTestCase { public void testGeoJsonParsing() throws Exception { diff --git a/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java b/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java index d69249d79f189..59403a73c4b4b 100644 --- a/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java +++ b/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.geo.builders.ShapeBuilder; import org.opensearch.geometry.LinearRing; import org.elasticsearch.index.mapper.GeoShapeIndexer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.Polygon; @@ -48,7 +48,7 @@ /** * Tests for {@link ShapeBuilder} */ -public class ShapeBuilderTests extends ESTestCase { +public class ShapeBuilderTests extends OpenSearchTestCase { public void testNewPoint() { PointBuilder pb = new PointBuilder().coordinate(-100, 45); diff --git a/server/src/test/java/org/opensearch/common/geo/ShapeRelationTests.java b/server/src/test/java/org/opensearch/common/geo/ShapeRelationTests.java index 9139a49c5e812..679d6e1ab53af 100644 --- a/server/src/test/java/org/opensearch/common/geo/ShapeRelationTests.java +++ b/server/src/test/java/org/opensearch/common/geo/ShapeRelationTests.java @@ -21,15 +21,14 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.geo.ShapeRelation; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class ShapeRelationTests extends ESTestCase { +public class ShapeRelationTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(ShapeRelation.INTERSECTS.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/opensearch/common/geo/SpatialStrategyTests.java b/server/src/test/java/org/opensearch/common/geo/SpatialStrategyTests.java index 10d177b72c3fd..12b99adc7324e 100644 --- a/server/src/test/java/org/opensearch/common/geo/SpatialStrategyTests.java +++ b/server/src/test/java/org/opensearch/common/geo/SpatialStrategyTests.java @@ -21,15 +21,14 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.geo.SpatialStrategy; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class SpatialStrategyTests extends ESTestCase { +public class SpatialStrategyTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(SpatialStrategy.TERM.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/opensearch/common/geo/builders/AbstractShapeBuilderTestCase.java b/server/src/test/java/org/opensearch/common/geo/builders/AbstractShapeBuilderTestCase.java index 88435605b05b7..3b1c056e890e4 100644 --- a/server/src/test/java/org/opensearch/common/geo/builders/AbstractShapeBuilderTestCase.java +++ b/server/src/test/java/org/opensearch/common/geo/builders/AbstractShapeBuilderTestCase.java @@ -29,15 +29,15 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import java.io.IOException; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public abstract class AbstractShapeBuilderTestCase> extends ESTestCase { +public abstract class AbstractShapeBuilderTestCase> extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static NamedWriteableRegistry namedWriteableRegistry; @@ -114,6 +114,6 @@ public void testEqualsAndHashcode() throws IOException { protected static T copyShape(T original) throws IOException { @SuppressWarnings("unchecked") Reader reader = (Reader) namedWriteableRegistry.getReader(ShapeBuilder.class, original.getWriteableName()); - return ESTestCase.copyWriteable(original, namedWriteableRegistry, reader); + return OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, reader); } } diff --git a/server/src/test/java/org/opensearch/common/hash/MessageDigestsTests.java b/server/src/test/java/org/opensearch/common/hash/MessageDigestsTests.java index 3c8c6563958c1..6c12b85801bf7 100644 --- a/server/src/test/java/org/opensearch/common/hash/MessageDigestsTests.java +++ b/server/src/test/java/org/opensearch/common/hash/MessageDigestsTests.java @@ -19,14 +19,13 @@ package org.opensearch.common.hash; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.hash.MessageDigests; +import org.opensearch.test.OpenSearchTestCase; import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; -public class MessageDigestsTests extends ESTestCase { +public class MessageDigestsTests extends OpenSearchTestCase { private void assertHash(String expected, String test, MessageDigest messageDigest) { String actual = MessageDigests.toHexString(messageDigest.digest(test.getBytes(StandardCharsets.UTF_8))); assertEquals(expected, actual); diff --git a/server/src/test/java/org/opensearch/common/hashing/MurmurHash3Tests.java b/server/src/test/java/org/opensearch/common/hashing/MurmurHash3Tests.java index abf55d8c63f59..4e3cdbf5d664f 100644 --- a/server/src/test/java/org/opensearch/common/hashing/MurmurHash3Tests.java +++ b/server/src/test/java/org/opensearch/common/hashing/MurmurHash3Tests.java @@ -20,12 +20,12 @@ package org.opensearch.common.hashing; import org.opensearch.common.hash.MurmurHash3; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -public class MurmurHash3Tests extends ESTestCase { +public class MurmurHash3Tests extends OpenSearchTestCase { public void testKnownValues() throws UnsupportedEncodingException { assertHash(0x629942693e10f867L, 0x92db0b82baeb5347L, "hell", 0); assertHash(0xa78ddff5adae8d10L, 0x128900ef20900135L, "hello", 1); diff --git a/server/src/test/java/org/opensearch/common/hppc/HppcMapsTests.java b/server/src/test/java/org/opensearch/common/hppc/HppcMapsTests.java index 1a4ccfdcdf440..255afb7ed00d0 100644 --- a/server/src/test/java/org/opensearch/common/hppc/HppcMapsTests.java +++ b/server/src/test/java/org/opensearch/common/hppc/HppcMapsTests.java @@ -21,14 +21,14 @@ import com.carrotsearch.hppc.ObjectHashSet; import org.opensearch.Assertions; import org.opensearch.common.collect.HppcMaps; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; import static org.hamcrest.Matchers.equalTo; -public class HppcMapsTests extends ESTestCase { +public class HppcMapsTests extends OpenSearchTestCase { public void testIntersection() throws Exception { assumeTrue("assertions enabled", Assertions.ENABLED); ObjectHashSet set1 = ObjectHashSet.from("1", "2", "3"); diff --git a/server/src/test/java/org/opensearch/common/io/FileSystemUtilsTests.java b/server/src/test/java/org/opensearch/common/io/FileSystemUtilsTests.java index a29864ca805d5..05b3257c96e06 100644 --- a/server/src/test/java/org/opensearch/common/io/FileSystemUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/io/FileSystemUtilsTests.java @@ -21,9 +21,8 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.io.FileSystemUtils; import java.io.IOException; import java.io.InputStream; @@ -42,7 +41,7 @@ * Unit tests for {@link FileSystemUtils}. */ @SuppressFileSystems("WindowsFS") // tries to move away open file handles -public class FileSystemUtilsTests extends ESTestCase { +public class FileSystemUtilsTests extends OpenSearchTestCase { private Path src; private Path dst; diff --git a/server/src/test/java/org/opensearch/common/io/StreamsTests.java b/server/src/test/java/org/opensearch/common/io/StreamsTests.java index 629d88cc3e452..07c539ade8358 100644 --- a/server/src/test/java/org/opensearch/common/io/StreamsTests.java +++ b/server/src/test/java/org/opensearch/common/io/StreamsTests.java @@ -21,9 +21,8 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.io.Streams; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,7 +37,7 @@ /** * Unit tests for {@link org.opensearch.common.io.Streams}. */ -public class StreamsTests extends ESTestCase { +public class StreamsTests extends OpenSearchTestCase { public void testCopyFromByteArray() throws IOException { byte[] content = "content".getBytes(StandardCharsets.UTF_8); diff --git a/server/src/test/java/org/opensearch/common/io/stream/AbstractWriteableEnumTestCase.java b/server/src/test/java/org/opensearch/common/io/stream/AbstractWriteableEnumTestCase.java index 1bc43267bc05a..b51377e3d71f2 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/AbstractWriteableEnumTestCase.java +++ b/server/src/test/java/org/opensearch/common/io/stream/AbstractWriteableEnumTestCase.java @@ -19,11 +19,7 @@ package org.opensearch.common.io.stream; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -32,7 +28,7 @@ /** * Abstract class offering base functionality for testing @{link Writeable} enums. */ -public abstract class AbstractWriteableEnumTestCase extends ESTestCase { +public abstract class AbstractWriteableEnumTestCase extends OpenSearchTestCase { private final Writeable.Reader reader; public AbstractWriteableEnumTestCase(Writeable.Reader reader) { diff --git a/server/src/test/java/org/opensearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/opensearch/common/io/stream/BytesStreamsTests.java index c22539b4d6150..f965b076b502c 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/BytesStreamsTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/BytesStreamsTests.java @@ -29,15 +29,8 @@ import org.opensearch.common.lucene.BytesRefs; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.NamedWriteable; -import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; import org.opensearch.script.JodaCompatibleZonedDateTime; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -70,7 +63,7 @@ /** * Tests for {@link StreamOutput}. */ -public class BytesStreamsTests extends ESTestCase { +public class BytesStreamsTests extends OpenSearchTestCase { public void testEmpty() throws Exception { BytesStreamOutput out = new BytesStreamOutput(); diff --git a/server/src/test/java/org/opensearch/common/io/stream/DelayableWriteableTests.java b/server/src/test/java/org/opensearch/common/io/stream/DelayableWriteableTests.java index 6e655de3d7040..18a1d772349a7 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/DelayableWriteableTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/DelayableWriteableTests.java @@ -25,16 +25,10 @@ import java.io.IOException; import org.opensearch.Version; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.opensearch.common.io.stream.DelayableWriteable; -import org.opensearch.common.io.stream.NamedWriteable; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; - -public class DelayableWriteableTests extends ESTestCase { +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; + +public class DelayableWriteableTests extends OpenSearchTestCase { // NOTE: we don't use AbstractWireSerializingTestCase because we don't implement equals and hashCode. private static class Example implements NamedWriteable { private final String s; diff --git a/server/src/test/java/org/opensearch/common/io/stream/NamedWriteableRegistryTests.java b/server/src/test/java/org/opensearch/common/io/stream/NamedWriteableRegistryTests.java index a7fa9df379afa..715d9de92b5e1 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/NamedWriteableRegistryTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/NamedWriteableRegistryTests.java @@ -23,14 +23,9 @@ import java.util.Arrays; import java.util.Collections; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.io.stream.NamedWriteable; -import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; +import org.opensearch.test.OpenSearchTestCase; -public class NamedWriteableRegistryTests extends ESTestCase { +public class NamedWriteableRegistryTests extends OpenSearchTestCase { private static class DummyNamedWriteable implements NamedWriteable { DummyNamedWriteable(StreamInput in) {} diff --git a/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java b/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java index 1a7d3167ed93f..622ca55a2c8ae 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java @@ -23,12 +23,11 @@ import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.io.stream.ReleasableBytesStreamOutput; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ReleasableBytesStreamOutputTests extends ESTestCase { +public class ReleasableBytesStreamOutputTests extends OpenSearchTestCase { public void testRelease() throws Exception { MockBigArrays mockBigArrays = diff --git a/server/src/test/java/org/opensearch/common/io/stream/StreamTests.java b/server/src/test/java/org/opensearch/common/io/stream/StreamTests.java index 59f8b00737fce..9b6658b987a34 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/StreamTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/StreamTests.java @@ -27,13 +27,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.SecureString; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.io.stream.BytesStreamOutput; -import org.opensearch.common.io.stream.FilterStreamInput; -import org.opensearch.common.io.stream.InputStreamStreamInput; -import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.io.stream.Writeable; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.EOFException; @@ -63,7 +57,7 @@ import static org.hamcrest.Matchers.iterableWithSize; import static org.hamcrest.Matchers.nullValue; -public class StreamTests extends ESTestCase { +public class StreamTests extends OpenSearchTestCase { public void testBooleanSerialization() throws IOException { final BytesStreamOutput output = new BytesStreamOutput(); diff --git a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java index 3d5566448fe9b..0df3f79423d43 100644 --- a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java +++ b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java @@ -21,13 +21,11 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.bootstrap.JavaVersion; -import org.opensearch.common.joda.Joda; -import org.opensearch.common.joda.JodaDateFormatter; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateFormatters; import org.opensearch.common.time.DateMathParser; import org.opensearch.common.time.FormatNames; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -45,7 +43,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class JavaJodaTimeDuellingTests extends ESTestCase { +public class JavaJodaTimeDuellingTests extends OpenSearchTestCase { @Override protected boolean enableWarningsCheck() { return false; diff --git a/server/src/test/java/org/opensearch/common/joda/JodaDateMathParserTests.java b/server/src/test/java/org/opensearch/common/joda/JodaDateMathParserTests.java index 78bf31df8bb97..da599f7417313 100644 --- a/server/src/test/java/org/opensearch/common/joda/JodaDateMathParserTests.java +++ b/server/src/test/java/org/opensearch/common/joda/JodaDateMathParserTests.java @@ -20,11 +20,9 @@ package org.opensearch.common.joda; import org.opensearch.OpenSearchParseException; -import org.opensearch.common.joda.Joda; -import org.opensearch.common.joda.JodaDateMathParser; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateMathParser; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTimeZone; import java.time.Instant; @@ -36,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class JodaDateMathParserTests extends ESTestCase { +public class JodaDateMathParserTests extends OpenSearchTestCase { DateFormatter formatter = Joda.forPattern("date_optional_time||epoch_millis"); DateMathParser parser = formatter.toDateMathParser(); diff --git a/server/src/test/java/org/opensearch/common/joda/JodaTests.java b/server/src/test/java/org/opensearch/common/joda/JodaTests.java index 6e8992f9c9c70..6747f0e32fc38 100644 --- a/server/src/test/java/org/opensearch/common/joda/JodaTests.java +++ b/server/src/test/java/org/opensearch/common/joda/JodaTests.java @@ -19,10 +19,8 @@ package org.opensearch.common.joda; -import org.opensearch.common.joda.Joda; -import org.opensearch.common.joda.JodaDateFormatter; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -32,7 +30,7 @@ import static org.hamcrest.Matchers.not; -public class JodaTests extends ESTestCase { +public class JodaTests extends OpenSearchTestCase { public void testBasicTTimePattern() { DateFormatter formatter1 = Joda.forPattern("basic_t_time"); diff --git a/server/src/test/java/org/opensearch/common/logging/DeprecationLoggerTests.java b/server/src/test/java/org/opensearch/common/logging/DeprecationLoggerTests.java index fc8757ea55fe4..8d156b574ea35 100644 --- a/server/src/test/java/org/opensearch/common/logging/DeprecationLoggerTests.java +++ b/server/src/test/java/org/opensearch/common/logging/DeprecationLoggerTests.java @@ -21,11 +21,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LoggerContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class DeprecationLoggerTests extends ESTestCase { +public class DeprecationLoggerTests extends OpenSearchTestCase { public void testMultipleSlowLoggersUseSingleLog4jLogger() { LoggerContext context = (LoggerContext) LogManager.getContext(false); diff --git a/server/src/test/java/org/opensearch/common/logging/HeaderWarningTests.java b/server/src/test/java/org/opensearch/common/logging/HeaderWarningTests.java index fe0daa6303b7f..11bf87ebf295b 100644 --- a/server/src/test/java/org/opensearch/common/logging/HeaderWarningTests.java +++ b/server/src/test/java/org/opensearch/common/logging/HeaderWarningTests.java @@ -21,10 +21,9 @@ import com.carrotsearch.randomizedtesting.generators.CodepointSetGenerator; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.hamcrest.RegexMatcher; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.hamcrest.RegexMatcher; import org.hamcrest.core.IsSame; -import org.opensearch.common.logging.HeaderWarning; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -36,7 +35,7 @@ import java.util.stream.IntStream; import static org.opensearch.common.logging.HeaderWarning.WARNING_HEADER_PATTERN; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -45,7 +44,7 @@ /** * Tests {@link HeaderWarning} */ -public class HeaderWarningTests extends ESTestCase { +public class HeaderWarningTests extends OpenSearchTestCase { private static final RegexMatcher warningValueMatcher = matches(WARNING_HEADER_PATTERN.pattern()); diff --git a/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java b/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java index 6698bc7d8f73b..fa6acea529c98 100644 --- a/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java +++ b/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java @@ -25,11 +25,8 @@ import org.apache.logging.log4j.message.SimpleMessage; import org.elasticsearch.common.logging.JsonLogLine; import org.elasticsearch.common.logging.JsonLogsStream; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -import org.opensearch.common.logging.JsonLogLine; -import org.opensearch.common.logging.JsonLogsStream; -import org.opensearch.common.logging.JsonThrowablePatternConverter; import java.io.BufferedReader; import java.io.IOException; @@ -37,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; -public class JsonThrowablePatternConverterTests extends ESTestCase { +public class JsonThrowablePatternConverterTests extends OpenSearchTestCase { private static final String LINE_SEPARATOR = System.lineSeparator(); private JsonThrowablePatternConverter converter = JsonThrowablePatternConverter.newInstance(null, null); diff --git a/server/src/test/java/org/opensearch/common/logging/LoggersTests.java b/server/src/test/java/org/opensearch/common/logging/LoggersTests.java index c296fd0daa490..eb0b1fbbe4a3a 100644 --- a/server/src/test/java/org/opensearch/common/logging/LoggersTests.java +++ b/server/src/test/java/org/opensearch/common/logging/LoggersTests.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.UnknownHostException; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class LoggersTests extends ESTestCase { +public class LoggersTests extends OpenSearchTestCase { public void testParameterizedMessageLambda() throws Exception { final MockAppender appender = new MockAppender("trace_appender"); diff --git a/server/src/test/java/org/opensearch/common/logging/LoggingOutputStreamTests.java b/server/src/test/java/org/opensearch/common/logging/LoggingOutputStreamTests.java index ab85b1b2c1093..d3693d544e87f 100644 --- a/server/src/test/java/org/opensearch/common/logging/LoggingOutputStreamTests.java +++ b/server/src/test/java/org/opensearch/common/logging/LoggingOutputStreamTests.java @@ -19,9 +19,8 @@ package org.opensearch.common.logging; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.logging.LoggingOutputStream; import java.io.IOException; import java.io.PrintStream; @@ -35,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class LoggingOutputStreamTests extends ESTestCase { +public class LoggingOutputStreamTests extends OpenSearchTestCase { class TestLoggingOutputStream extends LoggingOutputStream { List lines = new ArrayList<>(); diff --git a/server/src/test/java/org/opensearch/common/logging/PrefixLoggerTests.java b/server/src/test/java/org/opensearch/common/logging/PrefixLoggerTests.java index 03f4abcdea408..888af860b30e8 100644 --- a/server/src/test/java/org/opensearch/common/logging/PrefixLoggerTests.java +++ b/server/src/test/java/org/opensearch/common/logging/PrefixLoggerTests.java @@ -19,12 +19,11 @@ package org.opensearch.common.logging; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.logging.PrefixLogger; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; -public class PrefixLoggerTests extends ESTestCase { +public class PrefixLoggerTests extends OpenSearchTestCase { public void testNullPrefix() { Exception e = expectThrows(IllegalArgumentException.class, () -> new PrefixLogger(logger, null)); assertThat(e.getMessage(), containsString("use a regular logger")); diff --git a/server/src/test/java/org/opensearch/common/logging/RateLimitingFilterTests.java b/server/src/test/java/org/opensearch/common/logging/RateLimitingFilterTests.java index b4c476c113f39..89cd876ca2911 100644 --- a/server/src/test/java/org/opensearch/common/logging/RateLimitingFilterTests.java +++ b/server/src/test/java/org/opensearch/common/logging/RateLimitingFilterTests.java @@ -21,16 +21,14 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; -import org.opensearch.common.logging.DeprecatedMessage; -import org.opensearch.common.logging.RateLimitingFilter; import static org.apache.logging.log4j.core.Filter.Result; import static org.hamcrest.Matchers.equalTo; -public class RateLimitingFilterTests extends ESTestCase { +public class RateLimitingFilterTests extends OpenSearchTestCase { private RateLimitingFilter filter; diff --git a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java index 6c63030a22912..468418180c701 100644 --- a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java @@ -68,9 +68,8 @@ import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource; import org.opensearch.search.MultiValueMode; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.opensearch.common.lucene.Lucene; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.io.StringReader; @@ -84,7 +83,7 @@ import static org.hamcrest.Matchers.equalTo; -public class LuceneTests extends ESTestCase { +public class LuceneTests extends OpenSearchTestCase { private static final NamedWriteableRegistry EMPTY_REGISTRY = new NamedWriteableRegistry(Collections.emptyList()); public void testWaitForIndex() throws Exception { diff --git a/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java b/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java index f26548b706333..ef63aae1dec7a 100644 --- a/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java @@ -27,10 +27,9 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.opensearch.common.lucene.ShardCoreKeyMap; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -38,7 +37,7 @@ import java.util.HashSet; import java.util.Set; -public class ShardCoreKeyMapTests extends ESTestCase { +public class ShardCoreKeyMapTests extends OpenSearchTestCase { public void testMissingShard() throws IOException { try (Directory dir = newDirectory(); diff --git a/server/src/test/java/org/opensearch/common/lucene/index/FreqTermsEnumTests.java b/server/src/test/java/org/opensearch/common/lucene/index/FreqTermsEnumTests.java index 6f007860e5c72..4b450c3363c16 100644 --- a/server/src/test/java/org/opensearch/common/lucene/index/FreqTermsEnumTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/index/FreqTermsEnumTests.java @@ -36,10 +36,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.core.internal.io.IOUtils; -import org.opensearch.common.lucene.index.FreqTermsEnum; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -55,7 +54,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class FreqTermsEnumTests extends ESTestCase { +public class FreqTermsEnumTests extends OpenSearchTestCase { private String[] terms; private IndexWriter iw; diff --git a/server/src/test/java/org/opensearch/common/lucene/index/ESDirectoryReaderTests.java b/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java similarity index 94% rename from server/src/test/java/org/opensearch/common/lucene/index/ESDirectoryReaderTests.java rename to server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java index 0a0949fe62d09..8a3d0bf128349 100644 --- a/server/src/test/java/org/opensearch/common/lucene/index/ESDirectoryReaderTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java @@ -30,11 +30,10 @@ import org.apache.lucene.store.Directory; import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; +import org.opensearch.test.OpenSearchTestCase; /** Simple tests for this filterreader */ -public class ESDirectoryReaderTests extends ESTestCase { +public class OpenSearchDirectoryReaderTests extends OpenSearchTestCase { /** Test that core cache key (needed for NRT) is working */ public void testCoreCacheKey() throws Exception { diff --git a/server/src/test/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/server/src/test/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQueryTests.java index d99e225ae992d..3a8ce8fcf7807 100644 --- a/server/src/test/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQueryTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQueryTests.java @@ -30,12 +30,11 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; import org.opensearch.common.lucene.Lucene; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class MultiPhrasePrefixQueryTests extends ESTestCase { +public class MultiPhrasePrefixQueryTests extends OpenSearchTestCase { public void testSimple() throws Exception { IndexWriter writer = new IndexWriter(new ByteBuffersDirectory(), new IndexWriterConfig(Lucene.STANDARD_ANALYZER)); Document doc = new Document(); diff --git a/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java b/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java index 85d45367fcbb3..4c6f8ee4cf85d 100644 --- a/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java @@ -28,11 +28,10 @@ import org.apache.lucene.search.TermQuery; import org.opensearch.Version; import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.opensearch.common.lucene.search.Queries; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; -public class QueriesTests extends ESTestCase { +public class QueriesTests extends OpenSearchTestCase { public void testNonNestedQuery() { for (Version version : VersionUtils.allVersions()) { diff --git a/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java b/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java index de610a5da77ac..c11afdf47da4a 100644 --- a/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java @@ -31,12 +31,12 @@ import org.apache.lucene.store.Directory; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.search.MoreLikeThisQuery; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class MoreLikeThisQueryTests extends ESTestCase { +public class MoreLikeThisQueryTests extends OpenSearchTestCase { public void testSimple() throws Exception { Directory dir = new ByteBuffersDirectory(); IndexWriter indexWriter = new IndexWriter(dir, new IndexWriterConfig(Lucene.STANDARD_ANALYZER)); diff --git a/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java b/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java index bcc3efe6c375d..8925a3057b192 100644 --- a/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java @@ -31,14 +31,14 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.StringReader; import java.util.Arrays; import java.util.List; -public class XMoreLikeThisTests extends ESTestCase { +public class XMoreLikeThisTests extends OpenSearchTestCase { private void addDoc(RandomIndexWriter writer, String[] texts) throws IOException { Document doc = new Document(); for (String text : texts) { diff --git a/server/src/test/java/org/opensearch/common/lucene/store/InputStreamIndexInputTests.java b/server/src/test/java/org/opensearch/common/lucene/store/InputStreamIndexInputTests.java index ea24256f4ba0d..3c7ddcff0fd66 100644 --- a/server/src/test/java/org/opensearch/common/lucene/store/InputStreamIndexInputTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/store/InputStreamIndexInputTests.java @@ -24,15 +24,14 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.lucene.store.InputStreamIndexInput; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; -public class InputStreamIndexInputTests extends ESTestCase { +public class InputStreamIndexInputTests extends OpenSearchTestCase { public void testSingleReadSingleByteLimit() throws IOException { Directory dir = new ByteBuffersDirectory(); IndexOutput output = dir.createOutput("test", IOContext.DEFAULT); diff --git a/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java b/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java index 5b306fdd4f921..a90ff60a94724 100644 --- a/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java @@ -31,17 +31,16 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.lucene.Lucene; -import org.opensearch.common.lucene.uid.PerThreadIDVersionAndSeqNoLookup; import org.opensearch.common.lucene.uid.VersionsAndSeqNoResolver.DocIdAndVersion; import org.elasticsearch.index.mapper.IdFieldMapper; import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; /** * test per-segment lookup of version-related data structures */ -public class VersionLookupTests extends ESTestCase { +public class VersionLookupTests extends OpenSearchTestCase { /** * test version lookup actually works diff --git a/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java b/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java index 616eae18785fe..1a6faed61ed03 100644 --- a/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java @@ -33,9 +33,8 @@ import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.opensearch.common.lucene.uid.VersionsAndSeqNoResolver; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; @@ -46,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class VersionsTests extends ESTestCase { +public class VersionsTests extends OpenSearchTestCase { public static DirectoryReader reopen(DirectoryReader reader) throws IOException { return reopen(reader, true); diff --git a/server/src/test/java/org/opensearch/common/network/CidrsTests.java b/server/src/test/java/org/opensearch/common/network/CidrsTests.java index db71a4997ad1c..944068f6208a3 100644 --- a/server/src/test/java/org/opensearch/common/network/CidrsTests.java +++ b/server/src/test/java/org/opensearch/common/network/CidrsTests.java @@ -20,8 +20,7 @@ package org.opensearch.common.network; import org.opensearch.common.collect.Tuple; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.network.Cidrs; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -29,7 +28,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; -public class CidrsTests extends ESTestCase { +public class CidrsTests extends OpenSearchTestCase { public void testNullCidr() { try { Cidrs.cidrMaskToMinMax(null); diff --git a/server/src/test/java/org/opensearch/common/network/InetAddressesTests.java b/server/src/test/java/org/opensearch/common/network/InetAddressesTests.java index c988e39128cfb..1c5d4a83005b3 100644 --- a/server/src/test/java/org/opensearch/common/network/InetAddressesTests.java +++ b/server/src/test/java/org/opensearch/common/network/InetAddressesTests.java @@ -17,16 +17,15 @@ package org.opensearch.common.network; import org.opensearch.common.collect.Tuple; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -import org.opensearch.common.network.InetAddresses; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.UnknownHostException; import java.util.Enumeration; -public class InetAddressesTests extends ESTestCase { +public class InetAddressesTests extends OpenSearchTestCase { public void testForStringBogusInput() { String[] bogusInputs = { "", diff --git a/server/src/test/java/org/opensearch/common/network/NetworkAddressTests.java b/server/src/test/java/org/opensearch/common/network/NetworkAddressTests.java index 34bd62e582884..8301c5d29f89c 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkAddressTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkAddressTests.java @@ -19,9 +19,8 @@ package org.opensearch.common.network; -import org.opensearch.common.network.NetworkAddress; import org.opensearch.common.transport.PortsRange; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.Inet6Address; @@ -32,7 +31,7 @@ /** * Tests for network address formatting. Please avoid using any methods that cause DNS lookups! */ -public class NetworkAddressTests extends ESTestCase { +public class NetworkAddressTests extends OpenSearchTestCase { public void testFormatV4() throws Exception { assertEquals("127.0.0.1", NetworkAddress.format(forge("localhost", "127.0.0.1"))); diff --git a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java index f90e3bda19ed5..338023f49e01d 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java @@ -34,7 +34,7 @@ import org.opensearch.http.NullDispatcher; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.plugins.NetworkPlugin; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; @@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -public class NetworkModuleTests extends ESTestCase { +public class NetworkModuleTests extends OpenSearchTestCase { private ThreadPool threadPool; @Override diff --git a/server/src/test/java/org/opensearch/common/network/NetworkServiceTests.java b/server/src/test/java/org/opensearch/common/network/NetworkServiceTests.java index 5e93d0aa29314..494dd00ec982c 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkServiceTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkServiceTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.network; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.network.NetworkService; +import org.opensearch.test.OpenSearchTestCase; import java.net.InetAddress; import java.util.Collections; @@ -31,7 +30,7 @@ * Tests for network service... try to keep them safe depending upon configuration * please don't actually bind to anything, just test the addresses. */ -public class NetworkServiceTests extends ESTestCase { +public class NetworkServiceTests extends OpenSearchTestCase { /** * ensure exception if we bind to multicast ipv4 address diff --git a/server/src/test/java/org/opensearch/common/network/NetworkUtilsTests.java b/server/src/test/java/org/opensearch/common/network/NetworkUtilsTests.java index 2ede6b9141213..860f7b712a7c2 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkUtilsTests.java @@ -19,9 +19,8 @@ package org.opensearch.common.network; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.hamcrest.OptionalMatchers; -import org.opensearch.common.network.NetworkUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.hamcrest.OptionalMatchers; import java.net.InetAddress; import java.net.NetworkInterface; @@ -34,7 +33,7 @@ /** * Tests for network utils. Please avoid using any methods that cause DNS lookups! */ -public class NetworkUtilsTests extends ESTestCase { +public class NetworkUtilsTests extends OpenSearchTestCase { /** * test sort key order respects PREFER_IPV4 diff --git a/server/src/test/java/org/opensearch/common/path/PathTrieTests.java b/server/src/test/java/org/opensearch/common/path/PathTrieTests.java index 85bd99172e2af..a269b6f93f7d0 100644 --- a/server/src/test/java/org/opensearch/common/path/PathTrieTests.java +++ b/server/src/test/java/org/opensearch/common/path/PathTrieTests.java @@ -19,10 +19,9 @@ package org.opensearch.common.path; -import org.opensearch.common.path.PathTrie; import org.opensearch.common.path.PathTrie.TrieMatchingMode; import org.opensearch.rest.RestUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Iterator; @@ -31,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class PathTrieTests extends ESTestCase { +public class PathTrieTests extends OpenSearchTestCase { public static final PathTrie.Decoder NO_DECODER = new PathTrie.Decoder() { @Override diff --git a/server/src/test/java/org/opensearch/common/recycler/AbstractRecyclerTestCase.java b/server/src/test/java/org/opensearch/common/recycler/AbstractRecyclerTestCase.java index 9dabf39e9f8dc..6dc85960a5e7f 100644 --- a/server/src/test/java/org/opensearch/common/recycler/AbstractRecyclerTestCase.java +++ b/server/src/test/java/org/opensearch/common/recycler/AbstractRecyclerTestCase.java @@ -19,16 +19,14 @@ package org.opensearch.common.recycler; -import org.opensearch.common.recycler.AbstractRecyclerC; -import org.opensearch.common.recycler.Recycler; import org.opensearch.common.recycler.Recycler.V; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public abstract class AbstractRecyclerTestCase extends ESTestCase { +public abstract class AbstractRecyclerTestCase extends OpenSearchTestCase { // marker states for data protected static final byte FRESH = 1; diff --git a/server/src/test/java/org/opensearch/common/regex/RegexTests.java b/server/src/test/java/org/opensearch/common/regex/RegexTests.java index 50bc5df42dc83..bcc6bef8d717e 100644 --- a/server/src/test/java/org/opensearch/common/regex/RegexTests.java +++ b/server/src/test/java/org/opensearch/common/regex/RegexTests.java @@ -18,8 +18,7 @@ */ package org.opensearch.common.regex; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.regex.Regex; +import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; import java.util.Random; @@ -27,7 +26,7 @@ import static org.hamcrest.Matchers.equalTo; -public class RegexTests extends ESTestCase { +public class RegexTests extends OpenSearchTestCase { public void testFlags() { String[] supportedFlags = new String[]{"CASE_INSENSITIVE", "MULTILINE", "DOTALL", "UNICODE_CASE", "CANON_EQ", "UNIX_LINES", "LITERAL", "COMMENTS", "UNICODE_CHAR_CLASS", "UNICODE_CHARACTER_CLASS"}; diff --git a/server/src/test/java/org/opensearch/common/rounding/DateTimeUnitTests.java b/server/src/test/java/org/opensearch/common/rounding/DateTimeUnitTests.java index c253c3d673d82..2eff17cdd2e30 100644 --- a/server/src/test/java/org/opensearch/common/rounding/DateTimeUnitTests.java +++ b/server/src/test/java/org/opensearch/common/rounding/DateTimeUnitTests.java @@ -18,8 +18,7 @@ */ package org.opensearch.common.rounding; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.rounding.DateTimeUnit; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.common.rounding.DateTimeUnit.DAY_OF_MONTH; import static org.opensearch.common.rounding.DateTimeUnit.HOUR_OF_DAY; @@ -30,7 +29,7 @@ import static org.opensearch.common.rounding.DateTimeUnit.WEEK_OF_WEEKYEAR; import static org.opensearch.common.rounding.DateTimeUnit.YEAR_OF_CENTURY; -public class DateTimeUnitTests extends ESTestCase { +public class DateTimeUnitTests extends OpenSearchTestCase { /** * test that we don't accidentally change enum ids diff --git a/server/src/test/java/org/opensearch/common/rounding/RoundingDuelTests.java b/server/src/test/java/org/opensearch/common/rounding/RoundingDuelTests.java index 8b5a3f1fcdc35..4c1d856a8b7dd 100644 --- a/server/src/test/java/org/opensearch/common/rounding/RoundingDuelTests.java +++ b/server/src/test/java/org/opensearch/common/rounding/RoundingDuelTests.java @@ -22,17 +22,15 @@ import org.opensearch.Version; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.joda.time.DateTimeZone; -import org.opensearch.common.rounding.DateTimeUnit; -import org.opensearch.common.rounding.Rounding; import java.time.ZoneOffset; import static org.hamcrest.Matchers.is; -public class RoundingDuelTests extends ESTestCase { +public class RoundingDuelTests extends OpenSearchTestCase { // dont include nano/micro seconds as rounding would become zero then and throw an exception private static final String[] ALLOWED_TIME_SUFFIXES = new String[]{"d", "h", "ms", "s", "m"}; diff --git a/server/src/test/java/org/opensearch/common/rounding/TimeZoneRoundingTests.java b/server/src/test/java/org/opensearch/common/rounding/TimeZoneRoundingTests.java index d432398db1a59..de3819e094138 100644 --- a/server/src/test/java/org/opensearch/common/rounding/TimeZoneRoundingTests.java +++ b/server/src/test/java/org/opensearch/common/rounding/TimeZoneRoundingTests.java @@ -20,12 +20,10 @@ package org.opensearch.common.rounding; import org.opensearch.common.collect.Tuple; -import org.opensearch.common.rounding.DateTimeUnit; -import org.opensearch.common.rounding.Rounding; import org.opensearch.common.rounding.Rounding.TimeIntervalRounding; import org.opensearch.common.rounding.Rounding.TimeUnitRounding; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -47,7 +45,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.startsWith; -public class TimeZoneRoundingTests extends ESTestCase { +public class TimeZoneRoundingTests extends OpenSearchTestCase { public void testUTCTimeUnitRounding() { Rounding tzRounding = Rounding.builder(DateTimeUnit.MONTH_OF_YEAR).build(); diff --git a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java index aac73635ed273..e8460707e6c2d 100644 --- a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java +++ b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java @@ -24,14 +24,9 @@ import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; import org.elasticsearch.mock.orig.Mockito; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.mockito.stubbing.Answer; -import org.opensearch.common.settings.ConsistentSettingsService; -import org.opensearch.common.settings.MockSecureSettings; -import org.opensearch.common.settings.SecureSetting; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.settings.Settings; import java.util.Arrays; import java.util.Locale; @@ -40,7 +35,7 @@ import static org.mockito.Mockito.mock; import static org.hamcrest.Matchers.is; -public class ConsistentSettingsServiceTests extends ESTestCase { +public class ConsistentSettingsServiceTests extends OpenSearchTestCase { private AtomicReference clusterState = new AtomicReference<>(); private ClusterService clusterService; diff --git a/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java b/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java index 27850eb2f8b8e..52cb2938f4c8c 100644 --- a/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java @@ -19,9 +19,7 @@ package org.opensearch.common.settings; -import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; -import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.util.PageCacheRecycler; @@ -31,13 +29,13 @@ import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.monitor.jvm.JvmInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; -public class MemorySizeSettingsTests extends ESTestCase { +public class MemorySizeSettingsTests extends OpenSearchTestCase { public void testPageCacheLimitHeapSetting() { assertMemorySizeSetting(PageCacheRecycler.LIMIT_HEAP_SETTING, "cache.recycler.page.limit.heap", diff --git a/server/src/test/java/org/opensearch/common/settings/PropertyPlaceholderTests.java b/server/src/test/java/org/opensearch/common/settings/PropertyPlaceholderTests.java index 4ea5e73bf092d..ae651d1127f6e 100644 --- a/server/src/test/java/org/opensearch/common/settings/PropertyPlaceholderTests.java +++ b/server/src/test/java/org/opensearch/common/settings/PropertyPlaceholderTests.java @@ -22,12 +22,11 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.settings.PropertyPlaceholder; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.is; -public class PropertyPlaceholderTests extends ESTestCase { +public class PropertyPlaceholderTests extends OpenSearchTestCase { public void testSimple() { PropertyPlaceholder propertyPlaceholder = new PropertyPlaceholder("{", "}", false); Map map = new LinkedHashMap<>(); diff --git a/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java index ffc3bf6caa53d..510350f90b69e 100644 --- a/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java @@ -27,13 +27,9 @@ import org.opensearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; -import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.common.settings.Setting.Property; import org.opensearch.index.IndexModule; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.settings.SettingUpgrader; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.settings.SettingsException; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.transport.TransportSettings; import java.io.IOException; @@ -59,7 +55,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.sameInstance; -public class ScopedSettingsTests extends ESTestCase { +public class ScopedSettingsTests extends OpenSearchTestCase { public void testResetSetting() { Setting dynamicSetting = Setting.intSetting("some.dyn.setting", 1, Property.Dynamic, Property.NodeScope); diff --git a/server/src/test/java/org/opensearch/common/settings/SecureStringTests.java b/server/src/test/java/org/opensearch/common/settings/SecureStringTests.java index de9698ee9a983..af4069b672e36 100644 --- a/server/src/test/java/org/opensearch/common/settings/SecureStringTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SecureStringTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.settings; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.settings.SecureString; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; @@ -28,7 +27,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public class SecureStringTests extends ESTestCase { +public class SecureStringTests extends OpenSearchTestCase { public void testCloseableCharsDoesNotModifySecureString() { final char[] password = randomAlphaOfLengthBetween(1, 32).toCharArray(); diff --git a/server/src/test/java/org/opensearch/common/settings/SettingTests.java b/server/src/test/java/org/opensearch/common/settings/SettingTests.java index 268328c977dae..34c3bc053fd1c 100644 --- a/server/src/test/java/org/opensearch/common/settings/SettingTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SettingTests.java @@ -26,22 +26,16 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; -import org.opensearch.common.settings.AbstractScopedSettings; import org.opensearch.common.settings.AbstractScopedSettings.SettingUpdater; -import org.opensearch.common.settings.ClusterSettings; -import org.opensearch.common.settings.MockSecureSettings; -import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.settings.SettingsException; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.opensearch.index.IndexSettings; import org.opensearch.monitor.jvm.JvmInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import java.util.Arrays; import java.util.Collections; @@ -64,7 +58,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class SettingTests extends ESTestCase { +public class SettingTests extends OpenSearchTestCase { public void testGet() { Setting booleanSetting = Setting.boolSetting("foo.bar", false, Property.Dynamic, Property.NodeScope); diff --git a/server/src/test/java/org/opensearch/common/settings/SettingsFilterTests.java b/server/src/test/java/org/opensearch/common/settings/SettingsFilterTests.java index 09db3f0e71c10..ca98d44c7867b 100644 --- a/server/src/test/java/org/opensearch/common/settings/SettingsFilterTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SettingsFilterTests.java @@ -26,12 +26,10 @@ import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; -import org.opensearch.common.settings.Settings; -import org.opensearch.common.settings.SettingsFilter; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.util.Arrays; @@ -40,7 +38,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -public class SettingsFilterTests extends ESTestCase { +public class SettingsFilterTests extends OpenSearchTestCase { public void testAddingAndRemovingFilters() { HashSet hashSet = new HashSet<>(Arrays.asList("foo", "bar", "baz")); SettingsFilter settingsFilter = new SettingsFilter(hashSet); diff --git a/server/src/test/java/org/opensearch/common/settings/SettingsTests.java b/server/src/test/java/org/opensearch/common/settings/SettingsTests.java index 0bb3949b9769a..355035d415a0f 100644 --- a/server/src/test/java/org/opensearch/common/settings/SettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SettingsTests.java @@ -26,11 +26,6 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.opensearch.common.settings.MockSecureSettings; -import org.opensearch.common.settings.SecureSetting; -import org.opensearch.common.settings.SecureString; -import org.opensearch.common.settings.Setting; -import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; @@ -38,8 +33,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -64,7 +59,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class SettingsTests extends ESTestCase { +public class SettingsTests extends OpenSearchTestCase { public void testReplacePropertiesPlaceholderSystemProperty() { String value = System.getProperty("java.home"); diff --git a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java index 596fe081de441..e8667ed5112db 100644 --- a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java +++ b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java @@ -21,11 +21,7 @@ import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.joda.Joda; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.time.DateFormatter; -import org.opensearch.common.time.DateFormatters; -import org.opensearch.common.time.FormatNames; -import org.opensearch.common.time.JavaDateFormatter; +import org.opensearch.test.OpenSearchTestCase; import java.time.Clock; import java.time.Instant; @@ -44,7 +40,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -public class DateFormattersTests extends ESTestCase { +public class DateFormattersTests extends OpenSearchTestCase { public void testWeekBasedDates() { assumeFalse("won't work in jdk8 " + diff --git a/server/src/test/java/org/opensearch/common/time/DateUtilsRoundingTests.java b/server/src/test/java/org/opensearch/common/time/DateUtilsRoundingTests.java index c782512a04a6c..f827f2946cc58 100644 --- a/server/src/test/java/org/opensearch/common/time/DateUtilsRoundingTests.java +++ b/server/src/test/java/org/opensearch/common/time/DateUtilsRoundingTests.java @@ -19,15 +19,14 @@ package org.opensearch.common.time; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.time.DateUtilsRounding; +import org.opensearch.test.OpenSearchTestCase; import java.time.ZoneOffset; import java.time.ZonedDateTime; import static org.hamcrest.Matchers.equalTo; -public class DateUtilsRoundingTests extends ESTestCase { +public class DateUtilsRoundingTests extends OpenSearchTestCase { public void testDateUtilsRounding() { for (int year = -1000; year < 3000; year++) { diff --git a/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java b/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java index c336600b615da..492b1fcfd51b1 100644 --- a/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/time/DateUtilsTests.java @@ -19,9 +19,8 @@ package org.opensearch.common.time; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTimeZone; -import org.opensearch.common.time.DateUtils; import java.time.Instant; import java.time.LocalDate; @@ -45,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class DateUtilsTests extends ESTestCase { +public class DateUtilsTests extends OpenSearchTestCase { private static final Set IGNORE = new HashSet<>(Arrays.asList( "Eire", "Europe/Dublin", // dublin timezone in joda does not account for DST "Asia/Qostanay" // this has been added in joda 2.10.2 but is not part of the JDK 12.0.1 tzdata yet diff --git a/server/src/test/java/org/opensearch/common/time/JavaDateMathParserTests.java b/server/src/test/java/org/opensearch/common/time/JavaDateMathParserTests.java index 7f6c032739fa7..a8aefef5e9ef8 100644 --- a/server/src/test/java/org/opensearch/common/time/JavaDateMathParserTests.java +++ b/server/src/test/java/org/opensearch/common/time/JavaDateMathParserTests.java @@ -21,11 +21,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.bootstrap.JavaVersion; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.time.DateFormatter; -import org.opensearch.common.time.DateFormatters; -import org.opensearch.common.time.DateMathParser; -import org.opensearch.common.time.JavaDateFormatter; +import org.opensearch.test.OpenSearchTestCase; import java.time.Instant; import java.time.ZoneId; @@ -41,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class JavaDateMathParserTests extends ESTestCase { +public class JavaDateMathParserTests extends OpenSearchTestCase { private final DateFormatter formatter = DateFormatter.forPattern("date_optional_time||epoch_millis"); private final DateMathParser parser = formatter.toDateMathParser(); diff --git a/server/src/test/java/org/opensearch/common/transport/BoundTransportAddressTests.java b/server/src/test/java/org/opensearch/common/transport/BoundTransportAddressTests.java index 916486af36892..2cea60361b0bd 100644 --- a/server/src/test/java/org/opensearch/common/transport/BoundTransportAddressTests.java +++ b/server/src/test/java/org/opensearch/common/transport/BoundTransportAddressTests.java @@ -21,9 +21,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.transport.BoundTransportAddress; -import org.opensearch.common.transport.TransportAddress; +import org.opensearch.test.OpenSearchTestCase; import java.net.InetAddress; import java.util.ArrayList; @@ -37,7 +35,7 @@ * Basic tests for the {@link BoundTransportAddress} class. These tests should not bind to any addresses but should * just test things like serialization and exception handling... */ -public class BoundTransportAddressTests extends ESTestCase { +public class BoundTransportAddressTests extends OpenSearchTestCase { public void testSerialization() throws Exception { InetAddress[] inetAddresses = InetAddress.getAllByName("0.0.0.0"); diff --git a/server/src/test/java/org/opensearch/common/unit/ByteSizeUnitTests.java b/server/src/test/java/org/opensearch/common/unit/ByteSizeUnitTests.java index 79875d44c17f9..0b91f2afe241f 100644 --- a/server/src/test/java/org/opensearch/common/unit/ByteSizeUnitTests.java +++ b/server/src/test/java/org/opensearch/common/unit/ByteSizeUnitTests.java @@ -21,9 +21,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.unit.ByteSizeUnit; -import org.opensearch.common.unit.ByteSizeValue; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -36,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class ByteSizeUnitTests extends ESTestCase { +public class ByteSizeUnitTests extends OpenSearchTestCase { public void testBytes() { assertThat(BYTES.toBytes(1), equalTo(1L)); diff --git a/server/src/test/java/org/opensearch/common/unit/ByteSizeValueTests.java b/server/src/test/java/org/opensearch/common/unit/ByteSizeValueTests.java index b99eff686f85f..7ca7f39a99a1d 100644 --- a/server/src/test/java/org/opensearch/common/unit/ByteSizeValueTests.java +++ b/server/src/test/java/org/opensearch/common/unit/ByteSizeValueTests.java @@ -21,10 +21,8 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import org.hamcrest.MatcherAssert; -import org.opensearch.common.unit.ByteSizeUnit; -import org.opensearch.common.unit.ByteSizeValue; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/common/unit/DistanceUnitTests.java b/server/src/test/java/org/opensearch/common/unit/DistanceUnitTests.java index 788f1fff3a1ed..d132a4463a3a4 100644 --- a/server/src/test/java/org/opensearch/common/unit/DistanceUnitTests.java +++ b/server/src/test/java/org/opensearch/common/unit/DistanceUnitTests.java @@ -22,13 +22,12 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.unit.DistanceUnit; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; -public class DistanceUnitTests extends ESTestCase { +public class DistanceUnitTests extends OpenSearchTestCase { public void testSimpleDistanceUnit() { assertThat(DistanceUnit.KILOMETERS.convert(10, DistanceUnit.MILES), closeTo(16.09344, 0.001)); assertThat(DistanceUnit.MILES.convert(10, DistanceUnit.MILES), closeTo(10, 0.001)); diff --git a/server/src/test/java/org/opensearch/common/unit/FuzzinessTests.java b/server/src/test/java/org/opensearch/common/unit/FuzzinessTests.java index 107bc39443326..d2907eaf76f20 100644 --- a/server/src/test/java/org/opensearch/common/unit/FuzzinessTests.java +++ b/server/src/test/java/org/opensearch/common/unit/FuzzinessTests.java @@ -22,8 +22,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.unit.Fuzziness; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -32,7 +31,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.sameInstance; -public class FuzzinessTests extends ESTestCase { +public class FuzzinessTests extends OpenSearchTestCase { public void testNumerics() { String[] options = new String[]{"1.0", "1", "1.000000"}; assertThat(Fuzziness.build(randomFrom(options)).asFloat(), equalTo(1f)); diff --git a/server/src/test/java/org/opensearch/common/unit/RatioValueTests.java b/server/src/test/java/org/opensearch/common/unit/RatioValueTests.java index cd2ee40fe6444..811fd06c18230 100644 --- a/server/src/test/java/org/opensearch/common/unit/RatioValueTests.java +++ b/server/src/test/java/org/opensearch/common/unit/RatioValueTests.java @@ -20,15 +20,14 @@ package org.opensearch.common.unit; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.unit.RatioValue; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.is; /** * Tests for the {@link RatioValue} class */ -public class RatioValueTests extends ESTestCase { +public class RatioValueTests extends OpenSearchTestCase { public void testParsing() { assertThat(RatioValue.parseRatioValue("100%").toString(), is("100.0%")); assertThat(RatioValue.parseRatioValue("0%").toString(), is("0.0%")); diff --git a/server/src/test/java/org/opensearch/common/unit/SizeValueTests.java b/server/src/test/java/org/opensearch/common/unit/SizeValueTests.java index af99a9a31cfaa..a74c61e8356e7 100644 --- a/server/src/test/java/org/opensearch/common/unit/SizeValueTests.java +++ b/server/src/test/java/org/opensearch/common/unit/SizeValueTests.java @@ -18,14 +18,12 @@ */ package org.opensearch.common.unit; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.unit.SizeUnit; -import org.opensearch.common.unit.SizeValue; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -public class SizeValueTests extends ESTestCase { +public class SizeValueTests extends OpenSearchTestCase { public void testThatConversionWorks() { SizeValue sizeValue = new SizeValue(1000); assertThat(sizeValue.kilo(), is(1L)); @@ -77,7 +75,7 @@ public void testCompareEquality() { public void testCompareValue() { long firstRandom = randomNonNegativeLong(); - long secondRandom = randomValueOtherThan(firstRandom, ESTestCase::randomNonNegativeLong); + long secondRandom = randomValueOtherThan(firstRandom, OpenSearchTestCase::randomNonNegativeLong); SizeUnit unit = randomFrom(SizeUnit.values()); SizeValue firstSizeValue = new SizeValue(firstRandom, unit); SizeValue secondSizeValue = new SizeValue(secondRandom, unit); diff --git a/server/src/test/java/org/opensearch/common/util/ArrayUtilsTests.java b/server/src/test/java/org/opensearch/common/util/ArrayUtilsTests.java index 6172efce7381e..b21d6c40ab467 100644 --- a/server/src/test/java/org/opensearch/common/util/ArrayUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/util/ArrayUtilsTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.ArrayUtils; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +27,7 @@ import static org.hamcrest.Matchers.is; -public class ArrayUtilsTests extends ESTestCase { +public class ArrayUtilsTests extends OpenSearchTestCase { public void testBinarySearch() throws Exception { for (int j = 0; j < 100; j++) { int index = randomIntBetween(0, 9); diff --git a/server/src/test/java/org/opensearch/common/util/BigArraysTests.java b/server/src/test/java/org/opensearch/common/util/BigArraysTests.java index eb5b9ba0d2168..230047047a7ff 100644 --- a/server/src/test/java/org/opensearch/common/util/BigArraysTests.java +++ b/server/src/test/java/org/opensearch/common/util/BigArraysTests.java @@ -29,25 +29,8 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.util.BigArray; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.BigByteArray; -import org.opensearch.common.util.BigDoubleArray; -import org.opensearch.common.util.BigFloatArray; -import org.opensearch.common.util.BigIntArray; -import org.opensearch.common.util.BigLongArray; -import org.opensearch.common.util.BigObjectArray; -import org.opensearch.common.util.ByteArray; -import org.opensearch.common.util.DoubleArray; -import org.opensearch.common.util.FloatArray; -import org.opensearch.common.util.IntArray; -import org.opensearch.common.util.LongArray; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; -import org.opensearch.common.util.ObjectArray; -import org.opensearch.common.util.PageCacheRecycler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -61,7 +44,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThan; -public class BigArraysTests extends ESTestCase { +public class BigArraysTests extends OpenSearchTestCase { private BigArrays randombigArrays() { return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); diff --git a/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java b/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java index 980f8ab747059..fa266e029d906 100644 --- a/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java +++ b/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java @@ -24,18 +24,12 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.BigDoubleArray; -import org.opensearch.common.util.BinarySearcher; -import org.opensearch.common.util.DoubleArray; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; import java.util.Arrays; -public class BinarySearcherTests extends ESTestCase { +public class BinarySearcherTests extends OpenSearchTestCase { private BigArrays randombigArrays() { return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); diff --git a/server/src/test/java/org/opensearch/common/util/BitArrayTests.java b/server/src/test/java/org/opensearch/common/util/BitArrayTests.java index 2675ff03e79dc..822e88e9f9078 100644 --- a/server/src/test/java/org/opensearch/common/util/BitArrayTests.java +++ b/server/src/test/java/org/opensearch/common/util/BitArrayTests.java @@ -25,9 +25,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.BitArray; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class BitArrayTests extends ESTestCase { +public class BitArrayTests extends OpenSearchTestCase { public void testRandom() { try (BitArray bitArray = new BitArray(1, BigArrays.NON_RECYCLING_INSTANCE)) { int numBits = randomIntBetween(1000, 10000); diff --git a/server/src/test/java/org/opensearch/common/util/ByteUtilsTests.java b/server/src/test/java/org/opensearch/common/util/ByteUtilsTests.java index 21991fb43a5ab..1c80a8c15d97b 100644 --- a/server/src/test/java/org/opensearch/common/util/ByteUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/util/ByteUtilsTests.java @@ -21,12 +21,11 @@ import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.ByteUtils; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ByteUtilsTests extends ESTestCase { +public class ByteUtilsTests extends OpenSearchTestCase { public void testZigZag(long l) { assertEquals(l, ByteUtils.zigZagDecode(ByteUtils.zigZagEncode(l))); diff --git a/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java b/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java index e3b6e17348bf8..636b8d82d0da7 100644 --- a/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java @@ -29,11 +29,7 @@ import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.BytesRefHash; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.HashSet; @@ -41,7 +37,7 @@ import java.util.Map.Entry; import java.util.Set; -public class BytesRefHashTests extends ESTestCase { +public class BytesRefHashTests extends OpenSearchTestCase { BytesRefHash hash; diff --git a/server/src/test/java/org/opensearch/common/util/CancellableThreadsTests.java b/server/src/test/java/org/opensearch/common/util/CancellableThreadsTests.java index 68fe786ab38fb..46315abed4b67 100644 --- a/server/src/test/java/org/opensearch/common/util/CancellableThreadsTests.java +++ b/server/src/test/java/org/opensearch/common/util/CancellableThreadsTests.java @@ -18,10 +18,9 @@ */ package org.opensearch.common.util; -import org.opensearch.common.util.CancellableThreads; import org.opensearch.common.util.CancellableThreads.IOInterruptible; import org.opensearch.common.util.CancellableThreads.Interruptible; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.io.IOException; @@ -32,7 +31,7 @@ import static org.opensearch.common.util.CancellableThreads.ExecutionCancelledException; import static org.hamcrest.Matchers.equalTo; -public class CancellableThreadsTests extends ESTestCase { +public class CancellableThreadsTests extends OpenSearchTestCase { public static class CustomException extends RuntimeException { public CustomException(String msg) { super(msg); diff --git a/server/src/test/java/org/opensearch/common/util/CollectionUtilsTests.java b/server/src/test/java/org/opensearch/common/util/CollectionUtilsTests.java index 3c5652e8ae1b9..b405422f26eee 100644 --- a/server/src/test/java/org/opensearch/common/util/CollectionUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/util/CollectionUtilsTests.java @@ -23,8 +23,7 @@ import org.apache.lucene.util.BytesRefArray; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.Counter; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.CollectionUtils; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class CollectionUtilsTests extends ESTestCase { +public class CollectionUtilsTests extends OpenSearchTestCase { public void testRotateEmpty() { assertTrue(CollectionUtils.rotate(Collections.emptyList(), randomInt()).isEmpty()); } diff --git a/server/src/test/java/org/opensearch/common/util/CuckooFilterTests.java b/server/src/test/java/org/opensearch/common/util/CuckooFilterTests.java index 0f1259f3c9e41..87a7e7b8ba128 100644 --- a/server/src/test/java/org/opensearch/common/util/CuckooFilterTests.java +++ b/server/src/test/java/org/opensearch/common/util/CuckooFilterTests.java @@ -21,8 +21,7 @@ import org.opensearch.common.Randomness; import org.opensearch.common.hash.MurmurHash3; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.opensearch.common.util.CuckooFilter; +import org.opensearch.test.AbstractWireSerializingTestCase; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; diff --git a/server/src/test/java/org/opensearch/common/util/LocaleUtilsTests.java b/server/src/test/java/org/opensearch/common/util/LocaleUtilsTests.java index ba1152199358c..f6246931e9ce8 100644 --- a/server/src/test/java/org/opensearch/common/util/LocaleUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/util/LocaleUtilsTests.java @@ -19,13 +19,12 @@ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -import org.opensearch.common.util.LocaleUtils; import java.util.Locale; -public class LocaleUtilsTests extends ESTestCase { +public class LocaleUtilsTests extends OpenSearchTestCase { public void testIllegalLang() { IllegalArgumentException e = expectThrows(IllegalArgumentException.class, diff --git a/server/src/test/java/org/opensearch/common/util/LongHashTests.java b/server/src/test/java/org/opensearch/common/util/LongHashTests.java index c7101a041ba5d..86c0b3f4dc3ab 100644 --- a/server/src/test/java/org/opensearch/common/util/LongHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongHashTests.java @@ -27,11 +27,7 @@ import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.LongHash; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.HashSet; @@ -39,7 +35,7 @@ import java.util.Map; import java.util.Set; -public class LongHashTests extends ESTestCase { +public class LongHashTests extends OpenSearchTestCase { LongHash hash; private BigArrays randombigArrays() { diff --git a/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java b/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java index 3edb7c4d746dd..164fb94be05be 100644 --- a/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java @@ -23,11 +23,7 @@ import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.LongLongHash; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.HashMap; @@ -36,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; -public class LongLongHashTests extends ESTestCase { +public class LongLongHashTests extends OpenSearchTestCase { private BigArrays randombigArrays() { return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); } diff --git a/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java b/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java index 724432c1421b8..e4588e9dc771d 100644 --- a/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java @@ -24,13 +24,9 @@ import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.LongObjectPagedHashMap; -import org.opensearch.common.util.MockBigArrays; -import org.opensearch.common.util.MockPageCacheRecycler; +import org.opensearch.test.OpenSearchTestCase; -public class LongObjectHashMapTests extends ESTestCase { +public class LongObjectHashMapTests extends OpenSearchTestCase { private BigArrays randomBigArrays() { return new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); diff --git a/server/src/test/java/org/opensearch/common/util/MapsTests.java b/server/src/test/java/org/opensearch/common/util/MapsTests.java index 8b9ac8f3b25ba..1f393de8ed1c1 100644 --- a/server/src/test/java/org/opensearch/common/util/MapsTests.java +++ b/server/src/test/java/org/opensearch/common/util/MapsTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.Maps; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashMap; @@ -30,7 +29,7 @@ import static java.util.stream.Collectors.toMap; -public class MapsTests extends ESTestCase { +public class MapsTests extends OpenSearchTestCase { public void testDeepEquals() { final Supplier keyGenerator = () -> randomAlphaOfLengthBetween(1, 5); diff --git a/server/src/test/java/org/opensearch/common/util/SetBackedScalingCuckooFilterTests.java b/server/src/test/java/org/opensearch/common/util/SetBackedScalingCuckooFilterTests.java index 0da103c0e524c..3eb2b281aee60 100644 --- a/server/src/test/java/org/opensearch/common/util/SetBackedScalingCuckooFilterTests.java +++ b/server/src/test/java/org/opensearch/common/util/SetBackedScalingCuckooFilterTests.java @@ -21,8 +21,7 @@ import org.opensearch.common.Randomness; import org.opensearch.common.hash.MurmurHash3; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.opensearch.common.util.SetBackedScalingCuckooFilter; +import org.opensearch.test.AbstractWireSerializingTestCase; import java.io.IOException; import java.util.HashSet; diff --git a/server/src/test/java/org/opensearch/common/util/SingleObjectCacheTests.java b/server/src/test/java/org/opensearch/common/util/SingleObjectCacheTests.java index 23401d0599ddc..d3ec72caa79cd 100644 --- a/server/src/test/java/org/opensearch/common/util/SingleObjectCacheTests.java +++ b/server/src/test/java/org/opensearch/common/util/SingleObjectCacheTests.java @@ -20,14 +20,13 @@ package org.opensearch.common.util; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.SingleObjectCache; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public class SingleObjectCacheTests extends ESTestCase { +public class SingleObjectCacheTests extends OpenSearchTestCase { public void testRefresh() { final AtomicInteger count = new AtomicInteger(0); diff --git a/server/src/test/java/org/opensearch/common/util/URIPatternTests.java b/server/src/test/java/org/opensearch/common/util/URIPatternTests.java index 2473f0ed63699..b3188bf253500 100644 --- a/server/src/test/java/org/opensearch/common/util/URIPatternTests.java +++ b/server/src/test/java/org/opensearch/common/util/URIPatternTests.java @@ -18,12 +18,11 @@ */ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.URIPattern; +import org.opensearch.test.OpenSearchTestCase; import java.net.URI; -public class URIPatternTests extends ESTestCase { +public class URIPatternTests extends OpenSearchTestCase { public void testURIPattern() throws Exception { assertTrue(new URIPattern("http://test.local/").match(new URI("http://test.local/"))); assertFalse(new URIPattern("http://test.local/somepath").match(new URI("http://test.local/"))); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractAsyncTaskTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractAsyncTaskTests.java index 723433d61b7b7..5b70d2c34085c 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractAsyncTaskTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractAsyncTaskTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.Randomness; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.AfterClass; @@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -public class AbstractAsyncTaskTests extends ESTestCase { +public class AbstractAsyncTaskTests extends OpenSearchTestCase { private static ThreadPool threadPool; diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractLifecycleRunnableTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractLifecycleRunnableTests.java index 1bcff55369a5c..d523c3287d97b 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractLifecycleRunnableTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractLifecycleRunnableTests.java @@ -21,9 +21,8 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.SuppressLoggerChecks; import org.opensearch.common.component.Lifecycle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.InOrder; -import org.opensearch.common.util.concurrent.AbstractLifecycleRunnable; import java.util.concurrent.Callable; @@ -36,7 +35,7 @@ /** * Tests {@link AbstractLifecycleRunnable}. */ -public class AbstractLifecycleRunnableTests extends ESTestCase { +public class AbstractLifecycleRunnableTests extends OpenSearchTestCase { private final Lifecycle lifecycle = mock(Lifecycle.class); private final Logger logger = mock(Logger.class); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractRunnableTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractRunnableTests.java index e9fc8ccc9d614..5763e53c2d882 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/AbstractRunnableTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/AbstractRunnableTests.java @@ -18,10 +18,9 @@ */ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.InOrder; -import org.opensearch.common.util.concurrent.AbstractRunnable; import java.util.concurrent.Callable; @@ -32,7 +31,7 @@ /** * Tests {@link AbstractRunnable} */ -public class AbstractRunnableTests extends ESTestCase { +public class AbstractRunnableTests extends OpenSearchTestCase { public void testRunSuccess() throws Exception { Callable runCallable = mock(Callable.class); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/AsyncIOProcessorTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/AsyncIOProcessorTests.java index 1c44230ab6f75..3b2a2e4c28bad 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/AsyncIOProcessorTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/AsyncIOProcessorTests.java @@ -20,10 +20,8 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; -import org.opensearch.common.util.concurrent.AsyncIOProcessor; -import org.opensearch.common.util.concurrent.ThreadContext; import java.io.IOException; import java.util.Collections; @@ -39,7 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -public class AsyncIOProcessorTests extends ESTestCase { +public class AsyncIOProcessorTests extends OpenSearchTestCase { private ThreadContext threadContext; diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/CountDownTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/CountDownTests.java index afcc8b2d8acee..4f5b81da7417b 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/CountDownTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/CountDownTests.java @@ -19,9 +19,8 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -import org.opensearch.common.util.concurrent.CountDown; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; @@ -30,7 +29,7 @@ import static org.hamcrest.Matchers.greaterThan; -public class CountDownTests extends ESTestCase { +public class CountDownTests extends OpenSearchTestCase { public void testConcurrent() throws InterruptedException { final AtomicInteger count = new AtomicInteger(0); final CountDown countDown = new CountDown(scaledRandomIntBetween(10, 1000)); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/FutureUtilsTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/FutureUtilsTests.java index 340df6eb86cb5..51bfbdd203808 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/FutureUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/FutureUtilsTests.java @@ -19,15 +19,14 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.FutureUtils; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.Future; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class FutureUtilsTests extends ESTestCase { +public class FutureUtilsTests extends OpenSearchTestCase { public void testCancellingNullFutureOkay() { FutureUtils.cancel(null); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/KeyedLockTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/KeyedLockTests.java index 6a0053abf2745..35aaaf3e41a55 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/KeyedLockTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/KeyedLockTests.java @@ -20,9 +20,8 @@ package org.opensearch.common.util.concurrent; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; -import org.opensearch.common.util.concurrent.KeyedLock; import java.util.Arrays; import java.util.Collections; @@ -37,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class KeyedLockTests extends ESTestCase { +public class KeyedLockTests extends OpenSearchTestCase { public void testIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedException { ConcurrentHashMap counter = new ConcurrentHashMap<>(); ConcurrentHashMap safeCounter = new ConcurrentHashMap<>(); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java index 84a03623c5263..19c6d846831e6 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java @@ -22,11 +22,8 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.action.ActionListener; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.ListenableFuture; -import org.opensearch.common.util.concurrent.ThreadContext; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CountDownLatch; @@ -36,7 +33,7 @@ import static org.hamcrest.Matchers.is; -public class ListenableFutureTests extends ESTestCase { +public class ListenableFutureTests extends OpenSearchTestCase { private ExecutorService executorService; private ThreadContext threadContext = new ThreadContext(Settings.EMPTY); @@ -53,7 +50,7 @@ public void testListenableFutureNotifiesListeners() { AtomicInteger notifications = new AtomicInteger(0); final int numberOfListeners = scaledRandomIntBetween(1, 12); for (int i = 0; i < numberOfListeners; i++) { - future.addListener(ActionListener.wrap(notifications::incrementAndGet), EsExecutors.newDirectExecutorService(), threadContext); + future.addListener(ActionListener.wrap(notifications::incrementAndGet), OpenSearchExecutors.newDirectExecutorService(), threadContext); } future.onResponse(""); @@ -70,7 +67,7 @@ public void testListenableFutureNotifiesListenersOnException() { future.addListener(ActionListener.wrap(s -> fail("this should never be called"), e -> { assertEquals(exception, e); notifications.incrementAndGet(); - }), EsExecutors.newDirectExecutorService(), threadContext); + }), OpenSearchExecutors.newDirectExecutorService(), threadContext); } future.onFailure(exception); @@ -82,8 +79,8 @@ public void testConcurrentListenerRegistrationAndCompletion() throws BrokenBarri final int numberOfThreads = scaledRandomIntBetween(2, 32); final int completingThread = randomIntBetween(0, numberOfThreads - 1); final ListenableFuture future = new ListenableFuture<>(); - executorService = EsExecutors.newFixed("testConcurrentListenerRegistrationAndCompletion", numberOfThreads, 1000, - EsExecutors.daemonThreadFactory("listener"), threadContext); + executorService = OpenSearchExecutors.newFixed("testConcurrentListenerRegistrationAndCompletion", numberOfThreads, 1000, + OpenSearchExecutors.daemonThreadFactory("listener"), threadContext); final CyclicBarrier barrier = new CyclicBarrier(1 + numberOfThreads); final CountDownLatch listenersLatch = new CountDownLatch(numberOfThreads - 1); final AtomicInteger numResponses = new AtomicInteger(0); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java index 3a265ce9a4da9..219f32bcaeb7d 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java @@ -21,13 +21,8 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; -import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; -import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; -import org.opensearch.common.util.concurrent.ThreadContext; import java.util.Locale; import java.util.concurrent.CountDownLatch; @@ -42,9 +37,9 @@ import static org.hamcrest.Matchers.lessThan; /** - * Tests for EsExecutors and its components like EsAbortPolicy. + * Tests for OpenSearchExecutors and its components like OpenSearchAbortPolicy. */ -public class OpenSearchExecutorsTests extends ESTestCase { +public class OpenSearchExecutorsTests extends OpenSearchTestCase { private final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); private TimeUnit randomTimeUnit() { @@ -57,7 +52,7 @@ private String getName() { public void testFixedForcedExecution() throws Exception { EsThreadPoolExecutor executor = - EsExecutors.newFixed(getName(), 1, 1, EsExecutors.daemonThreadFactory("test"), threadContext); + OpenSearchExecutors.newFixed(getName(), 1, 1, OpenSearchExecutors.daemonThreadFactory("test"), threadContext); final CountDownLatch wait = new CountDownLatch(1); final CountDownLatch exec1Wait = new CountDownLatch(1); @@ -120,7 +115,7 @@ public void onFailure(Exception e) { public void testFixedRejected() throws Exception { EsThreadPoolExecutor executor = - EsExecutors.newFixed(getName(), 1, 1, EsExecutors.daemonThreadFactory("test"), threadContext); + OpenSearchExecutors.newFixed(getName(), 1, 1, OpenSearchExecutors.daemonThreadFactory("test"), threadContext); final CountDownLatch wait = new CountDownLatch(1); final CountDownLatch exec1Wait = new CountDownLatch(1); @@ -157,7 +152,7 @@ public void run() { } }); fail("should be rejected..."); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { // all is well } @@ -179,8 +174,8 @@ public void testScaleUp() throws Exception { final CyclicBarrier barrier = new CyclicBarrier(max + 1); ThreadPoolExecutor pool = - EsExecutors.newScaling(getClass().getName() + "/" + getTestName(), min, max, between(1, 100), randomTimeUnit(), - EsExecutors.daemonThreadFactory("test"), threadContext); + OpenSearchExecutors.newScaling(getClass().getName() + "/" + getTestName(), min, max, between(1, 100), randomTimeUnit(), + OpenSearchExecutors.daemonThreadFactory("test"), threadContext); assertThat("Min property", pool.getCorePoolSize(), equalTo(min)); assertThat("Max property", pool.getMaximumPoolSize(), equalTo(max)); @@ -214,8 +209,8 @@ public void testScaleDown() throws Exception { final CyclicBarrier barrier = new CyclicBarrier(max + 1); final ThreadPoolExecutor pool = - EsExecutors.newScaling(getClass().getName() + "/" + getTestName(), min, max, between(1, 100), TimeUnit.MILLISECONDS, - EsExecutors.daemonThreadFactory("test"), threadContext); + OpenSearchExecutors.newScaling(getClass().getName() + "/" + getTestName(), min, max, between(1, 100), TimeUnit.MILLISECONDS, + OpenSearchExecutors.daemonThreadFactory("test"), threadContext); assertThat("Min property", pool.getCorePoolSize(), equalTo(min)); assertThat("Max property", pool.getMaximumPoolSize(), equalTo(max)); @@ -253,7 +248,7 @@ public void testRejectionMessageAndShuttingDownFlag() throws InterruptedExceptio int actions = queue + pool; final CountDownLatch latch = new CountDownLatch(1); EsThreadPoolExecutor executor = - EsExecutors.newFixed(getName(), pool, queue, EsExecutors.daemonThreadFactory("dummy"), threadContext); + OpenSearchExecutors.newFixed(getName(), pool, queue, OpenSearchExecutors.daemonThreadFactory("dummy"), threadContext); try { for (int i = 0; i < actions; i++) { executor.execute(new Runnable() { @@ -280,7 +275,7 @@ public String toString() { } }); fail("Didn't get a rejection when we expected one."); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { assertFalse("Thread pool registering as terminated when it isn't", e.isExecutorShutdown()); String message = e.getMessage(); assertThat(message, containsString("of dummy runnable")); @@ -320,7 +315,7 @@ public String toString() { } }); fail("Didn't get a rejection when we expected one."); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { assertTrue("Thread pool not registering as terminated when it is", e.isExecutorShutdown()); String message = e.getMessage(); assertThat(message, containsString("of dummy runnable")); @@ -343,7 +338,7 @@ public void testInheritContext() throws InterruptedException { final Integer one = Integer.valueOf(1); threadContext.putTransient("foo", one); EsThreadPoolExecutor executor = - EsExecutors.newFixed(getName(), pool, queue, EsExecutors.daemonThreadFactory("dummy"), threadContext); + OpenSearchExecutors.newFixed(getName(), pool, queue, OpenSearchExecutors.daemonThreadFactory("dummy"), threadContext); try { executor.execute(() -> { try { @@ -374,7 +369,7 @@ public void testGetTasks() throws InterruptedException { final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch executed = new CountDownLatch(1); EsThreadPoolExecutor executor = - EsExecutors.newFixed(getName(), pool, queue, EsExecutors.daemonThreadFactory("dummy"), threadContext); + OpenSearchExecutors.newFixed(getName(), pool, queue, OpenSearchExecutors.daemonThreadFactory("dummy"), threadContext); try { Runnable r = () -> { latch.countDown(); @@ -396,11 +391,11 @@ public void testGetTasks() throws InterruptedException { } public void testNodeProcessorsBound() { - runProcessorsBoundTest(EsExecutors.NODE_PROCESSORS_SETTING); + runProcessorsBoundTest(OpenSearchExecutors.NODE_PROCESSORS_SETTING); } public void testProcessorsBound() { - runProcessorsBoundTest(EsExecutors.PROCESSORS_SETTING); + runProcessorsBoundTest(OpenSearchExecutors.PROCESSORS_SETTING); } private void runProcessorsBoundTest(final Setting processorsSetting) { diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutorTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutorTests.java index f402a3afff184..ee28e1dcf45e0 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutorTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutorTests.java @@ -20,8 +20,7 @@ package org.opensearch.common.util.concurrent; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.opensearch.common.util.concurrent.AbstractRunnable; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import java.util.concurrent.CountDownLatch; @@ -30,7 +29,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; -public class OpenSearchThreadPoolExecutorTests extends ESSingleNodeTestCase { +public class OpenSearchThreadPoolExecutorTests extends OpenSearchSingleNodeTestCase { @Override protected Settings nodeSettings() { diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedExecutorsTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedExecutorsTests.java index fddd1f1d2d057..2f95d90b79354 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedExecutorsTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedExecutorsTests.java @@ -21,12 +21,7 @@ import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.PrioritizedCallable; -import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; -import org.opensearch.common.util.concurrent.PrioritizedRunnable; -import org.opensearch.common.util.concurrent.ThreadContext; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -46,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class PrioritizedExecutorsTests extends ESTestCase { +public class PrioritizedExecutorsTests extends OpenSearchTestCase { private final ThreadContext holder = new ThreadContext(Settings.EMPTY); @@ -75,7 +70,7 @@ public void testPriorityQueue() throws Exception { public void testSubmitPrioritizedExecutorWithRunnables() throws Exception { ExecutorService executor = - EsExecutors.newSinglePrioritizing(getName(), EsExecutors.daemonThreadFactory(getTestName()), holder, null); + OpenSearchExecutors.newSinglePrioritizing(getName(), OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, null); List results = new ArrayList<>(8); CountDownLatch awaitingLatch = new CountDownLatch(1); CountDownLatch finishedLatch = new CountDownLatch(8); @@ -105,7 +100,7 @@ public void testSubmitPrioritizedExecutorWithRunnables() throws Exception { public void testExecutePrioritizedExecutorWithRunnables() throws Exception { ExecutorService executor = - EsExecutors.newSinglePrioritizing(getName(), EsExecutors.daemonThreadFactory(getTestName()), holder, null); + OpenSearchExecutors.newSinglePrioritizing(getName(), OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, null); List results = new ArrayList<>(8); CountDownLatch awaitingLatch = new CountDownLatch(1); CountDownLatch finishedLatch = new CountDownLatch(8); @@ -135,7 +130,7 @@ public void testExecutePrioritizedExecutorWithRunnables() throws Exception { public void testSubmitPrioritizedExecutorWithCallables() throws Exception { ExecutorService executor = - EsExecutors.newSinglePrioritizing(getName(), EsExecutors.daemonThreadFactory(getTestName()), holder, null); + OpenSearchExecutors.newSinglePrioritizing(getName(), OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, null); List results = new ArrayList<>(8); CountDownLatch awaitingLatch = new CountDownLatch(1); CountDownLatch finishedLatch = new CountDownLatch(8); @@ -164,8 +159,8 @@ public void testSubmitPrioritizedExecutorWithCallables() throws Exception { } public void testSubmitPrioritizedExecutorWithMixed() throws Exception { - ExecutorService executor = EsExecutors.newSinglePrioritizing(getTestName(), - EsExecutors.daemonThreadFactory(getTestName()), holder, null); + ExecutorService executor = OpenSearchExecutors.newSinglePrioritizing(getTestName(), + OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, null); List results = new ArrayList<>(8); CountDownLatch awaitingLatch = new CountDownLatch(1); CountDownLatch finishedLatch = new CountDownLatch(8); @@ -194,9 +189,9 @@ public void testSubmitPrioritizedExecutorWithMixed() throws Exception { } public void testTimeout() throws Exception { - ScheduledExecutorService timer = Executors.newSingleThreadScheduledExecutor(EsExecutors.daemonThreadFactory(getTestName())); + ScheduledExecutorService timer = Executors.newSingleThreadScheduledExecutor(OpenSearchExecutors.daemonThreadFactory(getTestName())); PrioritizedEsThreadPoolExecutor executor = - EsExecutors.newSinglePrioritizing(getName(), EsExecutors.daemonThreadFactory(getTestName()), holder, timer); + OpenSearchExecutors.newSinglePrioritizing(getName(), OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, timer); final CountDownLatch invoked = new CountDownLatch(1); final CountDownLatch block = new CountDownLatch(1); executor.execute(new Runnable() { @@ -260,7 +255,7 @@ public void testTimeoutCleanup() throws Exception { final ScheduledThreadPoolExecutor timer = (ScheduledThreadPoolExecutor) threadPool.scheduler(); final AtomicBoolean timeoutCalled = new AtomicBoolean(); PrioritizedEsThreadPoolExecutor executor = - EsExecutors.newSinglePrioritizing(getName(), EsExecutors.daemonThreadFactory(getTestName()), holder, timer); + OpenSearchExecutors.newSinglePrioritizing(getName(), OpenSearchExecutors.daemonThreadFactory(getTestName()), holder, timer); final CountDownLatch invoked = new CountDownLatch(1); executor.execute(new Runnable() { @Override diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedRunnableTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedRunnableTests.java index d37b914d9af7e..24e4965ec29a4 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedRunnableTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/PrioritizedRunnableTests.java @@ -20,15 +20,14 @@ package org.opensearch.common.util.concurrent; import org.opensearch.common.Priority; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.PrioritizedRunnable; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class PrioritizedRunnableTests extends ESTestCase { +public class PrioritizedRunnableTests extends OpenSearchTestCase { // test unit conversion with a controlled clock public void testGetAgeInMillis() throws Exception { diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutorTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutorTests.java index ef8526a87e45f..a291cebd0e518 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutorTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutorTests.java @@ -21,15 +21,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.opensearch.common.util.concurrent.EsAbortPolicy; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.QueueResizingEsThreadPoolExecutor; -import org.opensearch.common.util.concurrent.ResizableBlockingQueue; -import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.util.concurrent.TimedRunnable; -import org.opensearch.common.util.concurrent.WrappedRunnable; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; import java.util.function.Function; @@ -42,7 +34,7 @@ * Tests for the automatic queue resizing of the {@code QueueResizingOpenSearchThreadPoolExecutorTests} * based on the time taken for each event. */ -public class QueueResizingOpenSearchThreadPoolExecutorTests extends ESTestCase { +public class QueueResizingOpenSearchThreadPoolExecutorTests extends OpenSearchTestCase { public void testExactWindowSizeAdjustment() throws Exception { ThreadContext context = new ThreadContext(Settings.EMPTY); @@ -56,8 +48,8 @@ public void testExactWindowSizeAdjustment() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", threads, threads, 1000, TimeUnit.MILLISECONDS, queue, 10, 1000, fastWrapper(), - measureWindow, TimeValue.timeValueMillis(1), EsExecutors.daemonThreadFactory("queuetest"), - new EsAbortPolicy(), context); + measureWindow, TimeValue.timeValueMillis(1), OpenSearchExecutors.daemonThreadFactory("queuetest"), + new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -87,8 +79,8 @@ public void testAutoQueueSizingUp() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", threads, threads, 1000, TimeUnit.MILLISECONDS, queue, 10, 3000, fastWrapper(), - measureWindow, TimeValue.timeValueMillis(1), EsExecutors.daemonThreadFactory("queuetest"), - new EsAbortPolicy(), context); + measureWindow, TimeValue.timeValueMillis(1), OpenSearchExecutors.daemonThreadFactory("queuetest"), + new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -115,7 +107,7 @@ public void testAutoQueueSizingDown() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", threads, threads, 1000, TimeUnit.MILLISECONDS, queue, 10, 3000, slowWrapper(), measureWindow, TimeValue.timeValueMillis(1), - EsExecutors.daemonThreadFactory("queuetest"), new EsAbortPolicy(), context); + OpenSearchExecutors.daemonThreadFactory("queuetest"), new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -143,7 +135,7 @@ public void testAutoQueueSizingWithMin() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", threads, threads, 1000, TimeUnit.MILLISECONDS, queue, min, 100000, slowWrapper(), measureWindow, TimeValue.timeValueMillis(1), - EsExecutors.daemonThreadFactory("queuetest"), new EsAbortPolicy(), context); + OpenSearchExecutors.daemonThreadFactory("queuetest"), new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -172,7 +164,7 @@ public void testAutoQueueSizingWithMax() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", threads, threads, 1000, TimeUnit.MILLISECONDS, queue, 10, max, fastWrapper(), measureWindow, TimeValue.timeValueMillis(1), - EsExecutors.daemonThreadFactory("queuetest"), new EsAbortPolicy(), context); + OpenSearchExecutors.daemonThreadFactory("queuetest"), new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -197,7 +189,7 @@ public void testExecutionEWMACalculation() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", 1, 1, 1000, TimeUnit.MILLISECONDS, queue, 10, 200, fastWrapper(), 10, TimeValue.timeValueMillis(1), - EsExecutors.daemonThreadFactory("queuetest"), new EsAbortPolicy(), context); + OpenSearchExecutors.daemonThreadFactory("queuetest"), new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); @@ -238,7 +230,7 @@ public void testExceptionThrowingTask() throws Exception { new QueueResizingEsThreadPoolExecutor( "test-threadpool", 1, 1, 1000, TimeUnit.MILLISECONDS, queue, 10, 200, exceptionalWrapper(), 10, TimeValue.timeValueMillis(1), - EsExecutors.daemonThreadFactory("queuetest"), new EsAbortPolicy(), context); + OpenSearchExecutors.daemonThreadFactory("queuetest"), new OpenSearchAbortPolicy(), context); executor.prestartAllCoreThreads(); logger.info("--> executor: {}", executor); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ReleasableLockTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ReleasableLockTests.java index 557f0889276f1..4ece4c0c40ab7 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/ReleasableLockTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/ReleasableLockTests.java @@ -21,8 +21,7 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.ReleasableLock; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -41,7 +40,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class ReleasableLockTests extends ESTestCase { +public class ReleasableLockTests extends OpenSearchTestCase { /** * Test that accounting on whether or not a thread holds a releasable lock is correct. Previously we had a bug where on a re-entrant diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ResizableBlockingQueueTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ResizableBlockingQueueTests.java index 41171895daacc..a0f557119ead7 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/ResizableBlockingQueueTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/ResizableBlockingQueueTests.java @@ -19,13 +19,11 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.opensearch.common.util.concurrent.ResizableBlockingQueue; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class ResizableBlockingQueueTests extends ESTestCase { +public class ResizableBlockingQueueTests extends OpenSearchTestCase { public void testAdjustCapacity() throws Exception { ResizableBlockingQueue queue = diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/RunOnceTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/RunOnceTests.java index 6b8355d61b26d..5c4dd6b1a8ed9 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/RunOnceTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/RunOnceTests.java @@ -19,14 +19,12 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.RunOnce; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -public class RunOnceTests extends ESTestCase { +public class RunOnceTests extends OpenSearchTestCase { public void testRunOnce() { final AtomicInteger counter = new AtomicInteger(0); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/SizeBlockingQueueTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/SizeBlockingQueueTests.java index e45487157dc6b..b8a3f34b9a655 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/SizeBlockingQueueTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/SizeBlockingQueueTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.SizeBlockingQueue; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -30,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; -public class SizeBlockingQueueTests extends ESTestCase { +public class SizeBlockingQueueTests extends OpenSearchTestCase { /* * Tests that the size of a queue remains at most the capacity while offers are made to a queue when at capacity. This test would have diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java index 590adb82e9d59..c8de4ebc39cd8 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java @@ -21,9 +21,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.logging.HeaderWarning; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.ThreadContext; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -38,7 +36,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.sameInstance; -public class ThreadContextTests extends ESTestCase { +public class ThreadContextTests extends OpenSearchTestCase { public void testStashContext() { Settings build = Settings.builder().put("request.headers.default", "1").build(); diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/TimedRunnableTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/TimedRunnableTests.java index 9076736f06aee..c3f10774944d3 100644 --- a/server/src/test/java/org/opensearch/common/util/concurrent/TimedRunnableTests.java +++ b/server/src/test/java/org/opensearch/common/util/concurrent/TimedRunnableTests.java @@ -20,9 +20,7 @@ package org.opensearch.common.util.concurrent; import org.opensearch.ExceptionsHelper; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.TimedRunnable; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicBoolean; @@ -30,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; -public final class TimedRunnableTests extends ESTestCase { +public final class TimedRunnableTests extends OpenSearchTestCase { public void testTimedRunnableDelegatesToAbstractRunnable() { final boolean isForceExecution = randomBoolean(); diff --git a/server/src/test/java/org/opensearch/common/util/iterable/IterablesTests.java b/server/src/test/java/org/opensearch/common/util/iterable/IterablesTests.java index 8c664601406cb..5675bd490bc29 100644 --- a/server/src/test/java/org/opensearch/common/util/iterable/IterablesTests.java +++ b/server/src/test/java/org/opensearch/common/util/iterable/IterablesTests.java @@ -19,8 +19,7 @@ package org.opensearch.common.util.iterable; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.iterable.Iterables; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -30,7 +29,7 @@ import static org.hamcrest.object.HasToString.hasToString; -public class IterablesTests extends ESTestCase { +public class IterablesTests extends OpenSearchTestCase { public void testGetOverList() { test(Arrays.asList("a", "b", "c")); } diff --git a/server/src/test/java/org/opensearch/common/util/set/SetsTests.java b/server/src/test/java/org/opensearch/common/util/set/SetsTests.java index f8f7942c4e908..639c2e7a3bcb9 100644 --- a/server/src/test/java/org/opensearch/common/util/set/SetsTests.java +++ b/server/src/test/java/org/opensearch/common/util/set/SetsTests.java @@ -20,8 +20,7 @@ package org.opensearch.common.util.set; import org.opensearch.common.collect.Tuple; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.util.set.Sets; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashSet; import java.util.Iterator; @@ -33,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class SetsTests extends ESTestCase { +public class SetsTests extends OpenSearchTestCase { public void testDifference() { final int endExclusive = randomIntBetween(0, 256); diff --git a/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java index dd7a65d3bfde9..54060dc84d77a 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java +++ b/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java @@ -48,7 +48,7 @@ import org.opensearch.common.unit.DistanceUnit; import org.opensearch.common.util.CollectionUtils; import org.opensearch.common.xcontent.XContentParser.Token; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.joda.time.DateTime; @@ -100,7 +100,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -public abstract class BaseXContentTestCase extends ESTestCase { +public abstract class BaseXContentTestCase extends OpenSearchTestCase { protected abstract XContentType xcontentType(); diff --git a/server/src/test/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknownTests.java b/server/src/test/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknownTests.java index 026e1a7596385..425f626eadfb8 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknownTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknownTests.java @@ -19,14 +19,13 @@ package org.opensearch.common.xcontent; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.xcontent.SuggestingErrorOnUnknown; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import static org.hamcrest.Matchers.equalTo; -public class SuggestingErrorOnUnknownTests extends ESTestCase { +public class SuggestingErrorOnUnknownTests extends OpenSearchTestCase { private String errorMessage(String unknownField, String... candidates) { return new SuggestingErrorOnUnknown().errorMessage("test", unknownField, Arrays.asList(candidates)); } diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java index a221de01c4179..6c81ab3c7d472 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; -public class XContentFactoryTests extends ESTestCase { +public class XContentFactoryTests extends OpenSearchTestCase { public void testGuessJson() throws IOException { testGuessType(XContentType.JSON); } diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java index 04a408df047b2..198fc1e963707 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.instanceOf; -public class XContentParserUtilsTests extends ESTestCase { +public class XContentParserUtilsTests extends OpenSearchTestCase { public void testEnsureExpectedToken() throws IOException { final XContentParser.Token randomToken = randomFrom(XContentParser.Token.values()); diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java index 8d4b73ca55d28..3c11e11860c54 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java @@ -19,14 +19,14 @@ package org.opensearch.common.xcontent; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class XContentTypeTests extends ESTestCase { +public class XContentTypeTests extends OpenSearchTestCase { public void testFromJson() throws Exception { String mediaType = "application/json"; diff --git a/server/src/test/java/org/opensearch/common/xcontent/builder/XContentBuilderTests.java b/server/src/test/java/org/opensearch/common/xcontent/builder/XContentBuilderTests.java index 625e0b0988f58..91eb21dc8632a 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/builder/XContentBuilderTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/builder/XContentBuilderTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; -public class XContentBuilderTests extends ESTestCase { +public class XContentBuilderTests extends OpenSearchTestCase { public void testPrettyWithLfAtEnd() throws Exception { ByteArrayOutputStream os = new ByteArrayOutputStream(); XContentGenerator generator = XContentFactory.xContent(XContentType.JSON).createGenerator(os); diff --git a/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java b/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java index 363af5447d837..61106abc825d1 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java @@ -23,11 +23,11 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class CborXContentParserTests extends ESTestCase { +public class CborXContentParserTests extends OpenSearchTestCase { public void testEmptyValue() throws IOException { BytesReference ref = BytesReference.bytes(XContentFactory.cborBuilder().startObject().field("field", "").endObject()); diff --git a/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java b/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java index 5ddae3bc9ff0a..c3b01c019423f 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java @@ -26,14 +26,14 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class JsonVsCborTests extends ESTestCase { +public class JsonVsCborTests extends OpenSearchTestCase { public void testCompareParsingTokens() throws IOException { BytesStreamOutput xsonOs = new BytesStreamOutput(); XContentGenerator xsonGen = XContentFactory.xContent(XContentType.CBOR).createGenerator(xsonOs); diff --git a/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java b/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java index c9f45761b45a6..7275c87069530 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java @@ -26,14 +26,14 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class JsonVsSmileTests extends ESTestCase { +public class JsonVsSmileTests extends OpenSearchTestCase { public void testCompareParsingTokens() throws IOException { BytesStreamOutput xsonOs = new BytesStreamOutput(); XContentGenerator xsonGen = XContentFactory.xContent(XContentType.SMILE).createGenerator(xsonOs); diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/AbstractFilteringTestCase.java b/server/src/test/java/org/opensearch/common/xcontent/support/AbstractFilteringTestCase.java index 22cd51364e963..5a49bc25a1f5f 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/AbstractFilteringTestCase.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/AbstractFilteringTestCase.java @@ -24,7 +24,7 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Set; @@ -35,7 +35,7 @@ /** * Tests for {@link XContent} filtering. */ -public abstract class AbstractFilteringTestCase extends ESTestCase { +public abstract class AbstractFilteringTestCase extends OpenSearchTestCase { @FunctionalInterface protected interface Builder extends CheckedFunction { diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/XContentHelperTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/XContentHelperTests.java index 47cebf7b45e01..a5b968d97e5bf 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/XContentHelperTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/XContentHelperTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.io.IOException; @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; -public class XContentHelperTests extends ESTestCase { +public class XContentHelperTests extends OpenSearchTestCase { Map getMap(Object... keyValues) { Map map = new HashMap<>(); diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java index 1886c60c1cee0..1d08232ff6f14 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java @@ -24,13 +24,13 @@ import com.fasterxml.jackson.core.filter.FilteringGeneratorDelegate; import org.elasticsearch.common.xcontent.support.filtering.FilterPathBasedFilter; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import static org.hamcrest.Matchers.equalTo; -public class FilterPathGeneratorFilteringTests extends ESTestCase { +public class FilterPathGeneratorFilteringTests extends OpenSearchTestCase { private final JsonFactory JSON_FACTORY = new JsonFactory(); diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java index 56738784ebe59..b6889ac998088 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java @@ -21,7 +21,7 @@ import org.elasticsearch.common.xcontent.support.filtering.FilterPath; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Set; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class FilterPathTests extends ESTestCase { +public class FilterPathTests extends OpenSearchTestCase { public void testSimpleFilterPath() { final String input = "test"; diff --git a/server/src/test/java/org/opensearch/discovery/SeedHostsResolverTests.java b/server/src/test/java/org/opensearch/discovery/SeedHostsResolverTests.java index f693d2e1787e8..1ed39f01fb9b0 100644 --- a/server/src/test/java/org/opensearch/discovery/SeedHostsResolverTests.java +++ b/server/src/test/java/org/opensearch/discovery/SeedHostsResolverTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CancellableThreads; import org.opensearch.common.util.PageCacheRecycler; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.indices.breaker.NoneCircuitBreakerService; @@ -96,9 +96,9 @@ public void startResolver() { seedHostsResolver = new SeedHostsResolver("test_node", Settings.EMPTY, transportService, hostsResolver -> transportAddresses); seedHostsResolver.start(); - final ThreadFactory threadFactory = EsExecutors.daemonThreadFactory("[" + getClass().getName() + "]"); + final ThreadFactory threadFactory = OpenSearchExecutors.daemonThreadFactory("[" + getClass().getName() + "]"); executorService = - EsExecutors.newScaling( + OpenSearchExecutors.newScaling( getClass().getName() + "/" + getTestName(), 0, 2, 60, TimeUnit.SECONDS, threadFactory, threadPool.getThreadContext()); closeables = new Stack<>(); } diff --git a/server/src/test/java/org/opensearch/http/DefaultRestChannelTests.java b/server/src/test/java/org/opensearch/http/DefaultRestChannelTests.java index de9f5f360d897..f00c0cb55793c 100644 --- a/server/src/test/java/org/opensearch/http/DefaultRestChannelTests.java +++ b/server/src/test/java/org/opensearch/http/DefaultRestChannelTests.java @@ -227,7 +227,7 @@ public void testReleaseInListener() throws IOException { } else { listener.onFailure(new ClosedChannelException()); } - // ESTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released + // OpenSearchTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released } @SuppressWarnings("unchecked") @@ -290,7 +290,7 @@ public RestRequest.Method method() { HttpHandlingSettings.fromSettings(Settings.EMPTY), threadPool.getThreadContext(), CorsHandler.fromSettings(Settings.EMPTY), null); - // ESTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released + // OpenSearchTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released final BigArrays bigArrays = new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); final ByteArray byteArray = bigArrays.newByteArray(0, false); final BytesReference content = new ReleasableBytesReference(BytesReference.fromByteArray(byteArray, 0) , byteArray); @@ -328,7 +328,7 @@ public HttpResponse createResponse(RestStatus status, BytesReference content) { HttpHandlingSettings.fromSettings(Settings.EMPTY), threadPool.getThreadContext(), CorsHandler.fromSettings(Settings.EMPTY), null); - // ESTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released + // OpenSearchTestCase#after will invoke ensureAllArraysAreReleased which will fail if the response content was not released final BigArrays bigArrays = new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); final ByteArray byteArray = bigArrays.newByteArray(0, false); final BytesReference content = new ReleasableBytesReference(BytesReference.fromByteArray(byteArray, 0) , byteArray); diff --git a/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java b/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java index 4c853bdec5206..4c3ff44bbd118 100644 --- a/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java +++ b/server/src/test/java/org/opensearch/ingest/IngestServiceTests.java @@ -48,7 +48,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.cbor.CborXContent; @@ -122,7 +122,7 @@ public Map getProcessors(Processor.Parameters paramet @Before public void setup(){ threadPool = mock(ThreadPool.class); - ExecutorService executorService = EsExecutors.newDirectExecutorService(); + ExecutorService executorService = OpenSearchExecutors.newDirectExecutorService(); when(threadPool.generic()).thenReturn(executorService); when(threadPool.executor(anyString())).thenReturn(executorService); } @@ -1463,7 +1463,7 @@ private static IngestService createWithProcessors(Map Client client = mock(Client.class); ThreadPool threadPool = mock(ThreadPool.class); - ExecutorService executorService = EsExecutors.newDirectExecutorService(); + ExecutorService executorService = OpenSearchExecutors.newDirectExecutorService(); when(threadPool.generic()).thenReturn(executorService); when(threadPool.executor(anyString())).thenReturn(executorService); return new IngestService(mock(ClusterService.class), threadPool, null, null, diff --git a/server/src/test/java/org/opensearch/node/InternalSettingsPreparerTests.java b/server/src/test/java/org/opensearch/node/InternalSettingsPreparerTests.java index abc7a022e53f3..b12e6272b707e 100644 --- a/server/src/test/java/org/opensearch/node/InternalSettingsPreparerTests.java +++ b/server/src/test/java/org/opensearch/node/InternalSettingsPreparerTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsException; import org.opensearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -41,7 +41,7 @@ import static java.util.Collections.emptyMap; -public class InternalSettingsPreparerTests extends ESTestCase { +public class InternalSettingsPreparerTests extends OpenSearchTestCase { private static final Supplier DEFAULT_NODE_NAME_SHOULDNT_BE_CALLED = () -> { throw new AssertionError("shouldn't be called"); }; diff --git a/server/src/test/java/org/opensearch/node/NodeTests.java b/server/src/test/java/org/opensearch/node/NodeTests.java index 7bbed5fdf3c54..706046162f383 100644 --- a/server/src/test/java/org/opensearch/node/NodeTests.java +++ b/server/src/test/java/org/opensearch/node/NodeTests.java @@ -36,9 +36,9 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.plugins.CircuitBreakerPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.MockHttpTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.MockHttpTransport; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; @@ -53,8 +53,8 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; -import static org.elasticsearch.test.NodeRoles.dataNode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.NodeRoles.dataNode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.nullValue; @LuceneTestCase.SuppressFileSystems(value = "ExtrasFS") -public class NodeTests extends ESTestCase { +public class NodeTests extends OpenSearchTestCase { public static class CheckPlugin extends Plugin { public static final BootstrapCheck CHECK = context -> BootstrapCheck.BootstrapCheckResult.success(); diff --git a/server/src/test/java/org/opensearch/node/ResponseCollectorServiceTests.java b/server/src/test/java/org/opensearch/node/ResponseCollectorServiceTests.java index 6f874b6c2234d..a595f8c95ba26 100644 --- a/server/src/test/java/org/opensearch/node/ResponseCollectorServiceTests.java +++ b/server/src/test/java/org/opensearch/node/ResponseCollectorServiceTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class ResponseCollectorServiceTests extends ESTestCase { +public class ResponseCollectorServiceTests extends OpenSearchTestCase { private ClusterService clusterService; private ResponseCollectorService collector; diff --git a/server/src/test/java/org/opensearch/nodesinfo/NodeInfoStreamingTests.java b/server/src/test/java/org/opensearch/nodesinfo/NodeInfoStreamingTests.java index a2a69d6938622..235cdfa1c71fc 100644 --- a/server/src/test/java/org/opensearch/nodesinfo/NodeInfoStreamingTests.java +++ b/server/src/test/java/org/opensearch/nodesinfo/NodeInfoStreamingTests.java @@ -41,8 +41,8 @@ import org.elasticsearch.plugins.PluginInfo; import org.opensearch.search.aggregations.support.AggregationInfo; import org.opensearch.search.aggregations.support.AggregationUsageService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolInfo; import org.opensearch.transport.TransportInfo; @@ -59,7 +59,7 @@ import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.core.IsEqual.equalTo; -public class NodeInfoStreamingTests extends ESTestCase { +public class NodeInfoStreamingTests extends OpenSearchTestCase { public void testNodeInfoStreaming() throws IOException { NodeInfo nodeInfo = createNodeInfo(); diff --git a/server/src/test/java/org/opensearch/repositories/IndexIdTests.java b/server/src/test/java/org/opensearch/repositories/IndexIdTests.java index 8c8a683fd1b4d..16cd3df2d3417 100644 --- a/server/src/test/java/org/opensearch/repositories/IndexIdTests.java +++ b/server/src/test/java/org/opensearch/repositories/IndexIdTests.java @@ -26,14 +26,14 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; /** * Tests for the {@link IndexId} class. */ -public class IndexIdTests extends ESTestCase { +public class IndexIdTests extends OpenSearchTestCase { public void testEqualsAndHashCode() { // assert equals and hashcode diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java index 29b0963a31192..3166453647b55 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.RepositoryPlugin; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RepositoriesModuleTests extends ESTestCase { +public class RepositoriesModuleTests extends OpenSearchTestCase { private Environment environment; private NamedXContentRegistry contentRegistry; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java index e7e94b514ddda..24da43797bf25 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java @@ -51,7 +51,7 @@ import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportService; @@ -67,7 +67,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RepositoriesServiceTests extends ESTestCase { +public class RepositoriesServiceTests extends OpenSearchTestCase { private RepositoriesService repositoriesService; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java index 32c27c76ba8cc..a732d61edc4ce 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java @@ -21,14 +21,14 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import static org.hamcrest.Matchers.equalTo; -public class RepositoriesStatsArchiveTests extends ESTestCase { +public class RepositoriesStatsArchiveTests extends OpenSearchTestCase { public void testStatsAreEvictedOnceTheyAreOlderThanRetentionPeriod() { int retentionTimeInMillis = randomIntBetween(100, 1000); diff --git a/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java b/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java index 3ff7908b8e463..93a933b84c771 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoryDataTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotState; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -53,7 +53,7 @@ /** * Tests for the {@link RepositoryData} class. */ -public class RepositoryDataTests extends ESTestCase { +public class RepositoryDataTests extends OpenSearchTestCase { public void testEqualsAndHashCode() { RepositoryData repositoryData1 = generateRandomRepoData(); diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java index fd432a8776c9a..57db9e84037c7 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.seqno.RetentionLeaseSyncer; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShardState; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException; import org.elasticsearch.index.store.Store; diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java index 542789ff41273..d5aacc07adcb4 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java @@ -43,8 +43,8 @@ import org.opensearch.repositories.fs.FsRepository; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotState; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.nio.file.Path; import java.util.Arrays; @@ -62,7 +62,7 @@ /** * Tests for the {@link BlobStoreRepository} and its subclasses. */ -public class BlobStoreRepositoryTests extends ESSingleNodeTestCase { +public class BlobStoreRepositoryTests extends OpenSearchSingleNodeTestCase { static final String REPO_TYPE = "fsLike"; @@ -88,7 +88,7 @@ protected void assertSnapshotOrGenericThread() { public void testRetrieveSnapshots() throws Exception { final Client client = client(); - final Path location = ESIntegTestCase.randomRepoPath(node().settings()); + final Path location = OpenSearchIntegTestCase.randomRepoPath(node().settings()); final String repositoryName = "test-repo"; logger.info("--> creating repository"); @@ -134,7 +134,7 @@ public void testRetrieveSnapshots() throws Exception { (BlobStoreRepository) repositoriesService.repository(repositoryName); final List originalSnapshots = Arrays.asList(snapshotId1, snapshotId2); - List snapshotIds = ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).getSnapshotIds().stream() + List snapshotIds = OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).getSnapshotIds().stream() .sorted((s1, s2) -> s1.getName().compareTo(s2.getName())).collect(Collectors.toList()); assertThat(snapshotIds, equalTo(originalSnapshots)); } @@ -143,10 +143,10 @@ public void testReadAndWriteSnapshotsThroughIndexFile() throws Exception { final BlobStoreRepository repository = setupRepo(); final long pendingGeneration = repository.metadata.pendingGeneration(); // write to and read from a index file with no entries - assertThat(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).getSnapshotIds().size(), equalTo(0)); + assertThat(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).getSnapshotIds().size(), equalTo(0)); final RepositoryData emptyData = RepositoryData.EMPTY; writeIndexGen(repository, emptyData, emptyData.getGenId()); - RepositoryData repoData = ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository); + RepositoryData repoData = OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository); assertEquals(repoData, emptyData); assertEquals(repoData.getIndices().size(), 0); assertEquals(repoData.getSnapshotIds().size(), 0); @@ -155,40 +155,40 @@ public void testReadAndWriteSnapshotsThroughIndexFile() throws Exception { // write to and read from an index file with snapshots but no indices repoData = addRandomSnapshotsToRepoData(repoData, false); writeIndexGen(repository, repoData, repoData.getGenId()); - assertEquals(repoData, ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository)); + assertEquals(repoData, OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository)); // write to and read from a index file with random repository data - repoData = addRandomSnapshotsToRepoData(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), true); + repoData = addRandomSnapshotsToRepoData(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), true); writeIndexGen(repository, repoData, repoData.getGenId()); - assertEquals(repoData, ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository)); + assertEquals(repoData, OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository)); } public void testIndexGenerationalFiles() throws Exception { final BlobStoreRepository repository = setupRepo(); - assertEquals(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), RepositoryData.EMPTY); + assertEquals(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), RepositoryData.EMPTY); final long pendingGeneration = repository.metadata.pendingGeneration(); // write to index generational file RepositoryData repositoryData = generateRandomRepoData(); writeIndexGen(repository, repositoryData, RepositoryData.EMPTY_REPO_GEN); - assertThat(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), equalTo(repositoryData)); + assertThat(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), equalTo(repositoryData)); final long expectedGeneration = pendingGeneration + 1L; assertThat(repository.latestIndexBlobId(), equalTo(expectedGeneration)); assertThat(repository.readSnapshotIndexLatestBlob(), equalTo(expectedGeneration)); // adding more and writing to a new index generational file - repositoryData = addRandomSnapshotsToRepoData(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), true); + repositoryData = addRandomSnapshotsToRepoData(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), true); writeIndexGen(repository, repositoryData, repositoryData.getGenId()); - assertEquals(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), repositoryData); + assertEquals(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), repositoryData); assertThat(repository.latestIndexBlobId(), equalTo(expectedGeneration + 1L)); assertThat(repository.readSnapshotIndexLatestBlob(), equalTo(expectedGeneration + 1L)); // removing a snapshot and writing to a new index generational file - repositoryData = ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).removeSnapshots( + repositoryData = OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).removeSnapshots( Collections.singleton(repositoryData.getSnapshotIds().iterator().next()), ShardGenerations.EMPTY); writeIndexGen(repository, repositoryData, repositoryData.getGenId()); - assertEquals(ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), repositoryData); + assertEquals(OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository), repositoryData); assertThat(repository.latestIndexBlobId(), equalTo(expectedGeneration + 2L)); assertThat(repository.readSnapshotIndexLatestBlob(), equalTo(expectedGeneration + 2L)); } @@ -210,7 +210,7 @@ public void testRepositoryDataConcurrentModificationNotAllowed() { public void testBadChunksize() throws Exception { final Client client = client(); - final Path location = ESIntegTestCase.randomRepoPath(node().settings()); + final Path location = OpenSearchIntegTestCase.randomRepoPath(node().settings()); final String repositoryName = "test-repo"; expectThrows(RepositoryException.class, () -> @@ -223,7 +223,7 @@ public void testBadChunksize() throws Exception { } public void testFsRepositoryCompressDeprecated() { - final Path location = ESIntegTestCase.randomRepoPath(node().settings()); + final Path location = OpenSearchIntegTestCase.randomRepoPath(node().settings()); final Settings settings = Settings.builder().put(node().settings()).put("location", location).build(); final RepositoryMetadata metadata = new RepositoryMetadata("test-repo", REPO_TYPE, settings); @@ -247,7 +247,7 @@ private static void writeIndexGen(BlobStoreRepository repository, RepositoryData private BlobStoreRepository setupRepo() { final Client client = client(); - final Path location = ESIntegTestCase.randomRepoPath(node().settings()); + final Path location = OpenSearchIntegTestCase.randomRepoPath(node().settings()); final String repositoryName = "test-repo"; AcknowledgedResponse putRepositoryResponse = diff --git a/server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java b/server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java index e2a13e843c199..f92b4633bf78b 100644 --- a/server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java +++ b/server/src/test/java/org/opensearch/repositories/fs/FsRepositoryTests.java @@ -59,9 +59,9 @@ import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -77,7 +77,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; -public class FsRepositoryTests extends ESTestCase { +public class FsRepositoryTests extends OpenSearchTestCase { public void testSnapshotAndRestore() throws IOException, InterruptedException { ThreadPool threadPool = new TestThreadPool(getClass().getSimpleName()); diff --git a/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java b/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java index ab7b99591d878..6d23516c5199d 100644 --- a/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java @@ -27,9 +27,9 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.rest.action.cat.AbstractCatAction; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -43,7 +43,7 @@ import static org.hamcrest.core.StringContains.containsString; import static org.hamcrest.object.HasToString.hasToString; -public class BaseRestHandlerTests extends ESTestCase { +public class BaseRestHandlerTests extends OpenSearchTestCase { private NodeClient mockClient; private ThreadPool threadPool; diff --git a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java index 82f16e4c7458c..7bb61a8d486ec 100644 --- a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java +++ b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java @@ -33,10 +33,10 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.transport.RemoteTransportException; import java.io.FileNotFoundException; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -public class BytesRestResponseTests extends ESTestCase { +public class BytesRestResponseTests extends OpenSearchTestCase { class UnknownException extends Exception { UnknownException(final String message, final Throwable cause) { diff --git a/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java b/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java index 28ef34169be6c..5703b2dd936a2 100644 --- a/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/DeprecationRestHandlerTests.java @@ -22,7 +22,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import org.mockito.InOrder; @@ -34,7 +34,7 @@ /** * Tests {@link DeprecationRestHandler}. */ -public class DeprecationRestHandlerTests extends ESTestCase { +public class DeprecationRestHandlerTests extends OpenSearchTestCase { private RestHandler handler; /** diff --git a/server/src/test/java/org/opensearch/rest/RestControllerTests.java b/server/src/test/java/org/opensearch/rest/RestControllerTests.java index c18bf432eca5f..72c692afae7d7 100644 --- a/server/src/test/java/org/opensearch/rest/RestControllerTests.java +++ b/server/src/test/java/org/opensearch/rest/RestControllerTests.java @@ -40,9 +40,9 @@ import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpStats; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.usage.UsageService; import org.junit.After; import org.junit.Before; @@ -71,7 +71,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class RestControllerTests extends ESTestCase { +public class RestControllerTests extends OpenSearchTestCase { private static final ByteSizeValue BREAKER_LIMIT = new ByteSizeValue(20); private CircuitBreaker inFlightRequestsBreaker; diff --git a/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java b/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java index 6e76da2a5af3e..7b9aac5a7beed 100644 --- a/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java +++ b/server/src/test/java/org/opensearch/rest/RestHttpResponseHeadersTests.java @@ -26,9 +26,9 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.usage.UsageService; import java.util.ArrayList; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; -public class RestHttpResponseHeadersTests extends ESTestCase { +public class RestHttpResponseHeadersTests extends OpenSearchTestCase { /** * For requests to a valid REST endpoint using an unsupported HTTP method, diff --git a/server/src/test/java/org/opensearch/rest/RestRequestTests.java b/server/src/test/java/org/opensearch/rest/RestRequestTests.java index 2f40c2b24214d..82656fc36bbfe 100644 --- a/server/src/test/java/org/opensearch/rest/RestRequestTests.java +++ b/server/src/test/java/org/opensearch/rest/RestRequestTests.java @@ -29,8 +29,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.http.HttpChannel; import org.opensearch.http.HttpRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.util.ArrayList; @@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RestRequestTests extends ESTestCase { +public class RestRequestTests extends OpenSearchTestCase { public void testContentConsumesContent() { runConsumesContentTest(RestRequest::content, true); diff --git a/server/src/test/java/org/opensearch/rest/RestUtilsTests.java b/server/src/test/java/org/opensearch/rest/RestUtilsTests.java index dd51eb11020c1..fa0efca417635 100644 --- a/server/src/test/java/org/opensearch/rest/RestUtilsTests.java +++ b/server/src/test/java/org/opensearch/rest/RestUtilsTests.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Locale; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class RestUtilsTests extends ESTestCase { +public class RestUtilsTests extends OpenSearchTestCase { static char randomDelimiter() { return randomBoolean() ? '&' : ';'; diff --git a/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java b/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java index 129488ce90772..e6732217a474e 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.SearchModule; import org.opensearch.search.SearchShardTarget; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -48,7 +48,7 @@ import static java.util.Collections.emptyList; import static org.hamcrest.CoreMatchers.equalTo; -public class RestActionsTests extends ESTestCase { +public class RestActionsTests extends OpenSearchTestCase { private static NamedXContentRegistry xContentRegistry; diff --git a/server/src/test/java/org/opensearch/rest/action/RestBuilderListenerTests.java b/server/src/test/java/org/opensearch/rest/action/RestBuilderListenerTests.java index e8261ab1a5f56..d6cc708c0b9d5 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestBuilderListenerTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestBuilderListenerTests.java @@ -24,15 +24,15 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestResponse; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.transport.TransportResponse; import org.opensearch.transport.TransportResponse.Empty; import java.util.concurrent.atomic.AtomicReference; -public class RestBuilderListenerTests extends ESTestCase { +public class RestBuilderListenerTests extends OpenSearchTestCase { public void testXContentBuilderClosedInBuildResponse() throws Exception { AtomicReference builderAtomicReference = new AtomicReference<>(); diff --git a/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java b/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java index 5db11de5e387f..adc7f19292ab1 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestCancellableNodeClientTests.java @@ -35,7 +35,7 @@ import org.opensearch.http.HttpResponse; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -55,7 +55,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -public class RestCancellableNodeClientTests extends ESTestCase { +public class RestCancellableNodeClientTests extends OpenSearchTestCase { private ThreadPool threadPool; diff --git a/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java b/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java index fac9d9eef7d5e..e4460289551f7 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestMainActionTests.java @@ -30,8 +30,8 @@ import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.util.HashMap; import java.util.Map; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class RestMainActionTests extends ESTestCase { +public class RestMainActionTests extends OpenSearchTestCase { public void testHeadResponse() throws Exception { final String nodeName = "node1"; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java index 658abc360e653..9193d15f02a05 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest; import org.opensearch.common.Strings; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; import java.util.Map; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsActionTests.java index 487b7933b87c7..c0bdc6b034ef7 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterGetSettingsActionTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsFilter; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.Set; @@ -36,7 +36,7 @@ import java.util.stream.Stream; -public class RestClusterGetSettingsActionTests extends ESTestCase { +public class RestClusterGetSettingsActionTests extends OpenSearchTestCase { public void testFilterPersistentSettings() { runTestFilterSettingsTest(Metadata.Builder::persistentSettings, ClusterGetSettingsResponse::getPersistentSettings); diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java index 788be3685bf50..f9fae81d11319 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java @@ -25,15 +25,15 @@ import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.util.HashMap; import java.util.Map; import static org.hamcrest.Matchers.equalTo; -public class RestClusterHealthActionTests extends ESTestCase { +public class RestClusterHealthActionTests extends OpenSearchTestCase { public void testFromRequest() { Map params = new HashMap<>(); diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoActionTests.java index 235f4eadf705f..90bf8b5fb93c0 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesInfoActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; import org.opensearch.common.util.set.Sets; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.util.ArrayList; import java.util.HashMap; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; -public class RestNodesInfoActionTests extends ESTestCase { +public class RestNodesInfoActionTests extends OpenSearchTestCase { public void testDuplicatedFiltersAreNotRemoved() { Map params = new HashMap<>(); diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java index a6a9a95526037..f5da35fe7cfcd 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsActionTests.java @@ -21,8 +21,8 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.util.HashMap; @@ -33,7 +33,7 @@ import static org.hamcrest.object.HasToString.hasToString; import static org.mockito.Mockito.mock; -public class RestNodesStatsActionTests extends ESTestCase { +public class RestNodesStatsActionTests extends OpenSearchTestCase { private RestNodesStatsAction action; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsActionTests.java index 0ca0e1c4687cd..643acca3bc65c 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsActionTests.java @@ -24,11 +24,11 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.nullValue; -public class RestReloadSecureSettingsActionTests extends ESTestCase { +public class RestReloadSecureSettingsActionTests extends OpenSearchTestCase { public void testParserWithPassword() throws Exception { final String request = "{" + diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java index de20fb2bcbb11..0888bd45e19b8 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java @@ -26,9 +26,9 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.analysis.NameOrDefinition; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class RestAnalyzeActionTests extends ESTestCase { +public class RestAnalyzeActionTests extends OpenSearchTestCase { public void testParseXContentForAnalyzeRequest() throws Exception { try (XContentParser content = createParser(XContentFactory.jsonBuilder() diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java index 0fd3b97acfef4..f372c39836f2e 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheActionTests.java @@ -21,14 +21,14 @@ import org.opensearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.util.HashMap; import static org.hamcrest.Matchers.equalTo; -public class RestClearIndicesCacheActionTests extends ESTestCase { +public class RestClearIndicesCacheActionTests extends OpenSearchTestCase { public void testRequestCacheSet() throws Exception { final HashMap params = new HashMap<>(); diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java index b381d21e133eb..23545b8db461b 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestCreateIndexActionTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetAliasesActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetAliasesActionTests.java index 59fafeb55a765..fb1b80398f64c 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetAliasesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetAliasesActionTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestResponse; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.List; @@ -34,7 +34,7 @@ import static org.opensearch.rest.RestStatus.NOT_FOUND; import static org.hamcrest.Matchers.equalTo; -public class RestGetAliasesActionTests extends ESTestCase { +public class RestGetAliasesActionTests extends OpenSearchTestCase { // # Assumes the following setup // curl -X PUT "localhost:9200/index" -H "Content-Type: application/json" -d' diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingActionTests.java index 43a5b76b89631..89b7c55757256 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingActionTests.java @@ -23,9 +23,9 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java index db330f5d69ae8..111e0a5a6aa24 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetIndicesActionTests.java @@ -21,8 +21,8 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java index f3e00b37584a7..9753ee2840159 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestGetMappingActionTests.java @@ -24,9 +24,9 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java index f561cdc3078a6..50fc276943546 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsActionTests.java @@ -21,8 +21,8 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.util.HashMap; @@ -31,7 +31,7 @@ import static org.hamcrest.object.HasToString.hasToString; import static org.mockito.Mockito.mock; -public class RestIndicesStatsActionTests extends ESTestCase { +public class RestIndicesStatsActionTests extends OpenSearchTestCase { private RestIndicesStatsAction action; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java index cbd47e4f45c9f..83f7d273256d3 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateActionTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutMappingActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutMappingActionTests.java index 0454fc2f4cbcc..0fdba93ec572a 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutMappingActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestPutMappingActionTests.java @@ -23,9 +23,9 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestStatus; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java index e539fd6402859..383b84b91396b 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestResizeHandlerTests.java @@ -21,8 +21,8 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.io.IOException; import java.util.Collections; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.hasToString; import static org.mockito.Mockito.mock; -public class RestResizeHandlerTests extends ESTestCase { +public class RestResizeHandlerTests extends OpenSearchTestCase { public void testShrinkCopySettingsDeprecated() throws IOException { final RestResizeHandler.RestShrinkIndexAction handler = diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java index ec79ff657b523..1eec796359bdf 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestValidateQueryActionTests.java @@ -37,8 +37,8 @@ import org.opensearch.search.AbstractSearchTestCase; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.usage.UsageService; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java index 5c8537977e6d6..fe3de9f4a76ac 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java @@ -34,8 +34,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.util.LinkedHashMap; import java.util.List; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RestIndicesActionTests extends ESTestCase { +public class RestIndicesActionTests extends OpenSearchTestCase { public void testBuildTable() { final int numIndices = randomIntBetween(3, 20); diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java index e932f8479b092..74c3e756e0c8c 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestNodesActionTests.java @@ -29,8 +29,8 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import org.opensearch.threadpool.TestThreadPool; import org.junit.Before; @@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RestNodesActionTests extends ESTestCase { +public class RestNodesActionTests extends OpenSearchTestCase { private RestNodesAction action; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java index 02b9fc7e1c0a2..2924a3ce16811 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -46,7 +46,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.mockito.Mockito.mock; -public class RestRecoveryActionTests extends ESTestCase { +public class RestRecoveryActionTests extends OpenSearchTestCase { public void testRestRecoveryAction() { final RestCatRecoveryAction action = new RestCatRecoveryAction(); diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java index 54306fade126e..e6b8125ce443f 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java @@ -34,8 +34,8 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.Table; import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import java.nio.file.Path; import java.util.ArrayList; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RestShardsActionTests extends ESTestCase { +public class RestShardsActionTests extends OpenSearchTestCase { public void testBuildTable() { final int numShards = randomIntBetween(1, 5); diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestTableTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestTableTests.java index 24aa6bbd979aa..d95e8c0881240 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestTableTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestTableTests.java @@ -23,8 +23,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.AbstractRestChannel; import org.opensearch.rest.RestResponse; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.FakeRestRequest; import org.junit.Before; import java.util.ArrayList; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; -public class RestTableTests extends ESTestCase { +public class RestTableTests extends OpenSearchTestCase { private static final String APPLICATION_JSON = XContentType.JSON.mediaType(); private static final String APPLICATION_YAML = XContentType.YAML.mediaType(); diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestTasksActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestTasksActionTests.java index c81862e3eea63..5b693939b80fc 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestTasksActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestTasksActionTests.java @@ -27,15 +27,15 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.collect.MapBuilder; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import static java.util.Collections.emptyList; import static org.hamcrest.Matchers.is; -public class RestTasksActionTests extends ESTestCase { +public class RestTasksActionTests extends OpenSearchTestCase { public void testConsumesParameters() throws Exception { RestTasksAction action = new RestTasksAction(() -> DiscoveryNodes.EMPTY_NODES); diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java index ca308a68aecec..860a1355cb834 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestBulkActionTests.java @@ -30,9 +30,9 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestRequest; import java.util.HashMap; import java.util.Map; @@ -44,7 +44,7 @@ /** * Tests for {@link RestBulkAction}. */ -public class RestBulkActionTests extends ESTestCase { +public class RestBulkActionTests extends OpenSearchTestCase { public void testBulkPipelineUpsert() throws Exception { SetOnce bulkCalled = new SetOnce<>(); diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestDeleteActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestDeleteActionTests.java index b0c647167c13e..d512f509be95b 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestDeleteActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestDeleteActionTests.java @@ -21,8 +21,8 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; public class RestDeleteActionTests extends RestActionTestCase { diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestGetActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestGetActionTests.java index daa018b986e57..f788030324a8f 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestGetActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestGetActionTests.java @@ -20,8 +20,8 @@ package org.opensearch.rest.action.document; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; public class RestGetActionTests extends RestActionTestCase { diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java index 80c4faf515b1a..137ee3b5ba20e 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java @@ -29,9 +29,9 @@ import org.opensearch.rest.RestRequest.Method; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.document.RestGetSourceAction.RestGetSourceResponseListener; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.AfterClass; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestIndexActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestIndexActionTests.java index 7b57da61987b3..49a3d4cbefde6 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestIndexActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestIndexActionTests.java @@ -32,9 +32,9 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.document.RestIndexAction.AutoIdHandler; import org.opensearch.rest.action.document.RestIndexAction.CreateHandler; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.concurrent.atomic.AtomicReference; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestMultiGetActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestMultiGetActionTests.java index f3ee597ac0e77..ae94619db7a5b 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestMultiGetActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestMultiGetActionTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; public class RestMultiGetActionTests extends RestActionTestCase { diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java index 20813e3981e70..f395d12403972 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestMultiTermVectorsActionTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java index f39f5b03c6309..a741472510d59 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestTermVectorsActionTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java index 441511bfec3c0..2d96ba38689ff 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java @@ -26,8 +26,8 @@ import org.elasticsearch.index.VersionType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/rest/action/search/RestCountActionTests.java b/server/src/test/java/org/opensearch/rest/action/search/RestCountActionTests.java index c9abb7bbd97ea..9ff98362c98ee 100644 --- a/server/src/test/java/org/opensearch/rest/action/search/RestCountActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/search/RestCountActionTests.java @@ -21,8 +21,8 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/rest/action/search/RestExplainActionTests.java b/server/src/test/java/org/opensearch/rest/action/search/RestExplainActionTests.java index ff82f7158037a..7959ffa8858cc 100644 --- a/server/src/test/java/org/opensearch/rest/action/search/RestExplainActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/search/RestExplainActionTests.java @@ -20,8 +20,8 @@ package org.opensearch.rest.action.search; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; public class RestExplainActionTests extends RestActionTestCase { diff --git a/server/src/test/java/org/opensearch/rest/action/search/RestMultiSearchActionTests.java b/server/src/test/java/org/opensearch/rest/action/search/RestMultiSearchActionTests.java index 3f85243cb2980..b2beffb6a957e 100644 --- a/server/src/test/java/org/opensearch/rest/action/search/RestMultiSearchActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/search/RestMultiSearchActionTests.java @@ -23,8 +23,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.nio.charset.StandardCharsets; diff --git a/server/src/test/java/org/opensearch/rest/action/search/RestSearchActionTests.java b/server/src/test/java/org/opensearch/rest/action/search/RestSearchActionTests.java index 9a01a7873da3d..8afef18758657 100644 --- a/server/src/test/java/org/opensearch/rest/action/search/RestSearchActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/search/RestSearchActionTests.java @@ -20,8 +20,8 @@ package org.opensearch.rest.action.search; import org.opensearch.rest.RestRequest; -import org.elasticsearch.test.rest.FakeRestRequest; -import org.elasticsearch.test.rest.RestActionTestCase; +import org.opensearch.test.rest.FakeRestRequest; +import org.opensearch.test.rest.RestActionTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/script/ClassPermissionTests.java b/server/src/test/java/org/opensearch/script/ClassPermissionTests.java index 054047c550f36..d9d6f2b413465 100644 --- a/server/src/test/java/org/opensearch/script/ClassPermissionTests.java +++ b/server/src/test/java/org/opensearch/script/ClassPermissionTests.java @@ -19,13 +19,13 @@ package org.opensearch.script; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.security.AllPermission; import java.security.PermissionCollection; /** Very simple sanity checks for {@link ClassPermission} */ -public class ClassPermissionTests extends ESTestCase { +public class ClassPermissionTests extends OpenSearchTestCase { public void testEquals() { assertEquals(new ClassPermission("pkg.MyClass"), new ClassPermission("pkg.MyClass")); diff --git a/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java index c88668cafe513..4fa201b4afd6b 100644 --- a/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java +++ b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.opensearch.common.logging.Loggers; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Before; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; -public class JodaCompatibleZonedDateTimeTests extends ESTestCase { +public class JodaCompatibleZonedDateTimeTests extends OpenSearchTestCase { private static final Logger DEPRECATION_LOGGER = LogManager.getLogger("org.elasticsearch.deprecation.script.JodaCompatibleZonedDateTime"); diff --git a/server/src/test/java/org/opensearch/script/ScriptCacheTests.java b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java index 477f918b87e17..710ed0cd47998 100644 --- a/server/src/test/java/org/opensearch/script/ScriptCacheTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java @@ -21,9 +21,9 @@ import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class ScriptCacheTests extends ESTestCase { +public class ScriptCacheTests extends OpenSearchTestCase { // even though circuit breaking is allowed to be configured per minute, we actually weigh this over five minutes // simply by multiplying by five, so even setting it to one, requires five compilations to break public void testCompilationCircuitBreaking() throws Exception { diff --git a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java index 64262e01594af..b5bdf6401988e 100644 --- a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.script.ScriptContextInfo.ScriptMethodInfo; import org.opensearch.script.ScriptContextInfo.ScriptMethodInfo.ParameterInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -40,7 +40,7 @@ import java.util.List; import java.util.Set; -public class ScriptContextInfoTests extends ESTestCase { +public class ScriptContextInfoTests extends OpenSearchTestCase { public interface MinimalContext { void execute(); } diff --git a/server/src/test/java/org/opensearch/script/ScriptContextTests.java b/server/src/test/java/org/opensearch/script/ScriptContextTests.java index 0cff9bcc980ce..cc255a4d31964 100644 --- a/server/src/test/java/org/opensearch/script/ScriptContextTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextTests.java @@ -19,9 +19,9 @@ package org.opensearch.script; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class ScriptContextTests extends ESTestCase { +public class ScriptContextTests extends OpenSearchTestCase { public interface TwoNewInstance { String newInstance(int foo, int bar); diff --git a/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java b/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java index d5e4b3893778d..727e8780c5f24 100644 --- a/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptExceptionTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,7 @@ import java.util.List; /** Simple tests for {@link ScriptException} */ -public class ScriptExceptionTests extends ESTestCase { +public class ScriptExceptionTests extends OpenSearchTestCase { /** ensure we can round trip in serialization */ public void testRoundTrip() throws IOException { diff --git a/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java index 16d73e5e0fc14..4a9c2b0a01130 100644 --- a/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptLanguagesInfoTests.java @@ -20,7 +20,7 @@ package org.opensearch.script; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -public class ScriptLanguagesInfoTests extends ESTestCase { +public class ScriptLanguagesInfoTests extends OpenSearchTestCase { public void testEmptyTypesAllowedReturnsAllTypes() { ScriptService ss = getMockScriptService(Settings.EMPTY); ScriptLanguagesInfo info = ss.getScriptLanguages(); diff --git a/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java b/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java index 3cbe4e2daa270..825555c2bd38b 100644 --- a/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptMetadataTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java index 22bea48ebb476..e6ae9c95e7c46 100644 --- a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.sameInstance; -public class ScriptServiceTests extends ESTestCase { +public class ScriptServiceTests extends OpenSearchTestCase { private ScriptEngine scriptEngine; private Map engines; diff --git a/server/src/test/java/org/opensearch/script/ScriptTests.java b/server/src/test/java/org/opensearch/script/ScriptTests.java index f75e7d229a92c..fc30573aff9c4 100644 --- a/server/src/test/java/org/opensearch/script/ScriptTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; -public class ScriptTests extends ESTestCase { +public class ScriptTests extends OpenSearchTestCase { public void testScriptParsing() throws IOException { Script expectedScript = createScript(); diff --git a/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java b/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java index 464b2e4c79ccf..b1491b5e001f3 100644 --- a/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java +++ b/server/src/test/java/org/opensearch/script/StoredScriptSourceTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/script/StoredScriptTests.java b/server/src/test/java/org/opensearch/script/StoredScriptTests.java index c253bebf460bb..6dd55494a3f67 100644 --- a/server/src/test/java/org/opensearch/script/StoredScriptTests.java +++ b/server/src/test/java/org/opensearch/script/StoredScriptTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java index 24099380442a7..7f3434b29cd83 100644 --- a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java +++ b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java @@ -37,7 +37,7 @@ import org.opensearch.search.fetch.subphase.highlight.HighlightBuilderTests; import org.opensearch.search.rescore.QueryRescorerBuilderTests; import org.opensearch.search.suggest.SuggestBuilderTests; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -51,7 +51,7 @@ import java.util.function.Function; import java.util.function.Supplier; -public abstract class AbstractSearchTestCase extends ESTestCase { +public abstract class AbstractSearchTestCase extends OpenSearchTestCase { protected NamedWriteableRegistry namedWriteableRegistry; private TestSearchExtPlugin searchExtPlugin; diff --git a/server/src/test/java/org/opensearch/search/ClearScrollResponseTests.java b/server/src/test/java/org/opensearch/search/ClearScrollResponseTests.java index f98453352dc91..38d1557557aa9 100644 --- a/server/src/test/java/org/opensearch/search/ClearScrollResponseTests.java +++ b/server/src/test/java/org/opensearch/search/ClearScrollResponseTests.java @@ -27,13 +27,13 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class ClearScrollResponseTests extends ESTestCase { +public class ClearScrollResponseTests extends OpenSearchTestCase { public void testToXContent() throws IOException { ClearScrollResponse clearScrollResponse = new ClearScrollResponse(true, 10); diff --git a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java index 272fac72a77da..6169a2324a24d 100644 --- a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java +++ b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java @@ -58,7 +58,7 @@ import org.opensearch.search.rescore.RescoreContext; import org.opensearch.search.slice.SliceBuilder; import org.opensearch.search.sort.SortAndFormats; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -75,7 +75,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class DefaultSearchContextTests extends ESTestCase { +public class DefaultSearchContextTests extends OpenSearchTestCase { public void testPreProcess() throws Exception { TimeValue timeout = new TimeValue(randomIntBetween(1, 100)); diff --git a/server/src/test/java/org/opensearch/search/DocValueFormatTests.java b/server/src/test/java/org/opensearch/search/DocValueFormatTests.java index 5a6d02bf13508..3a8ce81eef7a1 100644 --- a/server/src/test/java/org/opensearch/search/DocValueFormatTests.java +++ b/server/src/test/java/org/opensearch/search/DocValueFormatTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.network.InetAddresses; import org.opensearch.common.time.DateFormatter; import org.elasticsearch.index.mapper.DateFieldMapper.Resolution; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.time.ZoneOffset; import java.util.ArrayList; @@ -37,7 +37,7 @@ import static org.opensearch.search.aggregations.bucket.geogrid.GeoTileUtils.longEncode; -public class DocValueFormatTests extends ESTestCase { +public class DocValueFormatTests extends OpenSearchTestCase { public void testSerialization() throws Exception { List entries = new ArrayList<>(); diff --git a/server/src/test/java/org/opensearch/search/MultiValueModeTests.java b/server/src/test/java/org/opensearch/search/MultiValueModeTests.java index 305b5a22703f3..727cb4a03ed8c 100644 --- a/server/src/test/java/org/opensearch/search/MultiValueModeTests.java +++ b/server/src/test/java/org/opensearch/search/MultiValueModeTests.java @@ -39,14 +39,14 @@ import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; import static org.hamcrest.Matchers.equalTo; -public class MultiValueModeTests extends ESTestCase { +public class MultiValueModeTests extends OpenSearchTestCase { @FunctionalInterface private interface Supplier { diff --git a/server/src/test/java/org/opensearch/search/NestedIdentityTests.java b/server/src/test/java/org/opensearch/search/NestedIdentityTests.java index a96f6de8f82cc..a248cf779db98 100644 --- a/server/src/test/java/org/opensearch/search/NestedIdentityTests.java +++ b/server/src/test/java/org/opensearch/search/NestedIdentityTests.java @@ -29,16 +29,16 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.search.SearchHit.NestedIdentity; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.function.Supplier; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public class NestedIdentityTests extends ESTestCase { +public class NestedIdentityTests extends OpenSearchTestCase { public static NestedIdentity createTestItem(int depth) { String field = frequently() ? randomAlphaOfLengthBetween(1, 20) : randomRealisticUnicodeOfCodepointLengthBetween(1, 20); diff --git a/server/src/test/java/org/opensearch/search/SearchCancellationTests.java b/server/src/test/java/org/opensearch/search/SearchCancellationTests.java index 51c243ca0c93c..3bc6829a53390 100644 --- a/server/src/test/java/org/opensearch/search/SearchCancellationTests.java +++ b/server/src/test/java/org/opensearch/search/SearchCancellationTests.java @@ -38,7 +38,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.tasks.TaskCancelledException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; -public class SearchCancellationTests extends ESTestCase { +public class SearchCancellationTests extends OpenSearchTestCase { private static final String STRING_FIELD_NAME = "foo"; private static final String POINT_FIELD_NAME = "point"; diff --git a/server/src/test/java/org/opensearch/search/SearchHitTests.java b/server/src/test/java/org/opensearch/search/SearchHitTests.java index 387295d84490b..f29dbad961eef 100644 --- a/server/src/test/java/org/opensearch/search/SearchHitTests.java +++ b/server/src/test/java/org/opensearch/search/SearchHitTests.java @@ -40,9 +40,9 @@ import org.opensearch.search.SearchHit.NestedIdentity; import org.opensearch.search.fetch.subphase.highlight.HighlightField; import org.opensearch.search.fetch.subphase.highlight.HighlightFieldTests; -import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.test.RandomObjects; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.RandomObjects; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; @@ -53,8 +53,8 @@ import java.util.function.Predicate; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/server/src/test/java/org/opensearch/search/SearchHitsTests.java b/server/src/test/java/org/opensearch/search/SearchHitsTests.java index 99b1dce4fba18..74466345c13f8 100644 --- a/server/src/test/java/org/opensearch/search/SearchHitsTests.java +++ b/server/src/test/java/org/opensearch/search/SearchHitsTests.java @@ -36,7 +36,7 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/SearchModuleTests.java b/server/src/test/java/org/opensearch/search/SearchModuleTests.java index 95f445c1b082d..b975a481b0029 100644 --- a/server/src/test/java/org/opensearch/search/SearchModuleTests.java +++ b/server/src/test/java/org/opensearch/search/SearchModuleTests.java @@ -73,7 +73,7 @@ import org.opensearch.search.suggest.SuggestionSearchContext.SuggestionContext; import org.opensearch.search.suggest.term.TermSuggestion; import org.opensearch.search.suggest.term.TermSuggestionBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -91,7 +91,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.hasSize; -public class SearchModuleTests extends ESTestCase { +public class SearchModuleTests extends OpenSearchTestCase { public void testDoubleRegister() { SearchPlugin registersDupeHighlighter = new SearchPlugin() { diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java index 2d9adbcaca9de..e87dd2f9460c7 100644 --- a/server/src/test/java/org/opensearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/opensearch/search/SearchServiceTests.java @@ -86,7 +86,7 @@ import org.opensearch.search.internal.ShardSearchRequest; import org.opensearch.search.query.QuerySearchResult; import org.opensearch.search.suggest.SuggestBuilder; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import org.junit.Before; @@ -108,16 +108,16 @@ import static java.util.Collections.singletonList; import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; import static org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason.DELETED; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.startsWith; -public class SearchServiceTests extends ESSingleNodeTestCase { +public class SearchServiceTests extends OpenSearchSingleNodeTestCase { @Override protected boolean resetNodeAfterTest() { diff --git a/server/src/test/java/org/opensearch/search/SearchSortValuesAndFormatsTests.java b/server/src/test/java/org/opensearch/search/SearchSortValuesAndFormatsTests.java index 57d5fe4787671..49dec07270c9a 100644 --- a/server/src/test/java/org/opensearch/search/SearchSortValuesAndFormatsTests.java +++ b/server/src/test/java/org/opensearch/search/SearchSortValuesAndFormatsTests.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; import org.junit.Before; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/SearchSortValuesTests.java b/server/src/test/java/org/opensearch/search/SearchSortValuesTests.java index 64d38e78caf17..551728162f2e4 100644 --- a/server/src/test/java/org/opensearch/search/SearchSortValuesTests.java +++ b/server/src/test/java/org/opensearch/search/SearchSortValuesTests.java @@ -28,8 +28,8 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.AbstractSerializingTestCase; +import org.opensearch.test.RandomObjects; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java index 82a93da53f3a0..d134542db6ceb 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java @@ -23,11 +23,11 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexService; import org.opensearch.search.internal.SearchContext; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; -public class AggregationCollectorTests extends ESSingleNodeTestCase { +public class AggregationCollectorTests extends OpenSearchSingleNodeTestCase { public void testNeedsScores() throws Exception { IndexService index = createIndex("idx"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java b/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java index f1fa1ba57cef4..4417563ba1b3a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java @@ -23,7 +23,7 @@ import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Map; @@ -122,7 +122,7 @@ protected Map, Object>> pluginScripts() { protected Map, Object>> nonDeterministicPluginScripts() { Map, Object>> scripts = new HashMap<>(); - scripts.put("Math.random()", vars -> ESTestCase.randomDouble()); + scripts.put("Math.random()", vars -> OpenSearchTestCase.randomDouble()); return scripts; } diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregationsTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregationsTests.java index 8d09c6cd6967c..8f8d926ab26e4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregationsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregationsTests.java @@ -81,10 +81,10 @@ import org.opensearch.search.aggregations.pipeline.InternalPercentilesBucketTests; import org.opensearch.search.aggregations.pipeline.InternalExtendedStatsBucketTests; import org.opensearch.search.aggregations.pipeline.InternalDerivativeTests; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; -import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.hamcrest.OpenSearchAssertions; import org.junit.After; import org.junit.Before; @@ -97,14 +97,14 @@ import java.util.stream.Collectors; import static java.util.Collections.singletonMap; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; /** * This class tests that aggregations parsing works properly. It checks that we can parse * different aggregations and adds sub-aggregations where applicable. * */ -public class AggregationsTests extends ESTestCase { +public class AggregationsTests extends OpenSearchTestCase { private static final List> aggsTests = getAggsTests(); private static List> getAggsTests() { @@ -257,7 +257,7 @@ private void parseAndAssert(boolean addRandomFields) throws IOException { assertEquals(XContentParser.Token.START_OBJECT, parser.nextToken()); Aggregations parsedAggregations = Aggregations.fromXContent(parser); BytesReference parsedBytes = XContentHelper.toXContent(parsedAggregations, xContentType, randomBoolean()); - ElasticsearchAssertions.assertToXContentEquivalent(originalBytes, parsedBytes, xContentType); + OpenSearchAssertions.assertToXContentEquivalent(originalBytes, parsedBytes, xContentType); } } diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregatorBaseTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregatorBaseTests.java index 6d291425ef93a..0897da60fb6d0 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregatorBaseTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregatorBaseTests.java @@ -37,7 +37,7 @@ import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.search.aggregations.support.ValuesSourceConfig; import org.opensearch.search.internal.SearchContext; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.time.Instant; @@ -48,7 +48,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class AggregatorBaseTests extends ESSingleNodeTestCase { +public class AggregatorBaseTests extends OpenSearchSingleNodeTestCase { class BogusAggregator extends AggregatorBase { BogusAggregator(SearchContext searchContext, Aggregator parent) throws IOException { diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesBuilderTests.java index 60b9bcf1d87e2..3b0ddabd0c563 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesBuilderTests.java @@ -27,7 +27,7 @@ import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.AggregatorFactories.Builder; import org.opensearch.search.aggregations.pipeline.CumulativeSumPipelineAggregationBuilder; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java index f63b54b981d26..3d5051fffb0d5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java @@ -44,8 +44,8 @@ import org.opensearch.search.aggregations.pipeline.BucketScriptPipelineAggregationBuilder; import org.opensearch.search.aggregations.pipeline.PipelineAggregator; import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -63,7 +63,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class AggregatorFactoriesTests extends ESTestCase { +public class AggregatorFactoriesTests extends OpenSearchTestCase { private NamedXContentRegistry xContentRegistry; @Override diff --git a/server/src/test/java/org/opensearch/search/aggregations/CardinalityUpperBoundTests.java b/server/src/test/java/org/opensearch/search/aggregations/CardinalityUpperBoundTests.java index 8ae18a4c6b0fe..fa58907bf246d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/CardinalityUpperBoundTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/CardinalityUpperBoundTests.java @@ -19,12 +19,12 @@ package org.opensearch.search.aggregations; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; -public class CardinalityUpperBoundTests extends ESTestCase { +public class CardinalityUpperBoundTests extends OpenSearchTestCase { public void testNoneMultiply() { assertThat(CardinalityUpperBound.NONE.multiply(randomInt()), sameInstance(CardinalityUpperBound.NONE)); } diff --git a/server/src/test/java/org/opensearch/search/aggregations/InternalAggregationsTests.java b/server/src/test/java/org/opensearch/search/aggregations/InternalAggregationsTests.java index 949f37b60298b..5895c8b54e007 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/InternalAggregationsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/InternalAggregationsTests.java @@ -36,8 +36,8 @@ import org.opensearch.search.aggregations.pipeline.PipelineAggregator; import org.opensearch.search.aggregations.pipeline.SiblingPipelineAggregator; import org.opensearch.search.aggregations.pipeline.SumBucketPipelineAggregationBuilder; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.ArrayList; @@ -48,7 +48,7 @@ import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.equalTo; -public class InternalAggregationsTests extends ESTestCase { +public class InternalAggregationsTests extends OpenSearchTestCase { private final NamedWriteableRegistry registry = new NamedWriteableRegistry( new SearchModule(Settings.EMPTY, false, Collections.emptyList()).getNamedWriteables()); diff --git a/server/src/test/java/org/opensearch/search/aggregations/InternalMultiBucketAggregationTests.java b/server/src/test/java/org/opensearch/search/aggregations/InternalMultiBucketAggregationTests.java index 7ead4ffa0c7c7..487704c51ee66 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/InternalMultiBucketAggregationTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/InternalMultiBucketAggregationTests.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.metrics.InternalAvg; import org.opensearch.search.aggregations.support.AggregationPath; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -36,7 +36,7 @@ import static org.opensearch.search.aggregations.InternalMultiBucketAggregation.resolvePropertyFromPath; import static org.hamcrest.Matchers.equalTo; -public class InternalMultiBucketAggregationTests extends ESTestCase { +public class InternalMultiBucketAggregationTests extends OpenSearchTestCase { public void testResolveToAgg() { AggregationPath path = AggregationPath.parse("the_avg"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/InternalOrderTests.java b/server/src/test/java/org/opensearch/search/aggregations/InternalOrderTests.java index 972f668abd4c8..deba8926a5a71 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/InternalOrderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/InternalOrderTests.java @@ -25,8 +25,8 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser.Token; import org.opensearch.search.aggregations.InternalOrder.CompoundOrder; -import org.elasticsearch.test.AbstractSerializingTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractSerializingTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/MultiBucketCollectorTests.java b/server/src/test/java/org/opensearch/search/aggregations/MultiBucketCollectorTests.java index 5a7e68599f09a..68a9a4e9bfa6a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/MultiBucketCollectorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/MultiBucketCollectorTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.Scorable; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.store.Directory; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -40,7 +40,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -public class MultiBucketCollectorTests extends ESTestCase { +public class MultiBucketCollectorTests extends OpenSearchTestCase { private static class ScoreAndDoc extends Scorable { float score; int doc = -1; diff --git a/server/src/test/java/org/opensearch/search/aggregations/SubAggCollectionModeTests.java b/server/src/test/java/org/opensearch/search/aggregations/SubAggCollectionModeTests.java index 737b1f0375607..fa19757799b66 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/SubAggCollectionModeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/SubAggCollectionModeTests.java @@ -22,14 +22,14 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.search.aggregations.Aggregator.SubAggCollectionMode; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class SubAggCollectionModeTests extends ESTestCase { +public class SubAggCollectionModeTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(SubAggCollectionMode.DEPTH_FIRST.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketUtilsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketUtilsTests.java index 40b8cf24ea043..04830f1693296 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketUtilsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketUtilsTests.java @@ -19,11 +19,11 @@ package org.opensearch.search.aggregations.bucket; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class BucketUtilsTests extends ESTestCase { +public class BucketUtilsTests extends OpenSearchTestCase { public void testBadInput() { IllegalArgumentException e = expectThrows(IllegalArgumentException.class, diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoHashGridTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoHashGridTests.java index 0ad7e2c5c2d3b..615046758df7d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoHashGridTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoHashGridTests.java @@ -30,7 +30,7 @@ import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder; import org.opensearch.search.aggregations.bucket.geogrid.GeoHashGridAggregationBuilder; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoTileGridTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoTileGridTests.java index 58aefa22caf74..6d882f27006f4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoTileGridTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/GeoTileGridTests.java @@ -31,7 +31,7 @@ import org.opensearch.search.aggregations.bucket.geogrid.GeoGridAggregationBuilder; import org.opensearch.search.aggregations.bucket.geogrid.GeoTileGridAggregationBuilder; import org.opensearch.search.aggregations.bucket.geogrid.GeoTileUtils; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/ShardSizeTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/ShardSizeTestCase.java index b6e9026477c92..8d60ebe633298 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/ShardSizeTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/ShardSizeTestCase.java @@ -21,7 +21,7 @@ import org.opensearch.action.index.IndexRequestBuilder; import org.opensearch.action.search.SearchResponse; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -29,11 +29,11 @@ import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.is; -public abstract class ShardSizeTestCase extends ESIntegTestCase { +public abstract class ShardSizeTestCase extends OpenSearchIntegTestCase { @Override protected int numberOfShards() { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java index 33731f1ceac48..780a2c056bc16 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java @@ -29,8 +29,8 @@ import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.AggregatorFactory; import org.opensearch.search.internal.SearchContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.TestSearchContext; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.TestSearchContext; import java.util.Collections; import java.util.HashMap; @@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class AdjacencyMatrixAggregationBuilderTests extends ESTestCase { +public class AdjacencyMatrixAggregationBuilderTests extends OpenSearchTestCase { public void testFilterSizeLimitation() throws Exception { // filter size grater than max size should thrown a exception diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java index 3244265cbba8f..9d945fffea6f3 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/InternalAdjacencyMatrixTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index 9ed1503a426b6..94c2cf1caa58e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -77,7 +77,7 @@ import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder; import org.opensearch.search.aggregations.support.ValueType; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import org.junit.After; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilderTests.java index 405144e91836f..3123aacd72692 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilderTests.java @@ -27,15 +27,15 @@ import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.Collections; import static org.hamcrest.Matchers.equalTo; -public class GeoTileGridValuesSourceBuilderTests extends ESTestCase { +public class GeoTileGridValuesSourceBuilderTests extends OpenSearchTestCase { public void testSetFormat() { CompositeValuesSourceBuilder builder = new GeoTileGridValuesSourceBuilder("name"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java index a88884b372de2..a97a6209d2ec3 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import org.junit.After; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java index 7b135af20e80d..cfae466845744 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java @@ -34,12 +34,12 @@ import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.search.DocValueFormat; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class SingleDimensionValuesSourceTests extends ESTestCase { +public class SingleDimensionValuesSourceTests extends OpenSearchTestCase { public void testBinarySorted() { MappedFieldType keyword = new KeywordFieldMapper.KeywordFieldType("keyword"); BinaryValuesSource source = new BinaryValuesSource( diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java index ac9b5a558e6f5..dda54ab74b220 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.bucket.filter.InternalFilters.InternalBucket; import org.opensearch.search.aggregations.pipeline.PipelineAggregator; import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java index fb47d53edbb08..2625c75d5b5fe 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridTestCase.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.IndexWriter; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java index 6ffc249a5e6da..183c3ecca409b 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java @@ -29,9 +29,9 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class GeoHashGridParserTests extends ESTestCase { +public class GeoHashGridParserTests extends OpenSearchTestCase { public void testParseValidFromInts() throws Exception { int precision = randomIntBetween(1, 12); XContentParser stParser = createParser(JsonXContent.jsonXContent, diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java index 934dcc8291ca4..97bfdbccf9286 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java @@ -24,12 +24,12 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; -public class GeoTileGridParserTests extends ESTestCase { +public class GeoTileGridParserTests extends OpenSearchTestCase { public void testParseValidFromInts() throws Exception { int precision = randomIntBetween(0, GeoTileUtils.MAX_ZOOM); XContentParser stParser = createParser(JsonXContent.jsonXContent, diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtilsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtilsTests.java index 40130c6c0586f..bfe194879ab48 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtilsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtilsTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.geo.GeoPoint; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.search.aggregations.bucket.geogrid.GeoTileUtils.MAX_ZOOM; import static org.opensearch.search.aggregations.bucket.geogrid.GeoTileUtils.checkPrecisionRange; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class GeoTileUtilsTests extends ESTestCase { +public class GeoTileUtilsTests extends OpenSearchTestCase { private static final double GEOTILE_TOLERANCE = 1E-5D; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilderTests.java index 00e6890dbb276..618e45dd9124c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregationBuilderTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashSet; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; -public class AutoDateHistogramAggregationBuilderTests extends ESTestCase { +public class AutoDateHistogramAggregationBuilderTests extends OpenSearchTestCase { public void testInvalidInterval() { AutoDateHistogramAggregationBuilder builder = new AutoDateHistogramAggregationBuilder("name"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapperTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapperTests.java index 9af04ef3161e7..c6fe86aeee466 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapperTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapperTests.java @@ -20,14 +20,14 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class DateIntervalWrapperTests extends ESTestCase { +public class DateIntervalWrapperTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(DateIntervalWrapper.IntervalTypeEnum.NONE.ordinal(), equalTo(0)); assertThat(DateIntervalWrapper.IntervalTypeEnum.FIXED.ordinal(), equalTo(1)); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DoubleBoundsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DoubleBoundsTests.java index 6b740ecabb90d..681e8dd5b4352 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DoubleBoundsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DoubleBoundsTests.java @@ -26,19 +26,19 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class DoubleBoundsTests extends ESTestCase { +public class DoubleBoundsTests extends OpenSearchTestCase { /** * Construct a random {@link DoubleBounds} */ public static DoubleBounds randomBounds() { Double min = randomDouble(); - Double max = randomValueOtherThan(min, ESTestCase::randomDouble); + Double max = randomValueOtherThan(min, OpenSearchTestCase::randomDouble); if (min > max) { double temp = min; min = max; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java index 508d58b000995..75bd37f2ebae6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java @@ -28,7 +28,7 @@ import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; import org.opensearch.search.aggregations.bucket.histogram.AutoDateHistogramAggregationBuilder.RoundingInfo; import org.opensearch.search.aggregations.bucket.histogram.InternalAutoDateHistogram.BucketInfo; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.time.Instant; import java.time.OffsetDateTime; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java index 55e7c9077098d..134f5b27dbdd7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java @@ -25,7 +25,7 @@ import org.opensearch.search.aggregations.BucketOrder; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.time.ZonedDateTime; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalHistogramTests.java index fe06cc90a2cde..78f4221b08d1a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalHistogramTests.java @@ -24,8 +24,8 @@ import org.opensearch.search.aggregations.BucketOrder; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java index fb1db73869cce..af6608744ec52 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java @@ -32,7 +32,7 @@ import org.opensearch.search.aggregations.MultiBucketConsumerService; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; import org.opensearch.search.aggregations.pipeline.PipelineAggregator; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java index 2d05601e145c3..b23322ee032ca 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.search.DocValueFormat; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.time.ZoneOffset; @@ -44,7 +44,7 @@ import static java.lang.Math.min; import static org.hamcrest.Matchers.equalTo; -public class LongBoundsTests extends ESTestCase { +public class LongBoundsTests extends OpenSearchTestCase { /** * Construct a random {@link LongBounds}. */ diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index 787a5474927e0..8de19671069df 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java @@ -78,7 +78,7 @@ import org.opensearch.search.aggregations.pipeline.InternalSimpleValue; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; import org.opensearch.search.aggregations.support.ValueType; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java index b5ece2877d06a..c3340c2cef224 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java @@ -30,11 +30,11 @@ import org.opensearch.search.aggregations.LeafBucketCollector; import org.opensearch.search.aggregations.bucket.range.BinaryRangeAggregator.SortedBinaryRangeLeafCollector; import org.opensearch.search.aggregations.bucket.range.BinaryRangeAggregator.SortedSetRangeLeafCollector; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import com.carrotsearch.hppc.LongHashSet; -public class BinaryRangeAggregatorTests extends ESTestCase { +public class BinaryRangeAggregatorTests extends OpenSearchTestCase { private static class FakeSortedSetDocValues extends AbstractSortedSetDocValues { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTestCase.java index 3b97ad5589b82..846ef65205632 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTestCase.java @@ -24,7 +24,7 @@ import org.opensearch.search.aggregations.InternalMultiBucketAggregation; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; import org.opensearch.search.aggregations.bucket.MultiBucketsAggregation; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.List; import java.util.Map; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java index aa67b52946e2a..0a1adc2cc5aca 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.io.stream.Writeable.Reader; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/BytesKeyedBucketOrdsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/BytesKeyedBucketOrdsTests.java index 267bda291a8ea..05f2e2ddcab94 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/BytesKeyedBucketOrdsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/BytesKeyedBucketOrdsTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.CardinalityUpperBound; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashSet; import java.util.Objects; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; -public class BytesKeyedBucketOrdsTests extends ESTestCase { +public class BytesKeyedBucketOrdsTests extends OpenSearchTestCase { private static final BytesRef SHIP_1 = new BytesRef("Just Read The Instructions"); private static final BytesRef SHIP_2 = new BytesRef("Of Course I Still Love You"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalRareTermsTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalRareTermsTestCase.java index 490d48de1e52b..5c56e6dae5e41 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalRareTermsTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalRareTermsTestCase.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.terms; import org.opensearch.search.aggregations.InternalAggregations; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java index f743ec8319a1f..6d77ae40ea0c6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalSignificantTermsTestCase.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.bucket.terms.heuristic.JLHScore; import org.opensearch.search.aggregations.bucket.terms.heuristic.MutualInformation; import org.opensearch.search.aggregations.bucket.terms.heuristic.SignificanceHeuristic; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import java.util.Arrays; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalTermsTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalTermsTestCase.java index ae46800d15799..d658ce6f25dab 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalTermsTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/InternalTermsTestCase.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.terms; import org.opensearch.search.aggregations.InternalAggregations; -import org.elasticsearch.test.InternalMultiBucketAggregationTestCase; +import org.opensearch.test.InternalMultiBucketAggregationTestCase; import org.junit.Before; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/LongKeyedBucketOrdsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/LongKeyedBucketOrdsTests.java index c696f7347b1f7..e51cdb69e6508 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/LongKeyedBucketOrdsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/LongKeyedBucketOrdsTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.CardinalityUpperBound; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashSet; import java.util.Objects; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class LongKeyedBucketOrdsTests extends ESTestCase { +public class LongKeyedBucketOrdsTests extends OpenSearchTestCase { private final MockBigArrays bigArrays = new MockBigArrays(new MockPageCacheRecycler(Settings.EMPTY), new NoneCircuitBreakerService()); public void testExplicitCollectsFromSingleBucket() { @@ -61,7 +61,7 @@ private void collectsFromSingleBucketCase(LongKeyedBucketOrds ords) { assertThat(ords.size(), equalTo(2L)); long[] values = new long[scaledRandomIntBetween(1, 10000)]; for (int i = 0; i < values.length; i++) { - values[i] = randomValueOtherThanMany(seen::contains, ESTestCase::randomLong); + values[i] = randomValueOtherThanMany(seen::contains, OpenSearchTestCase::randomLong); seen.add(values[i]); } for (int i = 0; i < values.length; i++) { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificanceHeuristicTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificanceHeuristicTests.java index b0f0445163fa9..610a6beabdca3 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificanceHeuristicTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificanceHeuristicTests.java @@ -44,8 +44,8 @@ import org.opensearch.search.aggregations.bucket.terms.heuristic.PercentageScore; import org.opensearch.search.aggregations.bucket.terms.heuristic.SignificanceHeuristic; import org.opensearch.search.aggregations.pipeline.PipelineAggregator; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -61,7 +61,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static org.opensearch.search.aggregations.AggregationBuilders.significantTerms; -import static org.elasticsearch.test.VersionUtils.randomVersion; +import static org.opensearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -70,7 +70,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class SignificanceHeuristicTests extends ESTestCase { +public class SignificanceHeuristicTests extends OpenSearchTestCase { // test that stream output can actually be read - does not replace bwc test public void testStreamResponse() throws Exception { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java index 3261ca085f668..5d39a9de44186 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorFactoryTests.java @@ -21,13 +21,13 @@ import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class TermsAggregatorFactoryTests extends ESTestCase { +public class TermsAggregatorFactoryTests extends OpenSearchTestCase { public void testPickEmpty() throws Exception { AggregatorFactories empty = mock(AggregatorFactories.class); when(empty.countAggregators()).thenReturn(0); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractGeoTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractGeoTestCase.java index b4af731b3b220..a5b86283f7359 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractGeoTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractGeoTestCase.java @@ -37,19 +37,19 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.elasticsearch.test.geo.RandomGeoGenerator; import java.util.ArrayList; import java.util.List; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.equalTo; -@ESIntegTestCase.SuiteScopeTestCase -public abstract class AbstractGeoTestCase extends ESIntegTestCase { +@OpenSearchIntegTestCase.SuiteScopeTestCase +public abstract class AbstractGeoTestCase extends OpenSearchIntegTestCase { protected static final String SINGLE_VALUED_FIELD_NAME = "geo_value"; protected static final String MULTI_VALUED_FIELD_NAME = "geo_values"; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesTestCase.java index 48ea230f4ee9c..1b23d9266d92d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesTestCase.java @@ -26,7 +26,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.Aggregation.CommonFields; import org.opensearch.search.aggregations.InternalAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/CompensatedSumTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/CompensatedSumTests.java index 3c4eb1e72928e..664853d145d7f 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/CompensatedSumTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/CompensatedSumTests.java @@ -19,10 +19,10 @@ package org.opensearch.search.aggregations.metrics; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; -public class CompensatedSumTests extends ESTestCase { +public class CompensatedSumTests extends OpenSearchTestCase { /** * When adding a series of numbers the order of the numbers should not impact the results. diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java index c00a043449aa1..324126421141d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.util.BigArrays; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class HyperLogLogPlusPlusSparseTests extends ESTestCase { +public class HyperLogLogPlusPlusSparseTests extends OpenSearchTestCase { public void testBasic() { final int p = randomIntBetween(MIN_PRECISION, MAX_PRECISION); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java index 7a5314d76b025..96df93fdc29b1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.util.BigArrays; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.atomic.AtomicLong; @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class HyperLogLogPlusPlusTests extends ESTestCase { +public class HyperLogLogPlusPlusTests extends OpenSearchTestCase { public void testEncodeDecode() { final int iters = scaledRandomIntBetween(100000, 500000); // random hashes diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalAvgTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalAvgTests.java index ff58562b37d79..94613367f41f7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalAvgTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalAvgTests.java @@ -22,7 +22,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java index 5ab873abd6cd0..d6f1918c5209d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import org.junit.After; import java.util.ArrayList; @@ -45,7 +45,7 @@ public void setUp() throws Exception { p = randomIntBetween(AbstractHyperLogLog.MIN_PRECISION, AbstractHyperLogLog.MAX_PRECISION); } - @After //we force @After to have it run before ESTestCase#after otherwise it fails + @After //we force @After to have it run before OpenSearchTestCase#after otherwise it fails @Override public void tearDown() throws Exception { super.tearDown(); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalExtendedStatsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalExtendedStatsTests.java index 9a7542df48fe6..82efc10b6ad16 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalExtendedStatsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalExtendedStatsTests.java @@ -23,7 +23,7 @@ import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.ParsedAggregation; import org.opensearch.search.aggregations.metrics.ExtendedStats.Bounds; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoBoundsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoBoundsTests.java index 424f0842374fa..845fdfed79be5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoBoundsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoBoundsTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoCentroidTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoCentroidTests.java index 1b8dca78606d5..95c97511040aa 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoCentroidTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalGeoCentroidTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.geo.GeoEncodingUtils; import org.opensearch.common.geo.GeoPoint; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import org.elasticsearch.test.geo.RandomGeoGenerator; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMaxTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMaxTests.java index 4bcda1bfe5b76..e2a43e1163df6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMaxTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMaxTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMedianAbsoluteDeviationTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMedianAbsoluteDeviationTests.java index 4684bf2d026c0..6d329ca2d976b 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMedianAbsoluteDeviationTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMedianAbsoluteDeviationTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMinTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMinTests.java index 711a6ba29f0b1..0e87256e8e1de 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMinTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalMinTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java index 8f137cfb6b2ed..c13f5650dcc0b 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java @@ -33,8 +33,8 @@ import org.opensearch.search.aggregations.InternalAggregation.ReduceContext; import org.opensearch.search.aggregations.ParsedAggregation; import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; -import org.elasticsearch.test.InternalAggregationTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.InternalAggregationTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalStatsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalStatsTests.java index 3f4e152352868..5fd96b4721b46 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalStatsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalStatsTests.java @@ -25,7 +25,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalSumTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalSumTests.java index 083a674784549..3b30b3667dedf 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalSumTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalSumTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.ArrayList; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java index 3f7d15338ff0a..27ba279f1ee40 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java @@ -40,9 +40,9 @@ import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; -import org.elasticsearch.test.NotEqualMessageBuilder; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; +import org.opensearch.test.NotEqualMessageBuilder; import java.io.IOException; import java.util.ArrayList; @@ -69,10 +69,10 @@ public class InternalTopHitsTests extends InternalAggregationTestCase metadata) { if (randomBoolean()) { - return createTestInstanceSortedByFields(name, between(1, 40), metadata, ESTestCase::randomFloat, + return createTestInstanceSortedByFields(name, between(1, 40), metadata, OpenSearchTestCase::randomFloat, randomSortFields(), InternalTopHitsTests::randomOfType); } - return createTestInstanceSortedScore(name, between(1, 40), metadata, ESTestCase::randomFloat); + return createTestInstanceSortedScore(name, between(1, 40), metadata, OpenSearchTestCase::randomFloat); } @Override @@ -83,7 +83,7 @@ protected List randomResultsToReduce(String name, int size) { */ Set usedScores = new HashSet<>(); Supplier scoreSupplier = () -> { - float score = randomValueOtherThanMany(usedScores::contains, ESTestCase::randomFloat); + float score = randomValueOtherThanMany(usedScores::contains, OpenSearchTestCase::randomFloat); usedScores.add(score); return score; }; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalValueCountTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalValueCountTests.java index 76ddbbb090d9b..02460997ca3d4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalValueCountTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalValueCountTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalWeightedAvgTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalWeightedAvgTests.java index 98a70525778a4..0b90ca63a939e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalWeightedAvgTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalWeightedAvgTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/MetricAggScriptPlugin.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/MetricAggScriptPlugin.java index 8081db12fd1eb..9a3f679384967 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/MetricAggScriptPlugin.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/MetricAggScriptPlugin.java @@ -28,7 +28,7 @@ import org.opensearch.script.MockScriptPlugin; import org.opensearch.search.lookup.LeafDocLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; /** * Provides a number of dummy scripts for tests. @@ -97,7 +97,7 @@ protected Map, Object>> pluginScripts() { protected Map, Object>> nonDeterministicPluginScripts() { Map, Object>> scripts = new HashMap<>(); - scripts.put("Math.random()", vars -> ESTestCase.randomDouble()); + scripts.put("Math.random()", vars -> OpenSearchTestCase.randomDouble()); return scripts; } diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/PercentilesMethodTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/PercentilesMethodTests.java index c9c5e1f082161..ba7bc29fbc4e1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/PercentilesMethodTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/PercentilesMethodTests.java @@ -21,14 +21,14 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class PercentilesMethodTests extends ESTestCase { +public class PercentilesMethodTests extends OpenSearchTestCase { public void testValidOrdinals() { assertThat(PercentilesMethod.TDIGEST.ordinal(), equalTo(0)); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestStateTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestStateTests.java index 2751f98f09bae..c712e316ee588 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestStateTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestStateTests.java @@ -19,11 +19,11 @@ package org.opensearch.search.aggregations.metrics; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; -public class TDigestStateTests extends ESTestCase { +public class TDigestStateTests extends OpenSearchTestCase { public void testMoreThan4BValues() { // Regression test for #19528 diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/TopHitsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/TopHitsTests.java index ab277607031ee..bca1f4b15e33c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/TopHitsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/TopHitsTests.java @@ -29,7 +29,7 @@ import org.opensearch.search.sort.ScriptSortBuilder.ScriptSortType; import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/weighted_avg/WeightedAvgAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/weighted_avg/WeightedAvgAggregationBuilderTests.java index 966e6a5c3a1fb..d18e5df679f59 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/weighted_avg/WeightedAvgAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/weighted_avg/WeightedAvgAggregationBuilderTests.java @@ -27,7 +27,7 @@ import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.metrics.WeightedAvgAggregationBuilder; import org.opensearch.search.aggregations.support.MultiValuesSourceFieldConfig; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketHelpersTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketHelpersTests.java index 0ee4357ada70a..9e549cac88046 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketHelpersTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketHelpersTests.java @@ -26,7 +26,7 @@ import org.opensearch.search.aggregations.InternalMultiBucketAggregation; import org.opensearch.search.aggregations.bucket.MultiBucketsAggregation; import org.opensearch.search.aggregations.metrics.InternalTDigestPercentiles; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.List; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; -public class BucketHelpersTests extends ESTestCase { +public class BucketHelpersTests extends OpenSearchTestCase { public void testReturnsObjectArray() { diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalBucketMetricValueTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalBucketMetricValueTests.java index b9da42c1824d8..2f2b2c8f966d9 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalBucketMetricValueTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalBucketMetricValueTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.Arrays; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalDerivativeTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalDerivativeTests.java index 8126f314a19da..8394bb7d1088a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalDerivativeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalDerivativeTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java index aa5590a809386..721af9dd58157 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalPercentilesBucketTests.java @@ -27,7 +27,7 @@ import org.opensearch.search.aggregations.Aggregation.CommonFields; import org.opensearch.search.aggregations.ParsedAggregation; import org.opensearch.search.aggregations.metrics.Percentile; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalSimpleValueTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalSimpleValueTests.java index 5d0cbd0f5ed54..ea04c5ab2ef24 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalSimpleValueTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/InternalSimpleValueTests.java @@ -21,7 +21,7 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.ParsedAggregation; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.util.HashMap; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovAvgUnitTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovAvgUnitTests.java index aa935079bf3ab..d07a18165995a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovAvgUnitTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovAvgUnitTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.pipeline; import org.opensearch.common.collect.EvictingQueue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.text.ParseException; import java.util.ArrayList; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; -public class MovAvgUnitTests extends ESTestCase { +public class MovAvgUnitTests extends OpenSearchTestCase { public void testSimpleMovAvgModel() { MovAvgModel model = new SimpleModel(); diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovFnWhitelistedFunctionTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovFnWhitelistedFunctionTests.java index 79c198793c383..b04d19bb62afc 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovFnWhitelistedFunctionTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/MovFnWhitelistedFunctionTests.java @@ -20,13 +20,13 @@ package org.opensearch.search.aggregations.pipeline; import org.opensearch.common.collect.EvictingQueue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import static org.hamcrest.Matchers.equalTo; -public class MovFnWhitelistedFunctionTests extends ESTestCase { +public class MovFnWhitelistedFunctionTests extends OpenSearchTestCase { public void testWindowMax() { int numValues = randomIntBetween(1, 100); diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java index ead20cb817ac1..f07151f610bd9 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java @@ -29,7 +29,7 @@ import org.opensearch.search.aggregations.metrics.MinAggregationBuilder; import org.opensearch.search.aggregations.metrics.SumAggregationBuilder; import org.opensearch.search.aggregations.support.ValuesSourceAggregationBuilder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -39,7 +39,7 @@ * Provides helper methods and classes for use in PipelineAggregation tests, * such as creating mock histograms or computing simple metrics */ -public class PipelineAggregationHelperTests extends ESTestCase { +public class PipelineAggregationHelperTests extends OpenSearchTestCase { /** * Generates a mock histogram to use for testing. Each MockBucket holds a doc count, key and document values diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/AggregationPathTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/AggregationPathTests.java index 17d763f9ef480..651dffb894d96 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/AggregationPathTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/AggregationPathTests.java @@ -20,14 +20,14 @@ package org.opensearch.search.aggregations.support; import org.opensearch.search.aggregations.AggregationExecutionException; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; import static org.hamcrest.Matchers.equalTo; -public class AggregationPathTests extends ESTestCase { +public class AggregationPathTests extends OpenSearchTestCase { public void testInvalidPaths() throws Exception { assertInvalidPath("[foo]", "brackets at the beginning of the token expression"); assertInvalidPath("foo[bar", "open brackets without closing at the token expression"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/CoreValuesSourceTypeTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/CoreValuesSourceTypeTests.java index c84046dfcdfa1..c01688c344c28 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/CoreValuesSourceTypeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/CoreValuesSourceTypeTests.java @@ -19,11 +19,11 @@ package org.opensearch.search.aggregations.support; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class CoreValuesSourceTypeTests extends ESTestCase { +public class CoreValuesSourceTypeTests extends OpenSearchTestCase { public void testFromString() { assertThat(CoreValuesSourceType.fromString("numeric"), equalTo(CoreValuesSourceType.NUMERIC)); diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java index 8bd403da776f5..39f7cf461da60 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/IncludeExcludeTests.java @@ -33,13 +33,13 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.bucket.terms.IncludeExclude; import org.opensearch.search.aggregations.bucket.terms.IncludeExclude.OrdinalsFilter; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; import java.util.TreeSet; -public class IncludeExcludeTests extends ESTestCase { +public class IncludeExcludeTests extends OpenSearchTestCase { public void testEmptyTermsWithOrds() throws IOException { IncludeExclude inexcl = new IncludeExclude( new TreeSet<>(Collections.singleton(new BytesRef("foo"))), diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java index fa5362df1a9bd..d42e4e891ebfd 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/MissingValuesTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.fielddata.MultiGeoPointValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -40,7 +40,7 @@ import java.util.Set; import java.util.function.LongUnaryOperator; -public class MissingValuesTests extends ESTestCase { +public class MissingValuesTests extends OpenSearchTestCase { public void testMissingBytes() throws IOException { final int numDocs = TestUtil.nextInt(random(), 1, 100); diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/MultiValuesSourceFieldConfigTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/MultiValuesSourceFieldConfigTests.java index 39250d7422a88..241d98cf3d2c6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/MultiValuesSourceFieldConfigTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/MultiValuesSourceFieldConfigTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.opensearch.script.Script; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/ScriptValuesTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/ScriptValuesTests.java index 7ba60394d6a7a..0c83cbcfcb6de 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/ScriptValuesTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/ScriptValuesTests.java @@ -31,7 +31,7 @@ import org.opensearch.search.aggregations.support.values.ScriptLongValues; import org.opensearch.search.lookup.LeafSearchLookup; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ScriptValuesTests extends ESTestCase { +public class ScriptValuesTests extends OpenSearchTestCase { private static class FakeAggregationScript extends AggregationScript { diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/ValueTypeTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/ValueTypeTests.java index a0eada093b8be..5f4aa7daf0a49 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/ValueTypeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/ValueTypeTests.java @@ -19,9 +19,9 @@ package org.opensearch.search.aggregations.support; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class ValueTypeTests extends ESTestCase { +public class ValueTypeTests extends OpenSearchTestCase { public void testResolve() { assertEquals(ValueType.STRING, ValueType.lenientParse("string")); diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceConfigTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceConfigTests.java index b4b88b87c3d14..7d48175d49d6d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceConfigTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceConfigTests.java @@ -29,10 +29,10 @@ import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; // TODO: This whole set of tests needs to be rethought. -public class ValuesSourceConfigTests extends ESSingleNodeTestCase { +public class ValuesSourceConfigTests extends OpenSearchSingleNodeTestCase { public void testKeyword() throws Exception { IndexService indexService = createIndex("index", Settings.EMPTY, "type", diff --git a/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceRegistryTests.java b/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceRegistryTests.java index e702c12d8d3b0..2b809e4728e8d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceRegistryTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/support/ValuesSourceRegistryTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.script.AggregationScript; import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregatorSupplier; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.mockito.Mockito; import java.util.Collections; @@ -30,7 +30,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ValuesSourceRegistryTests extends ESTestCase { +public class ValuesSourceRegistryTests extends OpenSearchTestCase { public void testAggregatorNotFoundException() { final QueryShardContext queryShardContext = mock(QueryShardContext.class); diff --git a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java index bc233e969ebb1..eb8c47938dd12 100644 --- a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java @@ -44,8 +44,8 @@ import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.ScoreSortBuilder; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import java.io.IOException; import java.util.Map; @@ -120,7 +120,7 @@ public void testEqualsAndHashcode() throws IOException { //we use the streaming infra to create a copy of the builder provided as argument private SearchSourceBuilder copyBuilder(SearchSourceBuilder original) throws IOException { - return ESTestCase.copyWriteable(original, namedWriteableRegistry, SearchSourceBuilder::new); + return OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, SearchSourceBuilder::new); } public void testParseIncludeExclude() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java b/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java index b7fcb963033a0..6dfcb377bedfc 100644 --- a/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.search.SearchModule; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/server/src/test/java/org/opensearch/search/fetch/FetchPhaseTests.java b/server/src/test/java/org/opensearch/search/fetch/FetchPhaseTests.java index a64b68f177191..61a23073f3d59 100644 --- a/server/src/test/java/org/opensearch/search/fetch/FetchPhaseTests.java +++ b/server/src/test/java/org/opensearch/search/fetch/FetchPhaseTests.java @@ -19,9 +19,9 @@ package org.opensearch.search.fetch; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class FetchPhaseTests extends ESTestCase { +public class FetchPhaseTests extends OpenSearchTestCase { public void testSequentialDocs() { FetchPhase.DocIdToIndex[] docs = new FetchPhase.DocIdToIndex[10]; int start = randomIntBetween(0, Short.MAX_VALUE); diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java b/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java index 6b7cf4146be77..462664a8b8a1e 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java @@ -30,7 +30,7 @@ import org.opensearch.search.fetch.FetchSubPhase.HitContext; import org.opensearch.search.fetch.FetchSubPhaseProcessor; import org.opensearch.search.lookup.SourceLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class FetchSourcePhaseTests extends ESTestCase { +public class FetchSourcePhaseTests extends OpenSearchTestCase { public void testFetchSource() throws IOException { XContentBuilder source = XContentFactory.jsonBuilder().startObject() diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/FieldFetcherTests.java b/server/src/test/java/org/opensearch/search/fetch/subphase/FieldFetcherTests.java index 5317490d50548..b67e84e6b770e 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/FieldFetcherTests.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/FieldFetcherTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService; import org.opensearch.search.lookup.SourceLookup; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.List; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItems; -public class FieldFetcherTests extends ESSingleNodeTestCase { +public class FieldFetcherTests extends OpenSearchSingleNodeTestCase { public void testLeafValues() throws IOException { MapperService mapperService = createMapperService(); diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilderTests.java index b69aa9990c9b3..50ae8ad5dd0db 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightBuilderTests.java @@ -53,8 +53,8 @@ import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder.Field; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder.Order; import org.opensearch.search.fetch.subphase.highlight.SearchHighlightContext.FieldOptions; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -70,11 +70,11 @@ import java.util.function.Function; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class HighlightBuilderTests extends ESTestCase { +public class HighlightBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static NamedWriteableRegistry namedWriteableRegistry; @@ -739,7 +739,7 @@ private static HighlightBuilder mutate(HighlightBuilder original) throws IOExcep } private static HighlightBuilder serializedCopy(HighlightBuilder original) throws IOException { - return ESTestCase.copyWriteable(original, namedWriteableRegistry, HighlightBuilder::new); + return OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, HighlightBuilder::new); } @Override diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightFieldTests.java b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightFieldTests.java index cadf599eec7d5..db2728cfd4c60 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightFieldTests.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/HighlightFieldTests.java @@ -29,14 +29,14 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Arrays; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public class HighlightFieldTests extends ESTestCase { +public class HighlightFieldTests extends OpenSearchTestCase { public static HighlightField createTestItem() { String name = frequently() ? randomAlphaOfLengthBetween(5, 20) : randomRealisticUnicodeOfCodepointLengthBetween(5, 20); diff --git a/server/src/test/java/org/opensearch/search/geo/GeoQueryTests.java b/server/src/test/java/org/opensearch/search/geo/GeoQueryTests.java index b9500217ecd20..24fdc930dd5a1 100644 --- a/server/src/test/java/org/opensearch/search/geo/GeoQueryTests.java +++ b/server/src/test/java/org/opensearch/search/geo/GeoQueryTests.java @@ -38,8 +38,8 @@ import org.opensearch.index.query.QueryBuilders; import org.opensearch.plugins.Plugin; import org.opensearch.search.SearchHits; -import org.elasticsearch.test.ESSingleNodeTestCase; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.OpenSearchSingleNodeTestCase; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import org.locationtech.jts.geom.Coordinate; import java.util.Collection; @@ -47,14 +47,14 @@ import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -public abstract class GeoQueryTests extends ESSingleNodeTestCase { +public abstract class GeoQueryTests extends OpenSearchSingleNodeTestCase { @Override protected Collection> getPlugins() { return Collections.singleton(TestGeoShapeFieldMapperPlugin.class); diff --git a/server/src/test/java/org/opensearch/search/geo/GeoShapeQueryTests.java b/server/src/test/java/org/opensearch/search/geo/GeoShapeQueryTests.java index 8d0992442f408..470ccafc6730a 100644 --- a/server/src/test/java/org/opensearch/search/geo/GeoShapeQueryTests.java +++ b/server/src/test/java/org/opensearch/search/geo/GeoShapeQueryTests.java @@ -63,8 +63,8 @@ import static org.elasticsearch.test.geo.RandomShapeGenerator.createGeometryCollectionWithin; import static org.elasticsearch.test.geo.RandomShapeGenerator.xRandomPoint; import static org.elasticsearch.test.geo.RandomShapeGenerator.xRandomRectangle; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java b/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java index a1d12594d82c5..a834f31f00195 100644 --- a/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java +++ b/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java @@ -23,15 +23,15 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.TermQueryBuilder; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import java.util.Arrays; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.instanceOf; -public class AliasFilterTests extends ESTestCase { +public class AliasFilterTests extends OpenSearchTestCase { public void testEqualsAndHashCode() { final QueryBuilder filter = QueryBuilders.termQuery("field", "value"); diff --git a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java index aadfbba1cddc2..165be8d8acc05 100644 --- a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java @@ -68,8 +68,8 @@ import org.opensearch.index.cache.bitset.BitsetFilterCache; import org.opensearch.index.shard.ShardId; import org.opensearch.search.aggregations.LeafBucketCollector; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.io.UncheckedIOException; @@ -84,7 +84,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class ContextIndexSearcherTests extends ESTestCase { +public class ContextIndexSearcherTests extends OpenSearchTestCase { public void testIntersectScorerAndRoleBits() throws Exception { final Directory directory = newDirectory(); IndexWriter iw = new IndexWriter( diff --git a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java index ce7b0eb6b995f..74514167bff76 100644 --- a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.InvalidAliasNameException; import org.opensearch.search.AbstractSearchTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; import org.opensearch.search.SearchSortValuesAndFormatsTests; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java index 5f366b0d5d11e..608238b8c8ea6 100644 --- a/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import static org.opensearch.search.lookup.LeafDocLookup.TYPES_DEPRECATION_MESSAGE; @@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class LeafDocLookupTests extends ESTestCase { +public class LeafDocLookupTests extends OpenSearchTestCase { private ScriptDocValues docValues; private LeafDocLookup docLookup; diff --git a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java index 69fcbd41bcddb..15cbd384d07c1 100644 --- a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.StoredFieldVisitor; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.util.Collections; @@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class LeafFieldsLookupTests extends ESTestCase { +public class LeafFieldsLookupTests extends OpenSearchTestCase { private LeafFieldsLookup fieldsLookup; @Before diff --git a/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java b/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java index 8be2d9a2aeeed..69fbd0319e64c 100644 --- a/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -38,10 +38,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class ProfileResultTests extends ESTestCase { +public class ProfileResultTests extends OpenSearchTestCase { public static ProfileResult createTestItem(int depth) { String type = randomAlphaOfLengthBetween(5, 10); diff --git a/server/src/test/java/org/opensearch/search/profile/SearchProfileShardResultsTests.java b/server/src/test/java/org/opensearch/search/profile/SearchProfileShardResultsTests.java index e2235de0fa67d..744a266d1785f 100644 --- a/server/src/test/java/org/opensearch/search/profile/SearchProfileShardResultsTests.java +++ b/server/src/test/java/org/opensearch/search/profile/SearchProfileShardResultsTests.java @@ -27,7 +27,7 @@ import org.opensearch.search.profile.aggregation.AggregationProfileShardResultTests; import org.opensearch.search.profile.query.QueryProfileShardResult; import org.opensearch.search.profile.query.QueryProfileShardResultTests; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -39,10 +39,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.common.xcontent.XContentParserUtils.ensureFieldName; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class SearchProfileShardResultsTests extends ESTestCase { +public class SearchProfileShardResultsTests extends OpenSearchTestCase { public static SearchProfileShardResults createTestItem() { int size = rarely() ? 0 : randomIntBetween(1, 2); diff --git a/server/src/test/java/org/opensearch/search/profile/TimerTests.java b/server/src/test/java/org/opensearch/search/profile/TimerTests.java index 1f73b33f8c717..201e48afb837d 100644 --- a/server/src/test/java/org/opensearch/search/profile/TimerTests.java +++ b/server/src/test/java/org/opensearch/search/profile/TimerTests.java @@ -19,11 +19,11 @@ package org.opensearch.search.profile; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.atomic.AtomicLong; -public class TimerTests extends ESTestCase { +public class TimerTests extends OpenSearchTestCase { public void testTimingInterval() { final AtomicLong nanoTimeCallCounter = new AtomicLong(); diff --git a/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java b/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java index 25dbd7418154f..7b5f37ad02e55 100644 --- a/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.profile.ProfileResult; import org.opensearch.search.profile.ProfileResultTests; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -36,9 +36,9 @@ import java.util.Map; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class AggregationProfileShardResultTests extends ESTestCase { +public class AggregationProfileShardResultTests extends OpenSearchTestCase { public static AggregationProfileShardResult createTestItem(int depth) { int size = randomIntBetween(0, 5); diff --git a/server/src/test/java/org/opensearch/search/profile/query/CollectorResultTests.java b/server/src/test/java/org/opensearch/search/profile/query/CollectorResultTests.java index b1960572852b0..3719d85271786 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/CollectorResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/query/CollectorResultTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -35,10 +35,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class CollectorResultTests extends ESTestCase { +public class CollectorResultTests extends OpenSearchTestCase { public static CollectorResult createTestItem(int depth) { String name = randomAlphaOfLengthBetween(5, 10); diff --git a/server/src/test/java/org/opensearch/search/profile/query/ProfileScorerTests.java b/server/src/test/java/org/opensearch/search/profile/query/ProfileScorerTests.java index c8e0d4d373e97..c0f311b48b63e 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/ProfileScorerTests.java +++ b/server/src/test/java/org/opensearch/search/profile/query/ProfileScorerTests.java @@ -27,11 +27,11 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Weight; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class ProfileScorerTests extends ESTestCase { +public class ProfileScorerTests extends OpenSearchTestCase { private static class FakeScorer extends Scorer { diff --git a/server/src/test/java/org/opensearch/search/profile/query/QueryProfileShardResultTests.java b/server/src/test/java/org/opensearch/search/profile/query/QueryProfileShardResultTests.java index 7dbca778db0aa..0f57d3bfc84d1 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/QueryProfileShardResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/query/QueryProfileShardResultTests.java @@ -26,16 +26,16 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.profile.ProfileResult; import org.opensearch.search.profile.ProfileResultTests; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.List; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class QueryProfileShardResultTests extends ESTestCase { +public class QueryProfileShardResultTests extends OpenSearchTestCase { public static QueryProfileShardResult createTestItem() { int size = randomIntBetween(0, 5); diff --git a/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java b/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java index 7b3faa33bcb76..c1970113dc088 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java +++ b/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java @@ -47,7 +47,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.search.profile.ProfileResult; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class QueryProfilerTests extends ESTestCase { +public class QueryProfilerTests extends OpenSearchTestCase { static Directory dir; static IndexReader reader; diff --git a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java index 0c578c9affd8f..226fe3900b89e 100644 --- a/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java +++ b/server/src/test/java/org/opensearch/search/query/QueryPhaseTests.java @@ -87,14 +87,14 @@ import org.opensearch.index.query.QueryShardContext; import org.opensearch.index.search.OpenSearchToParentBlockJoinQuery; import org.opensearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.opensearch.search.DocValueFormat; import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.search.internal.ScrollContext; import org.opensearch.search.internal.SearchContext; import org.opensearch.search.sort.SortAndFormats; import org.opensearch.tasks.TaskCancelledException; -import org.elasticsearch.test.TestSearchContext; +import org.opensearch.test.TestSearchContext; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java index 5e35e69d7e99d..6a01d16c2bb87 100644 --- a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java +++ b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java @@ -44,14 +44,14 @@ import org.opensearch.search.internal.ShardSearchContextId; import org.opensearch.search.internal.ShardSearchRequest; import org.opensearch.search.suggest.SuggestTests; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Base64; import static java.util.Collections.emptyList; -public class QuerySearchResultTests extends ESTestCase { +public class QuerySearchResultTests extends OpenSearchTestCase { private final NamedWriteableRegistry namedWriteableRegistry; diff --git a/server/src/test/java/org/opensearch/search/query/ScriptScoreQueryTests.java b/server/src/test/java/org/opensearch/search/query/ScriptScoreQueryTests.java index 23262d8677d88..3a3fffc0a4fff 100644 --- a/server/src/test/java/org/opensearch/search/query/ScriptScoreQueryTests.java +++ b/server/src/test/java/org/opensearch/search/query/ScriptScoreQueryTests.java @@ -38,7 +38,7 @@ import org.opensearch.script.Script; import org.opensearch.search.lookup.LeafSearchLookup; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -52,7 +52,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ScriptScoreQueryTests extends ESTestCase { +public class ScriptScoreQueryTests extends OpenSearchTestCase { private Directory dir; private IndexWriter w; diff --git a/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java b/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java index eaa7a38ee862c..a9d97adf0baf9 100644 --- a/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java +++ b/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.rescore; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -27,7 +27,7 @@ * Test fixing the ordinals and names in {@link QueryRescoreMode}. These should not be changed since we * use the names in the parser and the ordinals in serialization. */ -public class QueryRescoreModeTests extends ESTestCase { +public class QueryRescoreModeTests extends OpenSearchTestCase { /** * Test @link {@link QueryRescoreMode} enum ordinals and names, since serialization relies on it diff --git a/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java index 39af1d39fc41d..7bde9877f16f5 100644 --- a/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java @@ -48,18 +48,18 @@ import org.opensearch.index.query.Rewriteable; import org.opensearch.search.SearchModule; import org.opensearch.search.rescore.QueryRescorer.QueryRescoreContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.AfterClass; import org.junit.BeforeClass; import java.io.IOException; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.containsString; -public class QueryRescorerBuilderTests extends ESTestCase { +public class QueryRescorerBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static NamedWriteableRegistry namedWriteableRegistry; @@ -291,7 +291,7 @@ protected NamedXContentRegistry xContentRegistry() { } private static RescorerBuilder mutate(RescorerBuilder original) throws IOException { - RescorerBuilder mutation = ESTestCase.copyWriteable(original, namedWriteableRegistry, QueryRescorerBuilder::new); + RescorerBuilder mutation = OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, QueryRescorerBuilder::new); if (randomBoolean()) { Integer windowSize = original.windowSize(); if (windowSize != null) { diff --git a/server/src/test/java/org/opensearch/search/scroll/RestClearScrollActionTests.java b/server/src/test/java/org/opensearch/search/scroll/RestClearScrollActionTests.java index f0c8f85e5ea90..b2fc9ab8d5d6f 100644 --- a/server/src/test/java/org/opensearch/search/scroll/RestClearScrollActionTests.java +++ b/server/src/test/java/org/opensearch/search/scroll/RestClearScrollActionTests.java @@ -28,17 +28,17 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.search.RestClearScrollAction; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import java.util.Collections; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -public class RestClearScrollActionTests extends ESTestCase { +public class RestClearScrollActionTests extends OpenSearchTestCase { public void testParseClearScrollRequestWithInvalidJsonThrowsException() throws Exception { RestClearScrollAction action = new RestClearScrollAction(); diff --git a/server/src/test/java/org/opensearch/search/scroll/RestSearchScrollActionTests.java b/server/src/test/java/org/opensearch/search/scroll/RestSearchScrollActionTests.java index 4b019d89002be..5d272822ffa74 100644 --- a/server/src/test/java/org/opensearch/search/scroll/RestSearchScrollActionTests.java +++ b/server/src/test/java/org/opensearch/search/scroll/RestSearchScrollActionTests.java @@ -28,17 +28,17 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.search.RestSearchScrollAction; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestChannel; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestChannel; +import org.opensearch.test.rest.FakeRestRequest; import java.util.HashMap; import java.util.Map; import static org.hamcrest.Matchers.equalTo; -public class RestSearchScrollActionTests extends ESTestCase { +public class RestSearchScrollActionTests extends OpenSearchTestCase { public void testParseSearchScrollRequestWithInvalidJsonThrowsException() throws Exception { RestSearchScrollAction action = new RestSearchScrollAction(); diff --git a/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java index a72484c6fdd0c..082751eb75c2c 100644 --- a/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java @@ -39,18 +39,18 @@ import org.opensearch.search.MultiValueMode; import org.opensearch.search.sort.BucketedSort; import org.opensearch.search.sort.SortOrder; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.math.BigDecimal; import java.util.Collections; import static org.opensearch.search.searchafter.SearchAfterBuilder.extractSortType; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class SearchAfterBuilderTests extends ESTestCase { +public class SearchAfterBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static SearchAfterBuilder randomSearchAfterBuilder() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java b/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java index e0aee2bca0254..b6516d6c47542 100644 --- a/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java +++ b/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java @@ -36,7 +36,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; import org.opensearch.common.UUIDs; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; -public class DocValuesSliceQueryTests extends ESTestCase { +public class DocValuesSliceQueryTests extends OpenSearchTestCase { public void testBasics() { DocValuesSliceQuery query1 = diff --git a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java index 28aa2c950155e..4f68d03467824 100644 --- a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java @@ -59,7 +59,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.search.internal.ShardSearchRequest; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -70,7 +70,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +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; @@ -78,7 +78,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class SliceBuilderTests extends ESTestCase { +public class SliceBuilderTests extends OpenSearchTestCase { private static final int MAX_SLICE = 20; private static SliceBuilder randomSliceBuilder() { diff --git a/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java b/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java index 4baa7530f5234..8423411d0a81f 100644 --- a/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java +++ b/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java @@ -36,7 +36,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.StringHelper; import org.opensearch.common.UUIDs; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; -public class TermsSliceQueryTests extends ESTestCase { +public class TermsSliceQueryTests extends OpenSearchTestCase { public void testBasics() { TermsSliceQuery query1 = new TermsSliceQuery("field1", 1, 10); diff --git a/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java b/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java index 5827601ef29a3..e511b61c76017 100644 --- a/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java +++ b/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java @@ -58,8 +58,8 @@ import org.opensearch.search.DocValueFormat; import org.opensearch.search.SearchModule; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.AfterClass; import org.junit.BeforeClass; import org.mockito.Mockito; @@ -71,9 +71,9 @@ import java.util.function.Supplier; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public abstract class AbstractSortTestCase> extends ESTestCase { +public abstract class AbstractSortTestCase> extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; diff --git a/server/src/test/java/org/opensearch/search/sort/BucketedSortTestCase.java b/server/src/test/java/org/opensearch/search/sort/BucketedSortTestCase.java index cb3437f5378de..601d72a595cb2 100644 --- a/server/src/test/java/org/opensearch/search/sort/BucketedSortTestCase.java +++ b/server/src/test/java/org/opensearch/search/sort/BucketedSortTestCase.java @@ -29,7 +29,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.DocValueFormat; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; -public abstract class BucketedSortTestCase extends ESTestCase { +public abstract class BucketedSortTestCase extends OpenSearchTestCase { /** * Build a {@link BucketedSort} to test. Sorts built by this method shouldn't need scores. * @param values values to test, always sent as doubles just to have diff --git a/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java index 8c5695edb5b95..5ee2a699bc31d 100644 --- a/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java @@ -33,8 +33,8 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.mockito.Mockito; @@ -43,7 +43,7 @@ import static java.util.Collections.emptyList; -public class NestedSortBuilderTests extends ESTestCase { +public class NestedSortBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; private static NamedWriteableRegistry namedWriteableRegistry; diff --git a/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java index 6371989cacd18..ca1f05e7543b5 100644 --- a/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,7 +42,7 @@ import static java.util.Collections.emptyList; -public class SortBuilderTests extends ESTestCase { +public class SortBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; private static NamedXContentRegistry xContentRegistry; diff --git a/server/src/test/java/org/opensearch/search/sort/SortModeTests.java b/server/src/test/java/org/opensearch/search/sort/SortModeTests.java index fcbf758a5dbf5..1d944c5593e05 100644 --- a/server/src/test/java/org/opensearch/search/sort/SortModeTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortModeTests.java @@ -19,11 +19,11 @@ package org.opensearch.search.sort; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; -public class SortModeTests extends ESTestCase { +public class SortModeTests extends OpenSearchTestCase { public void testSortMode() { // we rely on these ordinals in serialization, so changing them breaks bwc. diff --git a/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java b/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java index 158e80ee34095..a2c58daec56b3 100644 --- a/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java @@ -21,11 +21,11 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; -public class SortOrderTests extends ESTestCase { +public class SortOrderTests extends OpenSearchTestCase { /** Check that ordinals remain stable as we rely on them for serialisation. */ public void testDistanceUnitNames() { diff --git a/server/src/test/java/org/opensearch/search/sort/SortValueTests.java b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java index 493a0dd1d739b..339cabf87758f 100644 --- a/server/src/test/java/org/opensearch/search/sort/SortValueTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.DateFieldMapper; import org.opensearch.search.DocValueFormat; -import org.elasticsearch.test.AbstractNamedWriteableTestCase; +import org.opensearch.test.AbstractNamedWriteableTestCase; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java b/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java index da18a38f2d822..92e4132fb7ebd 100644 --- a/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java +++ b/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java @@ -46,8 +46,8 @@ import org.opensearch.script.ScriptService; import org.opensearch.search.SearchModule; import org.opensearch.search.suggest.SuggestionSearchContext.SuggestionContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -55,12 +55,12 @@ import static java.util.Collections.emptyList; import static org.opensearch.common.lucene.BytesRefs.toBytesRef; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public abstract class AbstractSuggestionBuilderTestCase> extends ESTestCase { +public abstract class AbstractSuggestionBuilderTestCase> extends OpenSearchTestCase { private static final int NUMBER_OF_TESTBUILDERS = 20; protected static NamedWriteableRegistry namedWriteableRegistry; diff --git a/server/src/test/java/org/opensearch/search/suggest/CompletionSuggestionOptionTests.java b/server/src/test/java/org/opensearch/search/suggest/CompletionSuggestionOptionTests.java index d35e40db4a5e6..b702c08026d20 100644 --- a/server/src/test/java/org/opensearch/search/suggest/CompletionSuggestionOptionTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/CompletionSuggestionOptionTests.java @@ -28,7 +28,7 @@ import org.opensearch.search.SearchHitTests; import org.opensearch.search.suggest.completion.CompletionSuggestion; import org.opensearch.search.suggest.completion.CompletionSuggestion.Entry.Option; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -39,10 +39,10 @@ import java.util.function.Predicate; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class CompletionSuggestionOptionTests extends ESTestCase { +public class CompletionSuggestionOptionTests extends OpenSearchTestCase { public static Option createTestItem() { Text text = new Text(randomAlphaOfLengthBetween(5, 15)); diff --git a/server/src/test/java/org/opensearch/search/suggest/SuggestBuilderTests.java b/server/src/test/java/org/opensearch/search/suggest/SuggestBuilderTests.java index 271943eb299c5..58f22696f5901 100644 --- a/server/src/test/java/org/opensearch/search/suggest/SuggestBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/SuggestBuilderTests.java @@ -31,8 +31,8 @@ import org.opensearch.search.suggest.completion.CompletionSuggesterBuilderTests; import org.opensearch.search.suggest.phrase.PhraseSuggestionBuilderTests; import org.opensearch.search.suggest.term.TermSuggestionBuilderTests; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -41,7 +41,7 @@ import static java.util.Collections.emptyList; -public class SuggestBuilderTests extends ESTestCase { +public class SuggestBuilderTests extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; private static NamedWriteableRegistry namedWriteableRegistry; diff --git a/server/src/test/java/org/opensearch/search/suggest/SuggestTests.java b/server/src/test/java/org/opensearch/search/suggest/SuggestTests.java index 04dff6e208a6c..ffb53b748b95e 100644 --- a/server/src/test/java/org/opensearch/search/suggest/SuggestTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/SuggestTests.java @@ -42,8 +42,8 @@ import org.opensearch.search.suggest.completion.CompletionSuggestion; import org.opensearch.search.suggest.phrase.PhraseSuggestion; import org.opensearch.search.suggest.term.TermSuggestion; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; @@ -56,10 +56,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.common.xcontent.XContentParserUtils.ensureFieldName; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.equalTo; -public class SuggestTests extends ESTestCase { +public class SuggestTests extends OpenSearchTestCase { private static final NamedXContentRegistry xContentRegistry; private static final List namedXContents; diff --git a/server/src/test/java/org/opensearch/search/suggest/SuggestionEntryTests.java b/server/src/test/java/org/opensearch/search/suggest/SuggestionEntryTests.java index 3162b466faab5..1c89d6e0ae418 100644 --- a/server/src/test/java/org/opensearch/search/suggest/SuggestionEntryTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/SuggestionEntryTests.java @@ -29,7 +29,7 @@ import org.opensearch.search.suggest.completion.CompletionSuggestion; import org.opensearch.search.suggest.phrase.PhraseSuggestion; import org.opensearch.search.suggest.term.TermSuggestion; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -41,10 +41,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class SuggestionEntryTests extends ESTestCase { +public class SuggestionEntryTests extends OpenSearchTestCase { private static final Map, Function> ENTRY_PARSERS = new HashMap<>(); static { diff --git a/server/src/test/java/org/opensearch/search/suggest/SuggestionOptionTests.java b/server/src/test/java/org/opensearch/search/suggest/SuggestionOptionTests.java index ccdbc2328e216..3558a19ded6f0 100644 --- a/server/src/test/java/org/opensearch/search/suggest/SuggestionOptionTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/SuggestionOptionTests.java @@ -26,16 +26,16 @@ import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.suggest.Suggest.Suggestion.Entry.Option; import org.opensearch.search.suggest.phrase.PhraseSuggestion; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class SuggestionOptionTests extends ESTestCase { +public class SuggestionOptionTests extends OpenSearchTestCase { public static Option createTestItem() { Text text = new Text(randomAlphaOfLengthBetween(5, 15)); diff --git a/server/src/test/java/org/opensearch/search/suggest/SuggestionTests.java b/server/src/test/java/org/opensearch/search/suggest/SuggestionTests.java index e1bfc7be48629..e9be6fd238964 100644 --- a/server/src/test/java/org/opensearch/search/suggest/SuggestionTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/SuggestionTests.java @@ -36,7 +36,7 @@ import org.opensearch.search.suggest.completion.CompletionSuggestion; import org.opensearch.search.suggest.phrase.PhraseSuggestion; import org.opensearch.search.suggest.term.TermSuggestion; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -47,10 +47,10 @@ import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class SuggestionTests extends ESTestCase { +public class SuggestionTests extends OpenSearchTestCase { @SuppressWarnings("unchecked") private static final Class>>[] SUGGESTION_TYPES = new Class[] { diff --git a/server/src/test/java/org/opensearch/search/suggest/TermSuggestionOptionTests.java b/server/src/test/java/org/opensearch/search/suggest/TermSuggestionOptionTests.java index cbea9baefd5c6..5b3e26737756c 100644 --- a/server/src/test/java/org/opensearch/search/suggest/TermSuggestionOptionTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/TermSuggestionOptionTests.java @@ -25,16 +25,16 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.suggest.term.TermSuggestion.Entry.Option; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public class TermSuggestionOptionTests extends ESTestCase { +public class TermSuggestionOptionTests extends OpenSearchTestCase { public static Option createTestItem() { Text text = new Text(randomAlphaOfLengthBetween(5, 15)); diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java index a9820cd0259eb..9b7f2d5d3b142 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java @@ -50,7 +50,7 @@ import org.opensearch.search.suggest.completion.context.CategoryContextMapping; import org.opensearch.search.suggest.completion.context.ContextBuilder; import org.opensearch.search.suggest.completion.context.ContextMapping; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.List; import java.util.Set; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class CategoryContextMappingTests extends ESSingleNodeTestCase { +public class CategoryContextMappingTests extends OpenSearchSingleNodeTestCase { public void testIndexingWithNoContexts() throws Exception { String mapping = Strings.toString(jsonBuilder().startObject().startObject("type1") diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggestionTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggestionTests.java index 32f4033038bb2..29044e6125f26 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggestionTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggestionTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.text.Text; import org.opensearch.search.suggest.Suggest; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class CompletionSuggestionTests extends ESTestCase { +public class CompletionSuggestionTests extends OpenSearchTestCase { public void testReduce() { List> shardSuggestions = new ArrayList<>(); diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/FuzzyOptionsTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/FuzzyOptionsTests.java index 8fc099fbcb3bd..3d373970e946c 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/FuzzyOptionsTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/FuzzyOptionsTests.java @@ -21,16 +21,16 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.unit.Fuzziness; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public class FuzzyOptionsTests extends ESTestCase { +public class FuzzyOptionsTests extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java index f6f8949f60d78..8c1ceb2ab2cb8 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java @@ -34,7 +34,7 @@ import org.opensearch.search.suggest.completion.context.ContextBuilder; import org.opensearch.search.suggest.completion.context.ContextMapping; import org.opensearch.search.suggest.completion.context.GeoContextMapping; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.ArrayList; import java.util.Collection; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.in; import static org.hamcrest.Matchers.is; -public class GeoContextMappingTests extends ESSingleNodeTestCase { +public class GeoContextMappingTests extends OpenSearchSingleNodeTestCase { public void testIndexingWithNoContexts() throws Exception { XContentBuilder mapping = jsonBuilder().startObject().startObject("type1") diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/QueryContextTestCase.java b/server/src/test/java/org/opensearch/search/suggest/completion/QueryContextTestCase.java index 0992cb38c9488..a24836aabc36d 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/QueryContextTestCase.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/QueryContextTestCase.java @@ -23,12 +23,12 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public abstract class QueryContextTestCase extends ESTestCase { +public abstract class QueryContextTestCase extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; /** diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java index 71a301b89b22c..b71a4f08878d4 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java @@ -21,12 +21,12 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.index.query.RegexpFlag; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; -public class RegexOptionsTests extends ESTestCase { +public class RegexOptionsTests extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; diff --git a/server/src/test/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorTests.java b/server/src/test/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorTests.java index 19c0508cfeeb0..3df59c85235e6 100644 --- a/server/src/test/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorTests.java @@ -41,7 +41,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -49,12 +49,12 @@ import java.util.List; import java.util.function.Supplier; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; -public class DirectCandidateGeneratorTests extends ESTestCase { +public class DirectCandidateGeneratorTests extends OpenSearchTestCase { private static final int NUMBER_OF_RUNS = 20; /** diff --git a/server/src/test/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/server/src/test/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java index 9d46ecbbb33ff..43579575440e5 100644 --- a/server/src/test/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java @@ -46,7 +46,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; import org.opensearch.search.suggest.phrase.NoisyChannelSpellChecker.Result; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.CharArrayReader; import java.io.IOException; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class NoisyChannelSpellCheckerTests extends ESTestCase { +public class NoisyChannelSpellCheckerTests extends OpenSearchTestCase { private final BytesRef space = new BytesRef(" "); private final BytesRef preTag = new BytesRef(""); private final BytesRef postTag = new BytesRef(""); diff --git a/server/src/test/java/org/opensearch/search/suggest/phrase/SmoothingModelTestCase.java b/server/src/test/java/org/opensearch/search/suggest/phrase/SmoothingModelTestCase.java index 844b8755346b6..f1cb11af7db61 100644 --- a/server/src/test/java/org/opensearch/search/suggest/phrase/SmoothingModelTestCase.java +++ b/server/src/test/java/org/opensearch/search/suggest/phrase/SmoothingModelTestCase.java @@ -38,7 +38,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.SearchModule; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -48,9 +48,9 @@ import java.util.List; import java.util.Map; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; -public abstract class SmoothingModelTestCase extends ESTestCase { +public abstract class SmoothingModelTestCase extends OpenSearchTestCase { private static NamedWriteableRegistry namedWriteableRegistry; @@ -147,7 +147,7 @@ public void testEqualsAndHashcode() throws IOException { } private SmoothingModel copy(SmoothingModel original) throws IOException { - return ESTestCase.copyWriteable(original, namedWriteableRegistry, + return OpenSearchTestCase.copyWriteable(original, namedWriteableRegistry, namedWriteableRegistry.getReader(SmoothingModel.class, original.getWriteableName())); } } diff --git a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java index b0579bb8b78cb..05cbc5d0362c4 100644 --- a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java +++ b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java @@ -36,7 +36,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.elasticsearch.index.translog.BufferedChecksumStreamOutput; import org.opensearch.repositories.blobstore.ChecksumBlobStoreFormat; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.EOFException; import java.io.IOException; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThan; -public class BlobStoreFormatTests extends ESTestCase { +public class BlobStoreFormatTests extends OpenSearchTestCase { public static final String BLOB_CODEC = "blob"; diff --git a/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java b/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java index 408815e9110bc..69824d0edcc98 100644 --- a/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java @@ -50,8 +50,8 @@ import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; -import org.elasticsearch.test.ClusterServiceUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.ClusterServiceUtils; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolStats; @@ -85,7 +85,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class InternalSnapshotsInfoServiceTests extends ESTestCase { +public class InternalSnapshotsInfoServiceTests extends OpenSearchTestCase { private TestThreadPool threadPool; private ClusterService clusterService; @@ -418,7 +418,7 @@ private ClusterState addUnassignedShards(final ClusterState currentState, String } private ClusterState demoteMasterNode(final ClusterState currentState) { - final DiscoveryNode node = new DiscoveryNode("other", ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), + final DiscoveryNode node = new DiscoveryNode("other", OpenSearchTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), DiscoveryNodeRole.BUILT_IN_ROLES, Version.CURRENT); assertThat(currentState.nodes().get(node.getId()), nullValue()); diff --git a/server/src/test/java/org/opensearch/snapshots/RepositoriesMetadataSerializationTests.java b/server/src/test/java/org/opensearch/snapshots/RepositoriesMetadataSerializationTests.java index d0cc3ec96e001..7f26ae198f50c 100644 --- a/server/src/test/java/org/opensearch/snapshots/RepositoriesMetadataSerializationTests.java +++ b/server/src/test/java/org/opensearch/snapshots/RepositoriesMetadataSerializationTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractDiffableSerializationTestCase; +import org.opensearch.test.AbstractDiffableSerializationTestCase; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java b/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java index 91efaef401cc2..061ea7b2e79c3 100644 --- a/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; import java.util.List; @@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class RestoreServiceTests extends ESTestCase { +public class RestoreServiceTests extends OpenSearchTestCase { public void testUpdateDataStream() { String dataStreamName = "data-stream-1"; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java index c22a0be0718af..4c3ce202f41e1 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java @@ -21,8 +21,8 @@ import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.AbstractWireSerializingTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractWireSerializingTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.HashMap; @@ -87,7 +87,7 @@ protected SnapshotInfo mutateInstance(SnapshotInfo instance) { instance.userMetadata()); case 2: return new SnapshotInfo(instance.snapshotId(), instance.indices(), instance.dataStreams(), - randomValueOtherThan(instance.startTime(), ESTestCase::randomNonNegativeLong), instance.reason(), + randomValueOtherThan(instance.startTime(), OpenSearchTestCase::randomNonNegativeLong), instance.reason(), instance.endTime(), instance.totalShards(), instance.shardFailures(), instance.includeGlobalState(), instance.userMetadata()); case 3: @@ -96,7 +96,7 @@ protected SnapshotInfo mutateInstance(SnapshotInfo instance) { instance.totalShards(), instance.shardFailures(), instance.includeGlobalState(), instance.userMetadata()); case 4: return new SnapshotInfo(instance.snapshotId(), instance.indices(), instance.dataStreams(), - instance.startTime(), instance.reason(), randomValueOtherThan(instance.endTime(), ESTestCase::randomNonNegativeLong), + instance.startTime(), instance.reason(), randomValueOtherThan(instance.endTime(), OpenSearchTestCase::randomNonNegativeLong), instance.totalShards(), instance.shardFailures(), instance.includeGlobalState(), instance.userMetadata()); case 5: int totalShards = randomValueOtherThan(instance.totalShards(), () -> randomIntBetween(0, 100)); diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java index 968ec9ba696be..ddd45a40d2a85 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotRequestsTests.java @@ -25,13 +25,13 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -public class SnapshotRequestsTests extends ESTestCase { +public class SnapshotRequestsTests extends OpenSearchTestCase { public void testRestoreSnapshotRequestParsing() throws IOException { RestoreSnapshotRequest request = new RestoreSnapshotRequest("test-repo", "test-snap"); diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 35b8394c15564..0f8436620aa4c 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -185,8 +185,8 @@ import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.fetch.FetchPhase; import org.opensearch.snapshots.mockstore.MockEventuallyConsistentRepository; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.disruption.DisruptableMockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.disruption.DisruptableMockTransport; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportInterceptor; @@ -236,7 +236,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Mockito.mock; -public class SnapshotResiliencyTests extends ESTestCase { +public class SnapshotResiliencyTests extends OpenSearchTestCase { private DeterministicTaskQueue deterministicTaskQueue; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java index 48eb84be850b3..a4b4478dee6c9 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java @@ -21,14 +21,14 @@ import org.opensearch.cluster.SnapshotsInProgress; import org.opensearch.common.UUIDs; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.EqualsHashCodeTestUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.EqualsHashCodeTestUtils; import java.io.IOException; import static org.hamcrest.Matchers.is; -public class SnapshotShardsServiceTests extends ESTestCase { +public class SnapshotShardsServiceTests extends OpenSearchTestCase { public void testSummarizeFailure() { final RuntimeException wrapped = new RuntimeException("wrapped"); diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotTests.java index 2cd486e9997e9..aedd6994c4e4e 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; @@ -32,7 +32,7 @@ /** * Tests for the {@link Snapshot} class. */ -public class SnapshotTests extends ESTestCase { +public class SnapshotTests extends OpenSearchTestCase { public void testSnapshotEquals() { final SnapshotId snapshotId = new SnapshotId("snap", UUIDs.randomBase64UUID()); diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotUtilsTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotUtilsTests.java index 123a293ef9016..4d68787c62b59 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotUtilsTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotUtilsTests.java @@ -19,14 +19,14 @@ package org.opensearch.snapshots; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.List; import static org.hamcrest.Matchers.containsInAnyOrder; -public class SnapshotUtilsTests extends ESTestCase { +public class SnapshotUtilsTests extends OpenSearchTestCase { public void testIndexNameFiltering() { assertIndexNameFiltering(new String[]{"foo", "bar", "baz"}, new String[]{}, new String[]{"foo", "bar", "baz"}); assertIndexNameFiltering(new String[]{"foo", "bar", "baz"}, new String[]{"*"}, new String[]{"foo", "bar", "baz"}); diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java index 83c984d84de00..4e8a12e5cb18b 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; -import org.elasticsearch.test.AbstractDiffableWireSerializationTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.AbstractDiffableWireSerializationTestCase; +import org.opensearch.test.VersionUtils; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java index f1f5ca7f8ac88..0d111a7a738ee 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoryShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -48,7 +48,7 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED; import static org.hamcrest.Matchers.is; -public class SnapshotsServiceTests extends ESTestCase { +public class SnapshotsServiceTests extends OpenSearchTestCase { public void testNoopShardStateUpdates() throws Exception { final String repoName = "test-repo"; diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java index 6a81d948c2579..f7c8fbca8638a 100644 --- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java +++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java @@ -34,7 +34,7 @@ import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.snapshots.SnapshotInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -372,7 +372,7 @@ public void writeBlob(String blobName, InputStream inputStream, long blobSize, b } } else { if (hasConsistentContent) { - ESTestCase.assertArrayEquals("Tried to overwrite blob [" + blobName + "]", relevantActions.get(0).data, data); + OpenSearchTestCase.assertArrayEquals("Tried to overwrite blob [" + blobName + "]", relevantActions.get(0).data, data); return; // No need to add a write for this since we didn't change content } } diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java index 57aff0f87cabf..e07055164020e 100644 --- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java +++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java @@ -34,7 +34,7 @@ import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInfo; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.startsWith; -public class MockEventuallyConsistentRepositoryTests extends ESTestCase { +public class MockEventuallyConsistentRepositoryTests extends OpenSearchTestCase { private final RecoverySettings recoverySettings = new RecoverySettings(Settings.EMPTY, new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS)); diff --git a/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java b/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java index 1c8a8d422055c..2b10c2d89140a 100644 --- a/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java +++ b/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.net.ConnectException; diff --git a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java index 1199d4a885d33..a00d3c39bea27 100644 --- a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java +++ b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractXContentTestCase; +import org.opensearch.test.AbstractXContentTestCase; import java.io.IOException; import java.net.ConnectException; diff --git a/server/src/test/java/org/opensearch/tasks/TaskIdTests.java b/server/src/test/java/org/opensearch/tasks/TaskIdTests.java index 1a0aee1d5e652..e7b13cc817b19 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskIdTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskIdTests.java @@ -23,11 +23,11 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; -public class TaskIdTests extends ESTestCase { +public class TaskIdTests extends OpenSearchTestCase { private static final int ROUNDS = 30; public void testSerialization() throws IOException { diff --git a/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java b/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java index 9c8727f886851..988290afdcc25 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskInfoTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.AbstractSerializingTestCase; +import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java index 2dfb19f191adb..8355644ed012f 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.FakeTcpChannel; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.in; import static org.mockito.Mockito.mock; -public class TaskManagerTests extends ESTestCase { +public class TaskManagerTests extends OpenSearchTestCase { private ThreadPool threadPool; @Before diff --git a/server/src/test/java/org/opensearch/tasks/TaskResultTests.java b/server/src/test/java/org/opensearch/tasks/TaskResultTests.java index afc171478986f..0ebdf7a57c17b 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskResultTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskResultTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -40,7 +40,7 @@ /** * Round trip tests for {@link TaskResult} and those classes that it includes like {@link TaskInfo} and {@link RawTaskStatus}. */ -public class TaskResultTests extends ESTestCase { +public class TaskResultTests extends OpenSearchTestCase { public void testBinaryRoundTrip() throws IOException { NamedWriteableRegistry registry = new NamedWriteableRegistry(Collections.singletonList( new NamedWriteableRegistry.Entry(Task.Status.class, RawTaskStatus.NAME, RawTaskStatus::new))); diff --git a/server/src/test/java/org/opensearch/threadpool/FixedThreadPoolTests.java b/server/src/test/java/org/opensearch/threadpool/FixedThreadPoolTests.java index eeef2afff6604..cc8a08601fe59 100644 --- a/server/src/test/java/org/opensearch/threadpool/FixedThreadPoolTests.java +++ b/server/src/test/java/org/opensearch/threadpool/FixedThreadPoolTests.java @@ -20,8 +20,8 @@ package org.opensearch.threadpool; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.threadpool.ThreadPool.Names; import java.util.concurrent.CountDownLatch; @@ -34,7 +34,7 @@ public void testRejectedExecutionCounter() throws InterruptedException { final String threadPoolName = randomThreadPool(ThreadPool.ThreadPoolType.FIXED); // some of the fixed thread pool are bound by the number of // cores so we can not exceed that - final int size = randomIntBetween(1, EsExecutors.allocatedProcessors(Settings.EMPTY)); + final int size = randomIntBetween(1, OpenSearchExecutors.allocatedProcessors(Settings.EMPTY)); final int queueSize = randomIntBetween(1, 16); final long rejections = randomIntBetween(1, 16); @@ -77,7 +77,7 @@ public void testRejectedExecutionCounter() throws InterruptedException { for (int i = 0; i < rejections; i++) { try { threadPool.executor(threadPoolName).execute(() -> {}); - } catch (EsRejectedExecutionException e) { + } catch (OpenSearchRejectedExecutionException e) { counter++; } } diff --git a/server/src/test/java/org/opensearch/threadpool/OpenSearchThreadPoolTestCase.java b/server/src/test/java/org/opensearch/threadpool/OpenSearchThreadPoolTestCase.java index 5b3a7ec84271d..14ca151febcfc 100644 --- a/server/src/test/java/org/opensearch/threadpool/OpenSearchThreadPoolTestCase.java +++ b/server/src/test/java/org/opensearch/threadpool/OpenSearchThreadPoolTestCase.java @@ -19,12 +19,12 @@ package org.opensearch.threadpool; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Map; import java.util.stream.Collectors; -public abstract class OpenSearchThreadPoolTestCase extends ESTestCase { +public abstract class OpenSearchThreadPoolTestCase extends OpenSearchTestCase { protected final ThreadPool.Info info(final ThreadPool threadPool, final String name) { for (final ThreadPool.Info info : threadPool.info()) { diff --git a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java index 9037f0b66f0eb..bd80288555240 100644 --- a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java @@ -23,9 +23,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.BaseFuture; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.node.Node; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool.Names; import org.opensearch.threadpool.Scheduler.ReschedulingRunnable; @@ -50,7 +50,7 @@ /** * Unit tests for the scheduling of tasks with a fixed delay */ -public class ScheduleWithFixedDelayTests extends ESTestCase { +public class ScheduleWithFixedDelayTests extends OpenSearchTestCase { private ThreadPool threadPool; @@ -252,7 +252,7 @@ public void testOnRejectionCausesCancellation() throws Exception { @Override public ScheduledCancellable schedule(Runnable command, TimeValue delay, String executor) { if (command instanceof ReschedulingRunnable) { - ((ReschedulingRunnable) command).onRejection(new EsRejectedExecutionException()); + ((ReschedulingRunnable) command).onRejection(new OpenSearchRejectedExecutionException()); } else { fail("this should only be called with a rescheduling runnable in this test"); } diff --git a/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java b/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java index f714956016d68..9f34558174649 100644 --- a/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java +++ b/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.ArrayList; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; import java.util.stream.LongStream; -public class SchedulerTests extends ESTestCase { +public class SchedulerTests extends OpenSearchTestCase { public void testCancelOnThreadPool() { ThreadPool threadPool = new TestThreadPool("test"); diff --git a/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java b/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java index 7453aa646a68a..f8f25e9debc04 100644 --- a/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class ThreadPoolSerializationTests extends ESTestCase { +public class ThreadPoolSerializationTests extends OpenSearchTestCase { private final BytesStreamOutput output = new BytesStreamOutput(); private ThreadPool.ThreadPoolType threadPoolType; diff --git a/server/src/test/java/org/opensearch/threadpool/ThreadPoolStatsTests.java b/server/src/test/java/org/opensearch/threadpool/ThreadPoolStatsTests.java index bba04f26d9359..b4df2962fc77c 100644 --- a/server/src/test/java/org/opensearch/threadpool/ThreadPoolStatsTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ThreadPoolStatsTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; -public class ThreadPoolStatsTests extends ESTestCase { +public class ThreadPoolStatsTests extends OpenSearchTestCase { public void testThreadPoolStatsSort() throws IOException { List stats = new ArrayList<>(); stats.add(new ThreadPoolStats.Stats("z", -1, 0, 0, 0, 0, 0L)); diff --git a/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java b/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java index 5d14344ec6632..c8209dfdc7088 100644 --- a/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java @@ -21,9 +21,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.FutureUtils; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -32,7 +32,7 @@ import static org.opensearch.threadpool.ThreadPool.assertCurrentMethodIsNotCalledRecursively; import static org.hamcrest.CoreMatchers.equalTo; -public class ThreadPoolTests extends ESTestCase { +public class ThreadPoolTests extends OpenSearchTestCase { public void testBoundedByBelowMin() { int min = randomIntBetween(0, 32); @@ -100,7 +100,7 @@ public void testAssertCurrentMethodIsNotCalledRecursively() { assertThat(factorialForked(1, threadPool.generic()), equalTo(1)); assertThat(factorialForked(10, threadPool.generic()), equalTo(3628800)); assertThat(expectThrows(AssertionError.class, - () -> factorialForked(between(2, 10), EsExecutors.newDirectExecutorService())).getMessage(), + () -> factorialForked(between(2, 10), OpenSearchExecutors.newDirectExecutorService())).getMessage(), equalTo("org.opensearch.threadpool.ThreadPoolTests#factorialForked is called recursively")); terminate(threadPool); } diff --git a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java index e373114712acc..c396ad8a63163 100644 --- a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java +++ b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.threadpool.ThreadPool.Names; @@ -61,7 +61,7 @@ public void testCorrectThreadPoolTypePermittedInSettings() throws InterruptedExc } public void testWriteThreadPoolsMaxSize() throws InterruptedException { - final int maxSize = 1 + EsExecutors.allocatedProcessors(Settings.EMPTY); + final int maxSize = 1 + OpenSearchExecutors.allocatedProcessors(Settings.EMPTY); final int tooBig = randomIntBetween(1 + maxSize, Integer.MAX_VALUE); // try to create a too big thread pool @@ -88,7 +88,7 @@ public void testWriteThreadPoolsMaxSize() throws InterruptedException { private static int getExpectedThreadPoolSize(Settings settings, String name, int size) { if (name.equals(ThreadPool.Names.WRITE) || name.equals(Names.SYSTEM_WRITE)) { - return Math.min(size, EsExecutors.allocatedProcessors(settings)); + return Math.min(size, OpenSearchExecutors.allocatedProcessors(settings)); } else { return size; } @@ -192,7 +192,7 @@ public void testCustomThreadPool() throws Exception { new ScalingExecutorBuilder( "my_pool1", 1, - EsExecutors.allocatedProcessors(Settings.EMPTY), + OpenSearchExecutors.allocatedProcessors(Settings.EMPTY), TimeValue.timeValueMinutes(1)); final FixedExecutorBuilder fixed = new FixedExecutorBuilder(Settings.EMPTY, "my_pool2", 1, 1); diff --git a/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java b/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java index 73ab7312b5fd0..2a93b4d56cdd3 100644 --- a/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java +++ b/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import org.junit.After; import org.junit.Before; @@ -49,7 +49,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -public class ClusterConnectionManagerTests extends ESTestCase { +public class ClusterConnectionManagerTests extends OpenSearchTestCase { private ClusterConnectionManager connectionManager; private ThreadPool threadPool; diff --git a/server/src/test/java/org/opensearch/transport/CompressibleBytesOutputStreamTests.java b/server/src/test/java/org/opensearch/transport/CompressibleBytesOutputStreamTests.java index db7f386703ba9..d0708fb43f298 100644 --- a/server/src/test/java/org/opensearch/transport/CompressibleBytesOutputStreamTests.java +++ b/server/src/test/java/org/opensearch/transport/CompressibleBytesOutputStreamTests.java @@ -25,12 +25,12 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.EOFException; import java.io.IOException; -public class CompressibleBytesOutputStreamTests extends ESTestCase { +public class CompressibleBytesOutputStreamTests extends OpenSearchTestCase { public void testStreamWithoutCompression() throws IOException { BytesStream bStream = new ZeroOutOnCloseStream(); diff --git a/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java b/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java index 65134ba4cae5b..469df76bb8f60 100644 --- a/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java +++ b/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; import java.util.ArrayList; @@ -31,12 +31,12 @@ import java.util.HashSet; import java.util.List; -import static org.elasticsearch.test.NodeRoles.nonDataNode; -import static org.elasticsearch.test.NodeRoles.nonMasterNode; -import static org.elasticsearch.test.NodeRoles.removeRoles; +import static org.opensearch.test.NodeRoles.nonDataNode; +import static org.opensearch.test.NodeRoles.nonMasterNode; +import static org.opensearch.test.NodeRoles.removeRoles; import static org.hamcrest.Matchers.equalTo; -public class ConnectionProfileTests extends ESTestCase { +public class ConnectionProfileTests extends OpenSearchTestCase { public void testBuildConnectionProfile() { ConnectionProfile.Builder builder = new ConnectionProfile.Builder(); diff --git a/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java b/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java index 255d00892a684..04e677a4c4f19 100644 --- a/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; -public class InboundAggregatorTests extends ESTestCase { +public class InboundAggregatorTests extends OpenSearchTestCase { private final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); private final String unBreakableAction = "non_breakable_action"; diff --git a/server/src/test/java/org/opensearch/transport/InboundDecoderTests.java b/server/src/test/java/org/opensearch/transport/InboundDecoderTests.java index ed00cf9a341dc..8174525578174 100644 --- a/server/src/test/java/org/opensearch/transport/InboundDecoderTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundDecoderTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.io.IOException; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.hasItems; -public class InboundDecoderTests extends ESTestCase { +public class InboundDecoderTests extends OpenSearchTestCase { private ThreadContext threadContext; diff --git a/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java b/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java index ed9524f0bf81a..7ab2205b0d822 100644 --- a/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java @@ -38,9 +38,9 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.instanceOf; -public class InboundHandlerTests extends ESTestCase { +public class InboundHandlerTests extends OpenSearchTestCase { private final TestThreadPool threadPool = new TestThreadPool(getClass().getName()); private final Version version = Version.CURRENT; diff --git a/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java b/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java index 058ec6ceb46bf..ed03ee40702aa 100644 --- a/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java @@ -35,7 +35,7 @@ import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.internal.io.Streams; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.ArrayList; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.instanceOf; -public class InboundPipelineTests extends ESTestCase { +public class InboundPipelineTests extends OpenSearchTestCase { private static final int BYTE_THRESHOLD = 128 * 1024; private final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); diff --git a/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java b/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java index f7332c6dddfad..70f01eaacc539 100644 --- a/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java +++ b/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java @@ -36,7 +36,7 @@ import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.core.internal.io.Streams; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.instanceOf; -public class OutboundHandlerTests extends ESTestCase { +public class OutboundHandlerTests extends OpenSearchTestCase { private final String feature1 = "feature1"; private final String feature2 = "feature2"; diff --git a/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java index 8fbfb0f064d3a..f26f69d786a87 100644 --- a/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java @@ -29,8 +29,8 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -44,7 +44,7 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -public class ProxyConnectionStrategyTests extends ESTestCase { +public class ProxyConnectionStrategyTests extends OpenSearchTestCase { private final String clusterAlias = "cluster-alias"; private final String modeKey = RemoteConnectionStrategy.REMOTE_CONNECTION_MODE.getConcreteSettingForNamespace(clusterAlias).getKey(); diff --git a/server/src/test/java/org/opensearch/transport/PublishPortTests.java b/server/src/test/java/org/opensearch/transport/PublishPortTests.java index f97d696904e43..f71f2007db597 100644 --- a/server/src/test/java/org/opensearch/transport/PublishPortTests.java +++ b/server/src/test/java/org/opensearch/transport/PublishPortTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.network.NetworkUtils; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.net.InetSocketAddress; import java.net.UnknownHostException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class PublishPortTests extends ESTestCase { +public class PublishPortTests extends OpenSearchTestCase { public void testPublishPort() throws Exception { int boundPort = randomIntBetween(9000, 9100); diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterAwareClientTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterAwareClientTests.java index 5a078ae197e70..54a5eeffe581b 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterAwareClientTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterAwareClientTests.java @@ -28,8 +28,8 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -public class RemoteClusterAwareClientTests extends ESTestCase { +public class RemoteClusterAwareClientTests extends OpenSearchTestCase { private final ThreadPool threadPool = new TestThreadPool(getClass().getName()); diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterAwareTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterAwareTests.java index 77d96ff58039a..68001c705be07 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterAwareTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterAwareTests.java @@ -19,9 +19,9 @@ package org.opensearch.transport; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; -public class RemoteClusterAwareTests extends ESTestCase { +public class RemoteClusterAwareTests extends OpenSearchTestCase { public void testBuildRemoteIndexName() { { diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterClientTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterClientTests.java index fe51e8b0bbf48..1e7d044e296a7 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterClientTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterClientTests.java @@ -26,21 +26,21 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.junit.annotations.TestLogging; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import java.util.Collections; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.test.NodeRoles.onlyRole; -import static org.elasticsearch.test.NodeRoles.removeRoles; +import static org.opensearch.test.NodeRoles.onlyRole; +import static org.opensearch.test.NodeRoles.removeRoles; import static org.opensearch.transport.RemoteClusterConnectionTests.startTransport; import static org.hamcrest.Matchers.equalTo; -public class RemoteClusterClientTests extends ESTestCase { +public class RemoteClusterClientTests extends OpenSearchTestCase { private final ThreadPool threadPool = new TestThreadPool(getClass().getName()); @Override diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java index b658743d70690..122c34c7a1f2b 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java @@ -54,9 +54,9 @@ import org.opensearch.search.SearchHits; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.internal.InternalSearchResponse; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -88,7 +88,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.sameInstance; -public class RemoteClusterConnectionTests extends ESTestCase { +public class RemoteClusterConnectionTests extends OpenSearchTestCase { private final ThreadPool threadPool = new TestThreadPool(getClass().getName()); diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java index e21a8851ba5d7..32bfbf5a102be 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java @@ -31,8 +31,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -49,14 +49,14 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; -import static org.elasticsearch.test.NodeRoles.masterOnlyNode; -import static org.elasticsearch.test.NodeRoles.nonMasterNode; -import static org.elasticsearch.test.NodeRoles.removeRoles; +import static org.opensearch.test.NodeRoles.masterOnlyNode; +import static org.opensearch.test.NodeRoles.nonMasterNode; +import static org.opensearch.test.NodeRoles.removeRoles; import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; -public class RemoteClusterServiceTests extends ESTestCase { +public class RemoteClusterServiceTests extends OpenSearchTestCase { private final ThreadPool threadPool = new TestThreadPool(getClass().getName()); diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java index 9d9858b273c30..e68d506f81c25 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.opensearch.node.NodeRoleSettings; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.test.NodeRoles.nonRemoteClusterClientNode; -import static org.elasticsearch.test.NodeRoles.remoteClusterClientNode; +import static org.opensearch.test.NodeRoles.nonRemoteClusterClientNode; +import static org.opensearch.test.NodeRoles.remoteClusterClientNode; import static org.opensearch.transport.RemoteClusterService.ENABLE_REMOTE_CLUSTERS; import static org.opensearch.transport.RemoteClusterService.REMOTE_CLUSTER_SKIP_UNAVAILABLE; import static org.opensearch.transport.RemoteClusterService.REMOTE_INITIAL_CONNECTION_TIMEOUT_SETTING; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; -public class RemoteClusterSettingsTests extends ESTestCase { +public class RemoteClusterSettingsTests extends OpenSearchTestCase { public void testConnectionsPerClusterFallback() { final int value = randomIntBetween(1, 8); diff --git a/server/src/test/java/org/opensearch/transport/RemoteConnectionManagerTests.java b/server/src/test/java/org/opensearch/transport/RemoteConnectionManagerTests.java index cedb4b87fe048..e1a780e8c7324 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteConnectionManagerTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteConnectionManagerTests.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.net.InetAddress; import java.util.HashSet; @@ -36,7 +36,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -public class RemoteConnectionManagerTests extends ESTestCase { +public class RemoteConnectionManagerTests extends OpenSearchTestCase { private Transport transport; private RemoteConnectionManager remoteConnectionManager; diff --git a/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java index bc04b6be34361..ff5ffa7b8f213 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java @@ -23,11 +23,11 @@ import org.opensearch.action.ActionListener; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; -public class RemoteConnectionStrategyTests extends ESTestCase { +public class RemoteConnectionStrategyTests extends OpenSearchTestCase { public void testStrategyChangeMeansThatStrategyMustBeRebuilt() { ClusterConnectionManager connectionManager = new ClusterConnectionManager(Settings.EMPTY, mock(Transport.class)); diff --git a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java index b7b009c8b500f..67f4a43a4bdbe 100644 --- a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java @@ -36,10 +36,10 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.transport.MockTransportService; -import org.elasticsearch.test.transport.StubbableTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.transport.MockTransportService; +import org.opensearch.test.transport.StubbableTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.equalTo; -public class SniffConnectionStrategyTests extends ESTestCase { +public class SniffConnectionStrategyTests extends OpenSearchTestCase { private final String clusterAlias = "cluster-alias"; private final String modeKey = RemoteConnectionStrategy.REMOTE_CONNECTION_MODE.getConcreteSettingForNamespace(clusterAlias).getKey(); diff --git a/server/src/test/java/org/opensearch/transport/TcpTransportTests.java b/server/src/test/java/org/opensearch/transport/TcpTransportTests.java index e8e7e48d5c330..34e62e9be5739 100644 --- a/server/src/test/java/org/opensearch/transport/TcpTransportTests.java +++ b/server/src/test/java/org/opensearch/transport/TcpTransportTests.java @@ -35,9 +35,9 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.MockPageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.Matcher; @@ -56,7 +56,7 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf; /** Unit tests for {@link TcpTransport} */ -public class TcpTransportTests extends ESTestCase { +public class TcpTransportTests extends OpenSearchTestCase { /** Test ipv4 host with a default port works */ public void testParseV4DefaultPort() throws Exception { diff --git a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java index df8e637b15295..99b176ffe960c 100644 --- a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.Before; @@ -35,7 +35,7 @@ import java.io.IOException; import java.util.concurrent.CountDownLatch; -public class TransportActionProxyTests extends ESTestCase { +public class TransportActionProxyTests extends OpenSearchTestCase { protected ThreadPool threadPool; // we use always a non-alpha or beta version here otherwise minimumCompatibilityVersion will be different for the two used versions private static final Version CURRENT_VERSION = Version.fromString(String.valueOf(Version.CURRENT.major) + ".0.0"); diff --git a/server/src/test/java/org/opensearch/transport/TransportDecompressorTests.java b/server/src/test/java/org/opensearch/transport/TransportDecompressorTests.java index 961abc0be1036..19e8726b26814 100644 --- a/server/src/test/java/org/opensearch/transport/TransportDecompressorTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportDecompressorTests.java @@ -30,12 +30,12 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.io.OutputStream; -public class TransportDecompressorTests extends ESTestCase { +public class TransportDecompressorTests extends OpenSearchTestCase { public void testSimpleCompression() throws IOException { try (BytesStreamOutput output = new BytesStreamOutput()) { diff --git a/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java b/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java index fad24a4704287..2d9fa6148c52a 100644 --- a/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -public class TransportHandshakerTests extends ESTestCase { +public class TransportHandshakerTests extends OpenSearchTestCase { private TransportHandshaker handshaker; private DiscoveryNode node; diff --git a/server/src/test/java/org/opensearch/transport/TransportInfoTests.java b/server/src/test/java/org/opensearch/transport/TransportInfoTests.java index 7ed93b7536f69..71e00cdc5e355 100644 --- a/server/src/test/java/org/opensearch/transport/TransportInfoTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportInfoTests.java @@ -25,14 +25,14 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.net.InetAddress; import java.util.Collections; import java.util.Map; -public class TransportInfoTests extends ESTestCase { +public class TransportInfoTests extends OpenSearchTestCase { private TransportInfo createTransportInfo(InetAddress address, int port, boolean cnameInPublishAddress) { BoundTransportAddress boundAddress = new BoundTransportAddress( diff --git a/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java b/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java index 3f0d0a2733cce..514d5e16fed0e 100644 --- a/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class TransportKeepAliveTests extends ESTestCase { +public class TransportKeepAliveTests extends OpenSearchTestCase { private final ConnectionProfile defaultProfile = ConnectionProfile.buildDefaultConnectionProfile(Settings.EMPTY); private BytesReference expectedPingMessage; diff --git a/server/src/test/java/org/opensearch/transport/TransportLoggerTests.java b/server/src/test/java/org/opensearch/transport/TransportLoggerTests.java index cbdcfad76f667..62678b06d6aa2 100644 --- a/server/src/test/java/org/opensearch/transport/TransportLoggerTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportLoggerTests.java @@ -28,16 +28,16 @@ import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.junit.annotations.TestLogging; import java.io.IOException; import static org.mockito.Mockito.mock; @TestLogging(value = "org.opensearch.transport.TransportLogger:trace", reason = "to ensure we log network events on TRACE level") -public class TransportLoggerTests extends ESTestCase { +public class TransportLoggerTests extends OpenSearchTestCase { private MockLogAppender appender; diff --git a/server/src/test/java/org/opensearch/transport/TransportRequestDeduplicatorTests.java b/server/src/test/java/org/opensearch/transport/TransportRequestDeduplicatorTests.java index 2ec94037b8511..ce93bd153b959 100644 --- a/server/src/test/java/org/opensearch/transport/TransportRequestDeduplicatorTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportRequestDeduplicatorTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.action.ActionListener; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.Phaser; import java.util.concurrent.atomic.AtomicInteger; @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.sameInstance; -public class TransportRequestDeduplicatorTests extends ESTestCase { +public class TransportRequestDeduplicatorTests extends OpenSearchTestCase { public void testRequestDeduplication() throws Exception { AtomicInteger successCount = new AtomicInteger(); diff --git a/server/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java b/server/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java index 49a0863fd8d34..f7eafc8dd7b2e 100644 --- a/server/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportServiceDeserializationFailureTests.java @@ -29,8 +29,8 @@ import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskAwareRequest; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.transport.MockTransport; import org.opensearch.threadpool.ThreadPool; import java.util.Collections; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasToString; -public class TransportServiceDeserializationFailureTests extends ESTestCase { +public class TransportServiceDeserializationFailureTests extends OpenSearchTestCase { public void testDeserializationFailureLogIdentifiesListener() { final DiscoveryNode localNode = new DiscoveryNode("local", buildNewFakeTransportAddress(), Version.CURRENT); diff --git a/server/src/test/java/org/opensearch/transport/TransportServiceHandshakeTests.java b/server/src/test/java/org/opensearch/transport/TransportServiceHandshakeTests.java index 0fff0ef49e5a2..6f6c73e25d10c 100644 --- a/server/src/test/java/org/opensearch/transport/TransportServiceHandshakeTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportServiceHandshakeTests.java @@ -30,9 +30,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.nio.MockNioTransport; @@ -50,7 +50,7 @@ import static java.util.Collections.emptySet; import static org.hamcrest.Matchers.containsString; -public class TransportServiceHandshakeTests extends ESTestCase { +public class TransportServiceHandshakeTests extends OpenSearchTestCase { private static ThreadPool threadPool; private static final long timeout = Long.MAX_VALUE; diff --git a/server/src/test/java/org/opensearch/usage/UsageServiceTests.java b/server/src/test/java/org/opensearch/usage/UsageServiceTests.java index ae783a0dda7cd..91760af8556bc 100644 --- a/server/src/test/java/org/opensearch/usage/UsageServiceTests.java +++ b/server/src/test/java/org/opensearch/usage/UsageServiceTests.java @@ -23,9 +23,9 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.search.aggregations.support.AggregationUsageService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; -import org.elasticsearch.test.rest.FakeRestRequest; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; +import org.opensearch.test.rest.FakeRestRequest; import java.util.Collections; import java.util.List; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class UsageServiceTests extends ESTestCase { +public class UsageServiceTests extends OpenSearchTestCase { /** * Test that we can not add a null reference to a {@link org.opensearch.rest.RestHandler} to the {@link UsageService}. diff --git a/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java b/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java index 4d7564013e765..4537cbdbea986 100644 --- a/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java +++ b/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.unit.TimeValue; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; +import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import java.util.Arrays; import java.util.Collection; diff --git a/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/opensearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java b/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/opensearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java index a4cad3982406b..7271f1af1eb2d 100644 --- a/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/opensearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java +++ b/test/external-modules/delayed-aggs/src/yamlRestTest/java/org/opensearch/search/aggregations/DelayedShardAggregationClientYamlTestSuiteIT.java @@ -22,16 +22,16 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; -public class DelayedShardAggregationClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase { +public class DelayedShardAggregationClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public DelayedShardAggregationClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } @ParametersFactory public static Iterable parameters() throws Exception { - return ESClientYamlSuiteTestCase.createParameters(); + return OpenSearchClientYamlSuiteTestCase.createParameters(); } } diff --git a/test/framework/build.gradle b/test/framework/build.gradle index 4d4a154c13a18..a3197311ec7c3 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -import org.elasticsearch.gradle.info.BuildParams; +import org.opensearch.gradle.info.BuildParams; -apply plugin: 'elasticsearch.build' -apply plugin: 'elasticsearch.publish' +apply plugin: 'opensearch.build' +apply plugin: 'opensearch.publish' dependencies { api project(":client:rest") api project(":client:sniffer") - api project(':libs:elasticsearch-nio') + api project(':libs:opensearch-nio') api project(":server") - api project(":libs:elasticsearch-cli") + api project(":libs:opensearch-cli") api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" api "junit:junit:${versions.junit}" api "org.hamcrest:hamcrest:${versions.hamcrest}" @@ -34,8 +34,8 @@ dependencies { api "org.apache.lucene:lucene-codecs:${versions.lucene}" api "commons-logging:commons-logging:${versions.commonslogging}" api "commons-codec:commons-codec:${versions.commonscodec}" - api "org.elasticsearch:securemock:${versions.securemock}" - api "org.elasticsearch:mocksocket:${versions.mocksocket}" + api "org.opensearch:securemock:${versions.securemock}" + api "org.opensearch:mocksocket:${versions.mocksocket}" } compileJava.options.compilerArgs << '-Xlint:-cast,-rawtypes,-unchecked' diff --git a/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java b/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java index b4aed94fc3c85..d9337e4d57352 100644 --- a/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java +++ b/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Collections; @@ -52,9 +52,9 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomInt; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomInt; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; /** * Helper methods for generating cluster states @@ -396,7 +396,7 @@ public static ClusterState state(DiscoveryNode localNode, DiscoveryNode masterNo } private static DiscoveryNode newNode(int nodeId) { - return new DiscoveryNode("node_" + nodeId, ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), + return new DiscoveryNode("node_" + nodeId, OpenSearchTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), new HashSet<>(DiscoveryNodeRole.BUILT_IN_ROLES), Version.CURRENT); } diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/OpenSearchCliTestCase.java b/test/framework/src/main/java/org/opensearch/bootstrap/OpenSearchCliTestCase.java index 2895e6d33b172..7b4a0af587de5 100644 --- a/test/framework/src/main/java/org/opensearch/bootstrap/OpenSearchCliTestCase.java +++ b/test/framework/src/main/java/org/opensearch/bootstrap/OpenSearchCliTestCase.java @@ -23,7 +23,7 @@ import org.opensearch.cli.UserException; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.nio.file.Path; import java.util.Map; @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.equalTo; -abstract class OpenSearchCliTestCase extends ESTestCase { +abstract class OpenSearchCliTestCase extends OpenSearchTestCase { interface InitConsumer { void accept(boolean foreground, Path pidFile, boolean quiet, Environment initialEnv); diff --git a/test/framework/src/main/java/org/opensearch/cli/CommandTestCase.java b/test/framework/src/main/java/org/opensearch/cli/CommandTestCase.java index a084e560f3f25..12b40f5ad4bf8 100644 --- a/test/framework/src/main/java/org/opensearch/cli/CommandTestCase.java +++ b/test/framework/src/main/java/org/opensearch/cli/CommandTestCase.java @@ -19,13 +19,13 @@ package org.opensearch.cli; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; /** * A base test case for cli tools. */ -public abstract class CommandTestCase extends ESTestCase { +public abstract class CommandTestCase extends OpenSearchTestCase { /** The terminal that execute uses. */ protected final MockTerminal terminal = new MockTerminal(); diff --git a/test/framework/src/main/java/org/opensearch/client/RestClientBuilderTestCase.java b/test/framework/src/main/java/org/opensearch/client/RestClientBuilderTestCase.java index 34d8424d774e2..3e20926129307 100644 --- a/test/framework/src/main/java/org/opensearch/client/RestClientBuilderTestCase.java +++ b/test/framework/src/main/java/org/opensearch/client/RestClientBuilderTestCase.java @@ -24,12 +24,12 @@ import joptsimple.internal.Strings; import org.apache.http.Header; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; /** * A test case with access to internals of a RestClient. */ -public abstract class RestClientBuilderTestCase extends ESTestCase { +public abstract class RestClientBuilderTestCase extends OpenSearchTestCase { /** Checks the given rest client has the provided default headers. */ public void assertHeaders(RestClient client, Map expectedHeaders) { expectedHeaders = new HashMap<>(expectedHeaders); // copy so we can remove as we check diff --git a/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java b/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java index 20ddc59bf452b..0fc20c0b27f2e 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java +++ b/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java @@ -28,9 +28,7 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.cluster.ClusterName; -import org.opensearch.cluster.ClusterState; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.List; @@ -39,11 +37,11 @@ import static org.opensearch.cluster.metadata.DataStream.getDefaultBackingIndexName; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_INDEX_UUID; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength; public final class DataStreamTestHelper { - private static final Settings.Builder SETTINGS = ESTestCase.settings(Version.CURRENT).put("index.hidden", true); + private static final Settings.Builder SETTINGS = OpenSearchTestCase.settings(Version.CURRENT).put("index.hidden", true); private static final int NUMBER_OF_SHARDS = 1; private static final int NUMBER_OF_REPLICAS = 1; @@ -94,7 +92,7 @@ public static String generateMapping(String timestampFieldName, String type) { public static List randomIndexInstances() { - int numIndices = ESTestCase.randomIntBetween(0, 128); + int numIndices = OpenSearchTestCase.randomIntBetween(0, 128); List indices = new ArrayList<>(numIndices); for (int i = 0; i < numIndices; i++) { indices.add(new Index(randomAlphaOfLength(10).toLowerCase(Locale.ROOT), UUIDs.randomBase64UUID(LuceneTestCase.random()))); @@ -104,7 +102,7 @@ public static List randomIndexInstances() { public static DataStream randomInstance() { List indices = randomIndexInstances(); - long generation = indices.size() + ESTestCase.randomLongBetween(1, 128); + long generation = indices.size() + OpenSearchTestCase.randomLongBetween(1, 128); String dataStreamName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); indices.add(new Index(getDefaultBackingIndexName(dataStreamName, generation), UUIDs.randomBase64UUID(LuceneTestCase.random()))); return new DataStream(dataStreamName, createTimestampField("@timestamp"), indices, generation); diff --git a/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java b/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java index d53722b881e17..e4fe01adf28d1 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/cluster/OpenSearchAllocationTestCase.java @@ -39,14 +39,10 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.gateway.GatewayAllocator; -import org.opensearch.cluster.ClusterInfoService; -import org.opensearch.cluster.ClusterModule; -import org.opensearch.cluster.ClusterState; -import org.opensearch.cluster.EmptyClusterInfoService; import org.opensearch.snapshots.SnapshotShardSizeInfo; import org.opensearch.snapshots.SnapshotsInfoService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.gateway.TestGatewayAllocator; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.gateway.TestGatewayAllocator; import java.util.ArrayList; import java.util.Arrays; @@ -60,7 +56,7 @@ import static java.util.Collections.emptyMap; import static org.opensearch.cluster.routing.ShardRoutingState.INITIALIZING; -public abstract class OpenSearchAllocationTestCase extends ESTestCase { +public abstract class OpenSearchAllocationTestCase extends OpenSearchTestCase { private static final ClusterSettings EMPTY_CLUSTER_SETTINGS = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java index e6c68e51be7e3..9b451484e5e6e 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java +++ b/test/framework/src/main/java/org/opensearch/cluster/coordination/AbstractCoordinatorTestCase.java @@ -70,9 +70,9 @@ import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.monitor.NodeHealthService; import org.opensearch.monitor.StatusInfo; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.disruption.DisruptableMockTransport; -import org.elasticsearch.test.disruption.DisruptableMockTransport.ConnectionStatus; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.disruption.DisruptableMockTransport; +import org.opensearch.test.disruption.DisruptableMockTransport.ConnectionStatus; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportInterceptor; @@ -145,7 +145,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -public class AbstractCoordinatorTestCase extends ESTestCase { +public class AbstractCoordinatorTestCase extends OpenSearchTestCase { protected final List nodeEnvironments = new ArrayList<>(); protected final Set openPersistedStates = new HashSet<>(); diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/CoordinationStateTestCluster.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/CoordinationStateTestCluster.java index 0797722cea28c..61922e236fa32 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/coordination/CoordinationStateTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/cluster/coordination/CoordinationStateTestCluster.java @@ -38,12 +38,12 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.rarely; import static java.util.stream.Collectors.toSet; import static org.apache.lucene.util.LuceneTestCase.random; -import static org.elasticsearch.test.ESTestCase.randomBoolean; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; -import static org.elasticsearch.test.ESTestCase.randomLong; -import static org.elasticsearch.test.ESTestCase.randomLongBetween; -import static org.elasticsearch.test.ESTestCase.randomSubsetOf; +import static org.opensearch.test.OpenSearchTestCase.randomBoolean; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.randomLong; +import static org.opensearch.test.OpenSearchTestCase.randomLongBetween; +import static org.opensearch.test.OpenSearchTestCase.randomSubsetOf; import static org.hamcrest.Matchers.hasSize; import static org.junit.Assert.assertThat; diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/DeterministicTaskQueue.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/DeterministicTaskQueue.java index 87d1bbccdf99e..8d24abb84533f 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/coordination/DeterministicTaskQueue.java +++ b/test/framework/src/main/java/org/opensearch/cluster/coordination/DeterministicTaskQueue.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolInfo; import org.opensearch.threadpool.ThreadPoolStats; @@ -317,7 +317,7 @@ public ExecutorService generic() { @Override public ExecutorService executor(String name) { - return Names.SAME.equals(name) ? EsExecutors.newDirectExecutorService() : forkingExecutor; + return Names.SAME.equals(name) ? OpenSearchExecutors.newDirectExecutorService() : forkingExecutor; } @Override diff --git a/test/framework/src/main/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutor.java b/test/framework/src/main/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutor.java index c32f4ec7f5e87..2c74044a269af 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutor.java +++ b/test/framework/src/main/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutor.java @@ -18,7 +18,7 @@ */ package org.opensearch.cluster.coordination; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.threadpool.ThreadPool; @@ -26,7 +26,7 @@ /** * Mock single threaded {@link PrioritizedEsThreadPoolExecutor} based on {@link DeterministicTaskQueue}, - * simulating the behaviour of an executor returned by {@link EsExecutors#newSinglePrioritizing}. + * simulating the behaviour of an executor returned by {@link OpenSearchExecutors#newSinglePrioritizing}. */ public class MockSinglePrioritizingExecutor extends PrioritizedEsThreadPoolExecutor { diff --git a/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java b/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java index 588d3be95bde9..853d8ccd11ede 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java +++ b/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java @@ -23,18 +23,13 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.UUIDs; import org.elasticsearch.index.shard.ShardId; -import org.opensearch.cluster.routing.AllocationId; -import org.opensearch.cluster.routing.RecoverySource; -import org.opensearch.cluster.routing.ShardRouting; -import org.opensearch.cluster.routing.ShardRoutingState; -import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.apache.lucene.util.LuceneTestCase.random; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength; /** * A helper that allows to create shard routing instances within tests, while not requiring to expose @@ -104,7 +99,7 @@ private static RecoverySource buildRecoveryTarget(boolean primary, ShardRoutingS case UNASSIGNED: case INITIALIZING: if (primary) { - return ESTestCase.randomFrom(RecoverySource.EmptyStoreRecoverySource.INSTANCE, + return OpenSearchTestCase.randomFrom(RecoverySource.EmptyStoreRecoverySource.INSTANCE, RecoverySource.ExistingStoreRecoverySource.INSTANCE); } else { return RecoverySource.PeerRecoverySource.INSTANCE; @@ -136,7 +131,7 @@ private static UnassignedInfo buildUnassignedInfo(ShardRoutingState state) { switch (state) { case UNASSIGNED: case INITIALIZING: - return new UnassignedInfo(ESTestCase.randomFrom(UnassignedInfo.Reason.values()), "auto generated for test"); + return new UnassignedInfo(OpenSearchTestCase.randomFrom(UnassignedInfo.Reason.values()), "auto generated for test"); case STARTED: case RELOCATING: return null; @@ -146,7 +141,7 @@ private static UnassignedInfo buildUnassignedInfo(ShardRoutingState state) { } public static RecoverySource randomRecoverySource() { - return ESTestCase.randomFrom(RecoverySource.EmptyStoreRecoverySource.INSTANCE, + return OpenSearchTestCase.randomFrom(RecoverySource.EmptyStoreRecoverySource.INSTANCE, RecoverySource.ExistingStoreRecoverySource.INSTANCE, RecoverySource.PeerRecoverySource.INSTANCE, RecoverySource.LocalShardsRecoverySource.INSTANCE, diff --git a/test/framework/src/main/java/org/opensearch/cluster/service/FakeThreadPoolMasterService.java b/test/framework/src/main/java/org/opensearch/cluster/service/FakeThreadPoolMasterService.java index ddafb8200821b..48ea3cc2a5876 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/service/FakeThreadPoolMasterService.java +++ b/test/framework/src/main/java/org/opensearch/cluster/service/FakeThreadPoolMasterService.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.node.Node; @@ -40,7 +40,7 @@ import java.util.function.Consumer; import static org.apache.lucene.util.LuceneTestCase.random; -import static org.elasticsearch.test.ESTestCase.randomInt; +import static org.opensearch.test.OpenSearchTestCase.randomInt; public class FakeThreadPoolMasterService extends MasterService { private static final Logger logger = LogManager.getLogger(FakeThreadPoolMasterService.class); @@ -62,7 +62,7 @@ public FakeThreadPoolMasterService(String nodeName, String serviceName, ThreadPo @Override protected PrioritizedEsThreadPoolExecutor createThreadPoolExecutor() { - return new PrioritizedEsThreadPoolExecutor(name, 1, 1, 1, TimeUnit.SECONDS, EsExecutors.daemonThreadFactory(name), + return new PrioritizedEsThreadPoolExecutor(name, 1, 1, 1, TimeUnit.SECONDS, OpenSearchExecutors.daemonThreadFactory(name), null, null) { @Override diff --git a/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java b/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java index cbf2673afe858..cc95b2d3c5bca 100644 --- a/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java +++ b/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java @@ -30,9 +30,7 @@ import org.opensearch.common.util.ByteArray; import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ESTestCase; -import org.opensearch.common.bytes.BytesArray; -import org.opensearch.common.bytes.BytesReference; +import org.opensearch.test.OpenSearchTestCase; import java.io.EOFException; import java.io.IOException; @@ -45,7 +43,7 @@ import java.util.List; import java.util.Map; -public abstract class AbstractBytesReferenceTestCase extends ESTestCase { +public abstract class AbstractBytesReferenceTestCase extends OpenSearchTestCase { protected static final int PAGE_SIZE = PageCacheRecycler.BYTE_PAGE_SIZE; protected final BigArrays bigarrays = new BigArrays(null, new NoneCircuitBreakerService(), CircuitBreaker.REQUEST); @@ -684,7 +682,7 @@ public void testIndexOf() throws IOException { assertEquals(bytesReference.indexOf(value, from), pos); } }); - final byte missing = randomValueOtherThanMany(map::containsKey, ESTestCase::randomByte); + final byte missing = randomValueOtherThanMany(map::containsKey, OpenSearchTestCase::randomByte); assertEquals(-1, bytesReference.indexOf(missing, randomIntBetween(0, Math.max(0, size - 1)))); } } diff --git a/test/framework/src/main/java/org/opensearch/common/inject/ModuleTestCase.java b/test/framework/src/main/java/org/opensearch/common/inject/ModuleTestCase.java index 83d489f5480ea..3c4f6744b6c0a 100644 --- a/test/framework/src/main/java/org/opensearch/common/inject/ModuleTestCase.java +++ b/test/framework/src/main/java/org/opensearch/common/inject/ModuleTestCase.java @@ -22,7 +22,7 @@ import org.opensearch.common.inject.spi.Elements; import org.opensearch.common.inject.spi.InstanceBinding; import org.opensearch.common.inject.spi.ProviderInstanceBinding; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.lang.annotation.Annotation; import java.util.List; @@ -31,7 +31,7 @@ /** * Base testcase for testing {@link Module} implementations. */ -public abstract class ModuleTestCase extends ESTestCase { +public abstract class ModuleTestCase extends OpenSearchTestCase { /** * Configures the module, and ensures an instance is bound to the "to" class, and the * provided tester returns true on the instance. diff --git a/test/framework/src/main/java/org/opensearch/common/logging/JsonLogsIntegTestCase.java b/test/framework/src/main/java/org/opensearch/common/logging/JsonLogsIntegTestCase.java index 365dcdb594da6..b34c6210013ca 100644 --- a/test/framework/src/main/java/org/opensearch/common/logging/JsonLogsIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/common/logging/JsonLogsIntegTestCase.java @@ -20,7 +20,7 @@ package org.opensearch.common.logging; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.BufferedReader; import java.io.IOException; @@ -47,7 +47,7 @@ * Note that this won't pass for nodes in clusters that don't have the node name defined in elasticsearch.yml and start * with DEBUG or TRACE level logging. Those nodes log a few lines before the node.name is set by LogConfigurator.setNodeName. */ -public abstract class JsonLogsIntegTestCase extends ESRestTestCase { +public abstract class JsonLogsIntegTestCase extends OpenSearchRestTestCase { /** * Number of lines in the log file to check for the node.name, node.id or cluster.uuid. We don't * just check the entire log file because it could be quite long diff --git a/test/framework/src/main/java/org/opensearch/common/logging/TestThreadInfoPatternConverter.java b/test/framework/src/main/java/org/opensearch/common/logging/TestThreadInfoPatternConverter.java index def23729e7488..867aceb622815 100644 --- a/test/framework/src/main/java/org/opensearch/common/logging/TestThreadInfoPatternConverter.java +++ b/test/framework/src/main/java/org/opensearch/common/logging/TestThreadInfoPatternConverter.java @@ -28,12 +28,12 @@ import org.apache.logging.log4j.core.pattern.ConverterKeys; import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; import org.apache.logging.log4j.core.pattern.PatternConverter; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; /** * Converts {@code %test_thread_info} in log4j patterns into information * based on the loggin thread's name. If that thread is part of an - * {@link ESIntegTestCase} then this information is the node name. + * {@link OpenSearchIntegTestCase} then this information is the node name. */ @Plugin(category = PatternConverter.CATEGORY, name = "TestInfoPatternConverter") @ConverterKeys({"test_thread_info"}) diff --git a/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java b/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java index 8c06b9fbb5edc..da1001dfc5b28 100644 --- a/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java +++ b/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java @@ -23,10 +23,10 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -36,14 +36,14 @@ /** * Test harness for verifying {@link IndexInput} implementations. */ -public class OpenSearchIndexInputTestCase extends ESTestCase { +public class OpenSearchIndexInputTestCase extends OpenSearchTestCase { private static EsThreadPoolExecutor executor; @BeforeClass public static void createExecutor() { final String name = "TEST-" + getTestClass().getSimpleName() + "#randomReadAndSlice"; - executor = EsExecutors.newFixed(name, 10, 0, EsExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY)); + executor = OpenSearchExecutors.newFixed(name, 10, 0, OpenSearchExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY)); } @AfterClass diff --git a/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java b/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java index 72c26d00299bd..ac29366de09c4 100644 --- a/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java +++ b/test/framework/src/main/java/org/opensearch/common/util/MockBigArrays.java @@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.test.ESTestCase.assertBusy; +import static org.opensearch.test.OpenSearchTestCase.assertBusy; import static org.junit.Assert.assertTrue; public class MockBigArrays extends BigArrays { diff --git a/test/framework/src/main/java/org/opensearch/common/util/MockPageCacheRecycler.java b/test/framework/src/main/java/org/opensearch/common/util/MockPageCacheRecycler.java index 2c31eb7d21779..60426e0fec60e 100644 --- a/test/framework/src/main/java/org/opensearch/common/util/MockPageCacheRecycler.java +++ b/test/framework/src/main/java/org/opensearch/common/util/MockPageCacheRecycler.java @@ -22,7 +22,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.opensearch.common.recycler.Recycler.V; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.set.Sets; import java.lang.reflect.Array; @@ -34,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static org.elasticsearch.test.ESTestCase.waitUntil; +import static org.opensearch.test.OpenSearchTestCase.waitUntil; public class MockPageCacheRecycler extends PageCacheRecycler { diff --git a/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java b/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java index 09ed5bc1eb165..49492892858d4 100644 --- a/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java @@ -32,7 +32,7 @@ import org.opensearch.geometry.Point; import org.opensearch.geometry.Polygon; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; import java.util.Arrays; @@ -40,7 +40,7 @@ import java.util.List; import java.util.function.Function; -import static org.elasticsearch.test.ESTestCase.randomValueOtherThanMany; +import static org.opensearch.test.OpenSearchTestCase.randomValueOtherThanMany; public class GeometryTestUtils { @@ -53,15 +53,15 @@ public static double randomLon() { } public static double randomAlt() { - return ESTestCase.randomDouble(); + return OpenSearchTestCase.randomDouble(); } public static Circle randomCircle(boolean hasAlt) { if (hasAlt) { - return new Circle(randomLon(), randomLat(), ESTestCase.randomDouble(), - ESTestCase.randomDoubleBetween(0, 100, false)); + return new Circle(randomLon(), randomLat(), OpenSearchTestCase.randomDouble(), + OpenSearchTestCase.randomDoubleBetween(0, 100, false)); } else { - return new Circle(randomLon(), randomLat(), ESTestCase.randomDoubleBetween(0, 100, false)); + return new Circle(randomLon(), randomLat(), OpenSearchTestCase.randomDoubleBetween(0, 100, false)); } } @@ -86,7 +86,7 @@ public static Line randomLine(boolean hasAlts) { } public static Point randomPoint() { - return randomPoint(ESTestCase.randomBoolean()); + return randomPoint(OpenSearchTestCase.randomBoolean()); } public static Point randomPoint(boolean hasAlt) { @@ -145,7 +145,7 @@ public static Rectangle randomRectangle() { } public static MultiPoint randomMultiPoint(boolean hasAlt) { - int size = ESTestCase.randomIntBetween(3, 10); + int size = OpenSearchTestCase.randomIntBetween(3, 10); List points = new ArrayList<>(); for (int i = 0; i < size; i++) { points.add(randomPoint(hasAlt)); @@ -154,7 +154,7 @@ public static MultiPoint randomMultiPoint(boolean hasAlt) { } public static MultiLine randomMultiLine(boolean hasAlt) { - int size = ESTestCase.randomIntBetween(3, 10); + int size = OpenSearchTestCase.randomIntBetween(3, 10); List lines = new ArrayList<>(); for (int i = 0; i < size; i++) { lines.add(randomLine(hasAlt)); @@ -163,7 +163,7 @@ public static MultiLine randomMultiLine(boolean hasAlt) { } public static MultiPolygon randomMultiPolygon(boolean hasAlt) { - int size = ESTestCase.randomIntBetween(3, 10); + int size = OpenSearchTestCase.randomIntBetween(3, 10); List polygons = new ArrayList<>(); for (int i = 0; i < size; i++) { polygons.add(randomPolygon(hasAlt)); @@ -176,7 +176,7 @@ public static GeometryCollection randomGeometryCollection(boolean hasA } private static GeometryCollection randomGeometryCollection(int level, boolean hasAlt) { - int size = ESTestCase.randomIntBetween(1, 10); + int size = OpenSearchTestCase.randomIntBetween(1, 10); List shapes = new ArrayList<>(); for (int i = 0; i < size; i++) { shapes.add(randomGeometry(level, hasAlt)); @@ -189,7 +189,7 @@ public static Geometry randomGeometry(boolean hasAlt) { } protected static Geometry randomGeometry(int level, boolean hasAlt) { - @SuppressWarnings("unchecked") Function geometry = ESTestCase.randomFrom( + @SuppressWarnings("unchecked") Function geometry = OpenSearchTestCase.randomFrom( GeometryTestUtils::randomCircle, GeometryTestUtils::randomLine, GeometryTestUtils::randomPoint, diff --git a/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java b/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java rename to test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java index e29e00558a541..11f5bac35a971 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/MapperTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index; +package org.opensearch.index; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; @@ -33,14 +33,14 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.mapper.MapperRegistry; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.nio.file.Path; import java.util.Collections; import static org.apache.lucene.util.LuceneTestCase.expectThrows; -import static org.elasticsearch.test.ESTestCase.createTestAnalysis; +import static org.opensearch.test.OpenSearchTestCase.createTestAnalysis; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/test/framework/src/main/java/org/elasticsearch/index/MockEngineFactoryPlugin.java b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/index/MockEngineFactoryPlugin.java rename to test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java index 151430179c4df..d5001905b7cff 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/MockEngineFactoryPlugin.java +++ b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index; +package org.opensearch.index; import org.apache.lucene.index.AssertingDirectoryReader; import org.apache.lucene.index.FilterDirectoryReader; @@ -24,8 +24,8 @@ import org.elasticsearch.index.engine.EngineFactory; import org.elasticsearch.plugins.EnginePlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.engine.MockEngineFactory; -import org.elasticsearch.test.engine.MockEngineSupport; +import org.opensearch.test.engine.MockEngineFactory; +import org.opensearch.test.engine.MockEngineSupport; import java.util.Arrays; import java.util.List; diff --git a/test/framework/src/main/java/org/elasticsearch/index/RandomCreateIndexGenerator.java b/test/framework/src/main/java/org/opensearch/index/RandomCreateIndexGenerator.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/index/RandomCreateIndexGenerator.java rename to test/framework/src/main/java/org/opensearch/index/RandomCreateIndexGenerator.java index ee3fe3bfa8d7d..3f346b082eec4 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/RandomCreateIndexGenerator.java +++ b/test/framework/src/main/java/org/opensearch/index/RandomCreateIndexGenerator.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index; +package org.opensearch.index; import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.admin.indices.create.CreateIndexRequest; @@ -30,10 +30,10 @@ import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; -import static org.elasticsearch.test.ESTestCase.randomBoolean; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength; +import static org.opensearch.test.OpenSearchTestCase.randomBoolean; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; public final class RandomCreateIndexGenerator { diff --git a/test/framework/src/main/java/org/elasticsearch/index/alias/RandomAliasActionsGenerator.java b/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java similarity index 86% rename from test/framework/src/main/java/org/elasticsearch/index/alias/RandomAliasActionsGenerator.java rename to test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java index 1147dd1938458..4d21ba5033851 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/alias/RandomAliasActionsGenerator.java +++ b/test/framework/src/main/java/org/opensearch/index/alias/RandomAliasActionsGenerator.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.alias; +package org.opensearch.index.alias; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; @@ -25,14 +25,14 @@ import java.util.Locale; import java.util.Map; -import static org.elasticsearch.test.ESTestCase.between; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLength; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween; -import static org.elasticsearch.test.ESTestCase.randomBoolean; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomInt; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; -import static org.elasticsearch.test.ESTestCase.randomLong; +import static org.opensearch.test.OpenSearchTestCase.between; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLength; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLengthBetween; +import static org.opensearch.test.OpenSearchTestCase.randomBoolean; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomInt; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.randomLong; public final class RandomAliasActionsGenerator { diff --git a/test/framework/src/main/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java similarity index 81% rename from test/framework/src/main/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java rename to test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java index 66ba76748df88..bb00d770aa2dd 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/analysis/AnalysisTestsHelper.java +++ b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.analysis; +package org.opensearch.index.analysis; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; @@ -26,8 +26,8 @@ import org.elasticsearch.index.IndexSettings; import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import java.io.IOException; import java.nio.file.Path; @@ -35,9 +35,9 @@ public class AnalysisTestsHelper { - public static ESTestCase.TestAnalysis createTestAnalysisFromClassPath(final Path baseDir, - final String resource, - final AnalysisPlugin... plugins) throws IOException { + public static OpenSearchTestCase.TestAnalysis createTestAnalysisFromClassPath(final Path baseDir, + final String resource, + final AnalysisPlugin... plugins) throws IOException { final Settings settings = Settings.builder() .loadFromStream(resource, AnalysisTestsHelper.class.getResourceAsStream(resource), false) .put(Environment.PATH_HOME_SETTING.getKey(), baseDir.toString()) @@ -46,12 +46,12 @@ public static ESTestCase.TestAnalysis createTestAnalysisFromClassPath(final Path return createTestAnalysisFromSettings(settings, plugins); } - public static ESTestCase.TestAnalysis createTestAnalysisFromSettings( + public static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings( final Settings settings, final AnalysisPlugin... plugins) throws IOException { return createTestAnalysisFromSettings(settings, null, plugins); } - public static ESTestCase.TestAnalysis createTestAnalysisFromSettings( + public static OpenSearchTestCase.TestAnalysis createTestAnalysisFromSettings( final Settings settings, final Path configPath, final AnalysisPlugin... plugins) throws IOException { @@ -64,7 +64,7 @@ public static ESTestCase.TestAnalysis createTestAnalysisFromSettings( final IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("test", actualSettings); final AnalysisRegistry analysisRegistry = new AnalysisModule(new Environment(actualSettings, configPath), Arrays.asList(plugins)).getAnalysisRegistry(); - return new ESTestCase.TestAnalysis(analysisRegistry.build(indexSettings), + return new OpenSearchTestCase.TestAnalysis(analysisRegistry.build(indexSettings), analysisRegistry.buildTokenFilterFactories(indexSettings), analysisRegistry.buildTokenizerFactories(indexSettings), analysisRegistry.buildCharFilterFactories(indexSettings)); diff --git a/test/framework/src/main/java/org/elasticsearch/index/analysis/MyFilterTokenFilterFactory.java b/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/index/analysis/MyFilterTokenFilterFactory.java rename to test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java index 638642eb089a9..91a1499c1c5f0 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/analysis/MyFilterTokenFilterFactory.java +++ b/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.analysis; +package org.opensearch.index.analysis; import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/DocIdSeqNoAndSource.java b/test/framework/src/main/java/org/opensearch/index/engine/DocIdSeqNoAndSource.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/index/engine/DocIdSeqNoAndSource.java rename to test/framework/src/main/java/org/opensearch/index/engine/DocIdSeqNoAndSource.java index a48e813c1a68e..25129f1dc2ccb 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/DocIdSeqNoAndSource.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/DocIdSeqNoAndSource.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine; +package org.opensearch.index.engine; import org.apache.lucene.util.BytesRef; diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java rename to test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java index d0646d55e77bf..f1622a381a380 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/EngineTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine; +package org.opensearch.index.engine; import org.apache.logging.log4j.Logger; import org.apache.lucene.analysis.Analyzer; @@ -75,7 +75,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; -import org.elasticsearch.index.MapperTestUtils; +import org.opensearch.index.MapperTestUtils; import org.opensearch.index.VersionType; import org.opensearch.index.codec.CodecService; import org.opensearch.index.fieldvisitor.IdOnlyFieldVisitor; @@ -100,9 +100,9 @@ import org.opensearch.index.translog.TranslogConfig; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -134,13 +134,13 @@ import static org.opensearch.index.engine.Engine.Operation.Origin.PEER_RECOVERY; import static org.opensearch.index.engine.Engine.Operation.Origin.PRIMARY; import static org.opensearch.index.engine.Engine.Operation.Origin.REPLICA; -import static org.elasticsearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; +import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; -public abstract class EngineTestCase extends ESTestCase { +public abstract class EngineTestCase extends OpenSearchTestCase { protected final ShardId shardId = new ShardId(new Index("index", "_na_"), 0); protected final AllocationId allocationId = AllocationId.newInitializing(); @@ -764,12 +764,12 @@ protected Engine.Index indexForDoc(ParsedDocument doc) { protected Engine.Index replicaIndexForDoc(ParsedDocument doc, long version, long seqNo, boolean isRetry) { - return new Engine.Index(newUid(doc), doc, seqNo, primaryTerm.get(), version, null, Engine.Operation.Origin.REPLICA, + return new Engine.Index(newUid(doc), doc, seqNo, primaryTerm.get(), version, null, REPLICA, System.nanoTime(), IndexRequest.UNSET_AUTO_GENERATED_TIMESTAMP, isRetry, SequenceNumbers.UNASSIGNED_SEQ_NO, 0); } protected Engine.Delete replicaDeleteForDoc(String id, long version, long seqNo, long startTime) { - return new Engine.Delete("test", id, newUid(id), seqNo, 1, version, null, Engine.Operation.Origin.REPLICA, startTime, + return new Engine.Delete("test", id, newUid(id), seqNo, 1, version, null, REPLICA, startTime, SequenceNumbers.UNASSIGNED_SEQ_NO, 0); } protected static void assertVisibleCount(InternalEngine engine, int numDocs) throws IOException { diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/InternalTestEngine.java b/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/index/engine/InternalTestEngine.java rename to test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java index 78318002dfddb..4ca513ba49ae1 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/InternalTestEngine.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine; +package org.opensearch.index.engine; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.index.seqno.LocalCheckpointTracker; diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java b/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java rename to test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java index 858fb631da54c..2862343531b4c 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/TranslogHandler.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.engine; +package org.opensearch.index.engine; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.xcontent.NamedXContentRegistry; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/AbstractNumericFieldMapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/AbstractNumericFieldMapperTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/AbstractNumericFieldMapperTestCase.java rename to test/framework/src/main/java/org/opensearch/index/mapper/AbstractNumericFieldMapperTestCase.java index 617c2db960422..e3d503c189ddc 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/AbstractNumericFieldMapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/AbstractNumericFieldMapperTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import java.io.IOException; import java.util.Set; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase.java rename to test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java index 58eafa7666286..2edffc3da8b64 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; @@ -32,7 +32,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; import java.util.ArrayList; @@ -51,7 +51,7 @@ * @deprecated prefer {@link FieldMapperTestCase2} */ @Deprecated -public abstract class FieldMapperTestCase> extends ESSingleNodeTestCase { +public abstract class FieldMapperTestCase> extends OpenSearchSingleNodeTestCase { protected final Settings SETTINGS = Settings.builder() .put("index.version.created", Version.CURRENT) diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase2.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase2.java rename to test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java index 1dfad88c76e43..fb69ff0d15cbc 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldMapperTestCase2.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java similarity index 92% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java rename to test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java index d2990e8f4c3a9..895fc529456b2 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.search.lookup.SourceLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collections; @@ -30,7 +30,7 @@ import static org.mockito.Mockito.when; /** Base test case for subclasses of MappedFieldType */ -public abstract class FieldTypeTestCase extends ESTestCase { +public abstract class FieldTypeTestCase extends OpenSearchTestCase { public static final QueryShardContext MOCK_QSC = createMockQueryShardContext(true); public static final QueryShardContext MOCK_QSC_DISALLOW_EXPENSIVE = createMockQueryShardContext(false); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java rename to test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java index b9633917c2d0a..b01e1d7ea3cf9 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.index.IndexReader; @@ -50,7 +50,7 @@ import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.Collection; @@ -65,7 +65,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public abstract class MapperServiceTestCase extends ESTestCase { +public abstract class MapperServiceTestCase extends OpenSearchTestCase { protected static final Settings SETTINGS = Settings.builder().put("index.version.created", Version.CURRENT).build(); diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java rename to test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java index 8fe449f75ce32..13a505db59e2d 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldFilterPlugin.java b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldFilterPlugin.java rename to test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java index b109520ecc229..417366007db1a 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldFilterPlugin.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldFilterPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldMapper.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java rename to test/framework/src/main/java/org/opensearch/index/mapper/MockFieldMapper.java index 83fe6b3603d78..6bfbfa7b48eb6 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MockFieldMapper.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.mapper; +package org.opensearch.index.mapper; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; diff --git a/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java b/test/framework/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java similarity index 91% rename from test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java rename to test/framework/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java index bbcaab5859497..b05ad9747e792 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.index.reindex; +package org.opensearch.index.reindex; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.tasks.TaskId; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -32,7 +32,7 @@ public abstract class AbstractAsyncBulkByScrollActionTestCase< Request extends AbstractBulkByScrollRequest, Response extends BulkByScrollResponse> - extends ESTestCase { + extends OpenSearchTestCase { protected ThreadPool threadPool; protected BulkByScrollTask task; diff --git a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java rename to test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java index 6a4ab7b435d0a..12509f575b91f 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.replication; +package org.opensearch.index.replication; import org.apache.lucene.store.AlreadyClosedException; import org.opensearch.Version; @@ -68,7 +68,7 @@ import org.opensearch.common.xcontent.XContentType; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.DocIdSeqNoAndSource; import org.elasticsearch.index.engine.EngineFactory; import org.elasticsearch.index.engine.InternalEngineFactory; import org.elasticsearch.index.seqno.GlobalCheckpointSyncAction; @@ -77,7 +77,7 @@ import org.elasticsearch.index.seqno.RetentionLeaseSyncer; import org.elasticsearch.index.seqno.RetentionLeases; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.shard.PrimaryReplicaSyncer; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; @@ -110,7 +110,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public abstract class ESIndexLevelReplicationTestCase extends IndexShardTestCase { +public abstract class OpenSearchIndexLevelReplicationTestCase extends IndexShardTestCase { protected final Index index = new Index("test", "uuid"); private final ShardId shardId = new ShardId(index, 0); @@ -422,9 +422,9 @@ public void recoverReplica( boolean markAsRecovering) throws IOException { final IndexShardRoutingTable routingTable = routingTable(Function.identity()); final Set inSyncIds = activeIds(); - ESIndexLevelReplicationTestCase.this.recoverUnstartedReplica(replica, primary, targetSupplier, markAsRecovering, inSyncIds, + OpenSearchIndexLevelReplicationTestCase.this.recoverUnstartedReplica(replica, primary, targetSupplier, markAsRecovering, inSyncIds, routingTable); - ESIndexLevelReplicationTestCase.this.startReplicaAfterRecovery(replica, primary, inSyncIds, routingTable); + OpenSearchIndexLevelReplicationTestCase.this.startReplicaAfterRecovery(replica, primary, inSyncIds, routingTable); computeReplicationTargets(); } diff --git a/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java b/test/framework/src/main/java/org/opensearch/index/seqno/RetentionLeaseUtils.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java rename to test/framework/src/main/java/org/opensearch/index/seqno/RetentionLeaseUtils.java index 55807161d51ad..ca20506dd40ed 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/seqno/RetentionLeaseUtils.java +++ b/test/framework/src/main/java/org/opensearch/index/seqno/RetentionLeaseUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.seqno; +package org.opensearch.index.seqno; import java.util.LinkedHashMap; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java rename to test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java index b05c1dc7341ac..7767dcb50f6fd 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.shard; +package org.opensearch.index.shard; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.store.Directory; @@ -48,14 +48,14 @@ import org.opensearch.env.NodeEnvironment; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; -import org.elasticsearch.index.MapperTestUtils; +import org.opensearch.index.MapperTestUtils; import org.opensearch.index.VersionType; import org.opensearch.index.cache.IndexCache; import org.opensearch.index.cache.query.DisabledQueryCache; -import org.elasticsearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.DocIdSeqNoAndSource; import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.EngineFactory; -import org.elasticsearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.EngineTestCase; import org.opensearch.index.engine.InternalEngineFactory; import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.SourceToParse; @@ -79,10 +79,10 @@ import org.opensearch.indices.recovery.StartRecoveryRequest; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.Repository; -import org.opensearch.repositories.blobstore.ESBlobStoreRepositoryIntegTestCase; +import org.opensearch.repositories.blobstore.OpenSearchBlobStoreRepositoryIntegTestCase; import org.opensearch.snapshots.Snapshot; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -109,7 +109,7 @@ * containing utilities for shard creation and recoveries. See {{@link #newShard(boolean)}} and * {@link #newStartedShard()} for a good starting points */ -public abstract class IndexShardTestCase extends ESTestCase { +public abstract class IndexShardTestCase extends OpenSearchTestCase { public static final IndexEventListener EMPTY_EVENT_LISTENER = new IndexEventListener() {}; @@ -814,7 +814,7 @@ protected void recoverShardFromSnapshot(final IndexShard shard, final DiscoveryNode node = getFakeDiscoNode(shard.routingEntry().currentNodeId()); final RecoverySource.SnapshotRecoverySource recoverySource = new RecoverySource.SnapshotRecoverySource(UUIDs.randomBase64UUID(), snapshot, version, indexId); - final ShardRouting shardRouting = newShardRouting(shardId, node.getId(), true, ShardRoutingState.INITIALIZING, recoverySource); + final ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, node.getId(), true, ShardRoutingState.INITIALIZING, recoverySource); shard.markAsRecovering("from snapshot", new RecoveryState(shardRouting, node, null)); final PlainActionFuture future = PlainActionFuture.newFuture(); repository.restoreShard(shard.store(), @@ -837,7 +837,7 @@ protected String snapshotShard(final IndexShard shard, final Index index = shard.shardId().getIndex(); final IndexId indexId = new IndexId(index.getName(), index.getUUID()); final IndexShardSnapshotStatus snapshotStatus = IndexShardSnapshotStatus.newInitializing( - ESBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).shardGenerations().getShardGen( + OpenSearchBlobStoreRepositoryIntegTestCase.getRepositoryData(repository).shardGenerations().getShardGen( indexId, shard.shardId().getId())); final PlainActionFuture future = PlainActionFuture.newFuture(); final String shardGen; diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/RestoreOnlyRepository.java b/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/index/shard/RestoreOnlyRepository.java rename to test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java index aa48e2348e42a..5e2ca7e8c76cd 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/RestoreOnlyRepository.java +++ b/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.index.shard; +package org.opensearch.index.shard; import org.apache.lucene.index.IndexCommit; import org.opensearch.Version; diff --git a/test/framework/src/main/java/org/elasticsearch/index/store/EsBaseDirectoryTestCase.java b/test/framework/src/main/java/org/opensearch/index/store/OpenSearchBaseDirectoryTestCase.java similarity index 80% rename from test/framework/src/main/java/org/elasticsearch/index/store/EsBaseDirectoryTestCase.java rename to test/framework/src/main/java/org/opensearch/index/store/OpenSearchBaseDirectoryTestCase.java index 8b46254e2df7f..c34fecf981932 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/store/EsBaseDirectoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/store/OpenSearchBaseDirectoryTestCase.java @@ -1,5 +1,3 @@ -package org.elasticsearch.index.store; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -9,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -19,6 +17,8 @@ * under the License. */ +package org.opensearch.index.store; + import com.carrotsearch.randomizedtesting.annotations.Listeners; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; @@ -28,10 +28,10 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TimeUnits; import org.opensearch.bootstrap.BootstrapForTesting; -import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; +import org.opensearch.test.junit.listeners.ReproduceInfoPrinter; /** - * Extends Lucene's BaseDirectoryTestCase with ES test behavior. + * Extends Lucene's BaseDirectoryTestCase with OpenSearch test behavior. */ @Listeners({ ReproduceInfoPrinter.class @@ -39,10 +39,10 @@ @TimeoutSuite(millis = TimeUnits.HOUR) @LuceneTestCase.SuppressReproduceLine @LuceneTestCase.SuppressSysoutChecks(bugUrl = "we log a lot on purpose") -public abstract class EsBaseDirectoryTestCase extends BaseDirectoryTestCase { +public abstract class OpenSearchBaseDirectoryTestCase extends BaseDirectoryTestCase { static { try { - Class.forName("org.elasticsearch.test.ESTestCase"); + Class.forName("org.opensearch.test.OpenSearchTestCase"); } catch (ClassNotFoundException e) { throw new AssertionError(e); } diff --git a/test/framework/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicies.java b/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicies.java rename to test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java index 2247150add5a6..859fa9a53a189 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/translog/TranslogDeletionPolicies.java +++ b/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.index.translog; +package org.opensearch.index.translog; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java index e3a6b1d68b211..63f857e6b33b2 100644 --- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.analysis.StandardTokenizerFactory; import org.elasticsearch.index.analysis.StopTokenFilterFactory; import org.elasticsearch.plugins.AnalysisPlugin; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; import java.util.Locale; @@ -45,7 +45,7 @@ * If we don't want to expose one for a specific reason, just map it to Void. * The deprecated ones can be mapped to Deprecated.class. */ -public abstract class AnalysisFactoryTestCase extends ESTestCase { +public abstract class AnalysisFactoryTestCase extends OpenSearchTestCase { private static final Map> KNOWN_TOKENIZERS = new MapBuilder>() // exposed in ES diff --git a/test/framework/src/main/java/org/opensearch/node/MockNode.java b/test/framework/src/main/java/org/opensearch/node/MockNode.java index db5b4431ed890..1e2f0fe61e30a 100644 --- a/test/framework/src/main/java/org/opensearch/node/MockNode.java +++ b/test/framework/src/main/java/org/opensearch/node/MockNode.java @@ -45,8 +45,8 @@ import org.opensearch.search.MockSearchService; import org.opensearch.search.SearchService; import org.opensearch.search.fetch.FetchPhase; -import org.elasticsearch.test.MockHttpTransport; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.MockHttpTransport; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportInterceptor; diff --git a/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java index f72cbef8005f1..36cb1212ade14 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java @@ -33,7 +33,7 @@ import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.snapshots.SnapshotState; -import org.elasticsearch.test.ESSingleNodeTestCase; +import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; import java.io.ByteArrayInputStream; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.not; -public abstract class AbstractThirdPartyRepositoryTestCase extends ESSingleNodeTestCase { +public abstract class AbstractThirdPartyRepositoryTestCase extends OpenSearchSingleNodeTestCase { @Override protected Settings nodeSettings() { diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java index 4dc7a1fa00528..b14cc0fccb939 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java @@ -33,7 +33,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.CountDown; import org.elasticsearch.mocksocket.MockHttpServer; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.After; import org.junit.Before; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; @SuppressForbidden(reason = "use a http server") -public abstract class AbstractBlobContainerRetriesTestCase extends ESTestCase { +public abstract class AbstractBlobContainerRetriesTestCase extends OpenSearchTestCase { private static final long MAX_RANGE_VAL = Long.MAX_VALUE - 1; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java index 77a07d3a227e2..fbe1cef34f63a 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java @@ -50,7 +50,7 @@ import org.opensearch.repositories.ShardGenerations; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInfo; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import org.opensearch.threadpool.ThreadPool; import java.io.ByteArrayInputStream; @@ -73,8 +73,8 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import static org.elasticsearch.test.ESTestCase.buildNewFakeTransportAddress; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.buildNewFakeTransportAddress; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasKey; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchBlobStoreRepositoryIntegTestCase.java similarity index 98% rename from test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java rename to test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchBlobStoreRepositoryIntegTestCase.java index b7645198de990..6fd3f45897170 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchBlobStoreRepositoryIntegTestCase.java @@ -43,7 +43,7 @@ import org.opensearch.repositories.RepositoryData; import org.opensearch.snapshots.SnapshotMissingException; import org.opensearch.snapshots.SnapshotRestoreException; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; import org.hamcrest.CoreMatchers; @@ -58,8 +58,8 @@ import java.util.Map; import java.util.Set; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.instanceOf; @@ -70,7 +70,7 @@ /** * Integration tests for {@link BlobStoreRepository} implementations. */ -public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase { +public abstract class OpenSearchBlobStoreRepositoryIntegTestCase extends OpenSearchIntegTestCase { public static RepositoryData getRepositoryData(Repository repository) { return PlainActionFuture.get(repository::getRepositoryData); diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java similarity index 98% rename from test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java rename to test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java index 47b591f9844ab..5bfefe5002037 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java @@ -39,7 +39,7 @@ import org.opensearch.repositories.Repository; import org.opensearch.repositories.RepositoryMissingException; import org.opensearch.repositories.RepositoryStats; -import org.elasticsearch.test.BackgroundIndexer; +import org.opensearch.test.BackgroundIndexer; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -59,8 +59,8 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @@ -70,7 +70,7 @@ @SuppressForbidden(reason = "this test uses a HttpServer to emulate a cloud-based storage service") // The tests in here do a lot of state updates and other writes to disk and are slowed down too much by WindowsFS @LuceneTestCase.SuppressFileSystems(value = {"WindowsFS", "ExtrasFS"}) -public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreRepositoryIntegTestCase { +public abstract class OpenSearchMockAPIBasedRepositoryIntegTestCase extends OpenSearchBlobStoreRepositoryIntegTestCase { /** * A {@link HttpHandler} that allows to list stored blobs diff --git a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java index c9ab5461543f0..6078443bbd8ad 100644 --- a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java @@ -48,7 +48,7 @@ import org.opensearch.search.sort.SortBuilders; import org.opensearch.search.sort.SortOrder; import org.opensearch.search.suggest.SuggestBuilder; -import org.elasticsearch.test.AbstractQueryTestCase; +import org.opensearch.test.AbstractQueryTestCase; import java.io.IOException; import java.util.ArrayList; @@ -56,21 +56,21 @@ import java.util.function.Supplier; import static java.util.Collections.emptyMap; -import static org.elasticsearch.test.ESTestCase.between; -import static org.elasticsearch.test.ESTestCase.generateRandomStringArray; -import static org.elasticsearch.test.ESTestCase.mockScript; -import static org.elasticsearch.test.ESTestCase.randomAlphaOfLengthBetween; -import static org.elasticsearch.test.ESTestCase.randomBoolean; -import static org.elasticsearch.test.ESTestCase.randomByte; -import static org.elasticsearch.test.ESTestCase.randomDouble; -import static org.elasticsearch.test.ESTestCase.randomFloat; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.ESTestCase.randomInt; -import static org.elasticsearch.test.ESTestCase.randomIntBetween; -import static org.elasticsearch.test.ESTestCase.randomLong; -import static org.elasticsearch.test.ESTestCase.randomPositiveTimeValue; -import static org.elasticsearch.test.ESTestCase.randomShort; -import static org.elasticsearch.test.ESTestCase.randomTimeValue; +import static org.opensearch.test.OpenSearchTestCase.between; +import static org.opensearch.test.OpenSearchTestCase.generateRandomStringArray; +import static org.opensearch.test.OpenSearchTestCase.mockScript; +import static org.opensearch.test.OpenSearchTestCase.randomAlphaOfLengthBetween; +import static org.opensearch.test.OpenSearchTestCase.randomBoolean; +import static org.opensearch.test.OpenSearchTestCase.randomByte; +import static org.opensearch.test.OpenSearchTestCase.randomDouble; +import static org.opensearch.test.OpenSearchTestCase.randomFloat; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomInt; +import static org.opensearch.test.OpenSearchTestCase.randomIntBetween; +import static org.opensearch.test.OpenSearchTestCase.randomLong; +import static org.opensearch.test.OpenSearchTestCase.randomPositiveTimeValue; +import static org.opensearch.test.OpenSearchTestCase.randomShort; +import static org.opensearch.test.OpenSearchTestCase.randomTimeValue; /** * Builds random search requests. diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java index 9cd5a38694f7e..e07180082d841 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java @@ -119,8 +119,8 @@ import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.search.internal.SearchContext; import org.opensearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalAggregationTestCase; import org.junit.After; import org.junit.Before; @@ -141,7 +141,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; -import static org.elasticsearch.test.InternalAggregationTestCase.DEFAULT_MAX_BUCKETS; +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; @@ -155,7 +155,7 @@ * Provides helpers for constructing and searching an {@link Aggregator} implementation based on a provided * {@link AggregationBuilder} instance. */ -public abstract class AggregatorTestCase extends ESTestCase { +public abstract class AggregatorTestCase extends OpenSearchTestCase { private static final String NESTEDFIELD_PREFIX = "nested_"; private List releasables = new ArrayList<>(); private static final String TYPE_NAME = "type"; diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/BaseAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/BaseAggregationTestCase.java index f135e87a31d0a..edf92762e4b9b 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/BaseAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/BaseAggregationTestCase.java @@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.search.aggregations.support.ValuesSourceAggregationBuilder; -import org.elasticsearch.test.AbstractBuilderTestCase; +import org.opensearch.test.AbstractBuilderTestCase; import java.io.IOException; import java.util.ArrayList; @@ -37,7 +37,7 @@ import java.util.List; import java.util.Set; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.hasSize; public abstract class BaseAggregationTestCase> extends AbstractBuilderTestCase { diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java index 57878a78ac84a..2b2350a3aea6c 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations; import static java.util.Collections.emptyList; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.hasSize; import java.io.IOException; @@ -47,10 +47,10 @@ import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.PipelineAggregationBuilder.ValidationContext; import org.opensearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder; -import org.elasticsearch.test.AbstractQueryTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.AbstractQueryTestCase; +import org.opensearch.test.OpenSearchTestCase; -public abstract class BasePipelineAggregationTestCase> extends ESTestCase { +public abstract class BasePipelineAggregationTestCase> extends OpenSearchTestCase { protected static final String STRING_FIELD_NAME = "mapped_string"; protected static final String INT_FIELD_NAME = "mapped_int"; diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/InternalSingleBucketAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/InternalSingleBucketAggregationTestCase.java index acee11f71f90b..5e4800e909207 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/InternalSingleBucketAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/InternalSingleBucketAggregationTestCase.java @@ -27,7 +27,7 @@ import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import org.opensearch.search.aggregations.metrics.InternalMax; import org.opensearch.search.aggregations.metrics.InternalMin; -import org.elasticsearch.test.InternalAggregationTestCase; +import org.opensearch.test.InternalAggregationTestCase; import java.io.IOException; import java.util.ArrayList; @@ -39,7 +39,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.opensearch.common.xcontent.XContentHelper.toXContent; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; public abstract class InternalSingleBucketAggregationTestCase extends InternalAggregationTestCase { diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/bucket/AbstractTermsTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/bucket/AbstractTermsTestCase.java index 10a0ec0c6ef16..3cdf43fa70ebe 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/bucket/AbstractTermsTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/bucket/AbstractTermsTestCase.java @@ -23,12 +23,12 @@ import org.opensearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.opensearch.search.aggregations.bucket.terms.Terms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregatorFactory.ExecutionMode; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import static org.opensearch.search.aggregations.AggregationBuilders.terms; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchResponse; -public abstract class AbstractTermsTestCase extends ESIntegTestCase { +public abstract class AbstractTermsTestCase extends OpenSearchIntegTestCase { public String randomExecutionHint() { return randomBoolean() ? null : randomFrom(ExecutionMode.values()).toString(); diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/metrics/AbstractNumericTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/metrics/AbstractNumericTestCase.java index d43b77fd13c74..4d455800484b7 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/metrics/AbstractNumericTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/metrics/AbstractNumericTestCase.java @@ -19,15 +19,15 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.util.ArrayList; import java.util.List; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -@ESIntegTestCase.SuiteScopeTestCase -public abstract class AbstractNumericTestCase extends ESIntegTestCase { +@OpenSearchIntegTestCase.SuiteScopeTestCase +public abstract class AbstractNumericTestCase extends OpenSearchIntegTestCase { protected static long minValue, maxValue, minValues, maxValues; @Override diff --git a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java index 5bc6a5313fce6..bf93c5be1a220 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -57,8 +57,8 @@ import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.snapshots.mockstore.MockRepository; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.VersionUtils; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolStats; import org.junit.After; @@ -82,14 +82,14 @@ import java.util.function.Function; import java.util.function.Predicate; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -public abstract class AbstractSnapshotIntegTestCase extends ESIntegTestCase { +public abstract class AbstractSnapshotIntegTestCase extends OpenSearchIntegTestCase { private static final String OLD_VERSION_SNAPSHOT_PREFIX = "old-version-snapshot-"; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBootstrapCheckTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java similarity index 90% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractBootstrapCheckTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java index b814f1406b9d8..ca1abdbd5b9ed 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBootstrapCheckTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.bootstrap.BootstrapContext; @@ -27,7 +27,7 @@ import java.nio.file.Path; -public abstract class AbstractBootstrapCheckTestCase extends ESTestCase { +public abstract class AbstractBootstrapCheckTestCase extends OpenSearchTestCase { protected final BootstrapContext emptyContext; public AbstractBootstrapCheckTestCase() { diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java index 88062f36b6874..f33f34cdd0f57 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBroadcastResponseTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.OpenSearchException; import org.opensearch.action.support.DefaultShardOperationFailedException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractBuilderTestCase.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractBuilderTestCase.java index f1304c7d718ca..004897be1ece7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractBuilderTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.SeedUtils; @@ -103,7 +103,7 @@ import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; -public abstract class AbstractBuilderTestCase extends ESTestCase { +public abstract class AbstractBuilderTestCase extends OpenSearchTestCase { public static final String TEXT_FIELD_NAME = "mapped_string"; public static final String TEXT_ALIAS_FIELD_NAME = "mapped_string_alias"; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableSerializationTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractDiffableSerializationTestCase.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableSerializationTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractDiffableSerializationTestCase.java index bc2f53deee4a2..f3c4c68e27736 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableSerializationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractDiffableSerializationTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.Diff; import org.opensearch.cluster.Diffable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableWireSerializationTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractDiffableWireSerializationTestCase.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableWireSerializationTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractDiffableWireSerializationTestCase.java index 401604b4d69af..79dfee786ec01 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractDiffableWireSerializationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractDiffableWireSerializationTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.Diff; import org.opensearch.cluster.Diffable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java index 24d2cf8c09b61..aa79fb2ebede4 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractMultiClustersTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.action.admin.cluster.remote.RemoteInfoAction; import org.opensearch.action.admin.cluster.remote.RemoteInfoRequest; @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.transport.RemoteClusterAware; import org.opensearch.transport.RemoteConnectionInfo; import org.opensearch.transport.TransportService; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.hasSize; -public abstract class AbstractMultiClustersTestCase extends ESTestCase { +public abstract class AbstractMultiClustersTestCase extends OpenSearchTestCase { public static final String LOCAL_CLUSTER = RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY; private static volatile ClusterGroup clusterGroup; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractNamedWriteableTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractNamedWriteableTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractNamedWriteableTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractNamedWriteableTestCase.java index 0b44cb0eb0daf..33618d4e6adb1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractNamedWriteableTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractNamedWriteableTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.common.io.stream.NamedWriteable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java index f76683d735a9d..620dc1819d8ae 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.fasterxml.jackson.core.io.JsonStringEncoder; @@ -49,12 +49,12 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.Rewriteable; -import org.elasticsearch.index.query.support.QueryParsers; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.Rewriteable; +import org.opensearch.index.query.support.QueryParsers; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -70,8 +70,8 @@ import java.util.Map; import java.util.Set; -import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; -import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; +import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; +import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.either; @@ -583,7 +583,7 @@ public void testEqualsAndHashcode() { for (int runs = 0; runs < NUMBER_OF_TESTQUERIES; runs++) { // TODO we only change name and boost, we should extend by any sub-test supplying a "mutate" method that randomly changes one // aspect of the object under test - checkEqualsAndHashCode(createTestQueryBuilder(), this::copyQuery, this::mutateInstance); + EqualsHashCodeTestUtils.checkEqualsAndHashCode(createTestQueryBuilder(), this::copyQuery, this::mutateInstance); } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractSerializingTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractSerializingTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java index 0a560617bcd77..0f647eda94e78 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractSerializingTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.Writeable; @@ -31,7 +31,7 @@ import java.util.Date; import java.util.function.Predicate; -import static org.elasticsearch.test.AbstractXContentTestCase.xContentTester; +import static org.opensearch.test.AbstractXContentTestCase.xContentTester; public abstract class AbstractSerializingTestCase extends AbstractWireSerializingTestCase { diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractWireSerializingTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractWireSerializingTestCase.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractWireSerializingTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractWireSerializingTestCase.java index 66a355127ca06..8ad87877a1350 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractWireSerializingTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractWireSerializingTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.common.io.stream.NamedWriteable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractWireTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractWireTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractWireTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractWireTestCase.java index efb687ef56623..fdc87300b49c4 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractWireTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractWireTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.common.io.stream.NamedWriteable; @@ -31,7 +31,7 @@ * Standard test case for testing wire serialization. If the class being tested * extends {@link Writeable} then prefer extending {@link AbstractWireSerializingTestCase}. */ -public abstract class AbstractWireTestCase extends ESTestCase { +public abstract class AbstractWireTestCase extends OpenSearchTestCase { protected static final int NUMBER_OF_TEST_RUNS = 20; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java rename to test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java index 652c24340e3a7..f9bc302c8cb4e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.CheckedBiConsumer; import org.opensearch.common.CheckedBiFunction; @@ -38,10 +38,10 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; -public abstract class AbstractXContentTestCase extends ESTestCase { +public abstract class AbstractXContentTestCase extends OpenSearchTestCase { protected static final int NUMBER_OF_TEST_RUNS = 20; public static XContentTester xContentTester( @@ -272,7 +272,7 @@ static BytesReference insertRandomFieldsAndShuffle(BytesReference xContent, XCon withRandomFields = xContent; } XContentParser parserWithRandonFields = createParserFunction.apply(XContentFactory.xContent(xContentType), withRandomFields); - return BytesReference.bytes(ESTestCase.shuffleXContent(parserWithRandonFields, false, shuffleFieldsExceptions)); + return BytesReference.bytes(shuffleXContent(parserWithRandonFields, false, shuffleFieldsExceptions)); } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java b/test/framework/src/main/java/org/opensearch/test/BackgroundIndexer.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java rename to test/framework/src/main/java/org/opensearch/test/BackgroundIndexer.java index 65c5d0c3c46cc..1d4497aab4c98 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java +++ b/test/framework/src/main/java/org/opensearch/test/BackgroundIndexer.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java b/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java rename to test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java index 76b1406377f01..6eae671d0c945 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ClusterServiceUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.logging.log4j.core.util.Throwables; import org.opensearch.OpenSearchException; @@ -124,7 +124,7 @@ public void onFailure(String source, Exception e) { } public static ClusterService createClusterService(ThreadPool threadPool) { - DiscoveryNode discoveryNode = new DiscoveryNode("node", ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), + DiscoveryNode discoveryNode = new DiscoveryNode("node", OpenSearchTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), DiscoveryNodeRole.BUILT_IN_ROLES, Version.CURRENT); return createClusterService(threadPool, discoveryNode); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java b/test/framework/src/main/java/org/opensearch/test/CorruptionUtils.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java rename to test/framework/src/main/java/org/opensearch/test/CorruptionUtils.java index cd6032f78468d..c0671115c4fe8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/CorruptionUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/CorruptionUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/DiffableTestUtils.java b/test/framework/src/main/java/org/opensearch/test/DiffableTestUtils.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/DiffableTestUtils.java rename to test/framework/src/main/java/org/opensearch/test/DiffableTestUtils.java index a4f392f65d0db..d89c71cc7bbd8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/DiffableTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/DiffableTestUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.Diff; import org.opensearch.cluster.Diffable; @@ -32,7 +32,7 @@ import java.util.function.Function; import java.util.function.Supplier; -import static org.elasticsearch.test.AbstractWireSerializingTestCase.NUMBER_OF_TEST_RUNS; +import static org.opensearch.test.AbstractWireSerializingTestCase.NUMBER_OF_TEST_RUNS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/test/framework/src/main/java/org/elasticsearch/test/DummyShardLock.java b/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java similarity index 92% rename from test/framework/src/main/java/org/elasticsearch/test/DummyShardLock.java rename to test/framework/src/main/java/org/opensearch/test/DummyShardLock.java index 078803a8125d0..69daaa112306e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/DummyShardLock.java +++ b/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.elasticsearch.env.ShardLock; import org.elasticsearch.index.shard.ShardId; diff --git a/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java b/test/framework/src/main/java/org/opensearch/test/EqualsHashCodeTestUtils.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java rename to test/framework/src/main/java/org/opensearch/test/EqualsHashCodeTestUtils.java index d08b9541ffb2a..a16bfefea6895 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/EqualsHashCodeTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/EqualsHashCodeTestUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import java.io.IOException; @@ -73,7 +73,7 @@ public static void checkEqualsAndHashCode(T original, CopyFunction copyFu String objectName = original.getClass().getSimpleName(); assertFalse(objectName + " is equal to null", original.equals(null)); // TODO not sure how useful the following test is - assertFalse(objectName + " is equal to incompatible type", original.equals(ESTestCase.randomFrom(someObjects))); + assertFalse(objectName + " is equal to incompatible type", original.equals(OpenSearchTestCase.randomFrom(someObjects))); assertTrue(objectName + " is not equal to self", original.equals(original)); assertThat(objectName + " hashcode returns different values if called multiple times", original.hashCode(), equalTo(original.hashCode())); diff --git a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java rename to test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java index 2ec4399bbda7a..d34c1d3cfd7e2 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -50,7 +50,7 @@ import static org.opensearch.action.admin.cluster.node.info.NodesInfoRequest.Metric.HTTP; import static org.opensearch.action.admin.cluster.node.info.NodesInfoRequest.Metric.SETTINGS; import static org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest.Metric.BREAKER; -import static org.elasticsearch.test.ESTestCase.getTestTransportType; +import static org.opensearch.test.OpenSearchTestCase.getTestTransportType; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -82,7 +82,7 @@ public ExternalTestCluster(Path tempDir, Settings additionalSettings, Collection .put(additionalSettings) .put("node.name", InternalTestCluster.TRANSPORT_CLIENT_PREFIX + EXTERNAL_CLUSTER_PREFIX + counter.getAndIncrement()) .put("client.transport.ignore_cluster_name", true) - .put(TransportSettings.PORT.getKey(), ESTestCase.getPortRange()) + .put(TransportSettings.PORT.getKey(), OpenSearchTestCase.getPortRange()) .put(Environment.PATH_HOME_SETTING.getKey(), tempDir); boolean addMockTcpTransport = additionalSettings.get(NetworkModule.TRANSPORT_TYPE_KEY) == null; diff --git a/test/framework/src/main/java/org/elasticsearch/test/FieldMaskingReader.java b/test/framework/src/main/java/org/opensearch/test/FieldMaskingReader.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/FieldMaskingReader.java rename to test/framework/src/main/java/org/opensearch/test/FieldMaskingReader.java index 78bb3d9287f13..8552ffc68bb3a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/FieldMaskingReader.java +++ b/test/framework/src/main/java/org/opensearch/test/FieldMaskingReader.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.FieldFilterLeafReader; diff --git a/test/framework/src/main/java/org/elasticsearch/test/IndexSettingsModule.java b/test/framework/src/main/java/org/opensearch/test/IndexSettingsModule.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/IndexSettingsModule.java rename to test/framework/src/main/java/org/opensearch/test/IndexSettingsModule.java index d656f53046a99..0dad3f6a0b832 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/IndexSettingsModule.java +++ b/test/framework/src/main/java/org/opensearch/test/IndexSettingsModule.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; @@ -24,8 +24,8 @@ import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import java.util.Arrays; import java.util.HashSet; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/test/InternalAggregationTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java rename to test/framework/src/main/java/org/opensearch/test/InternalAggregationTestCase.java index 5c6efd680c0e0..aab4698df0924 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalAggregationTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.lucene.util.SetOnce; import org.opensearch.common.ParseField; @@ -152,6 +152,7 @@ import org.opensearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; import org.opensearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder; import org.opensearch.search.aggregations.pipeline.SumBucketPipelineAggregationBuilder; +import org.opensearch.test.hamcrest.OpenSearchAssertions; import java.io.IOException; import java.util.ArrayList; @@ -169,8 +170,6 @@ import static java.util.Collections.singletonMap; import static org.opensearch.common.xcontent.XContentHelper.toXContent; import static org.opensearch.search.aggregations.InternalMultiBucketAggregation.countInnerBucket; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -556,7 +555,7 @@ protected

P parseAndAssert(final InternalAggregati Predicate basicExcludes = path -> path.isEmpty() || path.endsWith(Aggregation.CommonFields.META.getPreferredName()) || path.endsWith(Aggregation.CommonFields.BUCKETS.getPreferredName()) || path.contains("top_hits"); Predicate excludes = basicExcludes.or(excludePathsFromXContentInsertion()); - mutated = insertRandomFields(xContentType, originalBytes, excludes, random()); + mutated = XContentTestUtils.insertRandomFields(xContentType, originalBytes, excludes, random()); } else { mutated = originalBytes; } @@ -580,7 +579,7 @@ protected

P parseAndAssert(final InternalAggregati assertEquals(aggregation.getType(), agg.getType()); BytesReference parsedBytes = toXContent(agg, xContentType, params, humanReadable); - assertToXContentEquivalent(originalBytes, parsedBytes, xContentType); + OpenSearchAssertions.assertToXContentEquivalent(originalBytes, parsedBytes, xContentType); return (P) agg; } diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalMultiBucketAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/test/InternalMultiBucketAggregationTestCase.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/InternalMultiBucketAggregationTestCase.java rename to test/framework/src/main/java/org/opensearch/test/InternalMultiBucketAggregationTestCase.java index 82cae63c3a085..8fef201bed5c7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalMultiBucketAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalMultiBucketAggregationTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.Aggregations; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java rename to test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java index 8b8d94e326c3d..d38ac3c7b8db7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Setting; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java rename to test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java index d5024b244df36..d87919a8ba826 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.hppc.ObjectLongMap; import com.carrotsearch.hppc.cursors.IntObjectCursor; @@ -74,7 +74,7 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.set.Sets; @@ -89,14 +89,14 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexingPressure; import org.elasticsearch.index.engine.CommitStats; -import org.elasticsearch.index.engine.DocIdSeqNoAndSource; +import org.opensearch.index.engine.DocIdSeqNoAndSource; import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.EngineTestCase; +import org.opensearch.index.engine.EngineTestCase; import org.elasticsearch.index.engine.InternalEngine; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardTestCase; +import org.opensearch.index.shard.IndexShardTestCase; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.breaker.CircuitBreakerService; @@ -113,8 +113,8 @@ import org.opensearch.script.ScriptService; import org.opensearch.search.SearchService; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.disruption.ServiceDisruptionScheme; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.disruption.ServiceDisruptionScheme; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.transport.MockTransportClient; import org.opensearch.transport.TransportService; import org.opensearch.transport.TransportSettings; @@ -162,15 +162,15 @@ import static org.opensearch.discovery.DiscoverySettings.INITIAL_STATE_TIMEOUT_SETTING; import static org.opensearch.discovery.FileBasedSeedHostsProvider.UNICAST_HOSTS_FILE; import static org.opensearch.discovery.zen.ElectMasterService.DISCOVERY_ZEN_MINIMUM_MASTER_NODES_SETTING; -import static org.elasticsearch.test.ESTestCase.assertBusy; -import static org.elasticsearch.test.ESTestCase.getTestTransportType; -import static org.elasticsearch.test.ESTestCase.randomFrom; -import static org.elasticsearch.test.NodeRoles.dataOnlyNode; -import static org.elasticsearch.test.NodeRoles.masterOnlyNode; -import static org.elasticsearch.test.NodeRoles.noRoles; -import static org.elasticsearch.test.NodeRoles.onlyRole; -import static org.elasticsearch.test.NodeRoles.removeRoles; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.OpenSearchTestCase.assertBusy; +import static org.opensearch.test.OpenSearchTestCase.getTestTransportType; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; +import static org.opensearch.test.NodeRoles.dataOnlyNode; +import static org.opensearch.test.NodeRoles.masterOnlyNode; +import static org.opensearch.test.NodeRoles.noRoles; +import static org.opensearch.test.NodeRoles.onlyRole; +import static org.opensearch.test.NodeRoles.removeRoles; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -190,7 +190,7 @@ * The Cluster is bound to a test lifecycle where tests must call {@link #beforeTest(java.util.Random, double)} and * {@link #afterTest()} to initialize and reset the cluster in order to be more reproducible. The term "more" relates * to the async nature of Elasticsearch in combination with randomized testing. Once Threads and asynchronous calls - * are involved reproducibility is very limited. This class should only be used through {@link ESIntegTestCase}. + * are involved reproducibility is very limited. This class should only be used through {@link OpenSearchIntegTestCase}. *

*/ public final class InternalTestCluster extends TestCluster { @@ -412,8 +412,8 @@ public InternalTestCluster( // and fails shards when a master abdicates, which breaks many tests. builder.put(NoMasterBlockService.NO_MASTER_BLOCK_SETTING.getKey(), randomFrom(random,"write", "metadata_write")); defaultSettings = builder.build(); - executor = EsExecutors.newScaling("internal_test_cluster_executor", 0, Integer.MAX_VALUE, 0, TimeUnit.SECONDS, - EsExecutors.daemonThreadFactory("test_" + clusterName), new ThreadContext(Settings.EMPTY)); + executor = OpenSearchExecutors.newScaling("internal_test_cluster_executor", 0, Integer.MAX_VALUE, 0, TimeUnit.SECONDS, + OpenSearchExecutors.daemonThreadFactory("test_" + clusterName), new ThreadContext(Settings.EMPTY)); } private static boolean usingZen1(Settings settings) { @@ -487,7 +487,7 @@ private static Settings getRandomNodeSettings(long seed) { } builder.put( - EsExecutors.NODE_PROCESSORS_SETTING.getKey(), + OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 1 + random.nextInt(Math.min(4, Runtime.getRuntime().availableProcessors()))); if (random.nextBoolean()) { if (random.nextBoolean()) { @@ -554,7 +554,7 @@ private static Settings getRandomNodeSettings(long seed) { public static String clusterName(String prefix, long clusterSeed) { StringBuilder builder = new StringBuilder(prefix); - builder.append("-TEST_WORKER_VM=[").append(ESTestCase.TEST_WORKER_VM_ID).append(']'); + builder.append("-TEST_WORKER_VM=[").append(OpenSearchTestCase.TEST_WORKER_VM_ID).append(']'); builder.append("-CLUSTER_SEED=[").append(clusterSeed).append(']'); // if multiple maven task run on a single host we better have an identifier that doesn't rely on input params builder.append("-HASH=[").append(SeedUtils.formatSeed(System.nanoTime())).append(']'); @@ -1720,7 +1720,7 @@ public synchronized void stopRandomNode(final Predicate filter) throws ensureOpen(); NodeAndClient nodeAndClient = getRandomNodeAndClient(nc -> filter.test(nc.node.settings())); if (nodeAndClient != null) { - if (nodePrefix.equals(ESIntegTestCase.SUITE_CLUSTER_NODE_PREFIX) && nodeAndClient.nodeAndClientId() < sharedNodesSeeds.length + if (nodePrefix.equals(OpenSearchIntegTestCase.SUITE_CLUSTER_NODE_PREFIX) && nodeAndClient.nodeAndClientId() < sharedNodesSeeds.length && nodeAndClient.isMasterEligible() && autoManageMasterNodes && nodes.values().stream() diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java b/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java rename to test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java index 909be2b0b2693..24913c5240187 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockHttpTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/MockHttpTransport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.transport.BoundTransportAddress; diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java rename to test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java index d78fbb5cc3cac..7811a4b8c67df 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java +++ b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.Nullable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockKeywordPlugin.java b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/MockKeywordPlugin.java rename to test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java index ffbeca0cb3729..1b16979a9151e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockKeywordPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.lucene.analysis.MockTokenizer; import org.elasticsearch.index.analysis.TokenizerFactory; diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java rename to test/framework/src/main/java/org/opensearch/test/MockLogAppender.java index cea160ad97630..02cf4df8528fa 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java +++ b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LogEvent; diff --git a/test/framework/src/main/java/org/elasticsearch/test/NodeConfigurationSource.java b/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/NodeConfigurationSource.java rename to test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java index be655984661f9..9364a9ac6b21d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/NodeConfigurationSource.java +++ b/test/framework/src/main/java/org/opensearch/test/NodeConfigurationSource.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/elasticsearch/test/NodeRoles.java b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/NodeRoles.java rename to test/framework/src/main/java/org/opensearch/test/NodeRoles.java index 229879c76851f..e4e24deeb9eee 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/NodeRoles.java +++ b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.elasticsearch.common.settings.Settings; diff --git a/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java b/test/framework/src/main/java/org/opensearch/test/NotEqualMessageBuilder.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java rename to test/framework/src/main/java/org/opensearch/test/NotEqualMessageBuilder.java index d6322f5725759..97de52f9463aa 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java +++ b/test/framework/src/main/java/org/opensearch/test/NotEqualMessageBuilder.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.Nullable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java rename to test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java index 1c087d50cdf91..a2b9f112925e8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedContext; import com.carrotsearch.randomizedtesting.annotations.TestGroup; @@ -99,7 +99,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; +import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.ToXContent; @@ -120,10 +120,10 @@ import org.opensearch.index.IndexSettings; import org.opensearch.index.MergePolicyConfig; import org.opensearch.index.MergeSchedulerConfig; -import org.elasticsearch.index.MockEngineFactoryPlugin; +import org.opensearch.index.MockEngineFactoryPlugin; import org.opensearch.index.codec.CodecService; import org.opensearch.index.engine.Segment; -import org.elasticsearch.index.mapper.MockFieldFilterPlugin; +import org.opensearch.index.mapper.MockFieldFilterPlugin; import org.opensearch.index.store.Store; import org.opensearch.index.translog.Translog; import org.opensearch.indices.IndicesQueryCache; @@ -141,11 +141,11 @@ import org.opensearch.search.MockSearchService; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchService; -import org.elasticsearch.test.client.RandomizingClient; -import org.elasticsearch.test.disruption.NetworkDisruption; -import org.elasticsearch.test.disruption.ServiceDisruptionScheme; -import org.elasticsearch.test.store.MockFSIndexStore; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.client.RandomizingClient; +import org.opensearch.test.disruption.NetworkDisruption; +import org.opensearch.test.disruption.ServiceDisruptionScheme; +import org.opensearch.test.store.MockFSIndexStore; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.transport.TransportInterceptor; import org.opensearch.transport.TransportRequest; import org.opensearch.transport.TransportRequestHandler; @@ -198,11 +198,11 @@ import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; import static org.opensearch.index.IndexSettings.INDEX_SOFT_DELETES_RETENTION_LEASE_PERIOD_SETTING; import static org.opensearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.XContentTestUtils.convertToMap; -import static org.elasticsearch.test.XContentTestUtils.differenceBetweenMapsIgnoringArrayOrder; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; +import static org.opensearch.test.XContentTestUtils.convertToMap; +import static org.opensearch.test.XContentTestUtils.differenceBetweenMapsIgnoringArrayOrder; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoTimeout; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.emptyArray; import static org.hamcrest.Matchers.emptyIterable; @@ -213,7 +213,7 @@ import static org.hamcrest.Matchers.startsWith; /** - * {@link ESIntegTestCase} is an abstract base class to run integration + * {@link OpenSearchIntegTestCase} is an abstract base class to run integration * tests against a JVM private OpenSearch Cluster. The test class supports 2 different * cluster scopes. *
    @@ -228,7 +228,7 @@ * should be used, here is an example: * 
      *
- * {@literal @}NodeScope(scope=Scope.TEST) public class SomeIT extends ESIntegTestCase {
+ * {@literal @}NodeScope(scope=Scope.TEST) public class SomeIT extends OpenSearchIntegTestCase {
  * public void testMethod() {}
  * }
  *
    @@ -240,12 +240,12 @@ * that are created before the tests start. * 
      * {@literal @}NodeScope(scope=Scope.SUITE, numDataNodes=3)
- * public class SomeIT extends ESIntegTestCase {
+ * public class SomeIT extends OpenSearchIntegTestCase {
  * public void testMethod() {}
  * }
  *
    *

    - * Note, the {@link ESIntegTestCase} uses randomized settings on a cluster and index level. For instance + * Note, the {@link OpenSearchIntegTestCase} uses randomized settings on a cluster and index level. For instance * each test might use different directory implementation for each test or will return a random client to one of the * nodes in the cluster for each call to {@link #client()}. Test failures might only be reproducible if the correct * system properties are passed to the test execution environment. @@ -260,7 +260,7 @@ *

*/ @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet -public abstract class ESIntegTestCase extends ESTestCase { +public abstract class OpenSearchIntegTestCase extends OpenSearchTestCase { /** * Property that controls whether ThirdParty Integration tests are run (not the default). @@ -278,7 +278,7 @@ public abstract class ESIntegTestCase extends ESTestCase { @Inherited @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - @TestGroup(enabled = false, sysProperty = ESIntegTestCase.SYSPROP_THIRDPARTY) + @TestGroup(enabled = false, sysProperty = OpenSearchIntegTestCase.SYSPROP_THIRDPARTY) public @interface ThirdParty { } @@ -309,7 +309,7 @@ public abstract class ESIntegTestCase extends ESTestCase { * system without asserting modules that to make sure they don't hide any bugs in * production. * - * @see ESIntegTestCase + * @see OpenSearchIntegTestCase */ public static final String TESTS_ENABLE_MOCK_MODULES = "tests.enable_mock_modules"; @@ -355,7 +355,7 @@ public abstract class ESIntegTestCase extends ESTestCase { private static final Map, TestCluster> clusters = new IdentityHashMap<>(); - private static ESIntegTestCase INSTANCE = null; // see @SuiteScope + private static OpenSearchIntegTestCase INSTANCE = null; // see @SuiteScope private static Long SUITE_SEED = null; @BeforeClass @@ -993,7 +993,7 @@ public ClusterHealthStatus waitForRelocation(ClusterHealthStatus status) { * Waits until at least a give number of document is visible for searchers * * @param numDocs number of documents to wait for - * @param indexer a {@link org.elasticsearch.test.BackgroundIndexer}. It will be first checked for documents indexed. + * @param indexer a {@link BackgroundIndexer}. It will be first checked for documents indexed. * This saves on unneeded searches. */ public void waitForDocs(final long numDocs, final BackgroundIndexer indexer) throws Exception { @@ -1564,7 +1564,7 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma final List actualErrors = new ArrayList<>(); for (Tuple tuple : errors) { Throwable t = ExceptionsHelper.unwrapCause(tuple.v2()); - if (t instanceof EsRejectedExecutionException) { + if (t instanceof OpenSearchRejectedExecutionException) { logger.debug("Error indexing doc: " + t.getMessage() + ", reindexing."); tuple.v1().execute().actionGet(); // re-index if rejected } else { @@ -1652,7 +1652,7 @@ private void postIndexAsyncActions(String[] indices, List inFlig /** * The scope of a test cluster used together with - * {@link ESIntegTestCase.ClusterScope} annotations on {@link ESIntegTestCase} subclasses. + * {@link OpenSearchIntegTestCase.ClusterScope} annotations on {@link OpenSearchIntegTestCase} subclasses. */ public enum Scope { /** @@ -1666,15 +1666,15 @@ public enum Scope { } /** - * Defines a cluster scope for a {@link ESIntegTestCase} subclass. - * By default if no {@link ClusterScope} annotation is present {@link ESIntegTestCase.Scope#SUITE} is used + * Defines a cluster scope for a {@link OpenSearchIntegTestCase} subclass. + * By default if no {@link ClusterScope} annotation is present {@link OpenSearchIntegTestCase.Scope#SUITE} is used * together with randomly chosen settings like number of nodes etc. */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) public @interface ClusterScope { /** - * Returns the scope. {@link ESIntegTestCase.Scope#SUITE} is default. + * Returns the scope. {@link OpenSearchIntegTestCase.Scope#SUITE} is default. */ Scope scope() default Scope.SUITE; @@ -1778,7 +1778,7 @@ public void clearScroll(String... scrollIds) { } private static A getAnnotation(Class clazz, Class annotationClass) { - if (clazz == Object.class || clazz == ESIntegTestCase.class) { + if (clazz == Object.class || clazz == OpenSearchIntegTestCase.class) { return null; } A annotation = clazz.getAnnotation(annotationClass); @@ -1972,28 +1972,28 @@ private NodeConfigurationSource getNodeConfigSource() { public Settings nodeSettings(int nodeOrdinal) { return Settings.builder() .put(initialNodeSettings.build()) - .put(ESIntegTestCase.this.nodeSettings(nodeOrdinal)).build(); + .put(OpenSearchIntegTestCase.this.nodeSettings(nodeOrdinal)).build(); } @Override public Path nodeConfigPath(int nodeOrdinal) { - return ESIntegTestCase.this.nodeConfigPath(nodeOrdinal); + return OpenSearchIntegTestCase.this.nodeConfigPath(nodeOrdinal); } @Override public Collection> nodePlugins() { - return ESIntegTestCase.this.nodePlugins(); + return OpenSearchIntegTestCase.this.nodePlugins(); } @Override public Settings transportClientSettings() { return Settings.builder().put(initialTransportClientSettings.build()) - .put(ESIntegTestCase.this.transportClientSettings()).build(); + .put(OpenSearchIntegTestCase.this.transportClientSettings()).build(); } @Override public Collection> transportClientPlugins() { - Collection> plugins = ESIntegTestCase.this.transportClientPlugins(); + Collection> plugins = OpenSearchIntegTestCase.this.transportClientPlugins(); if (plugins.contains(getTestTransportPlugin()) == false) { plugins = new ArrayList<>(plugins); plugins.add(getTestTransportPlugin()); @@ -2273,7 +2273,7 @@ private static void initializeSuiteScope() throws Exception { assert INSTANCE == null; if (isSuiteScopedTest(targetClass)) { // note we need to do this this way to make sure this is reproducible - INSTANCE = (ESIntegTestCase) targetClass.getConstructor().newInstance(); + INSTANCE = (OpenSearchIntegTestCase) targetClass.getConstructor().newInstance(); boolean success = false; try { INSTANCE.printTestMessage("setup"); diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java rename to test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java index 3bf1ad45d2b44..9de2fc1066bc8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedContext; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; @@ -36,7 +36,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.core.internal.io.IOUtils; @@ -67,8 +67,8 @@ import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; -import static org.elasticsearch.test.NodeRoles.dataNode; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.NodeRoles.dataNode; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -76,7 +76,7 @@ * A test that keep a singleton node started for all tests that can be used to get * references to Guice injectors in unit tests. */ -public abstract class ESSingleNodeTestCase extends ESTestCase { +public abstract class OpenSearchSingleNodeTestCase extends OpenSearchTestCase { private static Node NODE = null; @@ -203,12 +203,12 @@ private Node newNode() { .put(Environment.PATH_HOME_SETTING.getKey(), tempDir) .put(Environment.PATH_REPO_SETTING.getKey(), tempDir.resolve("repo")) // TODO: use a consistent data path for custom paths - // This needs to tie into the ESIntegTestCase#indexSettings() method + // This needs to tie into the OpenSearchIntegTestCase#indexSettings() method .put(Environment.PATH_SHARED_DATA_SETTING.getKey(), createTempDir().getParent()) .put(Node.NODE_NAME_SETTING.getKey(), nodeName) - .put(EsExecutors.NODE_PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created + .put(OpenSearchExecutors.NODE_PROCESSORS_SETTING.getKey(), 1) // limit the number of threads created .put("transport.type", getTestTransportType()) - .put(TransportSettings.PORT.getKey(), ESTestCase.getPortRange()) + .put(TransportSettings.PORT.getKey(), getPortRange()) .put(dataNode()) .put(NodeEnvironment.NODE_ID_SEED_SETTING.getKey(), random().nextLong()) // default the watermarks low values to prevent tests from failing on nodes without enough disk space diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java rename to test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java index 48e3ad0fdf363..6622adf9797bb 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.annotations.Listeners; @@ -71,8 +71,8 @@ import org.opensearch.common.logging.HeaderWarningAppender; import org.opensearch.common.logging.LogConfigurator; import org.opensearch.common.logging.Loggers; -import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Setting; +import org.opensearch.common.settings.Settings; import org.opensearch.common.time.DateUtils; import org.opensearch.common.time.FormatNames; import org.opensearch.common.transport.TransportAddress; @@ -110,8 +110,8 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.MockSearchService; -import org.elasticsearch.test.junit.listeners.LoggingListener; -import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; +import org.opensearch.test.junit.listeners.LoggingListener; +import org.opensearch.test.junit.listeners.ReproduceInfoPrinter; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.nio.MockNioTransportPlugin; import org.joda.time.DateTimeZone; @@ -163,7 +163,7 @@ import static org.hamcrest.Matchers.hasItem; /** - * Base testcase for randomized unit testing with Elasticsearch + * Base testcase for randomized unit testing with OpenSearch */ @Listeners({ ReproduceInfoPrinter.class, @@ -181,7 +181,7 @@ "LuceneVarGapFixedInterval", "LuceneVarGapDocFreqInterval", "Lucene50" }) @LuceneTestCase.SuppressReproduceLine -public abstract class ESTestCase extends LuceneTestCase { +public abstract class OpenSearchTestCase extends LuceneTestCase { protected static final List JODA_TIMEZONE_IDS; protected static final List JAVA_TIMEZONE_IDS; @@ -270,7 +270,7 @@ private static void setTestSysProps() { public RuleChain failureAndSuccessEvents = RuleChain.outerRule(new TestRuleAdapter() { @Override protected void afterIfSuccessful() throws Throwable { - ESTestCase.this.afterIfSuccessful(); + OpenSearchTestCase.this.afterIfSuccessful(); } @Override @@ -284,7 +284,7 @@ protected void afterAlways(List errors) throws Throwable { } } if (false == allAssumption) { - ESTestCase.this.afterIfFailed(errors); + OpenSearchTestCase.this.afterIfFailed(errors); } } super.afterAlways(errors); @@ -339,7 +339,7 @@ public static void restoreContentType() { @BeforeClass public static void ensureSupportedLocale() { if (isUnusableLocale()) { - Logger logger = LogManager.getLogger(ESTestCase.class); + Logger logger = LogManager.getLogger(OpenSearchTestCase.class); logger.warn("Attempting to run tests in an unusable locale in a FIPS JVM. Certificate expiration validation will fail, " + "switching to English. See: https://github.com/bcgit/bc-java/issues/405"); Locale.setDefault(Locale.ENGLISH); @@ -457,7 +457,7 @@ protected final void assertSettingDeprecationsAndWarnings(final String[] setting Stream.concat( Arrays .stream(settings) - .map(k -> "[" + k + "] setting was deprecated in Elasticsearch and will be removed in a future release! " + + .map(k -> "[" + k + "] setting was deprecated and will be removed in a future release! " + "See the breaking changes documentation for the next major version."), Arrays.stream(warnings)) .toArray(String[]::new)); @@ -1015,7 +1015,7 @@ public static void assertBusy(CheckedRunnable codeBlock, long maxWait /** * Periodically execute the supplied function until it returns true, or a timeout * is reached. This version uses a timeout of 10 seconds. If at all possible, - * use {@link ESTestCase#assertBusy(CheckedRunnable)} instead. + * use {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} instead. * * @param breakSupplier determines whether to return immediately or continue waiting. * @return the last value returned by breakSupplier @@ -1031,7 +1031,7 @@ public static boolean waitUntil(BooleanSupplier breakSupplier) throws Interrupte /** * Periodically execute the supplied function until it returns true, or until the * specified maximum wait time has elapsed. If at all possible, use - * {@link ESTestCase#assertBusy(CheckedRunnable)} instead. + * {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} instead. * * @param breakSupplier determines whether to return immediately or continue waiting. * @param maxWaitTime the maximum amount of time to wait @@ -1539,7 +1539,7 @@ protected static int getBasePort() { // Ephemeral ports on Linux start at 32768 so we modulo to make sure that we don't exceed that. // This is safe as long as we have fewer than 224 Gradle workers running in parallel // See also: https://github.com/elastic/elasticsearch/issues/44134 - final String workerIdStr = System.getProperty(ESTestCase.TEST_WORKER_SYS_PROPERTY); + final String workerIdStr = System.getProperty(OpenSearchTestCase.TEST_WORKER_SYS_PROPERTY); final int startAt; if (workerIdStr == null) { startAt = 0; // IDE diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTokenStreamTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTokenStreamTestCase.java similarity index 86% rename from test/framework/src/main/java/org/elasticsearch/test/ESTokenStreamTestCase.java rename to test/framework/src/main/java/org/opensearch/test/OpenSearchTokenStreamTestCase.java index 8316b45502472..d15d6f3d23d11 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTokenStreamTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTokenStreamTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.annotations.Listeners; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; @@ -29,7 +29,7 @@ import org.opensearch.bootstrap.BootstrapForTesting; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; +import org.opensearch.test.junit.listeners.ReproduceInfoPrinter; @Listeners({ ReproduceInfoPrinter.class @@ -41,11 +41,11 @@ * Basic test case for token streams. the assertion methods in this class will * run basic checks to enforce correct behavior of the token streams. */ -public abstract class ESTokenStreamTestCase extends BaseTokenStreamTestCase { +public abstract class OpenSearchTokenStreamTestCase extends BaseTokenStreamTestCase { static { try { - Class.forName("org.elasticsearch.test.ESTestCase"); + Class.forName("org.opensearch.test.OpenSearchTestCase"); } catch (ClassNotFoundException e) { throw new AssertionError(e); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/PosixPermissionsResetter.java b/test/framework/src/main/java/org/opensearch/test/PosixPermissionsResetter.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/PosixPermissionsResetter.java rename to test/framework/src/main/java/org/opensearch/test/PosixPermissionsResetter.java index 19bea3802f07d..ee0f90defeb37 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/PosixPermissionsResetter.java +++ b/test/framework/src/main/java/org/opensearch/test/PosixPermissionsResetter.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import java.util.EnumSet; import java.util.Set; diff --git a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java b/test/framework/src/main/java/org/opensearch/test/RandomObjects.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java rename to test/framework/src/main/java/org/opensearch/test/RandomObjects.java index 810445b66b6e7..87af0fd111d9b 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java +++ b/test/framework/src/main/java/org/opensearch/test/RandomObjects.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; @@ -58,7 +58,7 @@ import static com.carrotsearch.randomizedtesting.generators.RandomStrings.randomUnicodeOfLengthBetween; import static java.util.Collections.singleton; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_UUID_NA_VALUE; -import static org.elasticsearch.test.ESTestCase.randomFrom; +import static org.opensearch.test.OpenSearchTestCase.randomFrom; public final class RandomObjects { diff --git a/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java b/test/framework/src/main/java/org/opensearch/test/StreamsUtils.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java rename to test/framework/src/main/java/org/opensearch/test/StreamsUtils.java index 377b2bea93810..6ab28faf1fa59 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/StreamsUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java b/test/framework/src/main/java/org/opensearch/test/TestCluster.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/test/TestCluster.java rename to test/framework/src/main/java/org/opensearch/test/TestCluster.java index 1d92539dc2862..16854d32fe3b0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/TestCluster.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import com.carrotsearch.hppc.ObjectArrayList; @@ -35,6 +35,7 @@ import org.elasticsearch.index.IndexNotFoundException; import org.opensearch.indices.IndexTemplateMissingException; import org.opensearch.repositories.RepositoryMissingException; +import org.opensearch.test.hamcrest.OpenSearchAssertions; import java.io.Closeable; import java.io.IOException; @@ -42,7 +43,7 @@ import java.util.Random; import java.util.Set; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; /** * Base test cluster that exposes the basis to run tests against any elasticsearch cluster, whose layout @@ -139,11 +140,11 @@ public void assertAfterTest() throws Exception { * Deletes all data streams from the test cluster. */ public void wipeAllDataStreams() { - // Feature flag may not be enabled in all gradle modules that use ESIntegTestCase + // Feature flag may not be enabled in all gradle modules that use OpenSearchIntegTestCase if (size() > 0) { AcknowledgedResponse response = client().admin().indices().deleteDataStream(new DeleteDataStreamAction.Request(new String[]{"*"})).actionGet(); - assertAcked(response); + OpenSearchAssertions.assertAcked(response); } } @@ -156,7 +157,7 @@ public void wipeIndices(String... indices) { if (size() > 0) { try { // include wiping hidden indices! - assertAcked(client().admin().indices().prepareDelete(indices) + OpenSearchAssertions.assertAcked(client().admin().indices().prepareDelete(indices) .setIndicesOptions(IndicesOptions.fromOptions(false, true, true, true, true, false, false, true, false))); } catch (IndexNotFoundException e) { // ignore @@ -170,7 +171,7 @@ public void wipeIndices(String... indices) { concreteIndices.add(indexMetadata.getIndex().getName()); } if (!concreteIndices.isEmpty()) { - assertAcked(client().admin().indices().prepareDelete(concreteIndices.toArray(String.class))); + OpenSearchAssertions.assertAcked(client().admin().indices().prepareDelete(concreteIndices.toArray(String.class))); } } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java b/test/framework/src/main/java/org/opensearch/test/TestCustomMetadata.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java rename to test/framework/src/main/java/org/opensearch/test/TestCustomMetadata.java index 914e315efc67a..422cbc591c538 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestCustomMetadata.java +++ b/test/framework/src/main/java/org/opensearch/test/TestCustomMetadata.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.OpenSearchParseException; import org.opensearch.cluster.AbstractNamedDiffable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestGeoShapeFieldMapperPlugin.java b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/TestGeoShapeFieldMapperPlugin.java rename to test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java index 105028c36cd04..d5cd55c8bcadb 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestGeoShapeFieldMapperPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.elasticsearch.index.mapper.GeoShapeFieldMapper; import org.elasticsearch.index.mapper.Mapper; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java rename to test/framework/src/main/java/org/opensearch/test/TestSearchContext.java index 4b502aada183f..428b90c1ebc59 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java +++ b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.apache.lucene.search.Collector; import org.apache.lucene.search.FieldDoc; diff --git a/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java b/test/framework/src/main/java/org/opensearch/test/VersionUtils.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java rename to test/framework/src/main/java/org/opensearch/test/VersionUtils.java index afe30f663800a..86c2f59758244 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/VersionUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.Version; import org.opensearch.common.Nullable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java b/test/framework/src/main/java/org/opensearch/test/XContentTestUtils.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java rename to test/framework/src/main/java/org/opensearch/test/XContentTestUtils.java index 42e954672b287..dc2061881e498 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/XContentTestUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test; +package org.opensearch.test; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.DeprecationHandler; @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.rest.yaml.ObjectPath; +import org.opensearch.test.rest.yaml.ObjectPath; import java.io.IOException; import java.io.InputStream; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java b/test/framework/src/main/java/org/opensearch/test/client/NoOpClient.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java rename to test/framework/src/main/java/org/opensearch/test/client/NoOpClient.java index 46bc2e0f396f1..45b6477e33102 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java +++ b/test/framework/src/main/java/org/opensearch/test/client/NoOpClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.client; +package org.opensearch.test.client; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java b/test/framework/src/main/java/org/opensearch/test/client/NoOpNodeClient.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java rename to test/framework/src/main/java/org/opensearch/test/client/NoOpNodeClient.java index 8766be95b2272..6f1efe84b3e14 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/NoOpNodeClient.java +++ b/test/framework/src/main/java/org/opensearch/test/client/NoOpNodeClient.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.client; +package org.opensearch.test.client; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java b/test/framework/src/main/java/org/opensearch/test/client/RandomizingClient.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java rename to test/framework/src/main/java/org/opensearch/test/client/RandomizingClient.java index ac13bf24e5b84..7aaa504b8ac3a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java +++ b/test/framework/src/main/java/org/opensearch/test/client/RandomizingClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.client; +package org.opensearch.test.client; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.util.TestUtil; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java b/test/framework/src/main/java/org/opensearch/test/disruption/BlockClusterStateProcessing.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java rename to test/framework/src/main/java/org/opensearch/test/disruption/BlockClusterStateProcessing.java index 1981c8d23c1c0..f40b14b2669e0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/BlockClusterStateProcessing.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.apache.logging.log4j.core.util.Throwables; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.util.Random; import java.util.concurrent.CountDownLatch; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java b/test/framework/src/main/java/org/opensearch/test/disruption/BlockMasterServiceOnMaster.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java rename to test/framework/src/main/java/org/opensearch/test/disruption/BlockMasterServiceOnMaster.java index d34a0defe8ddc..7d5f1d0cbd508 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/BlockMasterServiceOnMaster.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.apache.logging.log4j.core.util.Throwables; import org.opensearch.cluster.ClusterState; @@ -24,7 +24,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.util.Random; import java.util.concurrent.CountDownLatch; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/BusyMasterServiceDisruption.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java rename to test/framework/src/main/java/org/opensearch/test/disruption/BusyMasterServiceDisruption.java index 57aeaa059c249..2fc307839145d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/BusyMasterServiceDisruption.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; + import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java b/test/framework/src/main/java/org/opensearch/test/disruption/DisruptableMockTransport.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java rename to test/framework/src/main/java/org/opensearch/test/disruption/DisruptableMockTransport.java index 34bcdfc4ea623..f5b5f257fa10c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/DisruptableMockTransport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; @@ -28,7 +28,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.test.transport.MockTransport; +import org.opensearch.test.transport.MockTransport; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.CloseableConnection; import org.opensearch.transport.ConnectTransportException; @@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Function; -import static org.elasticsearch.test.ESTestCase.copyWriteable; +import static org.opensearch.test.OpenSearchTestCase.copyWriteable; public abstract class DisruptableMockTransport extends MockTransport { private final DiscoveryNode localNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/IntermittentLongGCDisruption.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java rename to test/framework/src/main/java/org/opensearch/test/disruption/IntermittentLongGCDisruption.java index 2ffff8c49d50e..ddc74a8cc9b99 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/IntermittentLongGCDisruption.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.opensearch.common.unit.TimeValue; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/LongGCDisruption.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java rename to test/framework/src/main/java/org/opensearch/test/disruption/LongGCDisruption.java index eb7da359df637..8538114662903 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/LongGCDisruption.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.opensearch.common.Nullable; import org.opensearch.common.SuppressForbidden; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java rename to test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java index 186842920b0b5..bccac6613bda0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.logging.log4j.LogManager; @@ -26,8 +26,8 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.TransportService; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java b/test/framework/src/main/java/org/opensearch/test/disruption/ServiceDisruptionScheme.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java rename to test/framework/src/main/java/org/opensearch/test/disruption/ServiceDisruptionScheme.java index 57eb60b9261d9..a83ad842782c3 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/ServiceDisruptionScheme.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; public interface ServiceDisruptionScheme { diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/SingleNodeDisruption.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java rename to test/framework/src/main/java/org/opensearch/test/disruption/SingleNodeDisruption.java index 6a821293bf5e0..133659bda417d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/SingleNodeDisruption.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/SingleNodeDisruption.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java b/test/framework/src/main/java/org/opensearch/test/disruption/SlowClusterStateProcessing.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java rename to test/framework/src/main/java/org/opensearch/test/disruption/SlowClusterStateProcessing.java index 1c1204181161a..a8b522c8b4e52 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java +++ b/test/framework/src/main/java/org/opensearch/test/disruption/SlowClusterStateProcessing.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.disruption; +package org.opensearch.test.disruption; import org.opensearch.ExceptionsHelper; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.InternalTestCluster; import java.util.Random; import java.util.concurrent.CountDownLatch; diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineFactory.java b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineFactory.java rename to test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java index 2956e44d50799..0a87b66144668 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineFactory.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.engine; +package org.opensearch.test.engine; import org.apache.lucene.index.FilterDirectoryReader; import org.elasticsearch.index.engine.Engine; diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java rename to test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java index 01ecd104a18d5..4438b99fe0f53 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/MockEngineSupport.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.engine; +package org.opensearch.test.engine; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,7 +33,7 @@ import org.elasticsearch.index.engine.EngineConfig; import org.elasticsearch.index.engine.EngineException; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ESIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; import java.io.Closeable; import java.io.IOException; @@ -91,7 +91,7 @@ public MockContext(Random random, boolean wrapReader, Class wrapper) { Settings settings = config.getIndexSettings().getSettings(); shardId = config.getShardId(); - final long seed = config.getIndexSettings().getValue(ESIntegTestCase.INDEX_TEST_SEED_SETTING); + final long seed = config.getIndexSettings().getValue(OpenSearchIntegTestCase.INDEX_TEST_SEED_SETTING); Random random = new Random(seed); final double ratio = WRAP_READER_RATIO.get(settings); boolean wrapReader = random.nextDouble() < ratio; diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/MockInternalEngine.java b/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/engine/MockInternalEngine.java rename to test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java index 435feda33280a..e63655f773c43 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/MockInternalEngine.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.engine; +package org.opensearch.test.engine; import org.apache.lucene.index.FilterDirectoryReader; import org.elasticsearch.index.engine.Engine; diff --git a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java b/test/framework/src/main/java/org/opensearch/test/engine/ThrowingLeafReaderWrapper.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java rename to test/framework/src/main/java/org/opensearch/test/engine/ThrowingLeafReaderWrapper.java index 1d89fc981f06f..540d69d478c51 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/engine/ThrowingLeafReaderWrapper.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/ThrowingLeafReaderWrapper.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.engine; +package org.opensearch.test.engine; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.Fields; @@ -44,7 +44,7 @@ public class ThrowingLeafReaderWrapper extends FilterLeafReader { private final Thrower thrower; /** - * Flags passed to {@link Thrower#maybeThrow(org.elasticsearch.test.engine.ThrowingLeafReaderWrapper.Flags)} + * Flags passed to {@link Thrower#maybeThrow(ThrowingLeafReaderWrapper.Flags)} * when the corresponding method is called. */ public enum Flags { diff --git a/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java b/test/framework/src/main/java/org/opensearch/test/fixture/AbstractHttpFixture.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java rename to test/framework/src/main/java/org/opensearch/test/fixture/AbstractHttpFixture.java index 3640d119d46fd..a5886c91d0776 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java +++ b/test/framework/src/main/java/org/opensearch/test/fixture/AbstractHttpFixture.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.fixture; +package org.opensearch.test.fixture; import com.sun.net.httpserver.HttpServer; import org.opensearch.common.SuppressForbidden; diff --git a/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java b/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java rename to test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java index a331e023d4e48..554586f2e08ca 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/gateway/TestGatewayAllocator.java +++ b/test/framework/src/main/java/org/opensearch/test/gateway/TestGatewayAllocator.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.gateway; +package org.opensearch.test.gateway; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionAssertions.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionAssertions.java index 61429d7669517..18bd8cf5049d7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionAssertions.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionAssertions.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.opensearch.common.collect.ImmutableOpenMap; import org.hamcrest.Matcher; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionMatchers.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionMatchers.java index dac931cec200e..d67f0905f2428 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/CollectionMatchers.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/CollectionMatchers.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.opensearch.common.collect.ImmutableOpenMap; import org.hamcrest.Description; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchAssertions.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchAssertions.java index 0c2bad685cea8..4c6b2e38a7127 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchAssertions.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.DisjunctionMaxQuery; @@ -58,7 +58,7 @@ import org.opensearch.rest.RestStatus; import org.opensearch.search.SearchHit; import org.opensearch.search.suggest.Suggest; -import org.elasticsearch.test.NotEqualMessageBuilder; +import org.opensearch.test.NotEqualMessageBuilder; import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; import org.hamcrest.core.CombinableMatcher; @@ -97,7 +97,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -public class ElasticsearchAssertions { +public class OpenSearchAssertions { public static void assertAcked(AcknowledgedRequestBuilder builder) { assertAcked(builder.get()); @@ -486,23 +486,23 @@ public static void assertAliasesExist(AliasesExistResponse aliasesExistResponse) * matchers */ public static Matcher hasId(final String id) { - return new ElasticsearchMatchers.SearchHitHasIdMatcher(id); + return new OpenSearchMatchers.SearchHitHasIdMatcher(id); } public static Matcher hasType(final String type) { - return new ElasticsearchMatchers.SearchHitHasTypeMatcher(type); + return new OpenSearchMatchers.SearchHitHasTypeMatcher(type); } public static Matcher hasIndex(final String index) { - return new ElasticsearchMatchers.SearchHitHasIndexMatcher(index); + return new OpenSearchMatchers.SearchHitHasIndexMatcher(index); } public static Matcher hasScore(final float score) { - return new ElasticsearchMatchers.SearchHitHasScoreMatcher(score); + return new OpenSearchMatchers.SearchHitHasScoreMatcher(score); } public static CombinableMatcher hasProperty(Function property, Matcher valueMatcher) { - return ElasticsearchMatchers.HasPropertyLambdaMatcher.hasProperty(property, valueMatcher); + return OpenSearchMatchers.HasPropertyLambdaMatcher.hasProperty(property, valueMatcher); } public static Function fieldFromSource(String fieldName) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchMatchers.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchMatchers.java index 7bb13ceb3bcfd..6e945c9c0dd40 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchMatchers.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/OpenSearchMatchers.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.opensearch.search.SearchHit; import org.hamcrest.Description; @@ -27,7 +27,7 @@ import java.util.function.Function; -public class ElasticsearchMatchers { +public class OpenSearchMatchers { public static class SearchHitHasIdMatcher extends TypeSafeMatcher { private String id; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/OptionalMatchers.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/OptionalMatchers.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/OptionalMatchers.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/OptionalMatchers.java index e2246f0f1fcbe..3c29f1b7eafcc 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/OptionalMatchers.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/OptionalMatchers.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/RegexMatcher.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/RegexMatcher.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/RegexMatcher.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/RegexMatcher.java index 62c35e551c204..beda090a7d195 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/RegexMatcher.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/RegexMatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java b/test/framework/src/main/java/org/opensearch/test/hamcrest/TupleMatchers.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java rename to test/framework/src/main/java/org/opensearch/test/hamcrest/TupleMatchers.java index ff9a243141468..df6dbbdcd2725 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java +++ b/test/framework/src/main/java/org/opensearch/test/hamcrest/TupleMatchers.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.hamcrest; +package org.opensearch.test.hamcrest; import org.opensearch.common.collect.Tuple; import org.hamcrest.Description; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/Network.java b/test/framework/src/main/java/org/opensearch/test/junit/annotations/Network.java similarity index 92% rename from test/framework/src/main/java/org/elasticsearch/test/junit/annotations/Network.java rename to test/framework/src/main/java/org/opensearch/test/junit/annotations/Network.java index b999f24822bf3..45c171cd2adcf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/Network.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/annotations/Network.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.junit.annotations; +package org.opensearch.test.junit.annotations; import com.carrotsearch.randomizedtesting.annotations.TestGroup; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestIssueLogging.java b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestIssueLogging.java rename to test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java index 8e02b4dce1467..852502ce6205d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestIssueLogging.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.junit.annotations; +package org.opensearch.test.junit.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestLogging.java b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestLogging.java rename to test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java index 2354979d0606f..96933820ae777 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/annotations/TestLogging.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.junit.annotations; +package org.opensearch.test.junit.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java b/test/framework/src/main/java/org/opensearch/test/junit/listeners/LoggingListener.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java rename to test/framework/src/main/java/org/opensearch/test/junit/listeners/LoggingListener.java index 30ded71c3b99b..29a8a32c7a326 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/LoggingListener.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/listeners/LoggingListener.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.test.junit.listeners; +package org.opensearch.test.junit.listeners; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.common.logging.Loggers; -import org.elasticsearch.test.junit.annotations.TestIssueLogging; -import org.elasticsearch.test.junit.annotations.TestLogging; +import org.opensearch.test.junit.annotations.TestIssueLogging; +import org.opensearch.test.junit.annotations.TestLogging; import org.junit.runner.Description; import org.junit.runner.Result; import org.junit.runner.notification.RunListener; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java rename to test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java index 74b557f70d327..f4e724d72b229 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.junit.listeners; +package org.opensearch.test.junit.listeners; import com.carrotsearch.randomizedtesting.ReproduceErrorMessageBuilder; import org.apache.logging.log4j.LogManager; @@ -25,9 +25,9 @@ import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.Strings; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.notification.Failure; @@ -40,8 +40,6 @@ import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_PREFIX; import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_TESTCLASS; import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_TESTMETHOD; -import static org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase.REST_TESTS_BLACKLIST; -import static org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase.REST_TESTS_SUITE; /** * A {@link RunListener} that emits a command you can use to re-run a failing test with the failing random seed to @@ -49,7 +47,7 @@ */ public class ReproduceInfoPrinter extends RunListener { - protected final Logger logger = LogManager.getLogger(ESTestCase.class); + protected final Logger logger = LogManager.getLogger(OpenSearchTestCase.class); @Override public void testStarted(Description description) throws Exception { @@ -100,7 +98,7 @@ public void testFailure(Failure failure) throws Exception { gradleMessageBuilder.appendAllOpts(failure.getDescription()); // Client yaml suite tests are a special case as they allow for additional parameters - if (ESClientYamlSuiteTestCase.class.isAssignableFrom(failure.getDescription().getTestClass())) { + if (OpenSearchClientYamlSuiteTestCase.class.isAssignableFrom(failure.getDescription().getTestClass())) { gradleMessageBuilder.appendClientYamlSuiteProperties(); } @@ -163,7 +161,7 @@ private ReproduceErrorMessageBuilder appendESProperties() { appendProperties("tests.es.logger.level"); if (inVerifyPhase()) { // these properties only make sense for integration tests - appendProperties(ESIntegTestCase.TESTS_ENABLE_MOCK_MODULES); + appendProperties(OpenSearchIntegTestCase.TESTS_ENABLE_MOCK_MODULES); } appendProperties("tests.assertion.disabled", "tests.security.manager", "tests.nightly", "tests.jvms", "tests.client.ratio", "tests.heap.size", "tests.bwc", "tests.bwc.version", "build.snapshot"); @@ -173,12 +171,12 @@ private ReproduceErrorMessageBuilder appendESProperties() { appendOpt("tests.locale", Locale.getDefault().toLanguageTag()); appendOpt("tests.timezone", TimeZone.getDefault().getID()); appendOpt("runtime.java", Integer.toString(JavaVersion.current().getVersion().get(0))); - appendOpt(ESTestCase.FIPS_SYSPROP, System.getProperty(ESTestCase.FIPS_SYSPROP)); + appendOpt(OpenSearchTestCase.FIPS_SYSPROP, System.getProperty(OpenSearchTestCase.FIPS_SYSPROP)); return this; } public ReproduceErrorMessageBuilder appendClientYamlSuiteProperties() { - return appendProperties(REST_TESTS_SUITE, REST_TESTS_BLACKLIST); + return appendProperties(OpenSearchClientYamlSuiteTestCase.REST_TESTS_SUITE, OpenSearchClientYamlSuiteTestCase.REST_TESTS_BLACKLIST); } protected ReproduceErrorMessageBuilder appendProperties(String... properties) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestChannel.java b/test/framework/src/main/java/org/opensearch/test/rest/FakeRestChannel.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestChannel.java rename to test/framework/src/main/java/org/opensearch/test/rest/FakeRestChannel.java index da82ff83f8267..3690a4b3fde50 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestChannel.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/FakeRestChannel.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest; +package org.opensearch.test.rest; import org.opensearch.rest.AbstractRestChannel; import org.opensearch.rest.RestRequest; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestRequest.java b/test/framework/src/main/java/org/opensearch/test/rest/FakeRestRequest.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestRequest.java rename to test/framework/src/main/java/org/opensearch/test/rest/FakeRestRequest.java index 3fb7aa06394ed..a54fb661e64dd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/FakeRestRequest.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/FakeRestRequest.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest; +package org.opensearch.test.rest; import org.opensearch.action.ActionListener; import org.opensearch.common.bytes.BytesArray; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java rename to test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java index 2932f17e827a0..c5c66d12d07be 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest; +package org.opensearch.test.rest; import org.apache.http.Header; import org.apache.http.HttpHost; @@ -55,13 +55,13 @@ import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.support.XContentMapValues; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.seqno.ReplicationTracker; -import org.elasticsearch.indices.flush.SyncedFlushService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.seqno.ReplicationTracker; +import org.opensearch.indices.flush.SyncedFlushService; import org.opensearch.rest.RestStatus; import org.opensearch.snapshots.SnapshotState; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.yaml.ObjectPath; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.ObjectPath; import org.hamcrest.Matchers; import org.junit.After; import org.junit.AfterClass; @@ -107,7 +107,7 @@ /** * Superclass for tests that interact with an external test cluster using OpenSearch's {@link RestClient}. */ -public abstract class ESRestTestCase extends ESTestCase { +public abstract class OpenSearchRestTestCase extends OpenSearchTestCase { public static final String TRUSTSTORE_PATH = "truststore.path"; public static final String TRUSTSTORE_PASSWORD = "truststore.password"; public static final String CLIENT_SOCKET_TIMEOUT = "client.socket.timeout"; @@ -346,7 +346,7 @@ protected static RestClient adminClient() { /** * Wait for outstanding tasks to complete. The specified admin client is used to check the outstanding tasks and this is done using - * {@link ESTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. + * {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. * * @param adminClient the admin client * @throws Exception if an exception is thrown while checking the outstanding tasks @@ -357,7 +357,7 @@ public static void waitForPendingTasks(final RestClient adminClient) throws Exce /** * Wait for outstanding tasks to complete. The specified admin client is used to check the outstanding tasks and this is done using - * {@link ESTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. The specified filter is used + * {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. The specified filter is used * to filter out outstanding tasks that are expected to be there. * * @param adminClient the admin client diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java rename to test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java index 8a46f70530ca0..1e6c2a4ababb5 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/RestActionTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest; +package org.opensearch.test.rest; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; @@ -31,8 +31,8 @@ import org.opensearch.rest.RestRequest; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskListener; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.client.NoOpNodeClient; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.client.NoOpNodeClient; import org.opensearch.usage.UsageService; import org.junit.After; import org.junit.Before; @@ -45,7 +45,7 @@ * A common base class for Rest*ActionTests. Provides access to a {@link RestController} * that can be used to register individual REST actions, and test request handling. */ -public abstract class RestActionTestCase extends ESTestCase { +public abstract class RestActionTestCase extends OpenSearchTestCase { private RestController controller; protected VerifyingClient verifyingClient; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/package-info.java b/test/framework/src/main/java/org/opensearch/test/rest/package-info.java similarity index 77% rename from test/framework/src/main/java/org/elasticsearch/test/rest/package-info.java rename to test/framework/src/main/java/org/opensearch/test/rest/package-info.java index f3f5cedd13fa5..547365ff0674c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/package-info.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -18,7 +18,7 @@ */ /** - * Infrastructure for testing REST. See {@link ESRestTestCase} for running tests against an Elasticsearch cluster using the REST tests and + * Infrastructure for testing REST. See {@link OpenSearchRestTestCase} for running tests against an OpenSearch cluster using the REST tests and * the rest of the package for mocking utilities. */ -package org.elasticsearch.test.rest; \ No newline at end of file +package org.opensearch.test.rest; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcher.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/BlacklistedPathPatternMatcher.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcher.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/BlacklistedPathPatternMatcher.java index f0e0802a6b26b..617285a501438 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcher.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/BlacklistedPathPatternMatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import java.util.regex.Pattern; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlDocsTestClient.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlDocsTestClient.java index aa9143b1d7cf7..957c0d6fae023 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlDocsTestClient.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlDocsTestClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; @@ -29,7 +29,7 @@ import org.opensearch.client.RestClient; import org.opensearch.client.RestClientBuilder; import org.opensearch.common.CheckedSupplier; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; import java.io.IOException; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestCandidate.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestCandidate.java similarity index 84% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestCandidate.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestCandidate.java index dd650a38ebbd7..74a323f58db39 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestCandidate.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestCandidate.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; -import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSuite; -import org.elasticsearch.test.rest.yaml.section.SetupSection; -import org.elasticsearch.test.rest.yaml.section.TeardownSection; -import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSection; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSuite; +import org.opensearch.test.rest.yaml.section.SetupSection; +import org.opensearch.test.rest.yaml.section.TeardownSection; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSection; /** * Wraps {@link ClientYamlTestSection}s ready to be run. Each test section is associated to its {@link ClientYamlTestSuite}. diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java index 2210cb1c9e13e..12a9265874986 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestClient.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestClient.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import com.carrotsearch.randomizedtesting.RandomizedTest; import org.apache.http.HttpEntity; @@ -36,8 +36,8 @@ import org.opensearch.client.RestClientBuilder; import org.opensearch.client.WarningsHandler; import org.opensearch.common.CheckedSupplier; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; import java.io.Closeable; import java.io.IOException; @@ -53,7 +53,7 @@ import java.util.stream.Collectors; /** - * Used by {@link ESClientYamlSuiteTestCase} to execute REST requests according to the tests written in yaml suite files. Wraps a + * Used by {@link OpenSearchClientYamlSuiteTestCase} to execute REST requests according to the tests written in yaml suite files. Wraps a * {@link RestClient} instance used to send the REST requests. Holds the {@link ClientYamlSuiteRestSpec} used to translate api calls into * REST calls. */ diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java index 233f83c0d2813..2e7c45e860eec 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestExecutionContext.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import com.carrotsearch.randomizedtesting.RandomizedTest; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponse.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponse.java index 2268a51d04d3d..3cbadcfd279b9 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponse.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponse.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.apache.http.Header; import org.apache.http.client.methods.HttpHead; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponseException.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponseException.java index 66155418cba1e..8958749941b2c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestResponseException.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ClientYamlTestResponseException.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.opensearch.client.ResponseException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Features.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/Features.java index b08d6725430ff..df227e8ff57b1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Features.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.opensearch.bootstrap.JavaVersion; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java index e82ac9842b26c..4ce804e3fa552 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ObjectPath.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.apache.http.util.EntityUtils; import org.opensearch.client.Response; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java index 007b7c1bf6d08..f6c59f84faa12 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; @@ -37,12 +37,12 @@ import org.opensearch.common.io.PathUtils; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.test.rest.ESRestTestCase; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; -import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; -import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSection; -import org.elasticsearch.test.rest.yaml.section.ClientYamlTestSuite; -import org.elasticsearch.test.rest.yaml.section.ExecutableSection; +import org.opensearch.test.rest.OpenSearchRestTestCase; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSection; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSuite; +import org.opensearch.test.rest.yaml.section.ExecutableSection; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; @@ -67,7 +67,7 @@ * The suite timeout is extended to account for projects with a large number of tests. */ @TimeoutSuite(millis = 30 * TimeUnits.MINUTE) -public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase { +public abstract class OpenSearchClientYamlSuiteTestCase extends OpenSearchRestTestCase { /** * Property that allows to control which REST tests get run. Supports comma separated list of tests @@ -110,7 +110,7 @@ public abstract class ESClientYamlSuiteTestCase extends ESRestTestCase { private final ClientYamlTestCandidate testCandidate; - protected ESClientYamlSuiteTestCase(ClientYamlTestCandidate testCandidate) { + protected OpenSearchClientYamlSuiteTestCase(ClientYamlTestCandidate testCandidate) { this.testCandidate = testCandidate; } @@ -238,7 +238,7 @@ public static Iterable createParameters(NamedXContentRegistry executea // pkg private for tests static Map> loadSuites(String... paths) throws Exception { Map> files = new HashMap<>(); - Path root = PathUtils.get(ESClientYamlSuiteTestCase.class.getResource(TESTS_PATH).toURI()); + Path root = PathUtils.get(OpenSearchClientYamlSuiteTestCase.class.getResource(TESTS_PATH).toURI()); for (String strPath : paths) { Path path = root.resolve(strPath); if (Files.isDirectory(path)) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Stash.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Stash.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java index adfea4d32d4c7..1acb55b23ab31 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Stash.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml; +package org.opensearch.test.rest.yaml; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/package-info.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/package-info.java similarity index 91% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/package-info.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/package-info.java index e0ab923205195..cddd8737fc1f7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/package-info.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -21,4 +21,4 @@ * Infrastructure to run suites of tests written in YAML against a running Elasticsearch cluster using Elasticsearch's low level REST * client. The YAML tests are run by all official clients and serve as tests for both Elasticsearch and the clients. */ -package org.elasticsearch.test.rest.yaml; \ No newline at end of file +package org.opensearch.test.rest.yaml; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java index d6c1aa3250947..88f47cb4eb82a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.restspec; +package org.opensearch.test.rest.yaml.restspec; import org.opensearch.common.collect.Tuple; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java index 9ea2ba7f1563d..23c945ed5a195 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParser.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.restspec; +package org.opensearch.test.rest.yaml.restspec; import org.opensearch.common.ParseField; import org.opensearch.common.ParsingException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java index 9cc41ff787340..1dbb84b50f50e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.restspec; +package org.opensearch.test.rest.yaml.restspec; import org.opensearch.common.io.PathUtils; import org.opensearch.common.xcontent.LoggingDeprecationHandler; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/package-info.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/package-info.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/package-info.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/package-info.java index 8951c80290f72..99441108fc318 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/package-info.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/restspec/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -20,4 +20,4 @@ /** * Specification of REST endpoints used to convert YAML {@code do} sections into actual calls to Elasticsearch. */ -package org.elasticsearch.test.rest.yaml.restspec; \ No newline at end of file +package org.opensearch.test.rest.yaml.restspec; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ApiCallSection.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ApiCallSection.java index 3dd10bb341116..ea004826a1b94 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ApiCallSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ApiCallSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import java.util.ArrayList; import java.util.Collections; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/Assertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/Assertion.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/Assertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/Assertion.java index 97d7f9d716757..c474fddc88eef 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/Assertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/Assertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.xcontent.XContentLocation; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; import java.io.IOException; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSection.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSection.java index 012f6039e7651..57f897b4a4718 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentLocation; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSuite.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSuite.java index 4b982e8efb420..19f39913cea68 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuite.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ClientYamlTestSuite.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ContainsAssertion.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ContainsAssertion.java index 4f99a208ac3a6..98e1205a8aafe 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ContainsAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java index 12ef1f23fd226..b9909e12ac783 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,9 +35,10 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; -import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse; -import org.elasticsearch.test.rest.yaml.ClientYamlTestResponseException; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestResponse; +import org.opensearch.test.rest.yaml.ClientYamlTestResponseException; +import org.opensearch.test.hamcrest.RegexMatcher; import java.io.IOException; import java.util.ArrayList; @@ -56,7 +57,7 @@ import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toSet; import static org.opensearch.common.collect.Tuple.tuple; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -305,7 +306,7 @@ public void execute(ClientYamlTestExecutionContext executionContext) throws IOEx //remove delimiters from regex String regex = catchParam.substring(1, catchParam.length() - 1); assertThat("the error message was expected to match the provided regex but didn't", - error.toString(), matches(regex)); + error.toString(), RegexMatcher.matches(regex)); } else { throw new UnsupportedOperationException("catch value [" + catchParam + "] not supported"); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ExecutableSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ExecutableSection.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ExecutableSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ExecutableSection.java index 5b6c4a0a6ceb6..e805fd58680ee 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ExecutableSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ExecutableSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; import java.io.IOException; import java.util.Arrays; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanAssertion.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanAssertion.java index 942d52a13c50c..cfc3621951317 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java index 48bc0d1734f64..3663ea5de4f04 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsFalseAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsFalseAssertion.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsFalseAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsFalseAssertion.java index 143197a8c536c..a2d01ac90706f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsFalseAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsFalseAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsTrueAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsTrueAssertion.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsTrueAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsTrueAssertion.java index 741140ac7484c..ae8be1e389a4e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/IsTrueAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/IsTrueAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LengthAssertion.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LengthAssertion.java index 8d148cb078d84..9e6190f7ef262 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LengthAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanAssertion.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanAssertion.java index 5e5b7cec392a9..edb1c83fa8535 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java index 0f7b5124d8c0b..2855abe0c4778 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java similarity index 92% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java index 9758082a63ce2..ebded1fb3f7b4 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,19 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.common.collect.Tuple; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.NotEqualMessageBuilder; +import org.opensearch.test.NotEqualMessageBuilder; +import org.opensearch.test.hamcrest.RegexMatcher; import java.io.IOException; import java.util.regex.Pattern; -import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; +import static org.opensearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertNotNull; @@ -66,7 +67,7 @@ protected void doAssert(Object actualValue, Object expectedValue) { String regex = expValue.substring(1, expValue.length() - 1); logger.trace("assert that [{}] matches [{}]", stringValue, regex); assertThat("field [" + getField() + "] was expected to match the provided regex but didn't", - stringValue, matches(regex, Pattern.COMMENTS)); + stringValue, RegexMatcher.matches(regex, Pattern.COMMENTS)); return; } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ParserUtils.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ParserUtils.java index 1b6e6f49164ee..aac060f2175b1 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/ParserUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.collect.Tuple; import org.opensearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetSection.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetSection.java index 04e8057fb94a6..658c5ab787be8 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; import java.io.IOException; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetupSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetupSection.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetupSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetupSection.java index 50bbd7f830e97..f0c218159636d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SetupSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SetupSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SkipSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SkipSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java index 9cd19dbf127b2..cb66ec78b88da 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/SkipSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.Version; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.rest.yaml.Features; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.rest.yaml.Features; import java.io.IOException; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TeardownSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TeardownSection.java similarity index 96% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TeardownSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TeardownSection.java index f6682c621c5fa..c647735317672 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TeardownSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TeardownSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TransformAndSetSection.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSection.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TransformAndSetSection.java index 95fe21e56f1e5..acb06cb0f134a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSection.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/TransformAndSetSection.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/VersionRange.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/VersionRange.java similarity index 93% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/VersionRange.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/VersionRange.java index 5cf5ed1038355..a4ac485113865 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/VersionRange.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/VersionRange.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.rest.yaml.section; +package org.opensearch.test.rest.yaml.section; import org.opensearch.Version; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/package-info.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/package-info.java similarity index 89% rename from test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/package-info.java rename to test/framework/src/main/java/org/opensearch/test/rest/yaml/section/package-info.java index fe6a53ff93aa1..5e52eeefe0f8c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/package-info.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/package-info.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -20,4 +20,4 @@ /** * Sections within the YAML tests that are executed to run the tests. */ -package org.elasticsearch.test.rest.yaml.section; \ No newline at end of file +package org.opensearch.test.rest.yaml.section; diff --git a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java b/test/framework/src/main/java/org/opensearch/test/store/MockFSDirectoryFactory.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java rename to test/framework/src/main/java/org/opensearch/test/store/MockFSDirectoryFactory.java index 3e255302d5870..8468233e74891 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSDirectoryFactory.java +++ b/test/framework/src/main/java/org/opensearch/test/store/MockFSDirectoryFactory.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store; +package org.opensearch.test.store; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.logging.log4j.Logger; @@ -41,8 +41,8 @@ import org.opensearch.index.store.FsDirectoryFactory; import org.opensearch.index.store.Store; import org.opensearch.plugins.IndexStorePlugin; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Assert; import java.io.Closeable; @@ -65,7 +65,7 @@ public class MockFSDirectoryFactory implements IndexStorePlugin.DirectoryFactory @Override public Directory newDirectory(IndexSettings idxSettings, ShardPath path) throws IOException { Settings indexSettings = idxSettings.getSettings(); - Random random = new Random(idxSettings.getValue(ESIntegTestCase.INDEX_TEST_SEED_SETTING)); + Random random = new Random(idxSettings.getValue(OpenSearchIntegTestCase.INDEX_TEST_SEED_SETTING)); return wrap(randomDirectoryService(random, idxSettings, path), random, indexSettings, path.getShardId()); } @@ -86,7 +86,7 @@ public static void checkIndex(Logger logger, Store store, ShardId shardId) { if (!status.clean) { IOException failure = new IOException("failed to check index for shard " + shardId + ";index files [" + Arrays.toString(dir.listAll()) + "] os [" + os.bytes().utf8ToString() + "]"); - ESTestCase.checkIndexFailures.add(failure); + OpenSearchTestCase.checkIndexFailures.add(failure); throw failure; } else { if (logger.isDebugEnabled()) { @@ -95,7 +95,7 @@ public static void checkIndex(Logger logger, Store store, ShardId shardId) { } } catch (LockObtainFailedException e) { IllegalStateException failure = new IllegalStateException("IndexWriter is still open on shard " + shardId, e); - ESTestCase.checkIndexFailures.add(failure); + OpenSearchTestCase.checkIndexFailures.add(failure); throw failure; } } catch (Exception e) { @@ -168,7 +168,7 @@ static final class CloseableDirectory implements Closeable { CloseableDirectory(BaseDirectoryWrapper dir) { this.dir = dir; - this.failureMarker = ESTestCase.getSuiteFailureMarker(); + this.failureMarker = OpenSearchTestCase.getSuiteFailureMarker(); } @Override diff --git a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java b/test/framework/src/main/java/org/opensearch/test/store/MockFSIndexStore.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java rename to test/framework/src/main/java/org/opensearch/test/store/MockFSIndexStore.java index 2f536689798a4..39f1409f31552 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java +++ b/test/framework/src/main/java/org/opensearch/test/store/MockFSIndexStore.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.store; +package org.opensearch.test.store; import org.apache.logging.log4j.Logger; import org.opensearch.common.Nullable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java b/test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManager.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java rename to test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManager.java index b2d9de9abeb22..eecfbaf1712c7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManager.java +++ b/test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManager.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.tasks; +package org.opensearch.test.tasks; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManagerListener.java b/test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManagerListener.java similarity index 92% rename from test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManagerListener.java rename to test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManagerListener.java index 5841333bbe08c..875a8963f4800 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/tasks/MockTaskManagerListener.java +++ b/test/framework/src/main/java/org/opensearch/test/tasks/MockTaskManagerListener.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.tasks; +package org.opensearch.test.tasks; import org.opensearch.tasks.Task; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java b/test/framework/src/main/java/org/opensearch/test/transport/CapturingTransport.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java rename to test/framework/src/main/java/org/opensearch/test/transport/CapturingTransport.java index 4ce5b663fb2c6..ac7040eb8e7d7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/CapturingTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/CapturingTransport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.util.concurrent.ConcurrentCollections; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/FakeTransport.java b/test/framework/src/main/java/org/opensearch/test/transport/FakeTransport.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/transport/FakeTransport.java rename to test/framework/src/main/java/org/opensearch/test/transport/FakeTransport.java index a4422cca804c7..15249d7ba6fa0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/FakeTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/FakeTransport.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.opensearch.action.ActionListener; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java b/test/framework/src/main/java/org/opensearch/test/transport/MockTransport.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java rename to test/framework/src/main/java/org/opensearch/test/transport/MockTransport.java index c3aad156a955e..ed97cb696e357 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/MockTransport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/opensearch/test/transport/MockTransportService.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java rename to test/framework/src/main/java/org/opensearch/test/transport/MockTransportService.java index 906b63fbecb66..31f2343d6d941 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/MockTransportService.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,8 +44,8 @@ import org.opensearch.node.Node; import org.opensearch.plugins.Plugin; import org.opensearch.tasks.TaskManager; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.tasks.MockTaskManager; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.tasks.MockTaskManager; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.ClusterConnectionManager; @@ -112,7 +112,7 @@ public static MockTransportService createNewService(Settings settings, Version v } public static MockNioTransport newMockTransport(Settings settings, Version version, ThreadPool threadPool) { - settings = Settings.builder().put(TransportSettings.PORT.getKey(), ESTestCase.getPortRange()).put(settings).build(); + settings = Settings.builder().put(TransportSettings.PORT.getKey(), OpenSearchTestCase.getPortRange()).put(settings).build(); NamedWriteableRegistry namedWriteableRegistry = new NamedWriteableRegistry(ClusterModule.getNamedWriteables()); return new MockNioTransport(settings, version, threadPool, new NetworkService(Collections.emptyList()), new MockPageCacheRecycler(settings), namedWriteableRegistry, new NoneCircuitBreakerService()); diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/StubbableConnectionManager.java b/test/framework/src/main/java/org/opensearch/test/transport/StubbableConnectionManager.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/test/transport/StubbableConnectionManager.java rename to test/framework/src/main/java/org/opensearch/test/transport/StubbableConnectionManager.java index 5842bccf37096..d86e65e9b7254 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/StubbableConnectionManager.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/StubbableConnectionManager.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.opensearch.action.ActionListener; import org.opensearch.cluster.node.DiscoveryNode; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/StubbableTransport.java b/test/framework/src/main/java/org/opensearch/test/transport/StubbableTransport.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/test/transport/StubbableTransport.java rename to test/framework/src/main/java/org/opensearch/test/transport/StubbableTransport.java index 29092822f0cc8..17f133261ed0a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/StubbableTransport.java +++ b/test/framework/src/main/java/org/opensearch/test/transport/StubbableTransport.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.test.transport; +package org.opensearch.test.transport; import org.opensearch.Version; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/main/java/org/opensearch/threadpool/TestThreadPool.java b/test/framework/src/main/java/org/opensearch/threadpool/TestThreadPool.java index b3472db14ee8c..dfb810f0261ff 100644 --- a/test/framework/src/main/java/org/opensearch/threadpool/TestThreadPool.java +++ b/test/framework/src/main/java/org/opensearch/threadpool/TestThreadPool.java @@ -20,7 +20,7 @@ package org.opensearch.threadpool; import org.opensearch.common.settings.Settings; -import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.node.Node; import java.util.concurrent.CountDownLatch; @@ -84,8 +84,8 @@ private synchronized void createRejectingExecutor() { if (rejectingExecutor != null) { return; } - ThreadFactory factory = EsExecutors.daemonThreadFactory("reject_thread"); - rejectingExecutor = EsExecutors.newFixed("rejecting", 1, 0, factory, getThreadContext()); + ThreadFactory factory = OpenSearchExecutors.daemonThreadFactory("reject_thread"); + rejectingExecutor = OpenSearchExecutors.newFixed("rejecting", 1, 0, factory, getThreadContext()); CountDownLatch startedLatch = new CountDownLatch(1); rejectingExecutor.execute(() -> { diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java index 7d1d96d33e91f..842aa72e318ab 100644 --- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java @@ -53,12 +53,12 @@ import org.elasticsearch.mocksocket.MockServerSocket; import org.opensearch.node.Node; import org.opensearch.tasks.Task; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; -import org.elasticsearch.test.VersionUtils; -import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.transport.MockTransportService; -import org.elasticsearch.test.transport.StubbableTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.junit.annotations.TestLogging; +import org.opensearch.test.transport.MockTransportService; +import org.opensearch.test.transport.StubbableTransport; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; import org.junit.After; @@ -105,7 +105,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; -public abstract class AbstractSimpleTransportTestCase extends ESTestCase { +public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase { protected ThreadPool threadPool; // we use always a non-alpha or beta version here otherwise minimumCompatibilityVersion will be different for the two used versions diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java index f8386a0f920d7..28a7bfb194bf9 100644 --- a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java +++ b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java @@ -80,7 +80,7 @@ import java.util.stream.Collectors; import static org.opensearch.common.util.concurrent.ConcurrentCollections.newConcurrentMap; -import static org.opensearch.common.util.concurrent.EsExecutors.daemonThreadFactory; +import static org.opensearch.common.util.concurrent.OpenSearchExecutors.daemonThreadFactory; public class MockNioTransport extends TcpTransport { private static final Logger logger = LogManager.getLogger(MockNioTransport.class); diff --git a/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java b/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java index f8136fa7f1213..8b6d3e948071b 100644 --- a/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java +++ b/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java @@ -25,7 +25,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.test.rest.ESRestTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import org.junit.Before; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.equalTo; -public abstract class AbstractFullClusterRestartTestCase extends ESRestTestCase { +public abstract class AbstractFullClusterRestartTestCase extends OpenSearchRestTestCase { private static final boolean runningAgainstOldCluster = Booleans.parseBoolean(System.getProperty("tests.is_old_cluster")); diff --git a/test/framework/src/main/resources/log4j2-test.properties b/test/framework/src/main/resources/log4j2-test.properties index dae00805cb35f..303cbce4b8c40 100644 --- a/test/framework/src/main/resources/log4j2-test.properties +++ b/test/framework/src/main/resources/log4j2-test.properties @@ -3,12 +3,12 @@ appender.console.name = console appender.console.layout.type = PatternLayout appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%test_thread_info]%marker %m%n -rootLogger.level = ${sys:tests.es.logger.level:-info} +rootLogger.level = ${sys:tests.opensearch.logger.level:-info} rootLogger.appenderRef.console.ref = console appender.header_warning.type = HeaderWarningAppender appender.header_warning.name = header_warning -logger.deprecation.name = org.elasticsearch.deprecation +logger.deprecation.name = org.opensearch.deprecation logger.deprecation.level = deprecation logger.deprecation.appenderRef.header_warning.ref = header_warning diff --git a/test/framework/src/main/resources/org/elasticsearch/analysis/common/test1.json b/test/framework/src/main/resources/org/opensearch/analysis/common/test1.json similarity index 100% rename from test/framework/src/main/resources/org/elasticsearch/analysis/common/test1.json rename to test/framework/src/main/resources/org/opensearch/analysis/common/test1.json diff --git a/test/framework/src/main/resources/org/elasticsearch/analysis/common/test1.yml b/test/framework/src/main/resources/org/opensearch/analysis/common/test1.yml similarity index 100% rename from test/framework/src/main/resources/org/elasticsearch/analysis/common/test1.yml rename to test/framework/src/main/resources/org/opensearch/analysis/common/test1.yml diff --git a/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java b/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java index 51e4f44d4011d..5b233ca56c793 100644 --- a/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java +++ b/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.ingest; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; import java.util.Collections; @@ -28,7 +28,7 @@ import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; -public class IngestDocumentMatcherTests extends ESTestCase { +public class IngestDocumentMatcherTests extends OpenSearchTestCase { public void testDifferentMapData() { Map sourceAndMetadata1 = new HashMap<>(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java index ed32fd9b1ca74..0cac2003678c7 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java @@ -22,6 +22,7 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.set.Sets; import org.hamcrest.Matcher; +import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; import java.util.List; @@ -30,15 +31,15 @@ import java.util.stream.Collectors; import static java.util.Collections.singleton; -import static org.elasticsearch.test.AbstractQueryTestCase.alterateQueries; +import static org.opensearch.test.AbstractQueryTestCase.alterateQueries; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.notNullValue; /** - * Various test for {@link org.elasticsearch.test.AbstractQueryTestCase} + * Various test for {@link org.opensearch.test.AbstractQueryTestCase} */ -public class AbstractQueryTestCaseTests extends ESTestCase { +public class AbstractQueryTestCaseTests extends OpenSearchTestCase { public void testAlterateQueries() throws IOException { List> alterations = alterateQueries(singleton("{\"field\": \"value\"}"), null); diff --git a/test/framework/src/test/java/org/elasticsearch/test/AbstractXContentTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/AbstractXContentTestCaseTests.java index 8b08f16b50982..c0ba89d014df3 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/AbstractXContentTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/AbstractXContentTestCaseTests.java @@ -26,13 +26,15 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.test.AbstractXContentTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.Map; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class AbstractXContentTestCaseTests extends ESTestCase { +public class AbstractXContentTestCaseTests extends OpenSearchTestCase { public void testInsertRandomFieldsAndShuffle() throws Exception { XContentBuilder builder = XContentFactory.jsonBuilder(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java index fbfbd10da1b41..b340a367e38a3 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java @@ -21,6 +21,8 @@ import org.opensearch.Version; import org.opensearch.common.Booleans; import org.opensearch.common.collect.Tuple; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; import java.util.ArrayList; import java.util.Arrays; @@ -39,7 +41,7 @@ * Tests VersionUtils. Note: this test should remain unchanged across major versions * it uses the hardcoded versions on purpose. */ -public class VersionUtilsTests extends ESTestCase { +public class VersionUtilsTests extends OpenSearchTestCase { public void testAllVersionsSorted() { List allVersions = VersionUtils.allReleasedVersions(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/XContentTestUtilsTests.java b/test/framework/src/test/java/org/elasticsearch/test/XContentTestUtilsTests.java index 017a0d7af4acf..044b7b7505fad 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/XContentTestUtilsTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/XContentTestUtilsTests.java @@ -28,6 +28,8 @@ import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.XContentTestUtils; import java.io.IOException; import java.util.Collections; @@ -37,12 +39,12 @@ import java.util.Stack; import java.util.function.Predicate; -import static org.elasticsearch.test.XContentTestUtils.insertRandomFields; +import static org.opensearch.test.XContentTestUtils.insertRandomFields; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.instanceOf; -public class XContentTestUtilsTests extends ESTestCase { +public class XContentTestUtilsTests extends OpenSearchTestCase { public void testGetInsertPaths() throws IOException { XContentBuilder builder = JsonXContent.contentBuilder(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java index c2349d612220d..51a839bc40654 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java @@ -28,8 +28,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.node.Node; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.disruption.DisruptableMockTransport.ConnectionStatus; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.disruption.DisruptableMockTransport; +import org.opensearch.test.disruption.DisruptableMockTransport.ConnectionStatus; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.TransportChannel; @@ -58,7 +59,7 @@ import static org.hamcrest.Matchers.endsWith; import static org.hamcrest.Matchers.instanceOf; -public class DisruptableMockTransportTests extends ESTestCase { +public class DisruptableMockTransportTests extends OpenSearchTestCase { private DiscoveryNode node1; private DiscoveryNode node2; diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java index b6c18eaafd933..12637862330e9 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java @@ -19,7 +19,8 @@ package org.elasticsearch.test.disruption; import org.opensearch.common.Nullable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.disruption.LongGCDisruption; import java.lang.management.ThreadInfo; import java.util.ArrayList; @@ -36,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class LongGCDisruptionTests extends ESTestCase { +public class LongGCDisruptionTests extends OpenSearchTestCase { static class LockedExecutor { ReentrantLock lock = new ReentrantLock(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java index d78f92c66139d..b28cacff94f93 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java @@ -27,10 +27,11 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions; -import org.elasticsearch.test.transport.MockTransportService; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.disruption.NetworkDisruption; +import org.opensearch.test.disruption.NetworkDisruption.TwoPartitions; +import org.opensearch.test.transport.MockTransportService; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponse; @@ -49,8 +50,8 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false) -public class NetworkDisruptionIT extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, autoManageMasterNodes = false) +public class NetworkDisruptionIT extends OpenSearchIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(MockTransportService.TestPlugin.class); diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java index 298ca869ae51c..b44595ba70ad6 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionTests.java @@ -19,14 +19,15 @@ package org.elasticsearch.test.disruption; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.disruption.NetworkDisruption.Bridge; -import org.elasticsearch.test.disruption.NetworkDisruption.TwoPartitions; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.disruption.NetworkDisruption; +import org.opensearch.test.disruption.NetworkDisruption.Bridge; +import org.opensearch.test.disruption.NetworkDisruption.TwoPartitions; import java.util.HashSet; import java.util.Set; -public class NetworkDisruptionTests extends ESTestCase { +public class NetworkDisruptionTests extends OpenSearchTestCase { public void testTwoPartitions() { Set partition1 = generateRandomStringSet(1, 10); diff --git a/test/framework/src/test/java/org/elasticsearch/test/hamcrest/OpenSearchAssertionsTests.java b/test/framework/src/test/java/org/elasticsearch/test/hamcrest/OpenSearchAssertionsTests.java index dfd094bea5cd1..53009c7e83af6 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/hamcrest/OpenSearchAssertionsTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/hamcrest/OpenSearchAssertionsTests.java @@ -28,8 +28,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.RandomObjects; import java.io.IOException; import java.util.Arrays; @@ -39,11 +39,11 @@ import java.util.Map; import java.util.Set; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBlocked; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent; import static org.hamcrest.Matchers.containsString; -public class OpenSearchAssertionsTests extends ESTestCase { +public class OpenSearchAssertionsTests extends OpenSearchTestCase { public void testAssertXContentEquivalent() throws IOException { try (XContentBuilder original = JsonXContent.contentBuilder()) { diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/ESRestTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/OpenSearchRestTestCaseTests.java similarity index 85% rename from test/framework/src/test/java/org/elasticsearch/test/rest/ESRestTestCaseTests.java rename to test/framework/src/test/java/org/elasticsearch/test/rest/OpenSearchRestTestCaseTests.java index 3637928d4dec5..5f57fba910be7 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/ESRestTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/OpenSearchRestTestCaseTests.java @@ -18,26 +18,27 @@ */ package org.elasticsearch.test.rest; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase; import java.util.regex.Matcher; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class ESRestTestCaseTests extends ESTestCase { +public class OpenSearchRestTestCaseTests extends OpenSearchTestCase { public void testIgnoreMatchMultipleTemplatesPattern() { String input = "index [test_index] matches multiple legacy templates [global, prevent-bwc-deprecation-template], " + "composable templates will only match a single template"; - Matcher matcher = ESRestTestCase.CREATE_INDEX_MULTIPLE_MATCHING_TEMPLATES.matcher(input); + Matcher matcher = OpenSearchRestTestCase.CREATE_INDEX_MULTIPLE_MATCHING_TEMPLATES.matcher(input); assertThat(matcher.matches(), is(true)); assertThat(matcher.group(1), equalTo("test_index")); assertThat(matcher.group(2), equalTo("global, prevent-bwc-deprecation-template")); input = "index template [1] has index patterns [logs-*] matching patterns from existing older templates [global] " + "with patterns (global => [*]); this template [1] will take precedence during new index creation"; - matcher = ESRestTestCase.PUT_TEMPLATE_MULTIPLE_MATCHING_TEMPLATES.matcher(input); + matcher = OpenSearchRestTestCase.PUT_TEMPLATE_MULTIPLE_MATCHING_TEMPLATES.matcher(input); assertThat(matcher.matches(), is(true)); assertThat(matcher.group(1), equalTo("1")); assertThat(matcher.group(2), equalTo("logs-*")); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java index 272ef258d4802..010da8bfa871e 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/VersionSensitiveWarningsHandlerTests.java @@ -21,8 +21,8 @@ import org.opensearch.Version; import org.opensearch.client.WarningsHandler; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.ESRestTestCase.VersionSensitiveWarningsHandler; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.OpenSearchRestTestCase.VersionSensitiveWarningsHandler; import java.io.IOException; import java.util.Arrays; @@ -31,7 +31,7 @@ import java.util.Set; import java.util.function.Consumer; -public class VersionSensitiveWarningsHandlerTests extends ESTestCase { +public class VersionSensitiveWarningsHandlerTests extends OpenSearchTestCase { public void testSameVersionCluster() throws IOException { Set nodeVersions= new HashSet<>(); @@ -62,7 +62,7 @@ public void testMixedVersionCluster() throws IOException { private static WarningsHandler expectVersionSpecificWarnings(Set nodeVersions, Consumer expectationsSetter) { - //Based on EsRestTestCase.expectVersionSpecificWarnings helper method but without ESRestTestCase dependency + //Based on EsRestTestCase.expectVersionSpecificWarnings helper method but without OpenSearchRestTestCase dependency VersionSensitiveWarningsHandler warningsHandler = new VersionSensitiveWarningsHandler(nodeVersions); expectationsSetter.accept(warningsHandler); return warningsHandler; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java index a58a70111c2a4..bae4b5d819ef8 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/BlacklistedPathPatternMatcherTests.java @@ -19,10 +19,10 @@ package org.elasticsearch.test.rest.yaml; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.yaml.BlacklistedPathPatternMatcher; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.BlacklistedPathPatternMatcher; -public class BlacklistedPathPatternMatcherTests extends ESTestCase { +public class BlacklistedPathPatternMatcherTests extends OpenSearchTestCase { public void testMatchesExact() { // suffix match @@ -70,4 +70,4 @@ private void assertNoMatch(String pattern, String path) { BlacklistedPathPatternMatcher matcher = new BlacklistedPathPatternMatcher(pattern); assertFalse("Pattern [" + pattern + "] should not have matched path [" + path + "]", matcher.isSuffixMatch(path)); } -} \ No newline at end of file +} diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java index ea1a66e634d79..8fdfaa7c454d2 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContextTests.java @@ -22,8 +22,10 @@ import org.apache.http.HttpEntity; import org.opensearch.Version; import org.opensearch.client.NodeSelector; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestResponse; import java.io.IOException; import java.util.Collections; @@ -31,7 +33,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; -public class ClientYamlTestExecutionContextTests extends ESTestCase { +public class ClientYamlTestExecutionContextTests extends OpenSearchTestCase { public void testHeadersSupportStashedValueReplacement() throws IOException { final AtomicReference> headersRef = new AtomicReference<>(); @@ -40,7 +42,7 @@ public void testHeadersSupportStashedValueReplacement() throws IOException { new ClientYamlTestExecutionContext(null, randomBoolean()) { @Override ClientYamlTestResponse callApiInternal(String apiName, Map params, - HttpEntity entity, Map headers, NodeSelector nodeSelector) { + HttpEntity entity, Map headers, NodeSelector nodeSelector) { headersRef.set(headers); return null; } diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ObjectPathTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ObjectPathTests.java index 9b851c9468ad5..c3c7ef2363736 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ObjectPathTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ObjectPathTests.java @@ -22,7 +22,9 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.ObjectPath; +import org.opensearch.test.rest.yaml.Stash; import java.io.IOException; import java.util.HashMap; @@ -39,7 +41,7 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.oneOf; -public class ObjectPathTests extends ESTestCase { +public class ObjectPathTests extends OpenSearchTestCase { private static XContentBuilder randomXContentBuilder() throws IOException { XContentType xContentType = randomFrom(XContentType.values()); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCaseTests.java similarity index 82% rename from test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java rename to test/framework/src/test/java/org/elasticsearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCaseTests.java index ae64dbc893d81..eb12c0955ced8 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCaseTests.java @@ -23,38 +23,39 @@ import java.util.Map; import java.util.Set; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.greaterThan; -public class ESClientYamlSuiteTestCaseTests extends ESTestCase { +public class OpenSearchClientYamlSuiteTestCaseTests extends OpenSearchTestCase { public void testLoadAllYamlSuites() throws Exception { - Map> yamlSuites = ESClientYamlSuiteTestCase.loadSuites(""); + Map> yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites(""); assertEquals(2, yamlSuites.size()); } public void testLoadSingleYamlSuite() throws Exception { - Map> yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1/10_basic"); + Map> yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites("suite1/10_basic"); assertSingleFile(yamlSuites, "suite1", "10_basic.yml"); //extension .yaml is optional - yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1/10_basic"); + yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites("suite1/10_basic"); assertSingleFile(yamlSuites, "suite1", "10_basic.yml"); } public void testLoadMultipleYamlSuites() throws Exception { //single directory - Map> yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1"); + Map> yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites("suite1"); assertThat(yamlSuites, notNullValue()); assertThat(yamlSuites.size(), equalTo(1)); assertThat(yamlSuites.containsKey("suite1"), equalTo(true)); assertThat(yamlSuites.get("suite1").size(), greaterThan(1)); //multiple directories - yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite1", "suite2"); + yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites("suite1", "suite2"); assertThat(yamlSuites, notNullValue()); assertThat(yamlSuites.size(), equalTo(2)); assertThat(yamlSuites.containsKey("suite1"), equalTo(true)); @@ -63,7 +64,7 @@ public void testLoadMultipleYamlSuites() throws Exception { assertEquals(2, yamlSuites.get("suite2").size()); //multiple paths, which can be both directories or yaml test suites (with optional file extension) - yamlSuites = ESClientYamlSuiteTestCase.loadSuites("suite2/10_basic", "suite1"); + yamlSuites = OpenSearchClientYamlSuiteTestCase.loadSuites("suite2/10_basic", "suite1"); assertThat(yamlSuites, notNullValue()); assertThat(yamlSuites.size(), equalTo(2)); assertThat(yamlSuites.containsKey("suite2"), equalTo(true)); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/StashTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/StashTests.java index 1c616d8be8bcd..4db6169ace4b4 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/StashTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/StashTests.java @@ -19,7 +19,8 @@ package org.elasticsearch.test.rest.yaml; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.Stash; import java.io.IOException; import java.util.Arrays; @@ -30,7 +31,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public class StashTests extends ESTestCase { +public class StashTests extends OpenSearchTestCase { public void testReplaceStashedValuesStashKeyInMapValue() throws IOException { Stash stash = new Stash(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java index 752724166c0ba..ad4f1840519a7 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserFailingTests.java @@ -21,7 +21,8 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApiParser; import static org.hamcrest.Matchers.containsString; @@ -29,7 +30,7 @@ * These tests are not part of {@link ClientYamlSuiteRestApiParserTests} because the tested failures don't allow to consume the whole yaml * stream */ -public class ClientYamlSuiteRestApiParserFailingTests extends ESTestCase { +public class ClientYamlSuiteRestApiParserFailingTests extends OpenSearchTestCase { public void testDuplicateMethods() throws Exception { parseAndExpectParsingException("{\n" + diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java index a7f8ba4aa8a8b..75c44860424d7 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiParserTests.java @@ -20,6 +20,8 @@ import org.opensearch.common.xcontent.yaml.YamlXContent; import org.elasticsearch.test.rest.yaml.section.AbstractClientYamlTestFragmentParserTestCase; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApiParser; import java.util.Iterator; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java index 7f702bcafe689..eae8cc3e4b57a 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApiTests.java @@ -21,13 +21,16 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestApiParser; +import org.opensearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; import java.io.IOException; import java.util.Collections; import java.util.List; -public class ClientYamlSuiteRestApiTests extends ESTestCase { +public class ClientYamlSuiteRestApiTests extends OpenSearchTestCase { public void testParseCommonSpec() throws IOException { XContentParser parser = createParser(YamlXContent.yamlXContent, COMMON_SPEC); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java index 5f6302c474310..913b9326ada5c 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AbstractClientYamlTestFragmentParserTestCase.java @@ -21,8 +21,8 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.rest.yaml.section.ExecutableSection; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.section.ExecutableSection; import org.junit.After; import static org.hamcrest.Matchers.nullValue; @@ -30,7 +30,7 @@ /** * Superclass for tests that parse parts of the test suite. */ -public abstract class AbstractClientYamlTestFragmentParserTestCase extends ESTestCase { +public abstract class AbstractClientYamlTestFragmentParserTestCase extends OpenSearchTestCase { protected XContentParser parser; @Override diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java index 33f31c38b4230..90efcde181fd3 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/AssertionTests.java @@ -19,12 +19,13 @@ package org.elasticsearch.test.rest.yaml.section; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.rest.yaml.section.GreaterThanAssertion; -import org.elasticsearch.test.rest.yaml.section.IsFalseAssertion; -import org.elasticsearch.test.rest.yaml.section.IsTrueAssertion; -import org.elasticsearch.test.rest.yaml.section.LengthAssertion; -import org.elasticsearch.test.rest.yaml.section.LessThanAssertion; -import org.elasticsearch.test.rest.yaml.section.MatchAssertion; +import org.opensearch.test.rest.yaml.section.ContainsAssertion; +import org.opensearch.test.rest.yaml.section.GreaterThanAssertion; +import org.opensearch.test.rest.yaml.section.IsFalseAssertion; +import org.opensearch.test.rest.yaml.section.IsTrueAssertion; +import org.opensearch.test.rest.yaml.section.LengthAssertion; +import org.opensearch.test.rest.yaml.section.LessThanAssertion; +import org.opensearch.test.rest.yaml.section.MatchAssertion; import java.util.List; import java.util.Map; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSectionTests.java index 756a6547015eb..f1e3c0aa4e123 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSectionTests.java @@ -23,6 +23,16 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.yaml.YamlXContent; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSection; +import org.opensearch.test.rest.yaml.section.DoSection; +import org.opensearch.test.rest.yaml.section.GreaterThanAssertion; +import org.opensearch.test.rest.yaml.section.IsFalseAssertion; +import org.opensearch.test.rest.yaml.section.IsTrueAssertion; +import org.opensearch.test.rest.yaml.section.LengthAssertion; +import org.opensearch.test.rest.yaml.section.LessThanAssertion; +import org.opensearch.test.rest.yaml.section.MatchAssertion; +import org.opensearch.test.rest.yaml.section.SetSection; +import org.opensearch.test.rest.yaml.section.SkipSection; import java.io.IOException; import java.util.Map; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java index 472687bffe107..9c3849096dd6f 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/ClientYamlTestSuiteTests.java @@ -24,6 +24,17 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.yaml.YamlXContent; +import org.opensearch.test.rest.yaml.section.ApiCallSection; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSection; +import org.opensearch.test.rest.yaml.section.ClientYamlTestSuite; +import org.opensearch.test.rest.yaml.section.ContainsAssertion; +import org.opensearch.test.rest.yaml.section.DoSection; +import org.opensearch.test.rest.yaml.section.ExecutableSection; +import org.opensearch.test.rest.yaml.section.IsTrueAssertion; +import org.opensearch.test.rest.yaml.section.MatchAssertion; +import org.opensearch.test.rest.yaml.section.SetupSection; +import org.opensearch.test.rest.yaml.section.SkipSection; +import org.opensearch.test.rest.yaml.section.TeardownSection; import java.util.ArrayList; import java.util.Collections; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java index 3c8fbc9998076..e4316dd5eed9a 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/DoSectionTests.java @@ -28,9 +28,11 @@ import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; -import org.elasticsearch.test.rest.yaml.ClientYamlTestResponse; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.ClientYamlTestResponse; import org.hamcrest.MatcherAssert; +import org.opensearch.test.rest.yaml.section.ApiCallSection; +import org.opensearch.test.rest.yaml.section.DoSection; import java.io.IOException; import java.util.ArrayList; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/MatchAssertionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/MatchAssertionTests.java index f1b120dbbe931..8120f9e17d230 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/MatchAssertionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/MatchAssertionTests.java @@ -19,13 +19,14 @@ package org.elasticsearch.test.rest.yaml.section; import org.opensearch.common.xcontent.XContentLocation; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.rest.yaml.section.MatchAssertion; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static org.hamcrest.Matchers.containsString; -public class MatchAssertionTests extends ESTestCase { +public class MatchAssertionTests extends OpenSearchTestCase { public void testNull() { XContentLocation xContentLocation = new XContentLocation(0, 0); diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetSectionTests.java index 928f98b96bd8b..de070c4e088ec 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetSectionTests.java @@ -20,6 +20,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.yaml.YamlXContent; +import org.opensearch.test.rest.yaml.section.SetSection; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetupSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetupSectionTests.java index 5b128805d8004..003eeff420047 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetupSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SetupSectionTests.java @@ -20,6 +20,9 @@ import org.opensearch.Version; import org.opensearch.common.xcontent.yaml.YamlXContent; +import org.opensearch.test.rest.yaml.section.DoSection; +import org.opensearch.test.rest.yaml.section.SetSection; +import org.opensearch.test.rest.yaml.section.SetupSection; import java.io.IOException; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java index 09e56189610fd..e4117500c8402 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/SkipSectionTests.java @@ -22,7 +22,8 @@ import org.opensearch.Version; import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.VersionUtils; +import org.opensearch.test.rest.yaml.section.SkipSection; import java.util.Collections; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TeardownSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TeardownSectionTests.java index 965c75f55955c..1933fa86d127f 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TeardownSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TeardownSectionTests.java @@ -21,6 +21,8 @@ import org.opensearch.Version; import org.opensearch.common.xcontent.yaml.YamlXContent; +import org.opensearch.test.rest.yaml.section.DoSection; +import org.opensearch.test.rest.yaml.section.TeardownSection; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSectionTests.java b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSectionTests.java index efdc8f4c090c9..9fc46d1646aa8 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSectionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/rest/yaml/section/TransformAndSetSectionTests.java @@ -21,8 +21,9 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.rest.yaml.ClientYamlTestExecutionContext; -import org.elasticsearch.test.rest.yaml.Stash; +import org.opensearch.test.rest.yaml.ClientYamlTestExecutionContext; +import org.opensearch.test.rest.yaml.Stash; +import org.opensearch.test.rest.yaml.section.TransformAndSetSection; import java.nio.charset.StandardCharsets; import java.util.Base64; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java index 2974eea92d40b..836908436f57d 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterIT.java @@ -20,16 +20,16 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.ESIntegTestCase.ClusterScope; -import org.elasticsearch.test.InternalTestCluster; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; +import org.opensearch.test.InternalTestCluster; import java.io.IOException; import static org.hamcrest.Matchers.lessThanOrEqualTo; -@ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) -public class InternalTestClusterIT extends ESIntegTestCase { +@ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0) +public class InternalTestClusterIT extends OpenSearchIntegTestCase { public void testStartingAndStoppingNodes() throws IOException { logger.info("--> cluster has [{}] nodes", internalCluster().size()); diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index 9b146d9f5bdc3..7556bc19b3a61 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -32,10 +32,10 @@ import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.opensearch.plugins.Plugin; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.InternalTestCluster; -import org.elasticsearch.test.MockHttpTransport; -import org.elasticsearch.test.NodeConfigurationSource; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.InternalTestCluster; +import org.opensearch.test.MockHttpTransport; +import org.opensearch.test.NodeConfigurationSource; import java.io.IOException; import java.nio.file.Files; @@ -55,8 +55,8 @@ import java.util.stream.Collectors; import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileExists; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileNotExists; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertFileExists; +import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertFileNotExists; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; @@ -65,7 +65,7 @@ * configuration given the same seed / input. */ @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet -public class InternalTestClusterTests extends ESTestCase { +public class InternalTestClusterTests extends OpenSearchTestCase { private static Collection> mockPlugins() { return Arrays.asList(getTestTransportPlugin(), MockHttpTransport.TestPlugin.class); diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java index b886d5727dea0..07c7c4bd7096d 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java @@ -22,10 +22,10 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.junit.annotations.TestIssueLogging; -import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.junit.listeners.LoggingListener; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.junit.annotations.TestIssueLogging; +import org.opensearch.test.junit.annotations.TestLogging; +import org.opensearch.test.junit.listeners.LoggingListener; import org.junit.runner.Description; import org.junit.runner.Result; @@ -38,7 +38,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.hasToString; -public class LoggingListenerTests extends ESTestCase { +public class LoggingListenerTests extends OpenSearchTestCase { public void testTestRunStartedSupportsClassInDefaultPackage() throws Exception { LoggingListener loggingListener = new LoggingListener(); diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/ESTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/OpenSearchTestCaseTests.java similarity index 95% rename from test/framework/src/test/java/org/elasticsearch/test/test/ESTestCaseTests.java rename to test/framework/src/test/java/org/elasticsearch/test/test/OpenSearchTestCaseTests.java index f24a4a6488b88..012940deaa57f 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/ESTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/OpenSearchTestCaseTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.RandomObjects; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.RandomObjects; import java.io.IOException; import java.util.ArrayList; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; -public class ESTestCaseTests extends ESTestCase { +public class OpenSearchTestCaseTests extends OpenSearchTestCase { public void testExpectThrows() { IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> { @@ -174,7 +174,7 @@ public void testRandomUniqueNormalUsageAlwayMoreThanOne() { public void testRandomValueOtherThan() { // "normal" way of calling where the value is not null int bad = randomInt(); - assertNotEquals(bad, (int) randomValueOtherThan(bad, ESTestCase::randomInt)); + assertNotEquals(bad, (int) randomValueOtherThan(bad, OpenSearchTestCase::randomInt)); /* * "funny" way of calling where the value is null. This once @@ -188,18 +188,18 @@ public void testRandomValueOtherThan() { public void testWorkerSystemProperty() { assumeTrue("requires running tests with Gradle", System.getProperty("tests.gradle") != null); - assertThat(ESTestCase.TEST_WORKER_VM_ID, not(equals(ESTestCase.DEFAULT_TEST_WORKER_ID))); + assertThat(OpenSearchTestCase.TEST_WORKER_VM_ID, not(equals(OpenSearchTestCase.DEFAULT_TEST_WORKER_ID))); } public void testBasePortGradle() { assumeTrue("requires running tests with Gradle", System.getProperty("tests.gradle") != null); // Gradle worker IDs are 1 based - assertNotEquals(10300, ESTestCase.getBasePort()); + assertNotEquals(10300, OpenSearchTestCase.getBasePort()); } public void testBasePortIDE() { assumeTrue("requires running tests without Gradle", System.getProperty("tests.gradle") == null); - assertEquals(10300, ESTestCase.getBasePort()); + assertEquals(10300, OpenSearchTestCase.getBasePort()); } @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/61496") diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java b/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java index f97ce5f4cb576..d2f0b390b008c 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java @@ -20,8 +20,8 @@ import com.carrotsearch.randomizedtesting.annotations.Repeat; import org.opensearch.common.SuppressForbidden; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.TestCluster; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.TestCluster; import org.junit.Test; import java.io.IOException; @@ -32,8 +32,8 @@ * This test ensures that the cluster initializion for suite scope is not influencing * the tests random sequence due to initializtion using the same random instance. */ -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) -public class SuiteScopeClusterIT extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE) +public class SuiteScopeClusterIT extends OpenSearchIntegTestCase { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; private static Long CLUSTER_SEED = null; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java b/test/framework/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java index 8ef383050184b..c338f75542406 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java @@ -18,8 +18,8 @@ */ package org.elasticsearch.test.test; -import org.elasticsearch.test.ESIntegTestCase; -import org.elasticsearch.test.TestCluster; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.opensearch.test.TestCluster; import java.io.IOException; @@ -29,8 +29,8 @@ * This test ensures that the cluster initializion for TEST scope is not influencing * the tests random sequence due to initializtion using the same random instance. */ -@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) -public class TestScopeClusterIT extends ESIntegTestCase { +@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST) +public class TestScopeClusterIT extends OpenSearchIntegTestCase { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; private static Long CLUSTER_SEED = null; diff --git a/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java b/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java index 23aaa55f4397e..6f4402fecb182 100644 --- a/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java @@ -19,10 +19,9 @@ package org.opensearch.cluster.coordination; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; @@ -44,7 +43,7 @@ import static org.hamcrest.Matchers.oneOf; import static org.hamcrest.core.Is.is; -public class DeterministicTaskQueueTests extends ESTestCase { +public class DeterministicTaskQueueTests extends OpenSearchTestCase { public void testRunRandomTask() { final DeterministicTaskQueue taskQueue = newTaskQueue(); diff --git a/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java index 94ec19f4f5fad..8f9f6aa19753e 100644 --- a/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java @@ -18,16 +18,14 @@ */ package org.opensearch.cluster.coordination; -import org.opensearch.cluster.coordination.DeterministicTaskQueue; -import org.opensearch.cluster.coordination.MockSinglePrioritizingExecutor; import org.opensearch.common.Priority; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.common.util.concurrent.PrioritizedRunnable; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.atomic.AtomicBoolean; -public class MockSinglePrioritizingExecutorTests extends ESTestCase { +public class MockSinglePrioritizingExecutorTests extends OpenSearchTestCase { public void testPrioritizedEsThreadPoolExecutor() { final DeterministicTaskQueue taskQueue = DeterministicTaskQueueTests.newTaskQueue(); diff --git a/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java b/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java index 93b76b60bc882..7f9bd91b17300 100644 --- a/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java @@ -27,10 +27,9 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.opensearch.cluster.service.FakeThreadPoolMasterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; import java.util.ArrayList; @@ -49,12 +48,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class FakeThreadPoolMasterServiceTests extends ESTestCase { +public class FakeThreadPoolMasterServiceTests extends OpenSearchTestCase { public void testFakeMasterService() { List runnableTasks = new ArrayList<>(); AtomicReference lastClusterStateRef = new AtomicReference<>(); - DiscoveryNode discoveryNode = new DiscoveryNode("node", ESTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), + DiscoveryNode discoveryNode = new DiscoveryNode("node", OpenSearchTestCase.buildNewFakeTransportAddress(), Collections.emptyMap(), new HashSet<>(DiscoveryNodeRole.BUILT_IN_ROLES), Version.CURRENT); lastClusterStateRef.set(ClusterStateCreationUtils.state(discoveryNode, discoveryNode)); long firstClusterStateVersion = lastClusterStateRef.get().version(); diff --git a/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java b/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java index ba6fc1f2ca31f..ce6bd0b284509 100644 --- a/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java +++ b/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java @@ -19,13 +19,13 @@ package org.opensearch.common.logging; -import org.opensearch.common.util.concurrent.EsExecutors; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.common.util.concurrent.OpenSearchExecutors; +import org.opensearch.test.OpenSearchTestCase; import org.junit.BeforeClass; import static org.opensearch.common.logging.TestThreadInfoPatternConverter.threadInfo; -public class TestThreadInfoPatternConverterTests extends ESTestCase { +public class TestThreadInfoPatternConverterTests extends OpenSearchTestCase { private static String suiteInfo; @BeforeClass @@ -36,7 +36,7 @@ public static void captureSuiteInfo() { public void testThreadInfo() { // Threads that are part of a node get the node name String nodeName = randomAlphaOfLength(5); - String threadName = EsExecutors.threadName(nodeName, randomAlphaOfLength(20)) + String threadName = OpenSearchExecutors.threadName(nodeName, randomAlphaOfLength(20)) + "[T#" + between(0, 1000) + "]"; assertEquals(nodeName, threadInfo(threadName)); diff --git a/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java b/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java index 162a30c6b085a..691f2c909c7fa 100644 --- a/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java +++ b/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java @@ -19,10 +19,9 @@ package org.opensearch.common.util; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.junit.Rule; import org.junit.rules.ExpectedException; -import org.opensearch.common.util.NamedFormatter; import java.util.HashMap; import java.util.Map; @@ -30,7 +29,7 @@ import static java.util.Collections.singletonMap; import static org.hamcrest.Matchers.equalTo; -public class NamedFormatterTests extends ESTestCase { +public class NamedFormatterTests extends OpenSearchTestCase { @Rule public ExpectedException thrown = ExpectedException.none(); diff --git a/test/framework/src/test/java/org/opensearch/node/MockNodeTests.java b/test/framework/src/test/java/org/opensearch/node/MockNodeTests.java index 8de4df9a798d4..3977cc8211e39 100644 --- a/test/framework/src/test/java/org/opensearch/node/MockNodeTests.java +++ b/test/framework/src/test/java/org/opensearch/node/MockNodeTests.java @@ -26,14 +26,14 @@ import org.opensearch.plugins.Plugin; import org.opensearch.search.MockSearchService; import org.opensearch.search.SearchService; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockHttpTransport; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockHttpTransport; import java.io.IOException; import java.util.ArrayList; import java.util.List; -public class MockNodeTests extends ESTestCase { +public class MockNodeTests extends OpenSearchTestCase { /** * Test that we add the appropriate mock services when their plugins are added. This is a very heavy test for a testing component but * we've broken it in the past so it is important. diff --git a/test/framework/src/test/java/org/opensearch/search/MockSearchServiceTests.java b/test/framework/src/test/java/org/opensearch/search/MockSearchServiceTests.java index 7aa6f4b48b48c..817eaf06dda22 100644 --- a/test/framework/src/test/java/org/opensearch/search/MockSearchServiceTests.java +++ b/test/framework/src/test/java/org/opensearch/search/MockSearchServiceTests.java @@ -20,11 +20,11 @@ package org.opensearch.search; import org.opensearch.search.internal.ReaderContext; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import static org.mockito.Mockito.mock; -public class MockSearchServiceTests extends ESTestCase { +public class MockSearchServiceTests extends OpenSearchTestCase { public void testAssertNoInFlightContext() { ReaderContext reader = mock(ReaderContext.class); diff --git a/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java b/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java index 714ad2c36d99e..d353cbe5108c6 100644 --- a/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java +++ b/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java @@ -26,8 +26,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.nio.ServerChannelContext; import org.opensearch.nio.SocketChannelContext; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.MockLogAppender; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.MockLogAppender; import org.opensearch.threadpool.ThreadPool; import java.util.HashMap; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -public class TestEventHandlerTests extends ESTestCase { +public class TestEventHandlerTests extends OpenSearchTestCase { private MockLogAppender appender; diff --git a/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/ESLoggerUsageTests.java b/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/OpenSearchLoggerUsageTests.java similarity index 98% rename from test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/ESLoggerUsageTests.java rename to test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/OpenSearchLoggerUsageTests.java index ffd05d35824d7..09b3beab33633 100644 --- a/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/ESLoggerUsageTests.java +++ b/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/OpenSearchLoggerUsageTests.java @@ -27,7 +27,7 @@ import org.apache.logging.log4j.util.Supplier; import org.opensearch.common.SuppressLoggerChecks; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.test.ESTestCase; +import org.opensearch.test.OpenSearchTestCase; import org.elasticsearch.test.loggerusage.ESLoggerUsageChecker.WrongLoggerUsage; import java.io.IOException; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.oneOf; -public class ESLoggerUsageTests extends ESTestCase { +public class OpenSearchLoggerUsageTests extends OpenSearchTestCase { public void testLoggerUsageChecks() throws IOException { for (Method method : getClass().getMethods()) { @@ -246,7 +246,7 @@ public void checkFailComplexUsage2(boolean b) { } public void checkDeprecationLogger() { - DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(ESLoggerUsageTests.class); + DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(OpenSearchLoggerUsageTests.class); deprecationLogger.deprecate("key","message {}", 123); } diff --git a/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/TestMessage.java b/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/TestMessage.java index fa25d506ba4dc..27a523677572a 100644 --- a/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/TestMessage.java +++ b/test/logger-usage/src/test/java/org/elasticsearch/test/loggerusage/TestMessage.java @@ -24,7 +24,7 @@ /** * This class is for testing that ESLoggerUsageChecker can find incorrect usages of LogMessages * which are subclasses of ParametrizedMessage - * @see ESLoggerUsageTests + * @see OpenSearchLoggerUsageTests */ class TestMessage extends ParameterizedMessage { TestMessage(String messagePattern, String xOpaqueId, Object... args) {