From fb7a234040e2a2780ab4edbb3c89e50b9c7743e3 Mon Sep 17 00:00:00 2001 From: Simon Willnauer Date: Fri, 8 Nov 2013 23:56:44 +0100 Subject: [PATCH] s/AbstractIntegrationTest/ElasticsearchIntegrationTest --- .../java/org/elasticsearch/aliases/IndexAliasesTests.java | 4 ++-- .../java/org/elasticsearch/blocks/SimpleBlocksTests.java | 4 ++-- .../elasticsearch/broadcast/BroadcastActionsTests.java | 4 ++-- .../org/elasticsearch/cluster/ClusterHealthTests.java | 4 ++-- .../org/elasticsearch/cluster/ClusterServiceTests.java | 8 ++++---- .../elasticsearch/cluster/MinimumMasterNodesTests.java | 8 ++++---- .../java/org/elasticsearch/cluster/NoMasterNodeTests.java | 8 ++++---- .../org/elasticsearch/cluster/SimpleDataNodesTests.java | 8 ++++---- .../elasticsearch/cluster/SpecificMasterNodesTests.java | 8 ++++---- .../cluster/UpdateSettingsValidationTests.java | 8 ++++---- src/test/java/org/elasticsearch/cluster/ack/AckTests.java | 8 ++++---- .../cluster/allocation/AwarenessAllocationTests.java | 8 ++++---- .../cluster/allocation/ClusterRerouteTests.java | 8 ++++---- .../cluster/allocation/FilteringAllocationTests.java | 8 ++++---- .../cluster/allocation/ShardsAllocatorModuleTests.java | 8 ++++---- .../cluster/allocation/SimpleAllocationTests.java | 4 ++-- .../cluster/shards/ClusterSearchShardsTests.java | 8 ++++---- src/test/java/org/elasticsearch/codecs/CodecTests.java | 4 ++-- .../consistencylevel/WriteConsistencyLevelTests.java | 4 ++-- .../org/elasticsearch/count/query/SimpleQueryTests.java | 4 ++-- .../org/elasticsearch/count/simple/SimpleCountTests.java | 4 ++-- .../elasticsearch/deleteByQuery/DeleteByQueryTests.java | 4 ++-- .../java/org/elasticsearch/discovery/DiscoveryTests.java | 8 ++++---- src/test/java/org/elasticsearch/document/BulkTests.java | 4 ++-- .../org/elasticsearch/document/DocumentActionsTests.java | 4 ++-- .../org/elasticsearch/explain/ExplainActionTests.java | 4 ++-- .../org/elasticsearch/flt/FuzzyLikeThisActionTests.java | 4 ++-- .../org/elasticsearch/gateway/fs/IndexGatewayTests.java | 8 ++++---- .../gateway/local/LocalGatewayIndexStateTests.java | 6 +++--- .../gateway/local/QuorumLocalGatewayTests.java | 8 ++++---- .../gateway/local/SimpleRecoveryLocalGatewayTests.java | 8 ++++---- .../gateway/none/RecoverAfterNodesTests.java | 8 ++++---- src/test/java/org/elasticsearch/get/GetActionTests.java | 4 ++-- .../org/elasticsearch/index/IndexRequestBuilderTests.java | 4 ++-- .../index/analysis/PreBuiltAnalyzerIntegrationTests.java | 4 ++-- .../index/engine/robin/RobinEngineIntegrationTest.java | 4 ++-- .../index/fielddata/FieldDataFilterIntegrationTests.java | 4 ++-- .../java/org/elasticsearch/indexing/IndexActionTests.java | 4 ++-- .../indexlifecycle/IndexLifecycleActionTests.java | 8 ++++---- .../org/elasticsearch/indices/IgnoreIndicesTests.java | 4 ++-- .../elasticsearch/indices/analyze/AnalyzeActionTests.java | 4 ++-- .../indices/analyze/HunspellServiceTests.java | 8 ++++---- .../java/org/elasticsearch/indices/cache/CacheTests.java | 8 ++++---- .../indices/exists/types/TypesExistsTests.java | 4 ++-- .../elasticsearch/indices/leaks/IndicesLeaksTests.java | 8 ++++---- .../indices/mapping/ConcurrentDynamicTemplateTests.java | 4 ++-- .../indices/mapping/SimpleDeleteMappingTests.java | 4 ++-- .../indices/mapping/SimpleGetFieldMappingsTests.java | 4 ++-- .../indices/mapping/SimpleGetMappingsTests.java | 4 ++-- .../elasticsearch/indices/mapping/UpdateMappingTests.java | 4 ++-- .../indices/settings/UpdateNumberOfReplicasTests.java | 4 ++-- .../indices/settings/UpdateSettingsTests.java | 4 ++-- .../indices/state/CloseIndexDisableCloseAllTests.java | 8 ++++---- .../elasticsearch/indices/state/OpenCloseIndexTests.java | 4 ++-- .../indices/state/SimpleIndexStateTests.java | 4 ++-- .../indices/stats/SimpleIndexStatsTests.java | 8 ++++---- .../elasticsearch/indices/store/IndicesStoreTests.java | 8 ++++---- .../indices/store/SimpleDistributorTests.java | 8 ++++---- .../indices/template/SimpleIndexTemplateTests.java | 4 ++-- .../indices/warmer/LocalGatewayIndicesWarmerTests.java | 8 ++++---- .../indices/warmer/SimpleIndicesWarmerTests.java | 4 ++-- src/test/java/org/elasticsearch/mget/SimpleMgetTests.java | 4 ++-- .../org/elasticsearch/mlt/MoreLikeThisActionTests.java | 4 ++-- .../java/org/elasticsearch/nested/SimpleNestedTests.java | 4 ++-- .../org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java | 8 ++++---- .../percolator/ConcurrentPercolatorTests.java | 4 ++-- .../elasticsearch/percolator/MultiPercolatorTests.java | 4 ++-- .../elasticsearch/percolator/PercolatorFacetsTests.java | 4 ++-- .../org/elasticsearch/percolator/PercolatorTests.java | 4 ++-- .../elasticsearch/percolator/RecoveryPercolatorTests.java | 8 ++++---- .../org/elasticsearch/percolator/TTLPercolatorTests.java | 8 ++++---- .../java/org/elasticsearch/plugin/PluginManagerTests.java | 8 ++++---- .../elasticsearch/plugin/ResponseHeaderPluginTests.java | 8 ++++---- .../java/org/elasticsearch/plugin/SitePluginTests.java | 8 ++++---- .../elasticsearch/recovery/FullRollingRestartTests.java | 8 ++++---- .../recovery/RecoveryWhileUnderLoadTests.java | 4 ++-- .../java/org/elasticsearch/recovery/RelocationTests.java | 8 ++++---- .../org/elasticsearch/recovery/SimpleRecoveryTests.java | 4 ++-- .../elasticsearch/routing/AliasResolveRoutingTests.java | 4 ++-- .../java/org/elasticsearch/routing/AliasRoutingTests.java | 4 ++-- .../org/elasticsearch/routing/SimpleRoutingTests.java | 4 ++-- .../search/basic/SearchWhileCreatingIndexTests.java | 4 ++-- .../search/basic/SearchWhileRelocatingTests.java | 4 ++-- .../search/basic/SearchWithRandomExceptionsTests.java | 4 ++-- .../search/basic/TransportSearchFailuresTests.java | 4 ++-- .../search/basic/TransportTwoNodesSearchTests.java | 4 ++-- .../search/child/SimpleChildQuerySearchTests.java | 4 ++-- .../search/compress/SearchSourceCompressTests.java | 4 ++-- .../search/customscore/CustomScoreSearchTests.java | 4 ++-- .../elasticsearch/search/facet/ExtendedFacetsTests.java | 4 ++-- .../org/elasticsearch/search/facet/SimpleFacetsTests.java | 4 ++-- .../search/facet/terms/ShardSizeTermsFacetTests.java | 8 ++++---- .../facet/terms/UnmappedFieldsTermsFacetsTests.java | 4 ++-- .../facet/termsstats/ShardSizeTermsStatsFacetTests.java | 8 ++++---- .../elasticsearch/search/fields/SearchFieldsTests.java | 4 ++-- .../search/functionscore/DecayFunctionScoreTests.java | 4 ++-- .../search/functionscore/FunctionScorePluginTests.java | 8 ++++---- .../search/functionscore/RandomScoreFunctionTests.java | 4 ++-- .../org/elasticsearch/search/geo/GeoBoundingBoxTests.java | 4 ++-- .../elasticsearch/search/geo/GeoDistanceFacetTests.java | 4 ++-- .../org/elasticsearch/search/geo/GeoDistanceTests.java | 4 ++-- .../java/org/elasticsearch/search/geo/GeoFilterTests.java | 4 ++-- .../search/geo/GeoShapeIntegrationTests.java | 4 ++-- .../search/highlight/CustomHighlighterSearchTests.java | 8 ++++---- .../search/highlight/HighlighterSearchTests.java | 4 ++-- .../indicesboost/SimpleIndicesBoostSearchTests.java | 4 ++-- .../search/matchedqueries/MatchedQueriesTests.java | 4 ++-- .../search/msearch/SimpleMultiSearchTests.java | 4 ++-- .../search/preference/SearchPreferenceTests.java | 4 ++-- .../org/elasticsearch/search/query/SimpleQueryTests.java | 4 ++-- .../elasticsearch/search/rescore/QueryRescorerTests.java | 4 ++-- .../search/scan/SearchScanScrollingTests.java | 4 ++-- .../org/elasticsearch/search/scan/SearchScanTests.java | 4 ++-- .../search/scriptfilter/ScriptFilterSearchTests.java | 4 ++-- .../elasticsearch/search/scroll/SearchScrollTests.java | 4 ++-- .../elasticsearch/search/simple/SimpleSearchTests.java | 4 ++-- .../org/elasticsearch/search/sort/SimpleSortTests.java | 4 ++-- .../elasticsearch/search/source/SourceFetchingTests.java | 4 ++-- .../org/elasticsearch/search/stats/SearchStatsTests.java | 4 ++-- .../search/suggest/CompletionSuggestSearchTests.java | 4 ++-- .../search/suggest/CustomSuggesterSearchTests.java | 8 ++++---- .../elasticsearch/search/suggest/SuggestSearchTests.java | 4 ++-- .../elasticsearch/search/timeout/SearchTimeoutTests.java | 4 ++-- .../org/elasticsearch/similarity/SimilarityTests.java | 4 ++-- .../termvectors/AbstractTermVectorTests.java | 4 ++-- .../termvectors/GetTermVectorCheckDocFreqTests.java | 4 ++-- ...grationTest.java => ElasticsearchIntegrationTest.java} | 4 ++-- .../org/elasticsearch/test/engine/MockRobinEngine.java | 4 ++-- .../test/junit/listeners/ReproduceInfoPrinter.java | 6 +++--- .../org/elasticsearch/test/store/MockDirectoryHelper.java | 4 ++-- .../test/transport/AssertingLocalTransport.java | 4 ++-- .../elasticsearch/threadpool/SimpleThreadPoolTests.java | 8 ++++---- .../org/elasticsearch/timestamp/SimpleTimestampTests.java | 4 ++-- src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java | 8 ++++---- src/test/java/org/elasticsearch/update/UpdateTests.java | 4 ++-- .../elasticsearch/validate/SimpleValidateQueryTests.java | 4 ++-- .../versioning/ConcurrentDocumentOperationTests.java | 4 ++-- .../elasticsearch/versioning/SimpleVersioningTests.java | 4 ++-- 138 files changed, 360 insertions(+), 360 deletions(-) rename src/test/java/org/elasticsearch/test/{AbstractIntegrationTest.java => ElasticsearchIntegrationTest.java} (99%) diff --git a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java index c9bfdc9f944..777c9323e9c 100644 --- a/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java +++ b/src/test/java/org/elasticsearch/aliases/IndexAliasesTests.java @@ -40,7 +40,7 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Set; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class IndexAliasesTests extends AbstractIntegrationTest { +public class IndexAliasesTests extends ElasticsearchIntegrationTest { @Test public void testAliases() throws Exception { diff --git a/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java index 35fc7d5eaf8..a782a4373fb 100644 --- a/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java +++ b/src/test/java/org/elasticsearch/blocks/SimpleBlocksTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.HashMap; @@ -37,7 +37,7 @@ import java.util.HashMap; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.notNullValue; -public class SimpleBlocksTests extends AbstractIntegrationTest { +public class SimpleBlocksTests extends ElasticsearchIntegrationTest { @Test public void verifyIndexAndClusterReadOnly() throws Exception { diff --git a/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java index ee36f49da4e..3d3b4c3c85b 100644 --- a/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java +++ b/src/test/java/org/elasticsearch/broadcast/BroadcastActionsTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class BroadcastActionsTests extends AbstractIntegrationTest { +public class BroadcastActionsTests extends ElasticsearchIntegrationTest { @Test public void testBroadcastOperations() throws IOException { diff --git a/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java index 9d66f1f76fc..a6f28d939fb 100644 --- a/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterHealthTests.java @@ -22,12 +22,12 @@ package org.elasticsearch.cluster; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class ClusterHealthTests extends AbstractIntegrationTest { +public class ClusterHealthTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java index 430e1f0157e..160cf254944 100644 --- a/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java +++ b/src/test/java/org/elasticsearch/cluster/ClusterServiceTests.java @@ -33,9 +33,9 @@ import org.elasticsearch.common.inject.Singleton; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class ClusterServiceTests extends AbstractIntegrationTest { +public class ClusterServiceTests extends ElasticsearchIntegrationTest { @Test public void testTimeoutUpdateTask() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java index 12fdcce518f..8e752cf2c5b 100644 --- a/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesTests.java @@ -27,9 +27,9 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.util.concurrent.TimeUnit; @@ -39,7 +39,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = Scope.TEST, numNodes=0) -public class MinimumMasterNodesTests extends AbstractIntegrationTest { +public class MinimumMasterNodesTests extends ElasticsearchIntegrationTest { @Test public void simpleMinimumMasterNodes() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java index d7a19d0ec2c..0793150aacf 100644 --- a/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java +++ b/src/test/java/org/elasticsearch/cluster/NoMasterNodeTests.java @@ -27,9 +27,9 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.util.HashMap; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.greaterThan; /** */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class NoMasterNodeTests extends AbstractIntegrationTest { +public class NoMasterNodeTests extends ElasticsearchIntegrationTest { @Test public void testNoMasterActions() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java b/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java index 7b12040364e..e0e5234fca3 100644 --- a/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/SimpleDataNodesTests.java @@ -23,9 +23,9 @@ import org.elasticsearch.action.UnavailableShardsException; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.client.Requests.createIndexRequest; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class SimpleDataNodesTests extends AbstractIntegrationTest { +public class SimpleDataNodesTests extends ElasticsearchIntegrationTest { @Test public void testDataNodes() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java b/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java index dafc80a6a54..acf27f65bbf 100644 --- a/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java +++ b/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesTests.java @@ -23,9 +23,9 @@ import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.index.query.FilterBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class SpecificMasterNodesTests extends AbstractIntegrationTest { +public class SpecificMasterNodesTests extends ElasticsearchIntegrationTest { protected final ImmutableSettings.Builder settingsBuilder() { return ImmutableSettings.builder().put("discovery.type", "zen"); diff --git a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java index ad777517c55..23d7e8b40e1 100644 --- a/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java +++ b/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationTests.java @@ -22,9 +22,9 @@ package org.elasticsearch.cluster; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class UpdateSettingsValidationTests extends AbstractIntegrationTest { +public class UpdateSettingsValidationTests extends ElasticsearchIntegrationTest { @Test public void testUpdateSettingsValidation() throws Exception { diff --git a/src/test/java/org/elasticsearch/cluster/ack/AckTests.java b/src/test/java/org/elasticsearch/cluster/ack/AckTests.java index 3a2d385d1b5..3db0fc0e011 100644 --- a/src/test/java/org/elasticsearch/cluster/ack/AckTests.java +++ b/src/test/java/org/elasticsearch/cluster/ack/AckTests.java @@ -39,18 +39,18 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; import static org.hamcrest.Matchers.*; @ClusterScope(scope = SUITE) -public class AckTests extends AbstractIntegrationTest { +public class AckTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java index e1f4fdfaaec..14fa84e7216 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationTests.java @@ -31,9 +31,9 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class AwarenessAllocationTests extends AbstractIntegrationTest { +public class AwarenessAllocationTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(AwarenessAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java index d4cd129f196..d519895c001 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteTests.java @@ -33,9 +33,9 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.io.File; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class ClusterRerouteTests extends AbstractIntegrationTest { +public class ClusterRerouteTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(ClusterRerouteTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java index 9bbea5b043b..75b55759f15 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationTests.java @@ -27,16 +27,16 @@ import org.elasticsearch.cluster.routing.allocation.decider.ThrottlingAllocation import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope=Scope.TEST, numNodes=0) -public class FilteringAllocationTests extends AbstractIntegrationTest { +public class FilteringAllocationTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(FilteringAllocationTests.class); diff --git a/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java b/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java index 4a842575d3c..28699170208 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java @@ -25,15 +25,15 @@ import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocatorModule; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.instanceOf; @ClusterScope(scope=Scope.TEST, numNodes=0) -public class ShardsAllocatorModuleTests extends AbstractIntegrationTest { +public class ShardsAllocatorModuleTests extends ElasticsearchIntegrationTest { public void testLoadDefaultShardsAllocator() { diff --git a/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java b/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java index 3e90ce3f682..256bd0ea3ed 100644 --- a/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java +++ b/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.cluster.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; @@ -30,7 +30,7 @@ import java.util.Map.Entry; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class SimpleAllocationTests extends AbstractIntegrationTest { +public class SimpleAllocationTests extends ElasticsearchIntegrationTest { /** * Test for diff --git a/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java b/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java index 082d61606a6..8ea94ef0ffc 100644 --- a/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java +++ b/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsTests.java @@ -23,9 +23,9 @@ import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsResponse import org.elasticsearch.cluster.metadata.AliasAction; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope=Scope.SUITE, numNodes=2) -public class ClusterSearchShardsTests extends AbstractIntegrationTest { +public class ClusterSearchShardsTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/codecs/CodecTests.java b/src/test/java/org/elasticsearch/codecs/CodecTests.java index a3bdd397e8b..6b2f437b055 100644 --- a/src/test/java/org/elasticsearch/codecs/CodecTests.java +++ b/src/test/java/org/elasticsearch/codecs/CodecTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class CodecTests extends AbstractIntegrationTest { +public class CodecTests extends ElasticsearchIntegrationTest { @Test public void testFieldsWithCustomPostingsFormat() throws Exception { diff --git a/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java b/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java index 79cad4747dc..3e9829ff00c 100644 --- a/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java +++ b/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class WriteConsistencyLevelTests extends AbstractIntegrationTest { +public class WriteConsistencyLevelTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java index c3c4ba06182..9f994b6a6bb 100644 --- a/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/count/query/SimpleQueryTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.*; import org.elasticsearch.index.query.CommonTermsQueryBuilder.Operator; import org.elasticsearch.index.query.MatchQueryBuilder.Type; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleQueryTests extends AbstractIntegrationTest { +public class SimpleQueryTests extends ElasticsearchIntegrationTest { @Test public void passQueryAsStringTest() throws Exception { diff --git a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java index dd176e9e0fd..63c156603e9 100644 --- a/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java +++ b/src/test/java/org/elasticsearch/count/simple/SimpleCountTests.java @@ -4,7 +4,7 @@ import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.concurrent.ExecutionException; @@ -15,7 +15,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -public class SimpleCountTests extends AbstractIntegrationTest { +public class SimpleCountTests extends ElasticsearchIntegrationTest { @Test public void testCountRandomPreference() throws InterruptedException, ExecutionException { diff --git a/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java index c5429e643d8..59e0432b32f 100644 --- a/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java +++ b/src/test/java/org/elasticsearch/deleteByQuery/DeleteByQueryTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Assert; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class DeleteByQueryTests extends AbstractIntegrationTest { +public class DeleteByQueryTests extends ElasticsearchIntegrationTest { @Test public void testDeleteAllNoIndices() { diff --git a/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java b/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java index e2705070424..b099294feef 100644 --- a/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java +++ b/src/test/java/org/elasticsearch/discovery/DiscoveryTests.java @@ -22,15 +22,15 @@ package org.elasticsearch.discovery; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope=Scope.SUITE, numNodes=2) -public class DiscoveryTests extends AbstractIntegrationTest { +public class DiscoveryTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/document/BulkTests.java b/src/test/java/org/elasticsearch/document/BulkTests.java index 1f7c44581a0..ac8443446b7 100644 --- a/src/test/java/org/elasticsearch/document/BulkTests.java +++ b/src/test/java/org/elasticsearch/document/BulkTests.java @@ -12,7 +12,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.concurrent.CyclicBarrier; @@ -24,7 +24,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class BulkTests extends AbstractIntegrationTest { +public class BulkTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java index 893b1542151..68f653481b4 100644 --- a/src/test/java/org/elasticsearch/document/DocumentActionsTests.java +++ b/src/test/java/org/elasticsearch/document/DocumentActionsTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.action.support.broadcast.BroadcastOperationThreading; import org.elasticsearch.action.support.replication.ReplicationType; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class DocumentActionsTests extends AbstractIntegrationTest { +public class DocumentActionsTests extends ElasticsearchIntegrationTest { protected void createIndex() { wipeIndex(getConcreteIndexName()); diff --git a/src/test/java/org/elasticsearch/explain/ExplainActionTests.java b/src/test/java/org/elasticsearch/explain/ExplainActionTests.java index 9e9218b0240..c169ee4be0e 100644 --- a/src/test/java/org/elasticsearch/explain/ExplainActionTests.java +++ b/src/test/java/org/elasticsearch/explain/ExplainActionTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.explain.ExplainResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class ExplainActionTests extends AbstractIntegrationTest { +public class ExplainActionTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java index 4c8c28daaee..0d7ad48567e 100644 --- a/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/flt/FuzzyLikeThisActionTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.flt; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class FuzzyLikeThisActionTests extends AbstractIntegrationTest { +public class FuzzyLikeThisActionTests extends ElasticsearchIntegrationTest { @Test // See issue https://github.com/elasticsearch/elasticsearch/issues/3252 diff --git a/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java b/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java index c5c6ffd5956..3317d5f6f2d 100644 --- a/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/fs/IndexGatewayTests.java @@ -38,9 +38,9 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.indices.IndexAlreadyExistsException; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.client.Requests.*; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class IndexGatewayTests extends AbstractIntegrationTest { +public class IndexGatewayTests extends ElasticsearchIntegrationTest { private String storeType; private final SetOnce settings = new SetOnce(); diff --git a/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java b/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java index 373aed5f3e9..5086674cbd7 100644 --- a/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/LocalGatewayIndexStateTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.gateway.Gateway; import org.elasticsearch.test.*; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster.RestartCallback; import org.junit.Test; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.nullValue; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class LocalGatewayIndexStateTests extends AbstractIntegrationTest { +public class LocalGatewayIndexStateTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(LocalGatewayIndexStateTests.class); diff --git a/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java index 1725a743466..0d3e413f95c 100644 --- a/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/QuorumLocalGatewayTests.java @@ -26,9 +26,9 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster.RestartCallback; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(numNodes=0, scope=Scope.TEST) -public class QuorumLocalGatewayTests extends AbstractIntegrationTest { +public class QuorumLocalGatewayTests extends ElasticsearchIntegrationTest { @Test @Slow diff --git a/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java index 0cdec3a3c6c..48b6b5edeb8 100644 --- a/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java +++ b/src/test/java/org/elasticsearch/gateway/local/SimpleRecoveryLocalGatewayTests.java @@ -35,9 +35,9 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster.RestartCallback; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(numNodes = 0, scope = Scope.TEST) -public class SimpleRecoveryLocalGatewayTests extends AbstractIntegrationTest { +public class SimpleRecoveryLocalGatewayTests extends ElasticsearchIntegrationTest { private ImmutableSettings.Builder settingsBuilder() { diff --git a/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java b/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java index 11598a067a8..4f4b828b005 100644 --- a/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java +++ b/src/test/java/org/elasticsearch/gateway/none/RecoverAfterNodesTests.java @@ -26,9 +26,9 @@ import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.gateway.GatewayService; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.hasItem; * */ @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class RecoverAfterNodesTests extends AbstractIntegrationTest { +public class RecoverAfterNodesTests extends ElasticsearchIntegrationTest { private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(1); diff --git a/src/test/java/org/elasticsearch/get/GetActionTests.java b/src/test/java/org/elasticsearch/get/GetActionTests.java index 3a19853a9ae..fca6a28759d 100644 --- a/src/test/java/org/elasticsearch/get/GetActionTests.java +++ b/src/test/java/org/elasticsearch/get/GetActionTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; @@ -41,7 +41,7 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.*; -public class GetActionTests extends AbstractIntegrationTest { +public class GetActionTests extends ElasticsearchIntegrationTest { @Test public void simpleGetTests() { diff --git a/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java b/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java index 526606ba11a..08e8548a875 100644 --- a/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java +++ b/src/test/java/org/elasticsearch/index/IndexRequestBuilderTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutionException; -public class IndexRequestBuilderTests extends AbstractIntegrationTest { +public class IndexRequestBuilderTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerIntegrationTests.java b/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerIntegrationTests.java index dd446a94b82..74445fa0238 100644 --- a/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerIntegrationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.lang.reflect.Field; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class PreBuiltAnalyzerIntegrationTests extends AbstractIntegrationTest { +public class PreBuiltAnalyzerIntegrationTests extends ElasticsearchIntegrationTest { @Test public void testThatPreBuiltAnalyzersAreNotClosedOnIndexClose() throws Exception { diff --git a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java index 9ca9215b5ff..2e010083e30 100644 --- a/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java +++ b/src/test/java/org/elasticsearch/index/engine/robin/RobinEngineIntegrationTest.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.index.engine.Segment; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -39,7 +39,7 @@ import java.util.Collection; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -public class RobinEngineIntegrationTest extends AbstractIntegrationTest { +public class RobinEngineIntegrationTest extends ElasticsearchIntegrationTest { @Test public void testSetIndexCompoundOnFlush() { diff --git a/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java b/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java index a79e0d2d53c..364f47b1c4f 100644 --- a/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.facet.Facets; import org.elasticsearch.search.facet.terms.TermsFacet; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.facet.FacetBuilders.termsFacet; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -public class FieldDataFilterIntegrationTests extends AbstractIntegrationTest { +public class FieldDataFilterIntegrationTests extends ElasticsearchIntegrationTest { @Test public void testRegexpFilter() throws IOException { diff --git a/src/test/java/org/elasticsearch/indexing/IndexActionTests.java b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java index df60746b44d..3816ed622fa 100644 --- a/src/test/java/org/elasticsearch/indexing/IndexActionTests.java +++ b/src/test/java/org/elasticsearch/indexing/IndexActionTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.indexing; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.index.VersionType; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.ArrayList; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class IndexActionTests extends AbstractIntegrationTest { +public class IndexActionTests extends ElasticsearchIntegrationTest { @Test public void testCreatedFlag() throws Exception { diff --git a/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java b/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java index 53638a7461b..267b558d84a 100644 --- a/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java +++ b/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionTests.java @@ -30,9 +30,9 @@ import org.elasticsearch.cluster.routing.RoutingNode; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class IndexLifecycleActionTests extends AbstractIntegrationTest { +public class IndexLifecycleActionTests extends ElasticsearchIntegrationTest { @Slow @Test diff --git a/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java b/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java index 05c072ba787..6ac444ba642 100644 --- a/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java +++ b/src/test/java/org/elasticsearch/indices/IgnoreIndicesTests.java @@ -24,12 +24,12 @@ import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.hamcrest.Matchers.*; -public class IgnoreIndicesTests extends AbstractIntegrationTest { +public class IgnoreIndicesTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java index ab1447d2b0b..bdbf0d7ff5b 100644 --- a/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.analyze.AnalyzeRequestBuilder; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class AnalyzeActionTests extends AbstractIntegrationTest { +public class AnalyzeActionTests extends ElasticsearchIntegrationTest { @Test public void simpleAnalyzerTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java b/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java index 7cf302ffd23..1f2494b374e 100644 --- a/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java +++ b/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceTests.java @@ -25,9 +25,9 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.HunspellService; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.notNullValue; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class HunspellServiceTests extends AbstractIntegrationTest { +public class HunspellServiceTests extends ElasticsearchIntegrationTest { @Test public void testLocaleDirectoryWithNodeLevelConfig() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/cache/CacheTests.java b/src/test/java/org/elasticsearch/indices/cache/CacheTests.java index c234d5361ac..40f909a8094 100644 --- a/src/test/java/org/elasticsearch/indices/cache/CacheTests.java +++ b/src/test/java/org/elasticsearch/indices/cache/CacheTests.java @@ -27,9 +27,9 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope=Scope.SUITE, numNodes=1) -public class CacheTests extends AbstractIntegrationTest { +public class CacheTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java b/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java index d409b7cea2a..9cdbb3a340e 100644 --- a/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java +++ b/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsTests.java @@ -24,13 +24,13 @@ import org.elasticsearch.action.admin.indices.exists.types.TypesExistsResponse; import org.elasticsearch.action.support.IgnoreIndices; import org.elasticsearch.client.Client; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.equalTo; -public class TypesExistsTests extends AbstractIntegrationTest { +public class TypesExistsTests extends ElasticsearchIntegrationTest { @Test public void testSimple() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java b/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java index bd88299a456..290b1936067 100644 --- a/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java +++ b/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksTests.java @@ -27,9 +27,9 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.service.IndexService; import org.elasticsearch.index.shard.service.IndexShard; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.lang.ref.WeakReference; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ @ClusterScope(scope=Scope.TEST, numNodes=1) -public class IndicesLeaksTests extends AbstractIntegrationTest { +public class IndicesLeaksTests extends ElasticsearchIntegrationTest { @SuppressWarnings({"ConstantConditions", "unchecked"}) diff --git a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java index 49e0f72b932..184dd6807bc 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.HashMap; @@ -36,7 +36,7 @@ import java.util.concurrent.CountDownLatch; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.emptyIterable; -public class ConcurrentDynamicTemplateTests extends AbstractIntegrationTest { +public class ConcurrentDynamicTemplateTests extends ElasticsearchIntegrationTest { private final String mappingType = "test-mapping"; diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java index 8d57b845101..4b49fe3b2be 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/SimpleDeleteMappingTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.indices.mapping; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleDeleteMappingTests extends AbstractIntegrationTest { +public class SimpleDeleteMappingTests extends ElasticsearchIntegrationTest { @Test public void simpleDeleteMapping() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java index b36f3c9870c..40b9986a688 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsTests.java @@ -23,7 +23,7 @@ import com.google.common.base.Predicate; import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleGetFieldMappingsTests extends AbstractIntegrationTest { +public class SimpleGetFieldMappingsTests extends ElasticsearchIntegrationTest { @Test public void getMappingsWhereThereAreNone() { diff --git a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java index 55ae1e089c5..96dc1bb521a 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleGetMappingsTests extends AbstractIntegrationTest { +public class SimpleGetMappingsTests extends ElasticsearchIntegrationTest { @Test public void getMappingsWhereThereAreNone() { diff --git a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java index 9d6b95da2cc..b4ea0812817 100644 --- a/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java +++ b/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingTests.java @@ -13,7 +13,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MergeMappingException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -27,7 +27,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; -public class UpdateMappingTests extends AbstractIntegrationTest { +public class UpdateMappingTests extends ElasticsearchIntegrationTest { @Test public void dynamicUpdates() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java index cd77130ca17..3a9fef40bfc 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class UpdateNumberOfReplicasTests extends AbstractIntegrationTest { +public class UpdateNumberOfReplicasTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 1cb5806151e..4f878b245ea 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class UpdateSettingsTests extends AbstractIntegrationTest { +public class UpdateSettingsTests extends ElasticsearchIntegrationTest { @Test public void testOpenCloseUpdateSettings() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java index 6d2cf1039b2..f681a8cd0ea 100644 --- a/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java +++ b/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllTests.java @@ -25,16 +25,16 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; @ClusterScope(scope=Scope.SUITE, numNodes=2) -public class CloseIndexDisableCloseAllTests extends AbstractIntegrationTest { +public class CloseIndexDisableCloseAllTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java index 480705cd1fa..43c4b596d87 100644 --- a/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java +++ b/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexTests.java @@ -30,14 +30,14 @@ import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.indices.IndexMissingException; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class OpenCloseIndexTests extends AbstractIntegrationTest { +public class OpenCloseIndexTests extends ElasticsearchIntegrationTest { @Test public void testSimpleCloseOpen() { diff --git a/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java b/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java index 77e168512da..3b0a3636e42 100644 --- a/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java +++ b/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.indices.IndexMissingException; import org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SimpleIndexStateTests extends AbstractIntegrationTest { +public class SimpleIndexStateTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(SimpleIndexStateTests.class); diff --git a/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java b/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java index 5d6ffee87b1..bbc12489539 100644 --- a/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java +++ b/src/test/java/org/elasticsearch/indices/stats/SimpleIndexStatsTests.java @@ -30,9 +30,9 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.io.IOException; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.SUITE, numNodes = 2) -public class SimpleIndexStatsTests extends AbstractIntegrationTest { +public class SimpleIndexStatsTests extends ElasticsearchIntegrationTest { @Test public void simpleStats() throws Exception { diff --git a/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java index 3f1e426b1b1..f7ac2496702 100644 --- a/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java +++ b/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java @@ -24,9 +24,9 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class IndicesStoreTests extends AbstractIntegrationTest { +public class IndicesStoreTests extends ElasticsearchIntegrationTest { private static final Settings SETTINGS = settingsBuilder().put("gateway.type", "local").build(); @Test diff --git a/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java index c524b7f02b2..dc7dbff4af5 100644 --- a/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java +++ b/src/test/java/org/elasticsearch/indices/store/SimpleDistributorTests.java @@ -23,9 +23,9 @@ import org.apache.lucene.store.Directory; import org.elasticsearch.env.Environment; import org.elasticsearch.index.shard.service.InternalIndexShard; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.io.File; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope=Scope.TEST, numNodes = 1) -public class SimpleDistributorTests extends AbstractIntegrationTest { +public class SimpleDistributorTests extends ElasticsearchIntegrationTest { public final static String[] STORE_TYPES = {"fs", "simplefs", "niofs", "mmapfs"}; diff --git a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java index ceb639cb3be..c0dfd430be6 100644 --- a/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java +++ b/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.indices.IndexTemplateAlreadyExistsException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Arrays; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleIndexTemplateTests extends AbstractIntegrationTest { +public class SimpleIndexTemplateTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java b/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java index 70d4918e1fe..43704bb0ce5 100644 --- a/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/indices/warmer/LocalGatewayIndicesWarmerTests.java @@ -30,9 +30,9 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.test.TestCluster.RestartCallback; import org.hamcrest.Matchers; import org.junit.Test; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(numNodes=0, scope=Scope.TEST) -public class LocalGatewayIndicesWarmerTests extends AbstractIntegrationTest { +public class LocalGatewayIndicesWarmerTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(LocalGatewayIndicesWarmerTests.class); diff --git a/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java index 148a48c6e2e..7aa4c6692a1 100644 --- a/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java +++ b/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmerMissingException; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; /** */ -public class SimpleIndicesWarmerTests extends AbstractIntegrationTest { +public class SimpleIndicesWarmerTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java b/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java index a867f3ce765..b1c1e1fe297 100644 --- a/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java +++ b/src/test/java/org/elasticsearch/mget/SimpleMgetTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.search.fetch.source.FetchSourceContext; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.*; -public class SimpleMgetTests extends AbstractIntegrationTest { +public class SimpleMgetTests extends ElasticsearchIntegrationTest { @Test public void testThatMgetShouldWorkWithOneIndexMissing() throws IOException { diff --git a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java index 9549ceff651..3824c584399 100644 --- a/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java +++ b/src/test/java/org/elasticsearch/mlt/MoreLikeThisActionTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.client.Requests.*; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class MoreLikeThisActionTests extends AbstractIntegrationTest { +public class MoreLikeThisActionTests extends ElasticsearchIntegrationTest { @Test public void testSimpleMoreLikeThis() throws Exception { diff --git a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java index 2a8e51a3d45..6e47b12659b 100644 --- a/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java +++ b/src/test/java/org/elasticsearch/nested/SimpleNestedTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.search.facet.statistical.StatisticalFacet; import org.elasticsearch.search.facet.termsstats.TermsStatsFacet; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Assert; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; -public class SimpleNestedTests extends AbstractIntegrationTest { +public class SimpleNestedTests extends ElasticsearchIntegrationTest { @Test public void simpleNested() throws Exception { diff --git a/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java b/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java index 5bf56fa3ab0..a39d4019605 100644 --- a/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java +++ b/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java @@ -33,9 +33,9 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.nodesinfo.plugin.dummy1.TestPlugin; import org.elasticsearch.nodesinfo.plugin.dummy2.TestNoVersionPlugin; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.io.File; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class SimpleNodesInfoTests extends AbstractIntegrationTest { +public class SimpleNodesInfoTests extends ElasticsearchIntegrationTest { static final class Fields { static final String SITE_PLUGIN = "dummy"; diff --git a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java index 18be0f32ed0..e37cdeda29b 100644 --- a/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Random; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class ConcurrentPercolatorTests extends AbstractIntegrationTest { +public class ConcurrentPercolatorTests extends ElasticsearchIntegrationTest { @Test public void testSimpleConcurrentPercolator() throws Exception { diff --git a/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java index 85538e30be9..e743ac374a6 100644 --- a/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/MultiPercolatorTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder; import org.elasticsearch.action.percolate.MultiPercolateResponse; import org.elasticsearch.client.Requests; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class MultiPercolatorTests extends AbstractIntegrationTest { +public class MultiPercolatorTests extends ElasticsearchIntegrationTest { @Test public void testBasics() throws Exception { diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorFacetsTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorFacetsTests.java index 041379697fd..fa3081d031b 100644 --- a/src/test/java/org/elasticsearch/percolator/PercolatorFacetsTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorFacetsTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PercolatorFacetsTests extends AbstractIntegrationTest { +public class PercolatorFacetsTests extends ElasticsearchIntegrationTest { @Test public void testFacets() throws Exception { diff --git a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java index 0cca5c05b78..5f55513009a 100644 --- a/src/test/java/org/elasticsearch/percolator/PercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/PercolatorTests.java @@ -46,7 +46,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.functionscore.factor.FactorBuilder; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.search.highlight.HighlightBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.*; @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class PercolatorTests extends AbstractIntegrationTest { +public class PercolatorTests extends ElasticsearchIntegrationTest { @Test public void testSimple1() throws Exception { diff --git a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java index b694a7afbab..b71ac819e01 100644 --- a/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -48,13 +48,13 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.percolator.PercolatorTests.convertFromTextArray; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class RecoveryPercolatorTests extends AbstractIntegrationTest { +public class RecoveryPercolatorTests extends ElasticsearchIntegrationTest { @Test @Slow diff --git a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java index 4a260c0861e..2a25dd3caac 100644 --- a/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java +++ b/src/test/java/org/elasticsearch/percolator/TTLPercolatorTests.java @@ -6,9 +6,9 @@ import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope = Scope.TEST) -public class TTLPercolatorTests extends AbstractIntegrationTest { +public class TTLPercolatorTests extends ElasticsearchIntegrationTest { private static final long PURGE_INTERVAL = 200; diff --git a/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java b/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java index c0e834b9ea5..5e5b2c12902 100644 --- a/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java +++ b/src/test/java/org/elasticsearch/plugin/PluginManagerTests.java @@ -26,15 +26,15 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.http.HttpServerTransport; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.junit.annotations.Network; import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.plugins.PluginManager; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.helper.HttpClient; import org.elasticsearch.rest.helper.HttpClientResponse; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,7 +46,7 @@ import java.net.URL; import static org.hamcrest.CoreMatchers.*; @ClusterScope(scope = Scope.TEST, numNodes = 0) -public class PluginManagerTests extends AbstractIntegrationTest { +public class PluginManagerTests extends ElasticsearchIntegrationTest { private static final Settings SETTINGS = ImmutableSettings.settingsBuilder() .put("discovery.zen.ping.multicast.enabled", false) .put("force.http.enabled", true) diff --git a/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java b/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java index 89f77f944a4..0a1d1c2f653 100644 --- a/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java +++ b/src/test/java/org/elasticsearch/plugin/ResponseHeaderPluginTests.java @@ -27,9 +27,9 @@ import org.elasticsearch.plugin.responseheader.TestResponseHeaderPlugin; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.helper.HttpClient; import org.elasticsearch.rest.helper.HttpClientResponse; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.util.Map; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; * Test a rest action that sets special response headers */ @ClusterScope(scope = Scope.SUITE, numNodes = 1) -public class ResponseHeaderPluginTests extends AbstractIntegrationTest { +public class ResponseHeaderPluginTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/plugin/SitePluginTests.java b/src/test/java/org/elasticsearch/plugin/SitePluginTests.java index d7f02841039..6dd29484caf 100644 --- a/src/test/java/org/elasticsearch/plugin/SitePluginTests.java +++ b/src/test/java/org/elasticsearch/plugin/SitePluginTests.java @@ -24,9 +24,9 @@ import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.helper.HttpClient; import org.elasticsearch.rest.helper.HttpClientResponse; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.io.File; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; * We want to test site plugins */ @ClusterScope(scope = Scope.SUITE, numNodes = 1) -public class SitePluginTests extends AbstractIntegrationTest { +public class SitePluginTests extends ElasticsearchIntegrationTest { @Override diff --git a/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java b/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java index 6cc737fd44a..a754f7e9a8b 100644 --- a/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java +++ b/src/test/java/org/elasticsearch/recovery/FullRollingRestartTests.java @@ -24,10 +24,10 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.collect.MapBuilder; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC * */ @ClusterScope(scope = Scope.TEST, numNodes = 0, transportClientRatio = 0.0) -public class FullRollingRestartTests extends AbstractIntegrationTest { +public class FullRollingRestartTests extends ElasticsearchIntegrationTest { protected void assertTimeout(ClusterHealthRequestBuilder requestBuilder) { ClusterHealthResponse clusterHealth = requestBuilder.get(); diff --git a/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java index 8f3e87885ae..7f47f1a2ac7 100644 --- a/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java +++ b/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadTests.java @@ -33,8 +33,8 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.index.shard.DocsStats; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; import java.util.Arrays; @@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class RecoveryWhileUnderLoadTests extends AbstractIntegrationTest { +public class RecoveryWhileUnderLoadTests extends ElasticsearchIntegrationTest { private final ESLogger logger = Loggers.getLogger(RecoveryWhileUnderLoadTests.class); diff --git a/src/test/java/org/elasticsearch/recovery/RelocationTests.java b/src/test/java/org/elasticsearch/recovery/RelocationTests.java index 7d128f1a213..edf2db0202d 100644 --- a/src/test/java/org/elasticsearch/recovery/RelocationTests.java +++ b/src/test/java/org/elasticsearch/recovery/RelocationTests.java @@ -35,9 +35,9 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.equalTo; */ @ClusterScope(scope=Scope.TEST, numNodes=0) -public class RelocationTests extends AbstractIntegrationTest { +public class RelocationTests extends ElasticsearchIntegrationTest { private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(5, TimeUnit.MINUTES); diff --git a/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java index 250ea2a3afd..e9dd7ac4e63 100644 --- a/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java +++ b/src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.client.Requests.*; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleRecoveryTests extends AbstractIntegrationTest { +public class SimpleRecoveryTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java index 3d6e8f35998..fa92548aaa1 100644 --- a/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasResolveRoutingTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.routing; import org.elasticsearch.ElasticSearchIllegalArgumentException; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class AliasResolveRoutingTests extends AbstractIntegrationTest { +public class AliasResolveRoutingTests extends ElasticsearchIntegrationTest { @Test public void testResolveIndexRouting() throws Exception { diff --git a/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java index 2f0ca3cfb0f..6afea9c4465 100644 --- a/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/AliasRoutingTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Requests; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class AliasRoutingTests extends AbstractIntegrationTest { +public class AliasRoutingTests extends ElasticsearchIntegrationTest { @Test public void testAliasCrudRouting() throws Exception { diff --git a/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java index fb3d0cbf86c..441e1a98e53 100644 --- a/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java +++ b/src/test/java/org/elasticsearch/routing/SimpleRoutingTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class SimpleRoutingTests extends AbstractIntegrationTest { +public class SimpleRoutingTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java index 2bb0b79ed96..50d7ab889eb 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; * This test basically verifies that search with a single shard active (cause we indexed to it) and other * shards possibly not active at all (cause they haven't allocated) will still work. */ -public class SearchWhileCreatingIndexTests extends AbstractIntegrationTest { +public class SearchWhileCreatingIndexTests extends ElasticsearchIntegrationTest { @Test @Slow diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java index fc1b2045df8..c0d3fa3fad1 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -public class SearchWhileRelocatingTests extends AbstractIntegrationTest { +public class SearchWhileRelocatingTests extends ElasticsearchIntegrationTest { @LuceneTestCase.AwaitsFix(bugUrl = "problem with search searching on 1 shard (no replica), " + "and between getting the cluster state to do the search, and executing it, " + diff --git a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java index 9264ba1ed3a..ae19195313f 100644 --- a/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java +++ b/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.store.MockDirectoryHelper; import org.hamcrest.Matchers; import org.junit.Test; @@ -41,7 +41,7 @@ import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -public class SearchWithRandomExceptionsTests extends AbstractIntegrationTest { +public class SearchWithRandomExceptionsTests extends ElasticsearchIntegrationTest { @Test public void testRandomExceptions() throws IOException, InterruptedException, ExecutionException { diff --git a/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java b/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java index a11a657198a..87586e56ff1 100644 --- a/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class TransportSearchFailuresTests extends AbstractIntegrationTest { +public class TransportSearchFailuresTests extends ElasticsearchIntegrationTest { @Test public void testFailedSearchWithWrongQuery() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java index 226cd5b504a..598cd1de3f6 100644 --- a/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java +++ b/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.facet.FacetBuilders; import org.elasticsearch.search.facet.query.QueryFacet; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class TransportTwoNodesSearchTests extends AbstractIntegrationTest { +public class TransportTwoNodesSearchTests extends ElasticsearchIntegrationTest { private Set prepareData() throws Exception { Set fullExpectedIds = Sets.newHashSet(); diff --git a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java index 7c94003e30c..e51320585bb 100644 --- a/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java +++ b/src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleChildQuerySearchTests extends AbstractIntegrationTest { +public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest { @Test public void multiLevelChild() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java index cf4b1a31533..0ad7ee7871d 100644 --- a/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java +++ b/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.compress.lzf.LZFCompressor; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SearchSourceCompressTests extends AbstractIntegrationTest { +public class SearchSourceCompressTests extends ElasticsearchIntegrationTest { @Test public void testSourceCompressionLZF() throws IOException { diff --git a/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java index fccabe19bac..de9f0e29c5f 100644 --- a/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java +++ b/src/test/java/org/elasticsearch/search/customscore/CustomScoreSearchTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.Priority; import org.elasticsearch.index.query.FilterBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class CustomScoreSearchTests extends AbstractIntegrationTest { +public class CustomScoreSearchTests extends ElasticsearchIntegrationTest { @Test public void testScoreExplainBug_2283() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java index 373045f40a6..c799fde9c0a 100644 --- a/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/ExtendedFacetsTests.java @@ -10,7 +10,7 @@ import org.elasticsearch.common.text.Text; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.facet.terms.TermsFacet; import org.elasticsearch.search.facet.terms.TermsFacetBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.*; @@ -21,7 +21,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class ExtendedFacetsTests extends AbstractIntegrationTest { +public class ExtendedFacetsTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java index 206054f6df3..fb3d10b0dce 100644 --- a/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/SimpleFacetsTests.java @@ -43,7 +43,7 @@ import org.elasticsearch.search.facet.terms.TermsFacet.Entry; import org.elasticsearch.search.facet.terms.doubles.InternalDoubleTermsFacet; import org.elasticsearch.search.facet.terms.longs.InternalLongTermsFacet; import org.elasticsearch.search.facet.termsstats.TermsStatsFacet; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; @@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleFacetsTests extends AbstractIntegrationTest { +public class SimpleFacetsTests extends ElasticsearchIntegrationTest { private int numRuns = -1; @Override diff --git a/src/test/java/org/elasticsearch/search/facet/terms/ShardSizeTermsFacetTests.java b/src/test/java/org/elasticsearch/search/facet/terms/ShardSizeTermsFacetTests.java index 54d9eea5bb1..5a9b90380bd 100644 --- a/src/test/java/org/elasticsearch/search/facet/terms/ShardSizeTermsFacetTests.java +++ b/src/test/java/org/elasticsearch/search/facet/terms/ShardSizeTermsFacetTests.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.facet.Facets; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.List; @@ -32,8 +32,8 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.facet.FacetBuilders.termsFacet; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope = Scope.SUITE) -public class ShardSizeTermsFacetTests extends AbstractIntegrationTest { +public class ShardSizeTermsFacetTests extends ElasticsearchIntegrationTest { /** * to properly test the effect/functionality of shard_size, we need to force having 2 shards and also diff --git a/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java b/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java index 011b5e59baf..466718d64ef 100644 --- a/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java +++ b/src/test/java/org/elasticsearch/search/facet/terms/UnmappedFieldsTermsFacetsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.ElasticSearchException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class UnmappedFieldsTermsFacetsTests extends AbstractIntegrationTest { +public class UnmappedFieldsTermsFacetsTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/search/facet/termsstats/ShardSizeTermsStatsFacetTests.java b/src/test/java/org/elasticsearch/search/facet/termsstats/ShardSizeTermsStatsFacetTests.java index 83c5fe5628a..9471ff6445b 100644 --- a/src/test/java/org/elasticsearch/search/facet/termsstats/ShardSizeTermsStatsFacetTests.java +++ b/src/test/java/org/elasticsearch/search/facet/termsstats/ShardSizeTermsStatsFacetTests.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.facet.Facets; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.List; @@ -32,8 +32,8 @@ import java.util.Map; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.facet.FacetBuilders.termsStatsFacet; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope = Scope.SUITE) -public class ShardSizeTermsStatsFacetTests extends AbstractIntegrationTest { +public class ShardSizeTermsStatsFacetTests extends ElasticsearchIntegrationTest { /** * to properly test the effect/functionality of shard_size, we need to force having 2 shards and also diff --git a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java index 9680f2be75f..9bf16f2dfa2 100644 --- a/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java +++ b/src/test/java/org/elasticsearch/search/fields/SearchFieldsTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SearchFieldsTests extends AbstractIntegrationTest { +public class SearchFieldsTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java index 6d97b9531fc..b7c14879c83 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.functionscore.DecayFunctionBuilder; import org.elasticsearch.index.query.functionscore.gauss.GaussDecayFunctionBuilder; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTime; import org.junit.Test; @@ -49,7 +49,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -public class DecayFunctionScoreTests extends AbstractIntegrationTest { +public class DecayFunctionScoreTests extends ElasticsearchIntegrationTest { @Test public void testDistanceScoreGeoLinGaussExp() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java index d3fc3ffe287..0181e4de852 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.query.functionscore.DecayFunctionParser; import org.elasticsearch.index.query.functionscore.FunctionScoreModule; import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -43,15 +43,15 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.hamcrest.Matchers.equalTo; /** * */ @ClusterScope(scope = Scope.SUITE, numNodes = 1) -public class FunctionScorePluginTests extends AbstractIntegrationTest { +public class FunctionScorePluginTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java index 69bbf2f65e1..83467a41261 100644 --- a/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java +++ b/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.functionscore; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.CoreMatchers; import org.junit.Ignore; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class RandomScoreFunctionTests extends AbstractIntegrationTest { +public class RandomScoreFunctionTests extends ElasticsearchIntegrationTest { @Test public void consistentHitsWithSameSeed() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java b/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java index b65cbbeb2c0..6a6c500b248 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class GeoBoundingBoxTests extends AbstractIntegrationTest { +public class GeoBoundingBoxTests extends ElasticsearchIntegrationTest { @Test public void simpleBoundingBoxTest() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java index d74bca61f2e..352317766f2 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceFacetTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.facet.geodistance.GeoDistanceFacet; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class GeoDistanceFacetTests extends AbstractIntegrationTest { +public class GeoDistanceFacetTests extends ElasticsearchIntegrationTest { @Test public void simpleGeoFacetTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java index b726dc990d8..a0a6b9fd547 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoDistanceTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class GeoDistanceTests extends AbstractIntegrationTest { +public class GeoDistanceTests extends ElasticsearchIntegrationTest { @Test public void simpleDistanceTests() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java index 5f21d45d1a2..0fa56d4093f 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoFilterTests.java @@ -46,7 +46,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.BeforeClass; import org.junit.Test; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class GeoFilterTests extends AbstractIntegrationTest { +public class GeoFilterTests extends ElasticsearchIntegrationTest { private static boolean intersectSupport; private static boolean disjointSupport; diff --git a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java index 23708ede0ca..08f78b32696 100644 --- a/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java +++ b/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; -public class GeoShapeIntegrationTests extends AbstractIntegrationTest { +public class GeoShapeIntegrationTests extends ElasticsearchIntegrationTest { @Test public void testNullShape() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java index 947848432db..d22dda85c65 100644 --- a/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Before; import org.junit.Test; @@ -32,8 +32,8 @@ import java.io.IOException; import java.util.Map; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; -import static org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import static org.elasticsearch.test.AbstractIntegrationTest.Scope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHighlight; import static org.hamcrest.Matchers.equalTo; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.SUITE, numNodes = 1) -public class CustomHighlighterSearchTests extends AbstractIntegrationTest { +public class CustomHighlighterSearchTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java index 5f71a375d27..c03f12f87aa 100644 --- a/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matcher; import org.junit.Test; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class HighlighterSearchTests extends AbstractIntegrationTest { +public class HighlighterSearchTests extends ElasticsearchIntegrationTest { @Test // see #3486 diff --git a/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java index ea0ab086374..790e954cca4 100644 --- a/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java +++ b/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleIndicesBoostSearchTests extends AbstractIntegrationTest { +public class SimpleIndicesBoostSearchTests extends ElasticsearchIntegrationTest { private static final Settings DEFAULT_SETTINGS = ImmutableSettings.settingsBuilder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) diff --git a/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java index d95d82ab094..b763df1316d 100644 --- a/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java +++ b/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.matchedqueries; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.hasItemInArray; /** * */ -public class MatchedQueriesTests extends AbstractIntegrationTest { +public class MatchedQueriesTests extends ElasticsearchIntegrationTest { @Test public void simpleMatchedQueryFromFilteredQuery() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java index 74d631fa0d3..e97a6f69da0 100644 --- a/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java +++ b/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchTests.java @@ -2,7 +2,7 @@ package org.elasticsearch.search.msearch; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SimpleMultiSearchTests extends AbstractIntegrationTest { +public class SimpleMultiSearchTests extends ElasticsearchIntegrationTest { @Test public void simpleMultiSearch() { diff --git a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java index 16d4bdb0314..a1f594f3f90 100644 --- a/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java +++ b/src/test/java/org/elasticsearch/search/preference/SearchPreferenceTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.Client; import org.elasticsearch.common.Priority; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.*; -public class SearchPreferenceTests extends AbstractIntegrationTest { +public class SearchPreferenceTests extends ElasticsearchIntegrationTest { @Test // see #2896 public void testStopOneNodePreferenceWithRedState() throws InterruptedException { diff --git a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java index 1469d1b90dd..578404a13b8 100644 --- a/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java +++ b/src/test/java/org/elasticsearch/search/query/SimpleQueryTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.facet.FacetBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleQueryTests extends AbstractIntegrationTest { +public class SimpleQueryTests extends ElasticsearchIntegrationTest { @Test // see https://github.com/elasticsearch/elasticsearch/issues/3177 public void testIssue3177() { diff --git a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java index 7700fc4f8e6..30fe72dae53 100644 --- a/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java +++ b/src/test/java/org/elasticsearch/search/rescore/QueryRescorerTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.rescore.RescoreBuilder.QueryRescorer; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class QueryRescorerTests extends AbstractIntegrationTest { +public class QueryRescorerTests extends ElasticsearchIntegrationTest { @Test public void testRescorePhrase() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java b/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java index 60d0a62e1f4..94350e3944f 100644 --- a/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java +++ b/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import java.util.Set; @@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class SearchScanScrollingTests extends AbstractIntegrationTest { +public class SearchScanScrollingTests extends ElasticsearchIntegrationTest { public void testRandomized() throws Exception { testScroll(between(1, 4), atLeast(100), between(1, 300), getRandom().nextBoolean(), getRandom().nextBoolean()); diff --git a/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java b/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java index c348160761b..d0696c7aa36 100644 --- a/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java +++ b/src/test/java/org/elasticsearch/search/scan/SearchScanTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Set; @@ -37,7 +37,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.hamcrest.Matchers.equalTo; -public class SearchScanTests extends AbstractIntegrationTest { +public class SearchScanTests extends ElasticsearchIntegrationTest { @Test @Slow diff --git a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java index 1cd9099c0ef..b76b43c97c5 100644 --- a/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/scriptfilter/ScriptFilterSearchTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ScriptFilterSearchTests extends AbstractIntegrationTest { +public class ScriptFilterSearchTests extends ElasticsearchIntegrationTest { private final static Settings DEFAULT_SETTINGS = ImmutableSettings.settingsBuilder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) diff --git a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java index 42017c0371e..bc76388d444 100644 --- a/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java +++ b/src/test/java/org/elasticsearch/search/scroll/SearchScrollTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SearchScrollTests extends AbstractIntegrationTest { +public class SearchScrollTests extends ElasticsearchIntegrationTest { @Test public void testSimpleScrollQueryThenFetch() throws Exception { diff --git a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java index ae63941d947..907d8f06c3e 100644 --- a/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java +++ b/src/test/java/org/elasticsearch/search/simple/SimpleSearchTests.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.junit.annotations.TestLogging; -import org.elasticsearch.test.AbstractIntegrationTest; import org.junit.Test; import java.util.concurrent.ExecutionException; @@ -36,7 +36,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -public class SimpleSearchTests extends AbstractIntegrationTest { +public class SimpleSearchTests extends ElasticsearchIntegrationTest { @Test public void testSearchNullIndex() { diff --git a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java index c785e06ef90..600487461ce 100644 --- a/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java +++ b/src/test/java/org/elasticsearch/search/sort/SimpleSortTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHitField; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleSortTests extends AbstractIntegrationTest { +public class SimpleSortTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java b/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java index 83ec66977d0..8fbd562f6fa 100644 --- a/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java +++ b/src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java @@ -20,14 +20,14 @@ package org.elasticsearch.search.source; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.core.IsEqual.equalTo; -public class SourceFetchingTests extends AbstractIntegrationTest { +public class SourceFetchingTests extends ElasticsearchIntegrationTest { @Test public void testSourceDefaultBehavior() { diff --git a/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java index 9ad0bf2924a..a8fe89c9d1d 100644 --- a/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java +++ b/src/test/java/org/elasticsearch/search/stats/SearchStatsTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.stats.SearchStats.Stats; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Set; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class SearchStatsTests extends AbstractIntegrationTest { +public class SearchStatsTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java index 411bdc5dc12..1d518ce4e23 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.search.suggest.completion.CompletionStats; import org.elasticsearch.search.suggest.completion.CompletionSuggestion; import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder; import org.elasticsearch.search.suggest.completion.CompletionSuggestionFuzzyBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -59,7 +59,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; -public class CompletionSuggestSearchTests extends AbstractIntegrationTest { +public class CompletionSuggestSearchTests extends ElasticsearchIntegrationTest { private final String INDEX = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); private final String TYPE = RandomStrings.randomAsciiOfLength(getRandom(), 10).toLowerCase(Locale.ROOT); diff --git a/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java index a16cf448272..167e34120a9 100644 --- a/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchTests.java @@ -24,9 +24,9 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import java.util.List; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope=Scope.SUITE, numNodes=1) -public class CustomSuggesterSearchTests extends AbstractIntegrationTest { +public class CustomSuggesterSearchTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java index 6c511ee3f78..d37014e22ec 100644 --- a/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java +++ b/src/test/java/org/elasticsearch/search/suggest/SuggestSearchTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.suggest.SuggestBuilder.SuggestionBuilder; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder.DirectCandidateGenerator; import org.elasticsearch.search.suggest.term.TermSuggestionBuilder; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.nullValue; * possible these tests should declare for the first request, make the request, modify the configuration for the next request, make that * request, modify again, request again, etc. This makes it very obvious what changes between requests. */ -public class SuggestSearchTests extends AbstractIntegrationTest { +public class SuggestSearchTests extends ElasticsearchIntegrationTest { @Test // see #3037 public void testSuggestModes() throws IOException { CreateIndexRequestBuilder builder = prepareCreate("test").setSettings(settingsBuilder() diff --git a/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java index 22b504a6045..f5c94abf029 100644 --- a/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java +++ b/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.timeout; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.index.query.FilterBuilders.scriptFilter; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SearchTimeoutTests extends AbstractIntegrationTest { +public class SearchTimeoutTests extends ElasticsearchIntegrationTest { @Override public Settings getSettings() { diff --git a/src/test/java/org/elasticsearch/similarity/SimilarityTests.java b/src/test/java/org/elasticsearch/similarity/SimilarityTests.java index 143dfc79968..bd694e61117 100644 --- a/src/test/java/org/elasticsearch/similarity/SimilarityTests.java +++ b/src/test/java/org/elasticsearch/similarity/SimilarityTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.similarity; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.ImmutableSettings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -29,7 +29,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class SimilarityTests extends AbstractIntegrationTest { +public class SimilarityTests extends ElasticsearchIntegrationTest { @Test diff --git a/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java b/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java index cd010c25c4e..83c629e87e1 100644 --- a/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java +++ b/src/test/java/org/elasticsearch/termvectors/AbstractTermVectorTests.java @@ -43,7 +43,7 @@ import org.elasticsearch.common.inject.internal.Join; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.indices.IndexMissingException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import java.io.IOException; import java.io.Reader; @@ -52,7 +52,7 @@ import java.util.*; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.equalTo; -public abstract class AbstractTermVectorTests extends AbstractIntegrationTest { +public abstract class AbstractTermVectorTests extends ElasticsearchIntegrationTest { protected static class TestFieldSetting { final public String name; diff --git a/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java index 9d26dde9bf6..f5235422bd0 100644 --- a/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java +++ b/src/test/java/org/elasticsearch/termvectors/GetTermVectorCheckDocFreqTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.io.BytesStream; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.hamcrest.Matchers; import org.junit.Test; @@ -40,7 +40,7 @@ import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class GetTermVectorCheckDocFreqTests extends AbstractIntegrationTest { +public class GetTermVectorCheckDocFreqTests extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java similarity index 99% rename from src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java rename to src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java index 6fd84e66ae9..96d188fb62d 100644 --- a/src/test/java/org/elasticsearch/test/AbstractIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java @@ -105,7 +105,7 @@ import static org.hamcrest.Matchers.equalTo; */ @Ignore @IntegrationTests -public abstract class AbstractIntegrationTest extends ElasticsearchTestCase { +public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase { public static final String INDEX_SEED_SETTING = "index.tests.seed"; @@ -630,7 +630,7 @@ public abstract class AbstractIntegrationTest extends ElasticsearchTestCase { } private ClusterScope getAnnotation(Class clazz) { - if (clazz == Object.class || clazz == AbstractIntegrationTest.class) { + if (clazz == Object.class || clazz == ElasticsearchIntegrationTest.class) { return null; } ClusterScope annotation = clazz.getAnnotation(ClusterScope.class); diff --git a/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java b/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java index e392edd3dc3..e0b6bd80579 100644 --- a/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java +++ b/src/test/java/org/elasticsearch/test/engine/MockRobinEngine.java @@ -43,7 +43,7 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.warmer.IndicesWarmer; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.threadpool.ThreadPool; import java.util.Map.Entry; @@ -63,7 +63,7 @@ public final class MockRobinEngine extends RobinEngine implements Engine { CodecService codecService) throws EngineException { super(shardId, indexSettings, threadPool, indexSettingsService, indexingService, warmer, store, deletionPolicy, translog, mergePolicyProvider, mergeScheduler, analysisService, similarityService, codecService); - final long seed = indexSettings.getAsLong(AbstractIntegrationTest.INDEX_SEED_SETTING, 0l); + final long seed = indexSettings.getAsLong(ElasticsearchIntegrationTest.INDEX_SEED_SETTING, 0l); if (logger.isTraceEnabled()) { logger.trace("Using [{}] for shard [{}] seed: [{}]", this.getClass().getName(), shardId, seed); } diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index 077d1c4ad6a..ed4a7ed6831 100644 --- a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -6,7 +6,7 @@ import com.carrotsearch.randomizedtesting.SeedUtils; import com.carrotsearch.randomizedtesting.TraceFormatting; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; @@ -45,8 +45,8 @@ public class ReproduceInfoPrinter extends RunListener { b.append("FAILURE : ").append(d.getDisplayName()).append("\n"); b.append("REPRODUCE WITH : mvn test"); ReproduceErrorMessageBuilder builder = new MavenMessageBuilder(b).appendAllOpts(failure.getDescription()); - if (AbstractIntegrationTest.class.isAssignableFrom(failure.getDescription().getTestClass())) { - builder.appendOpt("tests.cluster_seed", SeedUtils.formatSeed(AbstractIntegrationTest.SHARED_CLUSTER_SEED)); + if (ElasticsearchIntegrationTest.class.isAssignableFrom(failure.getDescription().getTestClass())) { + builder.appendOpt("tests.cluster_seed", SeedUtils.formatSeed(ElasticsearchIntegrationTest.SHARED_CLUSTER_SEED)); } b.append("\n"); diff --git a/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java b/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java index 73ffe4d3289..16e126d87f6 100644 --- a/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java +++ b/src/test/java/org/elasticsearch/test/store/MockDirectoryHelper.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.store.fs.NioFsDirectoryService; import org.elasticsearch.index.store.fs.SimpleFsDirectoryService; import org.elasticsearch.index.store.memory.ByteBufferDirectoryService; import org.elasticsearch.index.store.ram.RamDirectoryService; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import java.util.Random; import java.util.Set; @@ -61,7 +61,7 @@ public class MockDirectoryHelper { private final boolean noDeleteOpenFile; public MockDirectoryHelper(ShardId shardId, Settings indexSettings, ESLogger logger) { - final long seed = indexSettings.getAsLong(AbstractIntegrationTest.INDEX_SEED_SETTING, 0l); + final long seed = indexSettings.getAsLong(ElasticsearchIntegrationTest.INDEX_SEED_SETTING, 0l); random = new Random(seed); randomIOExceptionRate = indexSettings.getAsDouble(RANDOM_IO_EXCEPTION_RATE, 0.0d); randomIOExceptionRateOnOpen = indexSettings.getAsDouble(RANDOM_IO_EXCEPTION_RATE_ON_OPEN, 0.0d); diff --git a/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java b/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java index bdfa09025a4..75f74b5eee0 100644 --- a/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java +++ b/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.elasticsearch.threadpool.ThreadPool; @@ -42,7 +42,7 @@ public class AssertingLocalTransport extends LocalTransport { @Inject public AssertingLocalTransport(Settings settings, ThreadPool threadPool, Version version) { super(settings, threadPool, version); - final long seed = settings.getAsLong(AbstractIntegrationTest.INDEX_SEED_SETTING, 0l); + final long seed = settings.getAsLong(ElasticsearchIntegrationTest.INDEX_SEED_SETTING, 0l); random = new Random(seed); } diff --git a/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java b/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java index 71b3bbfd797..c01d2ab9ed2 100644 --- a/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java +++ b/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolTests.java @@ -9,9 +9,9 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.elasticsearch.threadpool.ThreadPool.Names; import org.junit.Test; @@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope=Scope.TEST, numNodes=2) -public class SimpleThreadPoolTests extends AbstractIntegrationTest { +public class SimpleThreadPoolTests extends ElasticsearchIntegrationTest { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java index 7c06ec8ee4e..b4be9fb6807 100644 --- a/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java +++ b/src/test/java/org/elasticsearch/timestamp/SimpleTimestampTests.java @@ -22,14 +22,14 @@ package org.elasticsearch.timestamp; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import static org.hamcrest.Matchers.*; /** */ -public class SimpleTimestampTests extends AbstractIntegrationTest { +public class SimpleTimestampTests extends ElasticsearchIntegrationTest { @Test public void testSimpleTimestamp() throws Exception { diff --git a/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java b/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java index a264b0dda4f..38e803a599b 100644 --- a/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java +++ b/src/test/java/org/elasticsearch/ttl/SimpleTTLTests.java @@ -24,16 +24,16 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.AbstractIntegrationTest; -import org.elasticsearch.test.AbstractIntegrationTest.ClusterScope; -import org.elasticsearch.test.AbstractIntegrationTest.Scope; +import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.hamcrest.Matchers.*; @ClusterScope(scope=Scope.TEST) -public class SimpleTTLTests extends AbstractIntegrationTest { +public class SimpleTTLTests extends ElasticsearchIntegrationTest { static private final long PURGE_INTERVAL = 200; diff --git a/src/test/java/org/elasticsearch/update/UpdateTests.java b/src/test/java/org/elasticsearch/update/UpdateTests.java index 9736dd60975..ee030fa1e26 100644 --- a/src/test/java/org/elasticsearch/update/UpdateTests.java +++ b/src/test/java/org/elasticsearch/update/UpdateTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentMissingException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.HashMap; @@ -43,7 +43,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; import static org.hamcrest.Matchers.*; -public class UpdateTests extends AbstractIntegrationTest { +public class UpdateTests extends ElasticsearchIntegrationTest { protected void createIndex() throws Exception { diff --git a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java index 703eacc8e87..649272c60a2 100644 --- a/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java +++ b/src/test/java/org/elasticsearch/validate/SimpleValidateQueryTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.FilterBuilders; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matcher; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleValidateQueryTests extends AbstractIntegrationTest { +public class SimpleValidateQueryTests extends ElasticsearchIntegrationTest { @Test public void simpleValidateQuery() throws Exception { diff --git a/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java b/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java index 27252e4dcde..b66ad9e0308 100644 --- a/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java +++ b/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationTests.java @@ -2,7 +2,7 @@ package org.elasticsearch.versioning; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.Map; @@ -16,7 +16,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ConcurrentDocumentOperationTests extends AbstractIntegrationTest { +public class ConcurrentDocumentOperationTests extends ElasticsearchIntegrationTest { @Test public void concurrentOperationOnSameDocTest() throws Exception { diff --git a/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java index 7126e6d4166..7a74dd16d87 100644 --- a/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java +++ b/src/test/java/org/elasticsearch/versioning/SimpleVersioningTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.lucene.uid.Versions; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentAlreadyExistsException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.AbstractIntegrationTest; +import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; import java.util.HashMap; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleVersioningTests extends AbstractIntegrationTest { +public class SimpleVersioningTests extends ElasticsearchIntegrationTest { @Test public void testExternalVersioningInitialDelete() throws Exception {