diff options
828 files changed, 2013 insertions, 2173 deletions
diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java index 9f95ec6147..6a563afc00 100644 --- a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java +++ b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class TruncateTokenFilterTests extends ElasticsearchTestCase { +public class TruncateTokenFilterTests extends ESTestCase { @Test public void simpleTest() throws IOException { diff --git a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java index e8c074be47..25c4a688fe 100644 --- a/core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java +++ b/core/src/test/java/org/apache/lucene/analysis/miscellaneous/UniqueTokenFilterTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class UniqueTokenFilterTests extends ElasticsearchTestCase { +public class UniqueTokenFilterTests extends ESTestCase { @Test public void simpleTest() throws IOException { diff --git a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java b/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java index 634026a5df..74eb4babc6 100644 --- a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java +++ b/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java @@ -41,7 +41,7 @@ import org.apache.lucene.search.similarities.DefaultSimilarity; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class BlendedTermQueryTest extends ElasticsearchTestCase { +public class BlendedTermQueryTest extends ESTestCase { @Test public void testBooleanQuery() throws IOException { diff --git a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java index 2399502925..ef7a9ac31e 100644 --- a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java +++ b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPassageFormatterTests.java @@ -21,7 +21,7 @@ package org.apache.lucene.search.postingshighlight; import org.apache.lucene.search.highlight.DefaultEncoder; import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; @@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -public class CustomPassageFormatterTests extends ElasticsearchTestCase { +public class CustomPassageFormatterTests extends ESTestCase { @Test public void testSimpleFormat() { diff --git a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java index 8d04caae60..450382c1ff 100644 --- a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java +++ b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomPostingsHighlighterTests.java @@ -28,12 +28,12 @@ import org.apache.lucene.search.*; import org.apache.lucene.search.highlight.DefaultEncoder; import org.apache.lucene.store.Directory; import org.elasticsearch.search.highlight.HighlightUtils; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; -public class CustomPostingsHighlighterTests extends ElasticsearchTestCase { +public class CustomPostingsHighlighterTests extends ESTestCase { @Test public void testCustomPostingsHighlighter() throws Exception { diff --git a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java index 0df6add537..3b63f765f3 100644 --- a/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java +++ b/core/src/test/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIteratorTests.java @@ -20,7 +20,7 @@ under the License. package org.apache.lucene.search.postingshighlight; import org.elasticsearch.search.highlight.HighlightUtils; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.text.BreakIterator; @@ -30,7 +30,7 @@ import java.util.Locale; import static org.hamcrest.CoreMatchers.equalTo; -public class CustomSeparatorBreakIteratorTests extends ElasticsearchTestCase { +public class CustomSeparatorBreakIteratorTests extends ESTestCase { @Test public void testBreakOnCustomSeparator() throws Exception { diff --git a/core/src/test/java/org/apache/lucene/util/SloppyMathTests.java b/core/src/test/java/org/apache/lucene/util/SloppyMathTests.java index 61a74b49e0..f7d43fd130 100644 --- a/core/src/test/java/org/apache/lucene/util/SloppyMathTests.java +++ b/core/src/test/java/org/apache/lucene/util/SloppyMathTests.java @@ -21,12 +21,12 @@ package org.apache.lucene.util; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.unit.DistanceUnit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.number.IsCloseTo.closeTo; -public class SloppyMathTests extends ElasticsearchTestCase { +public class SloppyMathTests extends ESTestCase { @Test public void testAccuracy() { diff --git a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java b/core/src/test/java/org/elasticsearch/ESExceptionTests.java index b9995e83be..a4a6d28847 100644 --- a/core/src/test/java/org/elasticsearch/ElasticsearchExceptionTests.java +++ b/core/src/test/java/org/elasticsearch/ESExceptionTests.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.query.TestQueryParsingException; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchParseException; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestSearchContext; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; @@ -55,7 +55,7 @@ import java.nio.file.NoSuchFileException; import static org.hamcrest.Matchers.equalTo; -public class ElasticsearchExceptionTests extends ElasticsearchTestCase { +public class ESExceptionTests extends ESTestCase { @Test public void testStatus() { diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java index 32c0382e4c..69d83b7bde 100644 --- a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java @@ -62,7 +62,7 @@ import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.warmer.IndexWarmerMissingException; import org.elasticsearch.snapshots.SnapshotException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestSearchContext; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; @@ -81,7 +81,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.HashSet; import java.util.Set; -public class ExceptionSerializationTests extends ElasticsearchTestCase { +public class ExceptionSerializationTests extends ESTestCase { public void testExceptionRegistration() throws ClassNotFoundException, IOException, URISyntaxException { diff --git a/core/src/test/java/org/elasticsearch/NamingConventionTests.java b/core/src/test/java/org/elasticsearch/NamingConventionTests.java index 11a8767143..1187a1e263 100644 --- a/core/src/test/java/org/elasticsearch/NamingConventionTests.java +++ b/core/src/test/java/org/elasticsearch/NamingConventionTests.java @@ -24,10 +24,10 @@ import com.google.common.collect.Sets; import junit.framework.TestCase; import org.apache.lucene.util.LuceneTestCase; +import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.test.ElasticsearchTestCase; -import org.elasticsearch.test.ElasticsearchTestCase; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Ignore; import org.junit.Test; @@ -41,9 +41,9 @@ import java.util.HashSet; import java.util.Set; /** - * Simple class that ensures that all subclasses concrete of ElasticsearchTestCase end with either Test | Tests + * Simple class that ensures that all subclasses concrete of ESTestCase end with either Test | Tests */ -public class NamingConventionTests extends ElasticsearchTestCase { +public class NamingConventionTests extends ESTestCase { // see https://github.com/elasticsearch/elasticsearch/issues/9945 public void testNamingConventions() @@ -107,7 +107,7 @@ public class NamingConventionTests extends ElasticsearchTestCase { } private boolean isTestCase(Class<?> clazz) { - return ElasticsearchTestCase.class.isAssignableFrom(clazz) || ElasticsearchTestCase.class.isAssignableFrom(clazz) || ElasticsearchTokenStreamTestCase.class.isAssignableFrom(clazz) || LuceneTestCase.class.isAssignableFrom(clazz); + return LuceneTestCase.class.isAssignableFrom(clazz); } private Class<?> loadClass(String filename) throws ClassNotFoundException { @@ -140,11 +140,11 @@ public class NamingConventionTests extends ElasticsearchTestCase { assertTrue(pureUnitTest.remove(PlainUnitTheSecond.class)); String classesToSubclass = Joiner.on(',').join( - ElasticsearchTestCase.class.getSimpleName(), - ElasticsearchTestCase.class.getSimpleName(), - ElasticsearchTokenStreamTestCase.class.getSimpleName(), + ESTestCase.class.getSimpleName(), + ESTestCase.class.getSimpleName(), + ESTokenStreamTestCase.class.getSimpleName(), LuceneTestCase.class.getSimpleName()); - assertTrue("Not all subclasses of " + ElasticsearchTestCase.class.getSimpleName() + + assertTrue("Not all subclasses of " + ESTestCase.class.getSimpleName() + " match the naming convention. Concrete classes must end with [Test|Tests]: " + missingSuffix.toString(), missingSuffix.isEmpty()); assertTrue("Pure Unit-Test found must subclass one of [" + classesToSubclass +"] " + pureUnitTest.toString(), @@ -157,14 +157,16 @@ public class NamingConventionTests extends ElasticsearchTestCase { * Some test the test classes */ + @SuppressForbidden(reason = "Ignoring test the tester") @Ignore public static final class NotImplementingTests {} + @SuppressForbidden(reason = "Ignoring test the tester") @Ignore public static final class NotImplementingTest {} - public static final class WrongName extends ElasticsearchTestCase {} + public static final class WrongName extends ESTestCase {} - public static final class WrongNameTheSecond extends ElasticsearchTestCase {} + public static final class WrongNameTheSecond extends ESTestCase {} public static final class PlainUnit extends TestCase {} diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java index fbb9d1a2c0..4161578a5a 100644 --- a/core/src/test/java/org/elasticsearch/VersionTests.java +++ b/core/src/test/java/org/elasticsearch/VersionTests.java @@ -22,7 +22,7 @@ package org.elasticsearch; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.hamcrest.Matchers; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.sameInstance; -public class VersionTests extends ElasticsearchTestCase { +public class VersionTests extends ESTestCase { public void testMavenVersion() { // maven sets this property to ensure that the latest version diff --git a/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java b/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java index fdb2f5478b..1b95665609 100644 --- a/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java +++ b/core/src/test/java/org/elasticsearch/action/IndicesRequestIT.java @@ -91,9 +91,9 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.search.action.SearchServiceTransportAction; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.Transport; import org.elasticsearch.transport.TransportChannel; @@ -122,7 +122,7 @@ import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.instanceOf; @ClusterScope(scope = Scope.SUITE, numClientNodes = 1, minNumDataNodes = 2) -public class IndicesRequestIT extends ElasticsearchIntegrationTest { +public class IndicesRequestIT extends ESIntegTestCase { private final List<String> indices = new ArrayList<>(); diff --git a/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java b/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java index d371fd5b61..7d52c6c77c 100644 --- a/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java +++ b/core/src/test/java/org/elasticsearch/action/ListenerActionIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.cluster.node.DiscoveryNode; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReference; /** */ -public class ListenerActionIT extends ElasticsearchIntegrationTest { +public class ListenerActionIT extends ESIntegTestCase { @Test public void verifyThreadedListeners() throws Throwable { diff --git a/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java b/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java index 83411fcd40..becdb93386 100644 --- a/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java +++ b/core/src/test/java/org/elasticsearch/action/OriginalIndicesTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.action; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import java.io.IOException; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; -public class OriginalIndicesTests extends ElasticsearchTestCase { +public class OriginalIndicesTests extends ESTestCase { private static final IndicesOptions[] indicesOptionsValues = new IndicesOptions[]{ IndicesOptions.lenientExpandOpen() , IndicesOptions.strictExpand(), IndicesOptions.strictExpandOpen(), diff --git a/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java b/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java index 7ca17b1a39..ff094e09a4 100644 --- a/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java +++ b/core/src/test/java/org/elasticsearch/action/RejectionActionIT.java @@ -28,8 +28,8 @@ import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Locale; @@ -40,8 +40,8 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 2) -public class RejectionActionIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 2) +public class RejectionActionIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java b/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java index fb71a1c170..8d88be38e8 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/HotThreadsIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.node.hotthreads.NodeHotThreads; import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequestBuilder; import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Map; @@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.lessThan; -public class HotThreadsIT extends ElasticsearchIntegrationTest { +public class HotThreadsIT extends ESIntegTestCase { @Test public void testHotThreadsDontFail() throws ExecutionException, InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java index 90189204f7..caa88ddfb7 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/repositories/RepositoryBlocksIT.java @@ -23,8 +23,8 @@ import org.elasticsearch.action.admin.cluster.repositories.get.GetRepositoriesRe import org.elasticsearch.action.admin.cluster.repositories.verify.VerifyRepositoryResponse; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -37,8 +37,8 @@ import static org.hamcrest.Matchers.hasSize; * * The @ClusterScope TEST is needed because this class updates the cluster setting "cluster.blocks.read_only". */ -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class RepositoryBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class RepositoryBlocksIT extends ESIntegTestCase { @Test public void testPutRepositoryWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java index b3566013f6..2516310c7a 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/snapshots/SnapshotBlocksIT.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.cluster.snapshots; import org.elasticsearch.action.admin.cluster.repositories.verify.VerifyRepositoryResponse; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; -import org.elasticsearch.action.admin.cluster.snapshots.delete.DeleteSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.get.GetSnapshotsResponse; import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse; @@ -28,8 +27,8 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Before; import org.junit.Test; @@ -45,8 +44,8 @@ import static org.hamcrest.Matchers.hasSize; * * The @ClusterScope TEST is needed because this class updates the cluster setting "cluster.blocks.read_only". */ -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class SnapshotBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class SnapshotBlocksIT extends ESIntegTestCase { protected static final String INDEX_NAME = "test-blocks-1"; protected static final String OTHER_INDEX_NAME = "test-blocks-2"; diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java index dd66049adf..1b5a4ef41b 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Test; @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.equalTo; /** * Unit tests for the {@link ClusterStateRequest}. */ -public class ClusterStateRequestTest extends ElasticsearchTestCase { +public class ClusterStateRequestTest extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java index 7a6c429452..2be808ebef 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIT.java @@ -26,20 +26,20 @@ import org.elasticsearch.client.Requests; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.store.Store; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.hamcrest.Matchers; import org.junit.Test; import java.io.IOException; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.is; @ClusterScope(scope = Scope.SUITE, numDataNodes = 1, numClientNodes = 0) -public class ClusterStatsIT extends ElasticsearchIntegrationTest { +public class ClusterStatsIT extends ESIntegTestCase { private void assertCounts(ClusterStatsNodes.Counts counts, int total, int masterOnly, int dataOnly, int masterData, int client) { assertThat(counts.getTotal(), Matchers.equalTo(total)); diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java index 5a9ccd6a0b..a02860e8a8 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/tasks/PendingTasksBlocksIT.java @@ -19,16 +19,16 @@ package org.elasticsearch.action.admin.cluster.tasks; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class PendingTasksBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class PendingTasksBlocksIT extends ESIntegTestCase { @Test public void testPendingTasksWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java index 8aa22ee915..deb57cfa24 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/cache/clear/ClearIndicesCacheBlocksIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.action.admin.indices.cache.clear; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -30,8 +30,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class ClearIndicesCacheBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class ClearIndicesCacheBlocksIT extends ESIntegTestCase { @Test public void testClearIndicesCacheWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java index c105450c1c..ed2b503c37 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexIT.java @@ -25,9 +25,9 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.util.HashMap; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; import static org.hamcrest.core.IsNull.notNullValue; @ClusterScope(scope = Scope.TEST) -public class CreateIndexIT extends ElasticsearchIntegrationTest{ +public class CreateIndexIT extends ESIntegTestCase { @Test public void testCreationDate_Given() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java index 31576c38d0..2fff8357fd 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java @@ -19,12 +19,11 @@ package org.elasticsearch.action.admin.indices.create; -import org.elasticsearch.action.index.IndexRequestBuilderTest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.rest.NoOpClient; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -34,7 +33,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class CreateIndexRequestBuilderTest extends ElasticsearchTestCase { +public class CreateIndexRequestBuilderTest extends ESTestCase { private static final String KEY = "my.settings.key"; private static final String VALUE = "my.settings.value"; diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java index f5993c4b13..85e0072bfe 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java @@ -19,14 +19,14 @@ package org.elasticsearch.action.admin.indices.delete; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class DeleteIndexBlocksIT extends ElasticsearchIntegrationTest{ +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class DeleteIndexBlocksIT extends ESIntegTestCase { @Test public void testDeleteIndexWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java index df2321af5d..cf03bf798d 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/flush/FlushBlocksIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.action.admin.indices.flush; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -30,8 +30,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class FlushBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class FlushBlocksIT extends ESIntegTestCase { @Test public void testFlushWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java index 2926ed80b8..ce214dd5a9 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexIT.java @@ -20,7 +20,6 @@ package org.elasticsearch.action.admin.indices.get; import com.google.common.collect.ImmutableList; -import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.get.GetIndexRequest.Feature; import org.elasticsearch.cluster.metadata.AliasMetaData; @@ -29,7 +28,7 @@ import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.search.warmer.IndexWarmersMetaData.Entry; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -41,8 +40,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.*; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GetIndexIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GetIndexIT extends ESIntegTestCase { private static final String[] allFeatures = { "_alias", "_aliases", "_mapping", "_mappings", "_settings", "_warmer", "_warmers" }; diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java index f5c73082bc..967a902646 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java @@ -20,9 +20,9 @@ package org.elasticsearch.action.admin.indices.mapping.put; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; -public class PutMappingRequestTests extends ElasticsearchTestCase { +public class PutMappingRequestTests extends ESTestCase { public void testValidation() { PutMappingRequest r = new PutMappingRequest("myindex"); diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java index d4122e3ebf..06c19564c3 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/optimize/OptimizeBlocksIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.action.admin.indices.optimize; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -30,8 +30,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class OptimizeBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class OptimizeBlocksIT extends ESIntegTestCase { @Test public void testOptimizeWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java index 6143d93350..65c37c686b 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/refresh/RefreshBlocksIT.java @@ -20,8 +20,8 @@ package org.elasticsearch.action.admin.indices.refresh; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -31,8 +31,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.equalTo; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class RefreshBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class RefreshBlocksIT extends ESIntegTestCase { @Test public void testRefreshWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java index efe632d190..fcb7a509d5 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsBlocksIT.java @@ -19,8 +19,8 @@ package org.elasticsearch.action.admin.indices.segments; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -29,8 +29,8 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class IndicesSegmentsBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class IndicesSegmentsBlocksIT extends ESIntegTestCase { @Test public void testIndicesSegmentsWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java index df9fbda67c..9db47f6ab3 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.action.admin.indices.segments; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Segment; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; import org.junit.Test; import java.util.List; -public class IndicesSegmentsRequestTests extends ElasticsearchSingleNodeTest { +public class IndicesSegmentsRequestTests extends ESSingleNodeTestCase { @Before public void setupIndex() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java index 13c273b93b..396e442b80 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreRequestIT.java @@ -24,7 +24,6 @@ import com.carrotsearch.hppc.cursors.IntObjectCursor; import com.carrotsearch.hppc.cursors.ObjectCursor; import com.google.common.base.Predicate; import org.apache.lucene.index.CorruptIndexException; -import org.elasticsearch.action.admin.indices.shards.IndicesShardStoresResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.ClusterState; @@ -36,7 +35,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.store.MockFSDirectoryService; import org.junit.Test; @@ -48,8 +47,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; import static org.hamcrest.Matchers.*; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class IndicesShardStoreRequestIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class IndicesShardStoreRequestIT extends ESIntegTestCase { @Test public void testEmpty() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTest.java b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTest.java index 41372759da..12b61e2c2a 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTest.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTest.java @@ -20,17 +20,15 @@ package org.elasticsearch.action.admin.indices.shards; import com.google.common.collect.ImmutableList; -import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.Version; -import org.elasticsearch.action.admin.indices.shards.IndicesShardStoresResponse; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.ImmutableOpenIntMap; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.common.xcontent.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.transport.NodeDisconnectedException; import org.junit.Test; @@ -39,7 +37,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; -public class IndicesShardStoreResponseTest extends ElasticsearchTestCase { +public class IndicesShardStoreResponseTest extends ESTestCase { @Test public void testBasicSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java index fa8ff594dc..125c4e4602 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsBlocksIT.java @@ -21,16 +21,16 @@ package org.elasticsearch.action.admin.indices.stats; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class IndicesStatsBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class IndicesStatsBlocksIT extends ESIntegTestCase { @Test public void testIndicesStatsWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java index a8c40a8ce4..8539c6cb8e 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsTests.java @@ -24,12 +24,12 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.engine.CommitStats; import org.elasticsearch.index.engine.SegmentsStats; import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class IndicesStatsTests extends ElasticsearchSingleNodeTest { +public class IndicesStatsTests extends ESSingleNodeTestCase { public void testSegmentStatsEmptyIndex() { createIndex("test"); diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java index 67ed2bee12..1a17a4c78a 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/warmer/put/PutWarmerRequestTests.java @@ -19,13 +19,13 @@ package org.elasticsearch.action.admin.indices.warmer.put; import org.elasticsearch.action.ActionRequestValidationException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.hasSize; -public class PutWarmerRequestTests extends ElasticsearchTestCase { +public class PutWarmerRequestTests extends ESTestCase { @Test // issue 4196 public void testThatValidationWithoutSpecifyingSearchRequestFails() { diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java index cd52f6a3a7..fe5c082133 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java @@ -23,12 +23,12 @@ package org.elasticsearch.action.bulk; import com.google.common.base.Charsets; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; -public class BulkIntegrationIT extends ElasticsearchIntegrationTest { +public class BulkIntegrationIT extends ESIntegTestCase { @Test public void testBulkIndexCreatesMapping() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java index be6fcca12d..b26a10f100 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorClusterSettingsIT.java @@ -20,13 +20,13 @@ package org.elasticsearch.action.bulk; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class BulkProcessorClusterSettingsIT extends ElasticsearchIntegrationTest { +public class BulkProcessorClusterSettingsIT extends ESIntegTestCase { @Test public void testBulkProcessorAutoCreateRestrictions() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java index 0e50dfdcc4..dd39f85338 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkProcessorIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -47,7 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class BulkProcessorIT extends ElasticsearchIntegrationTest { +public class BulkProcessorIT extends ESIntegTestCase { @Test public void testThatBulkProcessorCountIsCorrect() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java b/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java index 6220958a0c..61361d48fb 100644 --- a/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/bulk/BulkRequestTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.client.Requests; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.script.Script; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.notNullValue; -public class BulkRequestTests extends ElasticsearchTestCase { +public class BulkRequestTests extends ESTestCase { @Test public void testSimpleBulk1() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java index 98ab1632e2..5d77247d38 100644 --- a/core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/action/count/CountRequestBuilderTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -39,7 +39,7 @@ import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; -public class CountRequestBuilderTests extends ElasticsearchTestCase { +public class CountRequestBuilderTests extends ESTestCase { private static Client client; diff --git a/core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java b/core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java index a972ff56d1..407cfbaec9 100644 --- a/core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/count/CountRequestTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.QuerySourceBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; -public class CountRequestTests extends ElasticsearchTestCase { +public class CountRequestTests extends ESTestCase { @Test public void testToSearchRequest() { diff --git a/core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java b/core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java index bbe6c64edf..11fd191c78 100644 --- a/core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java +++ b/core/src/test/java/org/elasticsearch/action/count/CountResponseTests.java @@ -24,12 +24,12 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.search.internal.InternalSearchHits; import org.elasticsearch.search.internal.InternalSearchResponse; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; -public class CountResponseTests extends ElasticsearchTestCase { +public class CountResponseTests extends ESTestCase { @Test public void testFromSearchResponse() { diff --git a/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java b/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java index e8521c7d50..e2c98ce65a 100644 --- a/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java +++ b/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java @@ -21,14 +21,14 @@ package org.elasticsearch.action.fieldstats; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.Streams; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import static org.elasticsearch.action.fieldstats.IndexConstraint.Comparison.*; import static org.elasticsearch.action.fieldstats.IndexConstraint.Property.MAX; import static org.elasticsearch.action.fieldstats.IndexConstraint.Property.MIN; import static org.hamcrest.Matchers.equalTo; -public class FieldStatsRequestTest extends ElasticsearchTestCase { +public class FieldStatsRequestTest extends ESTestCase { public void testFieldsParsing() throws Exception { byte[] data = Streams.copyToBytesFromClasspath("/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json"); diff --git a/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java b/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java index 073d259663..c48f65be4b 100644 --- a/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/get/MultiGetShardRequestTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.VersionType; import org.elasticsearch.search.fetch.source.FetchSourceContext; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +31,7 @@ import java.io.IOException; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; -public class MultiGetShardRequestTests extends ElasticsearchTestCase { +public class MultiGetShardRequestTests extends ESTestCase { @Test public void testSerialization() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java b/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java index 478e12051d..8e3b8b2a57 100644 --- a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.rest.NoOpClient; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,7 +33,7 @@ import java.io.ByteArrayOutputStream; import java.util.HashMap; import java.util.Map; -public class IndexRequestBuilderTest extends ElasticsearchTestCase { +public class IndexRequestBuilderTest extends ESTestCase { private static final String EXPECTED_SOURCE = "{\"SomeKey\":\"SomeValue\"}"; private NoOpClient testClient; diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java b/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java index a8aead541c..1cdea96542 100644 --- a/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/index/IndexRequestTests.java @@ -18,13 +18,13 @@ */ package org.elasticsearch.action.index; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; /** */ -public class IndexRequestTests extends ElasticsearchTestCase { +public class IndexRequestTests extends ESTestCase { @Test public void testIndexRequestOpTypeFromString() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java b/core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java index 3ff5cf9392..ea1d3ba8d9 100644 --- a/core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/indexedscripts/get/GetIndexedScriptRequestTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.action.indexedscripts.get; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.index.VersionType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import java.io.IOException; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; -public class GetIndexedScriptRequestTests extends ElasticsearchTestCase { +public class GetIndexedScriptRequestTests extends ESTestCase { @Test public void testGetIndexedScriptRequestSerialization() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java b/core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java index 50f915bfe6..2f2a0728c6 100644 --- a/core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/percolate/MultiPercolatorRequestTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class MultiPercolatorRequestTests extends ElasticsearchTestCase { +public class MultiPercolatorRequestTests extends ESTestCase { @Test public void testParseBulkRequests() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java b/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java index 538a8d452e..05f7d52234 100644 --- a/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/search/MultiSearchRequestTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class MultiSearchRequestTests extends ElasticsearchTestCase { +public class MultiSearchRequestTests extends ESTestCase { @Test public void simpleAdd() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java b/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java index 900c278780..3c2bada224 100644 --- a/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/action/search/SearchRequestBuilderTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -38,7 +38,7 @@ import java.io.IOException; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; -public class SearchRequestBuilderTests extends ElasticsearchTestCase { +public class SearchRequestBuilderTests extends ESTestCase { private static Client client; diff --git a/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java b/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java index 13657fb06d..c681a6107c 100644 --- a/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/IndicesOptionsTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.action.support; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; -public class IndicesOptionsTests extends ElasticsearchTestCase { +public class IndicesOptionsTests extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java b/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java index 2c97caf6e8..a6c21ca3d6 100644 --- a/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/ListenableActionFutureTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.action.support; import org.elasticsearch.action.ActionListener; import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.Transports; @@ -28,7 +28,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -public class ListenableActionFutureTests extends ElasticsearchTestCase { +public class ListenableActionFutureTests extends ESTestCase { public void testListenerIsCallableFromNetworkThreads() throws Throwable { ThreadPool threadPool = new ThreadPool("testListenerIsCallableFromNetworkThreads"); diff --git a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java index 2295f549fb..41fb1d919b 100644 --- a/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/TransportActionFilterChainTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.ActionRequest; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.CoreMatchers.*; -public class TransportActionFilterChainTests extends ElasticsearchTestCase { +public class TransportActionFilterChainTests extends ESTestCase { private AtomicInteger counter; diff --git a/core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java b/core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java index 5cfeceb3bd..d08840b077 100644 --- a/core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java +++ b/core/src/test/java/org/elasticsearch/action/support/replication/ShardReplicationTests.java @@ -54,7 +54,7 @@ import org.elasticsearch.index.shard.IndexShardNotStartedException; import org.elasticsearch.index.shard.IndexShardState; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cluster.TestClusterService; import org.elasticsearch.test.transport.CapturingTransport; import org.elasticsearch.threadpool.ThreadPool; @@ -80,7 +80,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.hamcrest.Matchers.*; -public class ShardReplicationTests extends ElasticsearchTestCase { +public class ShardReplicationTests extends ESTestCase { private static ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java index 06b21bbaab..23dd7562d1 100644 --- a/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java +++ b/core/src/test/java/org/elasticsearch/action/termvectors/AbstractTermVectorsTests.java @@ -40,8 +40,7 @@ import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.common.inject.internal.Join; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.*; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; import java.util.*; @@ -50,7 +49,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public abstract class AbstractTermVectorsTests extends ElasticsearchIntegrationTest { +public abstract class AbstractTermVectorsTests extends ESIntegTestCase { protected static class TestFieldSetting { final public String name; diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java index 0dca5ab5e0..0e1c978dda 100644 --- a/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java +++ b/core/src/test/java/org/elasticsearch/action/termvectors/GetTermVectorsCheckDocFreqIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -38,7 +38,7 @@ import java.io.IOException; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class GetTermVectorsCheckDocFreqIT extends ElasticsearchIntegrationTest { +public class GetTermVectorsCheckDocFreqIT extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java b/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java index d48473d850..13d923a790 100644 --- a/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java +++ b/core/src/test/java/org/elasticsearch/action/termvectors/TermVectorsUnitTests.java @@ -42,7 +42,7 @@ import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.core.TypeParsers; import org.elasticsearch.index.mapper.internal.AllFieldMapper; import org.elasticsearch.rest.action.termvectors.RestTermVectorsAction; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -56,7 +56,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class TermVectorsUnitTests extends ElasticsearchTestCase { +public class TermVectorsUnitTests extends ESTestCase { @Test public void streamResponse() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java index e127ec8151..6be5fe95fd 100644 --- a/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.index.get.GetResult; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService.ScriptType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class UpdateRequestTests extends ElasticsearchTestCase { +public class UpdateRequestTests extends ESTestCase { @Test public void testUpdateRequest() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java b/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java index 071355ee89..8f8759e45d 100644 --- a/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java +++ b/core/src/test/java/org/elasticsearch/aliases/IndexAliasesIT.java @@ -45,7 +45,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -81,7 +81,7 @@ import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class IndexAliasesIT extends ElasticsearchIntegrationTest { +public class IndexAliasesIT extends ESIntegTestCase { @Test public void testAliases() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java b/core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java index bcb2157317..ef7afbe8ed 100644 --- a/core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java +++ b/core/src/test/java/org/elasticsearch/benchmark/cluster/ClusterAllocationRerouteBenchmark.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import java.util.Random; @@ -48,9 +48,9 @@ public class ClusterAllocationRerouteBenchmark { final int numReplicas = 2; final int numberOfNodes = 30; final int numberOfTags = 2; - AllocationService strategy = ElasticsearchAllocationTestCase.createAllocationService(Settings.builder() - .put("cluster.routing.allocation.awareness.attributes", "tag") - .build(), new Random(1)); + AllocationService strategy = ESAllocationTestCase.createAllocationService(Settings.builder() + .put("cluster.routing.allocation.awareness.attributes", "tag") + .build(), new Random(1)); MetaData.Builder mb = MetaData.builder(); for (int i = 1; i <= numIndices; i++) { @@ -64,7 +64,7 @@ public class ClusterAllocationRerouteBenchmark { RoutingTable routingTable = rb.build(); DiscoveryNodes.Builder nb = DiscoveryNodes.builder(); for (int i = 1; i <= numberOfNodes; i++) { - nb.put(ElasticsearchAllocationTestCase.newNode("node" + i, numberOfTags == 0 ? ImmutableMap.<String, String>of() : ImmutableMap.of("tag", "tag_" + (i % numberOfTags)))); + nb.put(ESAllocationTestCase.newNode("node" + i, numberOfTags == 0 ? ImmutableMap.<String, String>of() : ImmutableMap.of("tag", "tag_" + (i % numberOfTags)))); } ClusterState initialClusterState = ClusterState.builder(ClusterName.DEFAULT).metaData(metaData).routingTable(routingTable).nodes(nb).build(); diff --git a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java b/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java index f9ad7749d6..d256c6a2c9 100644 --- a/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/blocks/SimpleBlocksIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -35,8 +35,8 @@ import java.util.HashMap; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class SimpleBlocksIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class SimpleBlocksIT extends ESIntegTestCase { @Test public void verifyIndexAndClusterReadOnly() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java b/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java index ead01b38cd..8497f91cdc 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/JNANativesTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.bootstrap; import org.apache.lucene.util.Constants; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class JNANativesTests extends ElasticsearchTestCase { +public class JNANativesTests extends ESTestCase { @Test public void testMlockall() { diff --git a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java index 819cb1f51e..50c68eba28 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.bootstrap; import org.elasticsearch.Version; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.net.URL; @@ -33,7 +33,7 @@ import java.util.jar.Manifest; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -public class JarHellTests extends ElasticsearchTestCase { +public class JarHellTests extends ESTestCase { URL makeJar(Path dir, String name, Manifest manifest, String... files) throws IOException { Path jarpath = dir.resolve(name); diff --git a/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java b/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java index 38780ec0ca..664b677fe7 100644 --- a/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java +++ b/core/src/test/java/org/elasticsearch/bootstrap/SecurityTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.Constants; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.FilePermission; import java.io.IOException; @@ -33,7 +33,7 @@ import java.security.PermissionCollection; import java.security.Permissions; import java.util.Set; -public class SecurityTests extends ElasticsearchTestCase { +public class SecurityTests extends ESTestCase { /** test generated permissions */ public void testGeneratedPermissions() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java b/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java index f961acc2b8..4196a8dde8 100644 --- a/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java +++ b/core/src/test/java/org/elasticsearch/broadcast/BroadcastActionsIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class BroadcastActionsIT extends ElasticsearchIntegrationTest { +public class BroadcastActionsIT extends ESIntegTestCase { @Override protected int maximumNumberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java index 359b6228f3..aec57c5781 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/BasicAnalysisBackwardCompatibilityIT.java @@ -24,8 +24,8 @@ import org.apache.lucene.util.TestUtil; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -38,8 +38,8 @@ import java.util.regex.Pattern; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -@ElasticsearchIntegrationTest.ClusterScope(numDataNodes = 0, scope = ElasticsearchIntegrationTest.Scope.SUITE, numClientNodes = 0, transportClientRatio = 0.0) -public class BasicAnalysisBackwardCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +@ESIntegTestCase.ClusterScope(numDataNodes = 0, scope = ESIntegTestCase.Scope.SUITE, numClientNodes = 0, transportClientRatio = 0.0) +public class BasicAnalysisBackwardCompatibilityIT extends ESBackcompatTestCase { // This pattern match characters with Line_Break = Complex_Content. final static Pattern complexUnicodeChars = Pattern.compile("[\u17B4\u17B5\u17D3\u17CB-\u17D1\u17DD\u1036\u17C6\u1A74\u1038\u17C7\u0E4E\u0E47-\u0E4D\u0EC8-\u0ECD\uAABF\uAAC1\u1037\u17C8-\u17CA\u1A75-\u1A7C\u1AA8-\u1AAB\uAADE\uAADF\u1AA0-\u1AA6\u1AAC\u1AAD\u109E\u109F\uAA77-\uAA79\u0E46\u0EC6\u17D7\u1AA7\uA9E6\uAA70\uAADD\u19DA\u0E01-\u0E3A\u0E40-\u0E45\u0EDE\u0E81\u0E82\u0E84\u0E87\u0E88\u0EAA\u0E8A\u0EDF\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAB\u0EDC\u0EDD\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\uAA80-\uAABE\uAAC0\uAAC2\uAADB\uAADC\u1000\u1075\u1001\u1076\u1002\u1077\uAA60\uA9E9\u1003\uA9E0\uA9EA\u1004\u105A\u1005\u1078\uAA61\u1006\uA9E1\uAA62\uAA7E\u1007\uAA63\uA9EB\u1079\uAA72\u1008\u105B\uA9E2\uAA64\uA9EC\u1061\uAA7F\u1009\u107A\uAA65\uA9E7\u100A\u100B\uAA66\u100C\uAA67\u100D\uAA68\uA9ED\u100E\uAA69\uA9EE\u100F\u106E\uA9E3\uA9EF\u1010-\u1012\u107B\uA9FB\u1013\uAA6A\uA9FC\u1014\u107C\uAA6B\u105E\u1015\u1016\u107D\u107E\uAA6F\u108E\uA9E8\u1017\u107F\uA9FD\u1018\uA9E4\uA9FE\u1019\u105F\u101A\u103B\u101B\uAA73\uAA7A\u103C\u101C\u1060\u101D\u103D\u1082\u1080\u1050\u1051\u1065\u101E\u103F\uAA6C\u101F\u1081\uAA6D\u103E\uAA6E\uAA71\u1020\uA9FA\u105C\u105D\u106F\u1070\u1066\u1021-\u1026\u1052-\u1055\u1027-\u102A\u102C\u102B\u1083\u1072\u109C\u102D\u1071\u102E\u1033\u102F\u1073\u1074\u1030\u1056-\u1059\u1031\u1084\u1035\u1085\u1032\u109D\u1034\u1062\u1067\u1068\uA9E5\u1086\u1039\u103A\u1063\u1064\u1069-\u106D\u1087\u108B\u1088\u108C\u108D\u1089\u108A\u108F\u109A\u109B\uAA7B-\uAA7D\uAA74-\uAA76\u1780-\u17A2\u17DC\u17A3-\u17B3\u17B6-\u17C5\u17D2\u1950-\u196D\u1970-\u1974\u1980-\u199C\u19DE\u19DF\u199D-\u19AB\u19B0-\u19C9\u1A20-\u1A26\u1A58\u1A59\u1A27-\u1A3B\u1A5A\u1A5B\u1A3C-\u1A46\u1A54\u1A47-\u1A4C\u1A53\u1A6B\u1A55-\u1A57\u1A5C-\u1A5E\u1A4D-\u1A52\u1A61\u1A6C\u1A62-\u1A6A\u1A6E\u1A6F\u1A73\u1A70-\u1A72\u1A6D\u1A60]"); diff --git a/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java index 19593b0771..8faccc5c88 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/BasicBackwardsCompatibilityIT.java @@ -46,7 +46,6 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; @@ -59,7 +58,7 @@ import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.io.IOException; @@ -76,7 +75,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class BasicBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class BasicBackwardsCompatibilityIT extends ESBackcompatTestCase { /** * Basic test using Index & Realtime Get with external versioning. This test ensures routing works correctly across versions. diff --git a/core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatIT.java b/core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatIT.java index 9964c64e0b..1fe1dbb063 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/ClusterStateBackwardsCompatIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.block.ClusterBlocks; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.util.HashMap; @@ -38,7 +38,7 @@ import java.util.Map; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.hamcrest.Matchers.equalTo; -public class ClusterStateBackwardsCompatIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class ClusterStateBackwardsCompatIT extends ESBackcompatTestCase { @Test public void testClusterState() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityIT.java index b8cc47242c..d26d049109 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/GetIndexBackwardsCompatibilityIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.warmer.IndexWarmersMetaData.Entry; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class GetIndexBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class GetIndexBackwardsCompatibilityIT extends ESBackcompatTestCase { @Test public void testGetAliases() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatIT.java b/core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatIT.java index 14eccf20f2..8cb9fc7566 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/NodesStatsBasicBackwardsCompatIT.java @@ -25,15 +25,15 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsRequestBuilde import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.lang.reflect.Method; -@ElasticsearchIntegrationTest.ClusterScope(scope= ElasticsearchIntegrationTest.Scope.SUITE, numClientNodes = 0) -public class NodesStatsBasicBackwardsCompatIT extends ElasticsearchBackwardsCompatIntegrationTest { +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE, numClientNodes = 0) +public class NodesStatsBasicBackwardsCompatIT extends ESBackcompatTestCase { @Test public void testNodeStatsSetIndices() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java index e2e948eece..c2ba057f9e 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java @@ -48,7 +48,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.hamcrest.Matchers; @@ -78,9 +78,9 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.greaterThanOrEqualTo; // needs at least 2 nodes since it bumps replicas to 1 -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class OldIndexBackwardsCompatibilityIT extends ElasticsearchIntegrationTest { +public class OldIndexBackwardsCompatibilityIT extends ESIntegTestCase { // TODO: test for proper exception on unsupported indexes (maybe via separate test?) // We have a 0.20.6.zip etc for this. diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java index 68d6faeaea..2130ea5726 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java @@ -28,12 +28,12 @@ import org.elasticsearch.cluster.metadata.IndexTemplateMetaData; import org.elasticsearch.cluster.routing.allocation.decider.FilterAllocationDecider; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.snapshots.AbstractSnapshotIT; +import org.elasticsearch.snapshots.AbstractSnapshotIntegTestCase; import org.elasticsearch.snapshots.RestoreInfo; import org.elasticsearch.snapshots.SnapshotInfo; import org.elasticsearch.snapshots.SnapshotRestoreException; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.io.IOException; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; @ClusterScope(scope = Scope.TEST) -public class RestoreBackwardsCompatIT extends AbstractSnapshotIT { +public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityIT.java index 4f90be1d4d..37961c3d35 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityIT.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.indices.get.GetIndexResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -32,8 +32,8 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; * a full cluster restart (ie no wire format compatibility). */ @LuceneTestCase.SuppressCodecs("*") -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0) -public class StaticIndexBackwardCompatibilityIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0) +public class StaticIndexBackwardCompatibilityIT extends ESIntegTestCase { public void loadIndex(String index, Object... settings) throws Exception { logger.info("Checking static index " + index); diff --git a/core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityIT.java index 26f8a126ad..e071c17b94 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/TransportClientBackwardsCompatibilityIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.test.CompositeTestCluster; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.util.concurrent.ExecutionException; @@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; import static org.hamcrest.CoreMatchers.equalTo; -public class TransportClientBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class TransportClientBackwardsCompatibilityIT extends ESBackcompatTestCase { @Test public void testSniffMode() throws ExecutionException, InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java index fb4c5424a6..f90eae446d 100644 --- a/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/bwcompat/UnicastBackwardsCompatibilityIT.java @@ -21,12 +21,12 @@ package org.elasticsearch.bwcompat; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class UnicastBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class UnicastBackwardsCompatibilityIT extends ESBackcompatTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java b/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java index b68ba8441e..ab4c35f16b 100644 --- a/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java +++ b/core/src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java @@ -49,7 +49,7 @@ import org.elasticsearch.action.search.SearchAction; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.support.Headers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportMessage; import org.junit.After; @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public abstract class AbstractClientHeadersTests extends ElasticsearchTestCase { +public abstract class AbstractClientHeadersTests extends ESTestCase { protected static final Settings HEADER_SETTINGS = Settings.builder() .put(Headers.PREFIX + ".key1", "val1") diff --git a/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java b/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java index 7d8f15ffd8..499998096b 100644 --- a/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java +++ b/core/src/test/java/org/elasticsearch/client/node/NodeClientIT.java @@ -20,19 +20,19 @@ package org.elasticsearch.client.node; import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.is; /** * */ @ClusterScope(scope = Scope.SUITE) -public class NodeClientIT extends ElasticsearchIntegrationTest { +public class NodeClientIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java index 0c0d1c2a97..144d79db35 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientIT.java @@ -26,21 +26,21 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalSettingsPreparer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.transport.TransportService; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.node.NodeBuilder.nodeBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 1.0) -public class TransportClientIT extends ElasticsearchIntegrationTest { +public class TransportClientIT extends ESIntegTestCase { @Test public void testPickingUpChangesInDiscoveryNode() { diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java index 6d1b95198f..ae107b9496 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientNodesServiceTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.LocalTransportAddress; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; import org.junit.Test; @@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; -public class TransportClientNodesServiceTests extends ElasticsearchTestCase { +public class TransportClientNodesServiceTests extends ESTestCase { private static class TestIteration implements Closeable { private final ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java b/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java index 8e7a378a80..307cc0dbe1 100644 --- a/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java +++ b/core/src/test/java/org/elasticsearch/client/transport/TransportClientRetryIT.java @@ -29,8 +29,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.node.internal.InternalSettingsPreparer; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.transport.TransportService; @@ -40,14 +39,14 @@ import java.io.IOException; import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @ClusterScope(scope = Scope.TEST, numClientNodes = 0) @TestLogging("discovery.zen:TRACE") -public class TransportClientRetryIT extends ElasticsearchIntegrationTest { +public class TransportClientRetryIT extends ESIntegTestCase { @Test public void testRetry() throws IOException, ExecutionException, InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java index 6c1e4d2026..f34f693af9 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthIT.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.Priority; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class ClusterHealthIT extends ElasticsearchIntegrationTest { +public class ClusterHealthIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java index 36c63c0d3e..50d7bc9910 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -45,7 +45,7 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.*; -public class ClusterHealthResponsesTests extends ElasticsearchTestCase { +public class ClusterHealthResponsesTests extends ESTestCase { private final IndexNameExpressionResolver indexNameExpressionResolver = new IndexNameExpressionResolver(Settings.EMPTY); diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java index 96caf28748..70e425e10e 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterInfoServiceIT.java @@ -36,7 +36,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.store.Store; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.*; @@ -61,8 +61,8 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; /** * Integration tests for the ClusterInfoService collecting information */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class ClusterInfoServiceIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class ClusterInfoServiceIT extends ESIntegTestCase { public static class Plugin extends AbstractPlugin { diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java index 5cf95f5da5..a174215a17 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterServiceIT.java @@ -37,8 +37,8 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.MockLogAppender; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.threadpool.ThreadPool; @@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; @@ -58,7 +58,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class ClusterServiceIT extends ElasticsearchIntegrationTest { +public class ClusterServiceIT extends ESIntegTestCase { @Test public void testTimeoutUpdateTask() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java index f8dd1320f0..a33730b834 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java @@ -41,7 +41,7 @@ import org.elasticsearch.gateway.GatewayService; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.List; @@ -54,8 +54,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 0, numClientNodes = 0) -public class ClusterStateDiffIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 0, numClientNodes = 0) +public class ClusterStateDiffIT extends ESIntegTestCase { @Test public void testClusterStateDiffSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java index 275f3bd96e..3006e3f522 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/ClusterStateDiffPublishingTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.publish.PublishClusterStateAction; import org.elasticsearch.node.service.NodeService; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.threadpool.ThreadPool; @@ -59,7 +59,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static com.google.common.collect.Maps.newHashMap; import static org.hamcrest.Matchers.*; -public class ClusterStateDiffPublishingTests extends ElasticsearchTestCase { +public class ClusterStateDiffPublishingTests extends ESTestCase { protected ThreadPool threadPool; protected Map<String, MockNode> nodes = newHashMap(); diff --git a/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java b/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java index c6e5ce2fb5..df9c1883dd 100644 --- a/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/DiskUsageTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.cluster; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class DiskUsageTests extends ElasticsearchTestCase { +public class DiskUsageTests extends ESTestCase { @Test public void diskUsageCalcTest() { diff --git a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java b/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java index 7dda2aad4d..6939df28dc 100644 --- a/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/MinimumMasterNodesIT.java @@ -21,7 +21,6 @@ package org.elasticsearch.cluster; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.Priority; @@ -30,8 +29,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.discovery.zen.elect.ElectMasterService; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; @@ -39,13 +38,13 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class MinimumMasterNodesIT extends ElasticsearchIntegrationTest { +public class MinimumMasterNodesIT extends ESIntegTestCase { @Test @TestLogging("cluster.service:TRACE,discovery.zen:TRACE,gateway:TRACE,transport.tracer:TRACE") diff --git a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java b/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java index 514015df54..de0952e5c6 100644 --- a/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/NoMasterNodeIT.java @@ -38,9 +38,9 @@ import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.util.HashMap; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.lessThan; /** */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class NoMasterNodeIT extends ElasticsearchIntegrationTest { +public class NoMasterNodeIT extends ESIntegTestCase { @Test public void testNoMasterActions() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java index 250aca5b5e..4088b69346 100644 --- a/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/SimpleClusterStateIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.CollectionAssertions; import org.junit.Before; import org.junit.Test; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.*; * Checking simple filtering capabilites of the cluster state * */ -public class SimpleClusterStateIT extends ElasticsearchIntegrationTest { +public class SimpleClusterStateIT extends ESIntegTestCase { @Before public void indexData() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java b/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java index 9f2dea3229..2979b1eac8 100644 --- a/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/SimpleDataNodesIT.java @@ -23,21 +23,21 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import static org.elasticsearch.client.Requests.createIndexRequest; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.hamcrest.Matchers.equalTo; /** * */ @ClusterScope(scope= Scope.TEST, numDataNodes =0) -public class SimpleDataNodesIT extends ElasticsearchIntegrationTest { +public class SimpleDataNodesIT extends ESIntegTestCase { @Test public void testDataNodes() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java index 3f3b5f3e92..2876f7911e 100644 --- a/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/SpecificMasterNodesIT.java @@ -23,18 +23,18 @@ import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.io.IOException; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class SpecificMasterNodesIT extends ElasticsearchIntegrationTest { +public class SpecificMasterNodesIT extends ESIntegTestCase { protected final Settings.Builder settingsBuilder() { return Settings.builder().put("discovery.type", "zen"); diff --git a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java b/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java index 69cda15e00..c91915bd9c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/UpdateSettingsValidationIT.java @@ -21,20 +21,20 @@ package org.elasticsearch.cluster; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.List; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope= Scope.TEST, numDataNodes =0) -public class UpdateSettingsValidationIT extends ElasticsearchIntegrationTest { +public class UpdateSettingsValidationIT extends ESIntegTestCase { @Test public void testUpdateSettingsValidation() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java index 608461b2eb..9e3a1127e0 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ack/AckClusterUpdateSettingsIT.java @@ -32,17 +32,17 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.DiscoverySettings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.TEST; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = TEST, minNumDataNodes = 2) -public class AckClusterUpdateSettingsIT extends ElasticsearchIntegrationTest { +public class AckClusterUpdateSettingsIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java b/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java index f1eb4850f0..de05f40aa5 100644 --- a/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/ack/AckIT.java @@ -42,7 +42,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.google.common.base.Predicate; @@ -52,12 +52,12 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; @ClusterScope(minNumDataNodes = 2) -public class AckIT extends ElasticsearchIntegrationTest { +public class AckIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java b/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java index 205abf2980..f15232db19 100644 --- a/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/allocation/AwarenessAllocationIT.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.zen.elect.ElectMasterService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.List; @@ -44,8 +44,8 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ClusterScope(scope= ElasticsearchIntegrationTest.Scope.TEST, numDataNodes =0, minNumDataNodes = 2) -public class AwarenessAllocationIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope= ESIntegTestCase.Scope.TEST, numDataNodes =0, minNumDataNodes = 2) +public class AwarenessAllocationIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(AwarenessAllocationIT.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java index 00a5dc3800..c9643d8601 100644 --- a/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java @@ -41,8 +41,8 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.nio.file.Path; @@ -52,7 +52,7 @@ import java.util.List; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_ENABLE; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.equalTo; @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.hasSize; /** */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class ClusterRerouteIT extends ElasticsearchIntegrationTest { +public class ClusterRerouteIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(ClusterRerouteIT.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java b/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java index ab242d487a..80eaf29655 100644 --- a/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/allocation/FilteringAllocationIT.java @@ -27,18 +27,18 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.List; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope= Scope.TEST, numDataNodes =0) -public class FilteringAllocationIT extends ElasticsearchIntegrationTest { +public class FilteringAllocationIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(FilteringAllocationIT.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java b/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java index a539c59873..edb6235b81 100644 --- a/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleIT.java @@ -23,17 +23,17 @@ import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllo import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator; import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocatorModule; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import java.io.IOException; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.hamcrest.Matchers.instanceOf; @ClusterScope(scope= Scope.TEST, numDataNodes =0) -public class ShardsAllocatorModuleIT extends ElasticsearchIntegrationTest { +public class ShardsAllocatorModuleIT extends ESIntegTestCase { public void testLoadDefaultShardsAllocator() throws IOException { assertAllocatorInstance(Settings.Builder.EMPTY_SETTINGS, BalancedShardsAllocator.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java b/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java index 7c06a3ad8d..5b07daa6ba 100644 --- a/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/allocation/SimpleAllocationIT.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.RoutingNode; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS; @@ -28,7 +28,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class SimpleAllocationIT extends ElasticsearchIntegrationTest { +public class SimpleAllocationIT extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java b/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java index 659f552e0a..0cc7b70796 100644 --- a/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/block/ClusterBlockTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.EnumSet; @@ -31,7 +31,7 @@ import java.util.EnumSet; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; -public class ClusterBlockTests extends ElasticsearchTestCase { +public class ClusterBlockTests extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java index 8dd5a1972d..d63319386b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/DateMathExpressionResolverTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver.Context; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver.DateMathExpressionResolver; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -40,7 +40,7 @@ import java.util.List; import static org.hamcrest.Matchers.equalTo; import static org.joda.time.DateTimeZone.UTC; -public class DateMathExpressionResolverTests extends ElasticsearchTestCase { +public class DateMathExpressionResolverTests extends ESTestCase { private final DateMathExpressionResolver expressionResolver = new DateMathExpressionResolver(Settings.EMPTY); private final Context context = new Context( diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java index 5a5ee4d311..8e906aeea0 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/HumanReadableIndexSettingsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -29,7 +29,7 @@ import org.junit.Test; import static com.google.common.collect.Sets.newHashSet; import static org.elasticsearch.test.VersionUtils.randomVersion; -public class HumanReadableIndexSettingsTests extends ElasticsearchTestCase { +public class HumanReadableIndexSettingsTests extends ESTestCase { @Test public void testHumanReadableSettings() { diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java index 8be23e6f38..e8459b4800 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolverTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.IndexClosedException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Arrays; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class IndexNameExpressionResolverTests extends ElasticsearchTestCase { +public class IndexNameExpressionResolverTests extends ESTestCase { private final IndexNameExpressionResolver indexNameExpressionResolver = new IndexNameExpressionResolver(Settings.EMPTY); diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java index 18ebbc8c43..2211b20ad9 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/MappingMetaDataParserTests.java @@ -23,14 +23,14 @@ import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class MappingMetaDataParserTests extends ElasticsearchTestCase { +public class MappingMetaDataParserTests extends ESTestCase { @Test public void testParseIdAlone() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java index c5063bfc80..4f8d98ed08 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/ToAndFromJsonMetaDataTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.cluster.metadata; import org.elasticsearch.Version; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class ToAndFromJsonMetaDataTests extends ElasticsearchTestCase { +public class ToAndFromJsonMetaDataTests extends ESTestCase { @Test public void testSimpleJsonFromAndTo() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java b/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java index 6c4af1e187..d2f55fc13f 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/WildcardExpressionResolverTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.Version; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Arrays; @@ -31,7 +31,7 @@ import java.util.Arrays; import static com.google.common.collect.Sets.newHashSet; import static org.hamcrest.Matchers.equalTo; -public class WildcardExpressionResolverTests extends ElasticsearchTestCase { +public class WildcardExpressionResolverTests extends ESTestCase { @Test public void testConvertWildcardsJustIndicesTests() { diff --git a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java index c86508f756..141d983ab9 100644 --- a/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeFiltersTests.java @@ -23,7 +23,7 @@ import com.google.common.collect.ImmutableMap; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.DummyTransportAddress; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.cluster.node.DiscoveryNodeFilters.OpType.AND; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DiscoveryNodeFiltersTests extends ElasticsearchTestCase { +public class DiscoveryNodeFiltersTests extends ESTestCase { @Test public void nameMatch() { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java index 2f64f39f05..9394dc8158 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/AllocationIdTests.java @@ -19,14 +19,14 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; /** */ -public class AllocationIdTests extends ElasticsearchTestCase { +public class AllocationIdTests extends ESTestCase { @Test public void testShardToStarted() { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java index c162142c2a..26ba7e1267 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.junit.Test; @@ -36,8 +36,8 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class DelayedAllocationIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class DelayedAllocationIT extends ESIntegTestCase { /** * Verifies that when there is no delay timeout, a 1/1 index shard will immediately diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java index 3892c3a2c4..7a794977c8 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import java.io.BufferedReader; @@ -35,7 +35,7 @@ import java.io.InputStreamReader; import java.nio.file.Path; import java.util.Arrays; -public class RoutingBackwardCompatibilityTests extends ElasticsearchTestCase { +public class RoutingBackwardCompatibilityTests extends ESTestCase { public void testBackwardCompatibility() throws Exception { Path baseDir = createTempDir(); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java index 3545f3d236..bff1977545 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingBackwardCompatibilityUponUpgradeIT.java @@ -28,16 +28,16 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.nio.file.Path; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0) +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0) @LuceneTestCase.SuppressFileSystems("*") // extra files break the single data cluster expectation when unzipping the static index -public class RoutingBackwardCompatibilityUponUpgradeIT extends ElasticsearchIntegrationTest { +public class RoutingBackwardCompatibilityUponUpgradeIT extends ESIntegTestCase { public void testDefaultRouting() throws Exception { test("default_routing_1_x", DjbHashFunction.class, false); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java index 97a1e3d790..94c9f19c4a 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingServiceTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.After; import org.junit.Before; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class RoutingServiceTests extends ElasticsearchAllocationTestCase { +public class RoutingServiceTests extends ESAllocationTestCase { private TestRoutingService routingService; diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java index 28e93ad693..0aa9c4c4ff 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class RoutingTableTest extends ElasticsearchAllocationTestCase { +public class RoutingTableTest extends ESAllocationTestCase { private static final String TEST_INDEX_1 = "test1"; private static final String TEST_INDEX_2 = "test2"; diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java index 81a187592b..79b7ec526b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/ShardRoutingTests.java @@ -26,11 +26,11 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.SnapshotId; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; -public class ShardRoutingTests extends ElasticsearchTestCase { +public class ShardRoutingTests extends ESTestCase { public void testFrozenAfterRead() throws IOException { ShardRouting routing = TestShardRouting.newShardRouting("foo", 1, "node_1", null, null, false, ShardRoutingState.INITIALIZING, 1); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/TestShardRouting.java b/core/src/test/java/org/elasticsearch/cluster/routing/TestShardRouting.java index 9f1f8296a6..0d60b6b571 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/TestShardRouting.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/TestShardRouting.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.routing; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; /** * A helper that allows to create shard routing instances within tests, while not requiring to expose @@ -68,7 +68,7 @@ public class TestShardRouting { switch (state) { case UNASSIGNED: case INITIALIZING: - return new UnassignedInfo(ElasticsearchTestCase.randomFrom(UnassignedInfo.Reason.values()), "auto generated for test"); + return new UnassignedInfo(ESTestCase.randomFrom(UnassignedInfo.Reason.values()), "auto generated for test"); case STARTED: case RELOCATING: return null; diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java index 29e46ff1b3..21c86c8298 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.EnumSet; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class UnassignedInfoTests extends ElasticsearchAllocationTestCase { +public class UnassignedInfoTests extends ESAllocationTestCase { @Test public void testReasonOrdinalOrder() { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java index 46424270fa..d774cf9295 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AddIncrementallyTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllo import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class AddIncrementallyTests extends ElasticsearchAllocationTestCase { +public class AddIncrementallyTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(AddIncrementallyTests.class); @Test diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java index 24cd971848..8e3b92be63 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AllocationCommandsTests.java @@ -40,7 +40,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class AllocationCommandsTests extends ElasticsearchAllocationTestCase { +public class AllocationCommandsTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(AllocationCommandsTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java index c8d1926b6d..f8895a7388 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/AwarenessAllocationTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class AwarenessAllocationTests extends ElasticsearchAllocationTestCase { +public class AwarenessAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(AwarenessAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java index cfc7d5e168..a8311ab606 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java @@ -35,9 +35,9 @@ import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllo import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.test.ESAllocationTestCase; import org.elasticsearch.test.gateway.NoopGatewayAllocator; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -45,7 +45,7 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class BalanceConfigurationTests extends ElasticsearchAllocationTestCase { +public class BalanceConfigurationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(BalanceConfigurationTests.class); // TODO maybe we can randomize these numbers somehow diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java index a7d6bc3335..89e0cf8332 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java @@ -40,7 +40,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** * see issue #9023 */ -public class BalanceUnbalancedClusterTest extends CatAllocationTestBase { +public class BalanceUnbalancedClusterTest extends CatAllocationTestCase { @Override protected Path getCatPath() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java index ff0233f7cf..de416db0c2 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestBase.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/CatAllocationTestCase.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.*; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Ignore; import org.junit.Test; @@ -50,8 +50,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; * the test builds up a clusterstate from the cat input and optionally runs a full balance on it. * This can be used to debug cluster allocation decisions. */ -@Ignore -public abstract class CatAllocationTestBase extends ElasticsearchAllocationTestCase { +public abstract class CatAllocationTestCase extends ESAllocationTestCase { protected abstract Path getCatPath() throws IOException; diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java index d738a8cbd6..1361d276fb 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ClusterRebalanceRoutingTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -37,7 +37,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; -public class ClusterRebalanceRoutingTests extends ElasticsearchAllocationTestCase { +public class ClusterRebalanceRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ClusterRebalanceRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java index 2cf4f13a3b..688a281cb6 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ConcurrentRebalanceRoutingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -36,7 +36,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class ConcurrentRebalanceRoutingTests extends ElasticsearchAllocationTestCase { +public class ConcurrentRebalanceRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ConcurrentRebalanceRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java index 5fc7cb58ab..7697e5bb38 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DeadNodesAllocationTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationComman import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DeadNodesAllocationTests extends ElasticsearchAllocationTestCase { +public class DeadNodesAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(DeadNodesAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java index fb6a3198ce..2b66bee7c6 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/DisableAllocationTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.DisableAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DisableAllocationTests extends ElasticsearchAllocationTestCase { +public class DisableAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(DisableAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java index eb341deded..e776ea5ace 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ElectReplicaAsPrimaryDuringRelocationTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ElectReplicaAsPrimaryDuringRelocationTests extends ElasticsearchAllocationTestCase { +public class ElectReplicaAsPrimaryDuringRelocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ElectReplicaAsPrimaryDuringRelocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 12a417bf69..2240e2e329 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -38,7 +38,7 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class FailedNodeRoutingTests extends ElasticsearchAllocationTestCase { +public class FailedNodeRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(FailedNodeRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java index a53206494d..f45b42cd5e 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedShardsRoutingTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.cluster.routing.allocation; -import com.carrotsearch.randomizedtesting.annotations.Repeat; import com.google.common.collect.ImmutableList; import org.elasticsearch.Version; import org.elasticsearch.cluster.ClusterState; @@ -32,7 +31,7 @@ import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationComman import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.ArrayList; @@ -44,7 +43,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class FailedShardsRoutingTests extends ElasticsearchAllocationTestCase { +public class FailedShardsRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(FailedShardsRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java index 04fb417e21..037daec3c5 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/FilterRoutingTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class FilterRoutingTests extends ElasticsearchAllocationTestCase { +public class FilterRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(FilterRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java index 85bcfb8a3e..c48cdda614 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class IndexBalanceTests extends ElasticsearchAllocationTestCase { +public class IndexBalanceTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(IndexBalanceTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java index 2b4ff06468..94df9af056 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Test; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class NodeVersionAllocationDeciderTests extends ElasticsearchAllocationTestCase { +public class NodeVersionAllocationDeciderTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(NodeVersionAllocationDeciderTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java index de1a57e993..f400513688 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferLocalPrimariesToRelocatingPrimariesTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.RoutingTable; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class PreferLocalPrimariesToRelocatingPrimariesTests extends ElasticsearchAllocationTestCase { +public class PreferLocalPrimariesToRelocatingPrimariesTests extends ESAllocationTestCase { @Test public void testPreferLocalPrimaryAllocationOverFiltered() { int concurrentRecoveries = randomIntBetween(1, 10); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java index d9607e9ac4..be0dde8f78 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PreferPrimaryAllocationTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class PreferPrimaryAllocationTests extends ElasticsearchAllocationTestCase { +public class PreferPrimaryAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(PreferPrimaryAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java index 7d900e889f..8e59326e06 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryElectionRoutingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PrimaryElectionRoutingTests extends ElasticsearchAllocationTestCase { +public class PrimaryElectionRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(PrimaryElectionRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java index ae3df56926..3202a829cb 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/PrimaryNotRelocatedWhileBeingRecoveredTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PrimaryNotRelocatedWhileBeingRecoveredTests extends ElasticsearchAllocationTestCase { +public class PrimaryNotRelocatedWhileBeingRecoveredTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(PrimaryNotRelocatedWhileBeingRecoveredTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java index df15051c22..8ebe7e7de3 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RandomAllocationDeciderTests.java @@ -36,8 +36,8 @@ import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders; import org.elasticsearch.cluster.routing.allocation.decider.Decision; import org.elasticsearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.test.ESAllocationTestCase; import org.elasticsearch.test.gateway.NoopGatewayAllocator; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -49,7 +49,7 @@ import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class RandomAllocationDeciderTests extends ElasticsearchAllocationTestCase { +public class RandomAllocationDeciderTests extends ESAllocationTestCase { /* This test will make random allocation decision on a growing and shrinking * cluster leading to a random distribution of the shards. After a certain diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java index a8d44c1df1..339f2e6985 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RebalanceAfterActiveTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class RebalanceAfterActiveTests extends ElasticsearchAllocationTestCase { +public class RebalanceAfterActiveTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(RebalanceAfterActiveTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java index 268fed8876..e5b2302dae 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ReplicaAllocatedAfterPrimaryTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class ReplicaAllocatedAfterPrimaryTests extends ElasticsearchAllocationTestCase { +public class ReplicaAllocatedAfterPrimaryTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ReplicaAllocatedAfterPrimaryTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java index 620ad859c8..885132b38d 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/RoutingNodesIntegrityTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class RoutingNodesIntegrityTests extends ElasticsearchAllocationTestCase { +public class RoutingNodesIntegrityTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(IndexBalanceTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java index 09dba75929..9896116a4d 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SameShardRoutingTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.SameShardAllocationD import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.transport.DummyTransportAddress; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SameShardRoutingTests extends ElasticsearchAllocationTestCase { +public class SameShardRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(SameShardRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java index 4ca86bfcf7..8568948964 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardVersioningTests.java @@ -29,14 +29,14 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; -public class ShardVersioningTests extends ElasticsearchAllocationTestCase { +public class ShardVersioningTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ShardVersioningTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java index 6b69be0a3d..cbd6233d08 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ShardsLimitAllocationTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class ShardsLimitAllocationTests extends ElasticsearchAllocationTestCase { +public class ShardsLimitAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ShardsLimitAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java index e99c8860c4..6f8027f05d 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardNoReplicasRoutingTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.List; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SingleShardNoReplicasRoutingTests extends ElasticsearchAllocationTestCase { +public class SingleShardNoReplicasRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(SingleShardNoReplicasRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java index 9b5b955d42..de6a1c6f4c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/SingleShardOneReplicaRoutingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SingleShardOneReplicaRoutingTests extends ElasticsearchAllocationTestCase { +public class SingleShardOneReplicaRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(SingleShardOneReplicaRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java index 92847cb5be..dc23085c34 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/StartedShardsRoutingTests.java @@ -25,17 +25,15 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.*; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.Arrays; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.nullValue; -public class StartedShardsRoutingTests extends ElasticsearchAllocationTestCase { +public class StartedShardsRoutingTests extends ESAllocationTestCase { @Test public void tesStartedShardsMatching() { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java index 54ac32c01a..2a8026870e 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/TenShardsOneReplicaRoutingTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class TenShardsOneReplicaRoutingTests extends ElasticsearchAllocationTestCase { +public class TenShardsOneReplicaRoutingTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(TenShardsOneReplicaRoutingTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java index 7479bd1db3..c156aea3bd 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/ThrottlingAllocationTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ThrottlingAllocationTests extends ElasticsearchAllocationTestCase { +public class ThrottlingAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(ThrottlingAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java index 4749ab5ad8..0d2d51388b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/UpdateNumberOfReplicasTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class UpdateNumberOfReplicasTests extends ElasticsearchAllocationTestCase { +public class UpdateNumberOfReplicasTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(UpdateNumberOfReplicasTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java index cc5628f605..c86eba9568 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderTests.java @@ -38,10 +38,10 @@ import org.elasticsearch.cluster.routing.allocation.command.AllocationCommand; import org.elasticsearch.cluster.routing.allocation.command.AllocationCommands; import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.test.ESAllocationTestCase; import org.elasticsearch.test.gateway.NoopGatewayAllocator; import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; import org.junit.Test; import java.util.Arrays; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class DiskThresholdDeciderTests extends ElasticsearchAllocationTestCase { +public class DiskThresholdDeciderTests extends ESAllocationTestCase { private static ShardsAllocators makeShardsAllocators() { return new ShardsAllocators(NoopGatewayAllocator.INSTANCE); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java index 083dc79acb..7b0f838647 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.DiskUsage; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.HashMap; @@ -38,7 +38,7 @@ import static org.hamcrest.CoreMatchers.equalTo; /** * Unit tests for the DiskThresholdDecider */ -public class DiskThresholdDeciderUnitTests extends ElasticsearchTestCase { +public class DiskThresholdDeciderUnitTests extends ESTestCase { @Test public void testDynamicSettings() { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java index 5d2f3bcd08..940634a465 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationDeciderIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.cluster.routing.allocation.decider; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.Set; @@ -32,8 +32,8 @@ import static org.hamcrest.Matchers.equalTo; * {@link EnableAllocationTests} this test is meant to check if the actual update of the settings * works as expected. */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class EnableAllocationDeciderIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class EnableAllocationDeciderIT extends ESIntegTestCase { public void testEnableRebalance() throws InterruptedException { final String firstNode = internalCluster().startNode(); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java index bb7944c332..4e2be68e5b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/EnableAllocationTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.EnumSet; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class EnableAllocationTests extends ElasticsearchAllocationTestCase { +public class EnableAllocationTests extends ESAllocationTestCase { private final ESLogger logger = Loggers.getLogger(EnableAllocationTests.class); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java index 20b1577ace..863031a349 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/MockDiskUsagesIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.monitor.fs.FsInfo; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Test; @@ -50,8 +50,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class MockDiskUsagesIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class MockDiskUsagesIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java index d19433853a..23b928db24 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/operation/hash/murmur3/Murmur3HashFunctionTests.java @@ -24,9 +24,9 @@ import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; import org.elasticsearch.cluster.routing.Murmur3HashFunction; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; -public class Murmur3HashFunctionTests extends ElasticsearchTestCase { +public class Murmur3HashFunctionTests extends ESTestCase { public void test() { // Make sure that we agree with guava diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java index 71e5e62f67..308b00031b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterSerializationTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ClusterSerializationTests extends ElasticsearchAllocationTestCase { +public class ClusterSerializationTests extends ESAllocationTestCase { @Test public void testClusterStateSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java index 9c812dd7b7..573cb13105 100644 --- a/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/serialization/ClusterStateToStringTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.common.transport.DummyTransportAddress; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.hamcrest.Matchers.containsString; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; /** * */ -public class ClusterStateToStringTests extends ElasticsearchAllocationTestCase { +public class ClusterStateToStringTests extends ESAllocationTestCase { @Test public void testClusterStateSerialization() throws Exception { MetaData metaData = MetaData.builder() diff --git a/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java b/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java index 0cc1c8c5ba..796da33f4e 100644 --- a/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/serialization/DiffableTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.DiffableUtils.KeyedReader; import org.elasticsearch.cluster.AbstractDiffable; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.io.stream.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import java.util.Map; import static com.google.common.collect.Maps.newHashMap; import static org.hamcrest.CoreMatchers.equalTo; -public class DiffableTests extends ElasticsearchTestCase { +public class DiffableTests extends ESTestCase { @Test public void testImmutableMapDiff() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java b/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java index 926a4e12a9..6112fe0402 100644 --- a/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java @@ -30,19 +30,19 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.indices.store.IndicesStore; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.TEST; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.*; @ClusterScope(scope = TEST) -public class ClusterSettingsIT extends ElasticsearchIntegrationTest { +public class ClusterSettingsIT extends ESIntegTestCase { @Test public void clusterNonExistingSettingsUpdate() { diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java index 8bce603658..8b3b871113 100644 --- a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java @@ -26,20 +26,20 @@ import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Collection; import static com.google.common.collect.Lists.newArrayList; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @ClusterScope(scope = SUITE, numDataNodes = 1) -public class SettingsFilteringIT extends ElasticsearchIntegrationTest { +public class SettingsFilteringIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java index 5208a7bb8d..fdb54cbb6f 100644 --- a/core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/settings/SettingsValidatorTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.cluster.settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; -public class SettingsValidatorTests extends ElasticsearchTestCase { +public class SettingsValidatorTests extends ESTestCase { @Test public void testValidators() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java index 94635db1ab..422846fc48 100644 --- a/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java +++ b/core/src/test/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java @@ -23,22 +23,22 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(scope= Scope.SUITE, numDataNodes = 2) -public class ClusterSearchShardsIT extends ElasticsearchIntegrationTest { +public class ClusterSearchShardsIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java b/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java index d54f931e8d..9e5f70907c 100644 --- a/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/structure/RoutingIteratorTests.java @@ -34,14 +34,14 @@ import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllo import org.elasticsearch.cluster.routing.OperationRouting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.*; -public class RoutingIteratorTests extends ElasticsearchAllocationTestCase { +public class RoutingIteratorTests extends ESAllocationTestCase { @Test public void testEmptyIterator() { diff --git a/core/src/test/java/org/elasticsearch/codecs/CodecTests.java b/core/src/test/java/org/elasticsearch/codecs/CodecTests.java index 94cbf351fc..697365151f 100644 --- a/core/src/test/java/org/elasticsearch/codecs/CodecTests.java +++ b/core/src/test/java/org/elasticsearch/codecs/CodecTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Assert; @@ -35,7 +35,7 @@ import java.io.IOException; import static org.hamcrest.Matchers.containsString; -public class CodecTests extends ElasticsearchSingleNodeTest { +public class CodecTests extends ESSingleNodeTestCase { public void testAcceptPostingsFormat() throws IOException { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/common/Base64Test.java b/core/src/test/java/org/elasticsearch/common/Base64Test.java index f80d6afb44..07a3689130 100644 --- a/core/src/test/java/org/elasticsearch/common/Base64Test.java +++ b/core/src/test/java/org/elasticsearch/common/Base64Test.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; import com.google.common.base.Charsets; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class Base64Test extends ElasticsearchTestCase { +public class Base64Test extends ESTestCase { @Test // issue #6334 public void testBase64DecodeWithExtraCharactersAfterPadding() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/BooleansTests.java b/core/src/test/java/org/elasticsearch/common/BooleansTests.java index 3bacaed7f5..0baf4335cd 100644 --- a/core/src/test/java/org/elasticsearch/common/BooleansTests.java +++ b/core/src/test/java/org/elasticsearch/common/BooleansTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -28,7 +28,7 @@ import java.util.Locale; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class BooleansTests extends ElasticsearchTestCase { +public class BooleansTests extends ESTestCase { @Test public void testIsBoolean() { diff --git a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java b/core/src/test/java/org/elasticsearch/common/ChannelsTests.java index 2fae109a6a..46e65ad1e7 100644 --- a/core/src/test/java/org/elasticsearch/common/ChannelsTests.java +++ b/core/src/test/java/org/elasticsearch/common/ChannelsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.bytes.ByteBufferBytesReference; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.Channels; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.jboss.netty.buffer.ByteBufferBackedChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer; @@ -32,9 +32,7 @@ import org.junit.Before; import org.junit.Test; import java.io.EOFException; -import java.io.File; import java.io.IOException; -import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; @@ -44,7 +42,7 @@ import java.nio.channels.WritableByteChannel; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -public class ChannelsTests extends ElasticsearchTestCase { +public class ChannelsTests extends ESTestCase { byte[] randomBytes; FileChannel fileChannel; diff --git a/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java b/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java index 7b0dacf850..6df6a50f9a 100644 --- a/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java +++ b/core/src/test/java/org/elasticsearch/common/ParseFieldTests.java @@ -19,14 +19,14 @@ package org.elasticsearch.common; import org.apache.commons.lang3.ArrayUtils; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.EnumSet; import static org.hamcrest.CoreMatchers.*; -public class ParseFieldTests extends ElasticsearchTestCase { +public class ParseFieldTests extends ESTestCase { @Test public void testParse() { diff --git a/core/src/test/java/org/elasticsearch/common/PidFileTests.java b/core/src/test/java/org/elasticsearch/common/PidFileTests.java index ab098924bc..ad083c092f 100644 --- a/core/src/test/java/org/elasticsearch/common/PidFileTests.java +++ b/core/src/test/java/org/elasticsearch/common/PidFileTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common; import com.google.common.base.Charsets; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.BufferedWriter; @@ -32,7 +32,7 @@ import java.nio.file.StandardOpenOption; /** * UnitTest for {@link org.elasticsearch.common.PidFile} */ -public class PidFileTests extends ElasticsearchTestCase { +public class PidFileTests extends ESTestCase { @Test(expected = IllegalArgumentException.class) public void testParentIsFile() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/StringsTests.java b/core/src/test/java/org/elasticsearch/common/StringsTests.java index e6f75aa9a1..611894c6a6 100644 --- a/core/src/test/java/org/elasticsearch/common/StringsTests.java +++ b/core/src/test/java/org/elasticsearch/common/StringsTests.java @@ -19,10 +19,10 @@ package org.elasticsearch.common; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; -public class StringsTests extends ElasticsearchTestCase { +public class StringsTests extends ESTestCase { @Test public void testToCamelCase() { diff --git a/core/src/test/java/org/elasticsearch/common/TableTests.java b/core/src/test/java/org/elasticsearch/common/TableTests.java index 032299cd1b..1afdf59296 100644 --- a/core/src/test/java/org/elasticsearch/common/TableTests.java +++ b/core/src/test/java/org/elasticsearch/common/TableTests.java @@ -19,13 +19,13 @@ package org.elasticsearch.common; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.List; import java.util.Map; -public class TableTests extends ElasticsearchTestCase { +public class TableTests extends ESTestCase { @Test(expected = IllegalStateException.class) public void testFailOnStartRowWithoutHeader() { diff --git a/core/src/test/java/org/elasticsearch/common/UUIDTests.java b/core/src/test/java/org/elasticsearch/common/UUIDTests.java index 23af5fb141..af5f382ec3 100644 --- a/core/src/test/java/org/elasticsearch/common/UUIDTests.java +++ b/core/src/test/java/org/elasticsearch/common/UUIDTests.java @@ -18,13 +18,12 @@ */ package org.elasticsearch.common; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; -import java.io.IOException; import java.util.HashSet; -public class UUIDTests extends ElasticsearchTestCase { +public class UUIDTests extends ESTestCase { static UUIDGenerator timeUUIDGen = new TimeBasedUUIDGenerator(); static UUIDGenerator randomUUIDGen = new RandomBasedUUIDGenerator(); diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java b/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java index 54def2b866..62daeb7e2b 100644 --- a/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java +++ b/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.common.blobstore; -import com.google.common.collect.ImmutableMap; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.LuceneTestCase; @@ -26,7 +25,7 @@ import org.elasticsearch.common.blobstore.fs.FsBlobStore; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -41,7 +40,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class BlobStoreTest extends ElasticsearchTestCase { +public class BlobStoreTest extends ESTestCase { @Test public void testWriteRead() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java b/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java index 27946bacf4..2a9f87a866 100644 --- a/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java +++ b/core/src/test/java/org/elasticsearch/common/breaker/MemoryCircuitBreakerTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.indices.breaker.BreakerSettings; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.concurrent.atomic.AtomicBoolean; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; /** * Tests for the Memory Aggregating Circuit Breaker */ -public class MemoryCircuitBreakerTests extends ElasticsearchTestCase { +public class MemoryCircuitBreakerTests extends ESTestCase { @Test public void testThreadedUpdatesToBreaker() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java b/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java index aaf2ef557f..b18e6f62d2 100644 --- a/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java +++ b/core/src/test/java/org/elasticsearch/common/bytes/BytesReferenceTests.java @@ -20,11 +20,11 @@ package org.elasticsearch.common.bytes; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Arrays; -public class BytesReferenceTests extends ElasticsearchTestCase { +public class BytesReferenceTests extends ESTestCase { public void testEquals() { final int len = randomIntBetween(0, randomBoolean() ? 10: 100000); diff --git a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java index aa0f411039..59a3d01255 100644 --- a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java +++ b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.ByteArray; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.jboss.netty.buffer.ChannelBuffer; import org.junit.After; @@ -42,7 +42,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Arrays; -public class PagedBytesReferenceTest extends ElasticsearchTestCase { +public class PagedBytesReferenceTest extends ESTestCase { private static final int PAGE_SIZE = BigArrays.BYTE_PAGE_SIZE; diff --git a/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java b/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java index 4914f589c5..bb9cad1ce2 100644 --- a/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java +++ b/core/src/test/java/org/elasticsearch/common/cli/CheckFileCommandTests.java @@ -25,7 +25,7 @@ import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class CheckFileCommandTests extends ElasticsearchTestCase { +public class CheckFileCommandTests extends ESTestCase { private CliToolTestCase.CaptureOutputTerminal captureOutputTerminal = new CliToolTestCase.CaptureOutputTerminal(); diff --git a/core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java b/core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java index e4bf49c813..fdfee87dfc 100644 --- a/core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java +++ b/core/src/test/java/org/elasticsearch/common/cli/CliToolTestCase.java @@ -22,7 +22,7 @@ package org.elasticsearch.common.cli; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.Streams; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Ignore; @@ -38,11 +38,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; -/** - * - */ -@Ignore -public abstract class CliToolTestCase extends ElasticsearchTestCase { +public abstract class CliToolTestCase extends ESTestCase { @Before public void setPathHome() { diff --git a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java index 6cdde46941..f6372e53ea 100644 --- a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java +++ b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashMapTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.common.collect; import com.google.common.collect.ImmutableMap; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.HashMap; import java.util.Map; -public class CopyOnWriteHashMapTests extends ElasticsearchTestCase { +public class CopyOnWriteHashMapTests extends ESTestCase { private static class O { diff --git a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java index f489c47bc4..7ca4a7bca5 100644 --- a/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java +++ b/core/src/test/java/org/elasticsearch/common/collect/CopyOnWriteHashSetTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.common.collect; import com.google.common.collect.ImmutableSet; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.HashSet; import java.util.Set; -public class CopyOnWriteHashSetTests extends ElasticsearchTestCase { +public class CopyOnWriteHashSetTests extends ESTestCase { private static class O { diff --git a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java index e9404f4f20..62ea9b6070 100644 --- a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java +++ b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedStreamTests.java @@ -25,8 +25,7 @@ import org.elasticsearch.common.io.stream.ByteBufferStreamInput; import org.elasticsearch.common.io.stream.OutputStreamStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -38,7 +37,7 @@ import java.util.concurrent.CountDownLatch; /** * Test streaming compression (e.g. used for recovery) */ -public abstract class AbstractCompressedStreamTests extends ElasticsearchTestCase { +public abstract class AbstractCompressedStreamTests extends ESTestCase { private final Compressor compressor; diff --git a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java index ad424b7e33..5b8bcf1e44 100644 --- a/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java +++ b/core/src/test/java/org/elasticsearch/common/compress/AbstractCompressedXContentTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.TestUtil; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Assert; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.not; /** * */ -public abstract class AbstractCompressedXContentTests extends ElasticsearchTestCase { +public abstract class AbstractCompressedXContentTests extends ESTestCase { private final Compressor compressor; diff --git a/core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java b/core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java index 720a0331ee..a18a9e3fb6 100644 --- a/core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java +++ b/core/src/test/java/org/elasticsearch/common/compress/lzf/CorruptedCompressorTests.java @@ -24,7 +24,7 @@ import com.ning.compress.lzf.ChunkEncoder; import com.ning.compress.lzf.LZFChunk; import com.ning.compress.lzf.util.ChunkDecoderFactory; import com.ning.compress.lzf.util.ChunkEncoderFactory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -35,7 +35,7 @@ import java.util.Arrays; /** * Test an extremely rare corruption produced by the pure java impl of ChunkEncoder. */ -public class CorruptedCompressorTests extends ElasticsearchTestCase { +public class CorruptedCompressorTests extends ESTestCase { public void testCorruption() throws IOException { // this test generates a hash collision: [0,1,153,64] hashes the same as [1,153,64,64] diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java b/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java index 55ff0bdb21..c38deb1da0 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/GeoHashTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.geo; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; @@ -26,7 +26,7 @@ import org.junit.Test; /** * Tests for {@link GeoHashUtils} */ -public class GeoHashTests extends ElasticsearchTestCase { +public class GeoHashTests extends ESTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java index 9a06b10d81..53463e5605 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions; import java.io.IOException; @@ -46,7 +46,7 @@ import static org.elasticsearch.common.geo.builders.ShapeBuilder.SPATIAL_CONTEXT /** * Tests for {@link GeoJSONShapeParser} */ -public class GeoJSONShapeParserTests extends ElasticsearchTestCase { +public class GeoJSONShapeParserTests extends ESTestCase { private final static GeometryFactory GEOMETRY_FACTORY = SPATIAL_CONTEXT.getGeometryFactory(); diff --git a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java b/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java index d82b1bdd14..703ab2ffaa 100644 --- a/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/geo/ShapeBuilderTests.java @@ -28,17 +28,16 @@ import com.spatial4j.core.shape.impl.PointImpl; import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Polygon; -import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.geo.builders.PolygonBuilder; import org.elasticsearch.common.geo.builders.ShapeBuilder; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.*; /** * Tests for {@link ShapeBuilder} */ -public class ShapeBuilderTests extends ElasticsearchTestCase { +public class ShapeBuilderTests extends ESTestCase { public void testNewPoint() { Point point = ShapeBuilder.newPoint(-100, 45).build(); diff --git a/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java b/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java index 6d3f5c8d05..d9d4057f96 100644 --- a/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java +++ b/core/src/test/java/org/elasticsearch/common/hashing/MurmurHash3Tests.java @@ -22,13 +22,13 @@ package org.elasticsearch.common.hashing; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import org.elasticsearch.common.hash.MurmurHash3; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.LongBuffer; -public class MurmurHash3Tests extends ElasticsearchTestCase { +public class MurmurHash3Tests extends ESTestCase { public void testHash128() { final int iters = scaledRandomIntBetween(100, 5000); diff --git a/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java b/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java index f3534da9f3..8998d1bccf 100644 --- a/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java +++ b/core/src/test/java/org/elasticsearch/common/hppc/HppcMapsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.hppc; import com.carrotsearch.hppc.ObjectHashSet; import org.elasticsearch.common.collect.HppcMaps; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -28,7 +28,7 @@ import java.util.List; import static org.hamcrest.Matchers.equalTo; -public class HppcMapsTests extends ElasticsearchTestCase { +public class HppcMapsTests extends ESTestCase { @Test public void testIntersection() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java b/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java index 53d7c82de3..751cb93522 100644 --- a/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/FileSystemUtilsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.io; import com.google.common.base.Charsets; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems; import org.junit.Assert; import org.junit.Before; @@ -43,7 +43,7 @@ import static org.hamcrest.CoreMatchers.is; * Unit tests for {@link org.elasticsearch.common.io.FileSystemUtils}. */ @SuppressFileSystems("WindowsFS") // tries to move away open file handles -public class FileSystemUtilsTests extends ElasticsearchTestCase { +public class FileSystemUtilsTests extends ESTestCase { private Path src; private Path dst; diff --git a/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java index 2528b25a92..edfe0ba03a 100644 --- a/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/StreamsTests.java @@ -23,7 +23,7 @@ import com.google.common.base.Charsets; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.*; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Unit tests for {@link org.elasticsearch.common.io.Streams}. */ -public class StreamsTests extends ElasticsearchTestCase { +public class StreamsTests extends ESTestCase { @Test public void testCopyFromInputStream() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java b/core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java index 74a97ecc5f..bc25a9f591 100644 --- a/core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java +++ b/core/src/test/java/org/elasticsearch/common/io/streams/BytesStreamsTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.lucene.BytesRefs; import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Ignore; import org.junit.Test; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for {@link BytesStreamOutput} paging behaviour. */ -public class BytesStreamsTests extends ElasticsearchTestCase { +public class BytesStreamsTests extends ESTestCase { @Test public void testEmpty() throws Exception { @@ -306,7 +306,7 @@ public class BytesStreamsTests extends ElasticsearchTestCase { // we ignore this test for now since all existing callers of BytesStreamOutput happily // call bytes() after close(). - @Ignore + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/12620") @Test public void testAccessAfterClose() throws Exception { BytesStreamOutput out = new BytesStreamOutput(); diff --git a/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java b/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java index 359e418bb6..6a1f146046 100644 --- a/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java +++ b/core/src/test/java/org/elasticsearch/common/joda/DateMathParserTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.joda; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.hamcrest.Matchers.equalTo; -public class DateMathParserTests extends ElasticsearchTestCase { +public class DateMathParserTests extends ESTestCase { FormatDateTimeFormatter formatter = Joda.forPattern("dateOptionalTime||epoch_millis"); DateMathParser parser = new DateMathParser(formatter); diff --git a/core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java b/core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java index d236ad5ecf..748994da9f 100644 --- a/core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java +++ b/core/src/test/java/org/elasticsearch/common/logging/jdk/JDKESLoggerTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.logging.jdk; import org.elasticsearch.common.logging.ESLogger; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.logging.Logger; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class JDKESLoggerTests extends ElasticsearchTestCase { +public class JDKESLoggerTests extends ESTestCase { private ESLogger esTestLogger; private TestHandler testHandler; diff --git a/core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java b/core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java index f0d0c076eb..c1bdf00bd3 100644 --- a/core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java +++ b/core/src/test/java/org/elasticsearch/common/logging/log4j/Log4jESLoggerTests.java @@ -27,7 +27,7 @@ import org.apache.log4j.spi.LoggingEvent; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Test; @@ -38,7 +38,7 @@ import java.util.List; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class Log4jESLoggerTests extends ElasticsearchTestCase { +public class Log4jESLoggerTests extends ESTestCase { private ESLogger esTestLogger; private TestAppender testAppender; diff --git a/core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java b/core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java index 4997ea6974..6515432c1a 100644 --- a/core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java +++ b/core/src/test/java/org/elasticsearch/common/logging/log4j/LoggingConfigurationTests.java @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class LoggingConfigurationTests extends ElasticsearchTestCase { +public class LoggingConfigurationTests extends ESTestCase { @Before public void before() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java index 330689d1c4..70a2a2c601 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/IndexCacheableQueryTests.java @@ -36,12 +36,12 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; import org.apache.lucene.util.Version; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.Set; -public class IndexCacheableQueryTests extends ElasticsearchTestCase { +public class IndexCacheableQueryTests extends ESTestCase { static class DummyIndexCacheableQuery extends IndexCacheableQuery { @Override diff --git a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java index 85852cf9f9..8418befe54 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.Version; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * */ -public class LuceneTest extends ElasticsearchTestCase { +public class LuceneTest extends ESTestCase { /* diff --git a/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java b/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java index f6873d0c07..61660f9674 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/ShardCoreKeyMapTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.Directory; import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.Arrays; @@ -35,7 +35,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -public class ShardCoreKeyMapTests extends ElasticsearchTestCase { +public class ShardCoreKeyMapTests extends ESTestCase { public void testMissingShard() throws IOException { try (Directory dir = newDirectory(); diff --git a/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java b/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java index 10661a5ec0..ccf657cf76 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/all/SimpleAllTests.java @@ -34,7 +34,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleAllTests extends ElasticsearchTestCase { +public class SimpleAllTests extends ESTestCase { @Test public void testBoostOnEagerTokenizer() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java b/core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java index 934dd8d6c4..0307a3806c 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/index/ElasticsearchDirectoryReaderTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java @@ -31,10 +31,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; /** Simple tests for this filterreader */ -public class ElasticsearchDirectoryReaderTests extends ElasticsearchTestCase { +public class ESDirectoryReaderTests extends ESTestCase { /** Test that core cache key (needed for NRT) is working */ public void testCoreCacheKey() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java index 840ebd8e9b..49ca12e0f8 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java @@ -44,7 +44,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -55,18 +55,13 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.carrotsearch.randomizedtesting.RandomizedTest.frequently; -import static com.carrotsearch.randomizedtesting.RandomizedTest.getRandom; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomAsciiOfLength; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomBoolean; import static com.carrotsearch.randomizedtesting.RandomizedTest.randomInt; -import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; /** */ -public class FreqTermsEnumTests extends ElasticsearchTestCase { +public class FreqTermsEnumTests extends ESTestCase { private String[] terms; private IndexWriter iw; diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java index 14e688d574..d4fff53f27 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/search/MultiPhrasePrefixQueryTests.java @@ -26,13 +26,13 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -public class MultiPhrasePrefixQueryTests extends ElasticsearchTestCase { +public class MultiPhrasePrefixQueryTests extends ESTestCase { @Test public void simpleTests() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java index 2ae7df16bc..4b0c939edf 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/search/function/ScriptScoreFunctionTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptException; import org.elasticsearch.script.SearchScript; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class ScriptScoreFunctionTests extends ElasticsearchTestCase { +public class ScriptScoreFunctionTests extends ESTestCase { /** * Tests https://github.com/elasticsearch/elasticsearch/issues/2426 diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java index d18d7ff349..5db7e7e9b3 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/MoreLikeThisQueryTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.lucene.search.MoreLikeThisQuery; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class MoreLikeThisQueryTests extends ElasticsearchTestCase { +public class MoreLikeThisQueryTests extends ESTestCase { @Test public void testSimple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java index cafa2ef9ee..29d794ad59 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/search/morelikethis/XMoreLikeThisTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import java.io.StringReader; import java.util.Arrays; import java.util.List; -public class XMoreLikeThisTests extends ElasticsearchTestCase { +public class XMoreLikeThisTests extends ESTestCase { private void addDoc(RandomIndexWriter writer, String[] texts) throws IOException { Document doc = new Document(); diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java b/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java index 0a8492fb7b..3966974d68 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/store/ByteArrayIndexInputTests.java @@ -21,14 +21,14 @@ package org.elasticsearch.common.lucene.store; import com.google.common.base.Charsets; import org.apache.lucene.store.IndexInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; import static org.hamcrest.Matchers.containsString; -public class ByteArrayIndexInputTests extends ElasticsearchTestCase { +public class ByteArrayIndexInputTests extends ESTestCase { @Test public void testRandomReads() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java b/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java index 315b93edd2..e8540d3cba 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/store/InputStreamIndexInputTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RAMDirectory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.lessThan; /** * */ -public class InputStreamIndexInputTests extends ElasticsearchTestCase { +public class InputStreamIndexInputTests extends ESTestCase { @Test public void testSingleReadSingleByteLimit() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java b/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java index b29c078d78..290af55df4 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/uid/VersionsTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.mapper.internal.VersionFieldMapper; import org.elasticsearch.index.shard.ElasticsearchMergePolicy; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -46,7 +46,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class VersionsTests extends ElasticsearchTestCase { +public class VersionsTests extends ESTestCase { public static DirectoryReader reopen(DirectoryReader reader) throws IOException { return reopen(reader, true); diff --git a/core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java b/core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java index f0daca4b17..85fd28da68 100644 --- a/core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/common/math/MathUtilsTests.java @@ -19,10 +19,10 @@ package org.elasticsearch.common.math; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; -public class MathUtilsTests extends ElasticsearchTestCase { +public class MathUtilsTests extends ESTestCase { @Test public void mod() { diff --git a/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java b/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java index 3151352c1e..1fbf76df36 100644 --- a/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java +++ b/core/src/test/java/org/elasticsearch/common/path/PathTrieTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.path; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PathTrieTests extends ElasticsearchTestCase { +public class PathTrieTests extends ESTestCase { @Test public void testPath() { diff --git a/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java b/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java index 3e4d3fffec..0c4ea86144 100644 --- a/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java +++ b/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java @@ -19,13 +19,13 @@ package org.elasticsearch.common.property; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.LinkedHashMap; import java.util.Map; -public class PropertyPlaceholderTest extends ElasticsearchTestCase { +public class PropertyPlaceholderTest extends ESTestCase { @Test public void testSimple() { diff --git a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java b/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java index 60d161b412..39376441d2 100644 --- a/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java +++ b/core/src/test/java/org/elasticsearch/common/recycler/AbstractRecyclerTests.java @@ -20,13 +20,13 @@ package org.elasticsearch.common.recycler; import org.elasticsearch.common.recycler.Recycler.V; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public abstract class AbstractRecyclerTests extends ElasticsearchTestCase { +public abstract class AbstractRecyclerTests extends ESTestCase { // marker states for data protected static final byte FRESH = 1; diff --git a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java b/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java index 380bf90ad5..18ff2c1d00 100644 --- a/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java +++ b/core/src/test/java/org/elasticsearch/common/regex/RegexTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.regex; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Random; @@ -26,7 +26,7 @@ import java.util.regex.Pattern; import static org.hamcrest.Matchers.equalTo; -public class RegexTests extends ElasticsearchTestCase { +public class RegexTests extends ESTestCase { @Test public void testFlags() { diff --git a/core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java b/core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java index 6846c408cb..b3a2cea212 100644 --- a/core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java +++ b/core/src/test/java/org/elasticsearch/common/rounding/RoundingTests.java @@ -19,14 +19,14 @@ package org.elasticsearch.common.rounding; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class RoundingTests extends ElasticsearchTestCase { +public class RoundingTests extends ESTestCase { /** * simple test case to illustrate how Rounding.Interval works on readable input diff --git a/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java b/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java index 0a6d8f980d..4e42c68aad 100644 --- a/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java +++ b/core/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.rounding; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** */ -public class TimeZoneRoundingTests extends ElasticsearchTestCase { +public class TimeZoneRoundingTests extends ESTestCase { final static DateTimeZone JERUSALEM_TIMEZONE = DateTimeZone.forID("Asia/Jerusalem"); diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java index 7c13810297..a00c9af037 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/SettingsFilterTests.java @@ -20,16 +20,16 @@ package org.elasticsearch.common.settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.json.JsonXContent; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.elasticsearch.rest.RestRequest; -import org.elasticsearch.test.ElasticsearchTestCase; import org.junit.Test; import java.io.IOException; import static org.hamcrest.CoreMatchers.equalTo; -public class SettingsFilterTests extends ElasticsearchTestCase { +public class SettingsFilterTests extends ESTestCase { @Test public void testAddingAndRemovingFilters() { diff --git a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java index cf76a01ee0..5e2a44a327 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.common.settings; import org.elasticsearch.common.settings.bar.BarTestClass; import org.elasticsearch.common.settings.foo.FooTestClass; import org.elasticsearch.common.settings.loader.YamlSettingsLoader; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class SettingsTests extends ElasticsearchTestCase { +public class SettingsTests extends ESTestCase { @Test public void testCamelCaseSupport() { diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java b/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java index 5d492a6d6a..f4604d28d1 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/loader/JsonSettingsLoaderTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JsonSettingsLoaderTests extends ElasticsearchTestCase { +public class JsonSettingsLoaderTests extends ESTestCase { @Test public void testSimpleJsonSettings() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java b/core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java index 0ad737cb70..e43f5e7f2a 100644 --- a/core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java +++ b/core/src/test/java/org/elasticsearch/common/settings/loader/YamlSettingsLoaderTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.settings.loader; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class YamlSettingsLoaderTests extends ElasticsearchTestCase { +public class YamlSettingsLoaderTests extends ESTestCase { @Test public void testSimpleYamlSettings() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java index 8b39e4eecb..5e8a55a347 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeUnitTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.unit.ByteSizeUnit.*; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ByteSizeUnitTests extends ElasticsearchTestCase { +public class ByteSizeUnitTests extends ESTestCase { @Test public void testBytes() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java index ebbd71132e..362fd0dfc7 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/ByteSizeValueTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.unit; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class ByteSizeValueTests extends ElasticsearchTestCase { +public class ByteSizeValueTests extends ESTestCase { @Test public void testActualPeta() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java b/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java index f6748da3bc..e29cd1e686 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/DistanceUnitTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.closeTo; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class DistanceUnitTests extends ElasticsearchTestCase { +public class DistanceUnitTests extends ESTestCase { @Test public void testSimpleDistanceUnit() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java b/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java index dc3c66b4e8..234e341f4c 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/FuzzinessTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.unit; import org.elasticsearch.common.xcontent.XContent; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.number.IsCloseTo.closeTo; -public class FuzzinessTests extends ElasticsearchTestCase { +public class FuzzinessTests extends ESTestCase { @Test public void testNumerics() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java index d9a04726e4..b9ac8e5287 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/RatioValueTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.unit; import org.elasticsearch.ElasticsearchParseException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.is; @@ -28,7 +28,7 @@ import static org.hamcrest.Matchers.is; /** * Tests for the {@link RatioValue} class */ -public class RatioValueTests extends ElasticsearchTestCase { +public class RatioValueTests extends ESTestCase { @Test public void testParsing() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java index 5e0ab4f3b0..c1595acf58 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/SizeValueTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.unit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.is; @@ -26,7 +26,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class SizeValueTests extends ElasticsearchTestCase { +public class SizeValueTests extends ESTestCase { @Test public void testThatConversionWorks() { diff --git a/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java index b901f1f393..19738bc28d 100644 --- a/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java +++ b/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.common.unit; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.PeriodType; import org.junit.Test; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; -public class TimeValueTests extends ElasticsearchTestCase { +public class TimeValueTests extends ESTestCase { public void testSimple() { assertThat(TimeUnit.MILLISECONDS.toMillis(10), equalTo(new TimeValue(10, TimeUnit.MILLISECONDS).millis())); diff --git a/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java index f85ab89021..0c7038e8cd 100644 --- a/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/ArrayUtilsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Arrays; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class ArrayUtilsTests extends ElasticsearchTestCase { +public class ArrayUtilsTests extends ESTestCase { @Test public void binarySearch() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java b/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java index 3dd8e65cd0..01fae517c3 100644 --- a/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/BigArraysTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.junit.Before; @@ -36,10 +36,10 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Arrays; -public class BigArraysTests extends ElasticsearchSingleNodeTest { +public class BigArraysTests extends ESSingleNodeTestCase { public static BigArrays randombigArrays() { - final PageCacheRecycler recycler = randomBoolean() ? null : ElasticsearchSingleNodeTest.getInstanceFromNode(PageCacheRecycler.class); + final PageCacheRecycler recycler = randomBoolean() ? null : ESSingleNodeTestCase.getInstanceFromNode(PageCacheRecycler.class); return new MockBigArrays(recycler, new NoneCircuitBreakerService()); } diff --git a/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java index 729033bdd6..0df125e572 100644 --- a/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/ByteUtilsTests.java @@ -21,11 +21,11 @@ package org.elasticsearch.common.util; import org.apache.lucene.store.ByteArrayDataInput; import org.apache.lucene.store.ByteArrayDataOutput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; -public class ByteUtilsTests extends ElasticsearchTestCase { +public class ByteUtilsTests extends ESTestCase { public void testZigZag(long l) { assertEquals(l, ByteUtils.zigZagDecode(ByteUtils.zigZagEncode(l))); diff --git a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java b/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java index e7d98db5c5..91c74762df 100644 --- a/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/BytesRefHashTests.java @@ -25,13 +25,13 @@ import com.carrotsearch.hppc.cursors.ObjectLongCursor; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.*; import java.util.Map.Entry; -public class BytesRefHashTests extends ElasticsearchSingleNodeTest { +public class BytesRefHashTests extends ESSingleNodeTestCase { BytesRefHash hash; diff --git a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java b/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java index d2cacb9c49..85dd1c14b3 100644 --- a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java @@ -19,13 +19,13 @@ package org.elasticsearch.common.util; import org.elasticsearch.common.util.CancellableThreads.Interruptable; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; import java.util.concurrent.CountDownLatch; -public class CancellableThreadsTest extends ElasticsearchTestCase { +public class CancellableThreadsTest extends ESTestCase { public static class CustomException extends RuntimeException { diff --git a/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java b/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java index 14b77df40a..09c4b80056 100644 --- a/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/CollectionUtilsTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefArray; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.Counter; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.*; @@ -33,7 +33,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class CollectionUtilsTests extends ElasticsearchTestCase { +public class CollectionUtilsTests extends ESTestCase { @Test public void rotateEmpty() { diff --git a/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java b/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java index d35a6f1416..09221b5151 100644 --- a/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/LongHashTests.java @@ -22,12 +22,12 @@ package org.elasticsearch.common.util; import com.carrotsearch.hppc.LongLongHashMap; import com.carrotsearch.hppc.LongLongMap; import com.carrotsearch.hppc.cursors.LongLongCursor; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.*; -public class LongHashTests extends ElasticsearchSingleNodeTest { +public class LongHashTests extends ESSingleNodeTestCase { LongHash hash; diff --git a/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java b/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java index fae90cd395..2036535a61 100644 --- a/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/LongObjectHashMapTests.java @@ -20,10 +20,10 @@ package org.elasticsearch.common.util; import com.carrotsearch.hppc.LongObjectHashMap; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; -public class LongObjectHashMapTests extends ElasticsearchSingleNodeTest { +public class LongObjectHashMapTests extends ESSingleNodeTestCase { @Test public void duel() { diff --git a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java index 324d0f2fc3..fc05a79423 100644 --- a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.common.util; -import com.carrotsearch.randomizedtesting.annotations.Repeat; import com.google.common.base.Charsets; import com.google.common.collect.Sets; import org.apache.lucene.util.CollectionUtil; @@ -34,7 +33,7 @@ import org.elasticsearch.gateway.MetaDataStateFormat; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; import org.elasticsearch.index.shard.ShardStateMetaData; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.BufferedWriter; import java.io.IOException; @@ -46,7 +45,7 @@ import java.util.*; /** */ @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class MultiDataPathUpgraderTests extends ElasticsearchTestCase { +public class MultiDataPathUpgraderTests extends ESTestCase { public void testUpgradeRandomPaths() throws IOException { try (NodeEnvironment nodeEnvironment = newNodeEnvironment()) { diff --git a/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java b/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java index de06302d28..9f951440a0 100644 --- a/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java @@ -20,13 +20,13 @@ package org.elasticsearch.common.util; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -public class SingleObjectCacheTests extends ElasticsearchTestCase { +public class SingleObjectCacheTests extends ESTestCase { public void testRefresh() { final AtomicInteger count = new AtomicInteger(0); diff --git a/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java b/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java index 5c4b2a7c70..4923a3ea97 100644 --- a/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/URIPatternTests.java @@ -18,12 +18,12 @@ */ package org.elasticsearch.common.util; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.net.URI; -public class URIPatternTests extends ElasticsearchTestCase { +public class URIPatternTests extends ESTestCase { @Test public void testURIPattern() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java index 24d89824c3..52fe724725 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class CountDownTest extends ElasticsearchTestCase { +public class CountDownTest extends ESTestCase { @Test public void testConcurrent() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java index 9e05683836..eabac31974 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.lessThan; /** */ -public class EsExecutorsTests extends ElasticsearchTestCase { +public class EsExecutorsTests extends ESTestCase { private TimeUnit randomTimeUnit() { return TimeUnit.values()[between(0, TimeUnit.values().length - 1)]; diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java index 1a2b577ab5..0620f2f91b 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.util.concurrent; import com.google.common.collect.Lists; import org.elasticsearch.common.Priority; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class PrioritizedExecutorsTests extends ElasticsearchTestCase { +public class PrioritizedExecutorsTests extends ESTestCase { @Test public void testPriorityQueue() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java index 3ff0767fa4..1301c9efcb 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.concurrent; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.is; /** */ -public class RefCountedTest extends ElasticsearchTestCase { +public class RefCountedTest extends ESTestCase { @Test public void testRefCount() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java index f3d89e86ca..0f803509bc 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/XContentFactoryTests.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.dataformat.cbor.CBORConstants; import com.fasterxml.jackson.dataformat.smile.SmileConstants; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class XContentFactoryTests extends ElasticsearchTestCase { +public class XContentFactoryTests extends ESTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java index d1f90ced81..9cfedcc1cf 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/builder/BuilderRawFieldTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class BuilderRawFieldTests extends ElasticsearchTestCase { +public class BuilderRawFieldTests extends ESTestCase { @Test public void testJsonRawField() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java index ec76100c9b..d273f7c22b 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.io.FastCharArrayWriter; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class XContentBuilderTests extends ElasticsearchTestCase { +public class XContentBuilderTests extends ESTestCase { @Test public void testPrettyWithLfAtEnd() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java index 4bc093ff95..20e4d4163b 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/CborXContentParserTests.java @@ -23,12 +23,12 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; -public class CborXContentParserTests extends ElasticsearchTestCase { +public class CborXContentParserTests extends ESTestCase { @Test public void testEmptyValue() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java index bda1c31a3f..903914bc5f 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/cbor/JsonVsCborTests.java @@ -19,19 +19,14 @@ package org.elasticsearch.common.xcontent.cbor; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.dataformat.cbor.CBORFactory; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentGenerator; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; -import java.io.ByteArrayOutputStream; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; @@ -40,7 +35,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class JsonVsCborTests extends ElasticsearchTestCase { +public class JsonVsCborTests extends ESTestCase { @Test public void compareParsingTokens() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java index 0a57adf8d3..e1a89ff242 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/smile/JsonVsSmileTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentGenerator; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class JsonVsSmileTests extends ElasticsearchTestCase { +public class JsonVsSmileTests extends ESTestCase { // @Test public void testBinarySmileField() throws Exception { // JsonGenerator gen = new SmileFactory().createJsonGenerator(new ByteArrayOutputStream()); diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java index a66cb2086f..067c553828 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.xcontent.support; import org.elasticsearch.common.xcontent.XContentHelper; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class XContentHelperTests extends ElasticsearchTestCase { +public class XContentHelperTests extends ESTestCase { Map<String, Object> getMap(Object... keyValues) { Map<String, Object> map = new HashMap<>(); diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java index 2e3e7b6569..ba34812a64 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -44,7 +44,7 @@ import static org.hamcrest.core.IsEqual.equalTo; /** */ -public class XContentMapValuesTests extends ElasticsearchTestCase { +public class XContentMapValuesTests extends ESTestCase { @Test public void testFilter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java index d07bf44288..5ef19bdaf3 100644 --- a/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java +++ b/core/src/test/java/org/elasticsearch/common/xcontent/support/filtering/AbstractFilteringJsonGeneratorTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.common.xcontent.support.filtering; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.ByteArrayInputStream; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public abstract class AbstractFilteringJsonGeneratorTests extends ElasticsearchTestCase { +public abstract class AbstractFilteringJsonGeneratorTests extends ESTestCase { protected abstract XContentType getXContentType(); diff --git a/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java b/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java index bbeef21e05..50637cb801 100644 --- a/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java +++ b/core/src/test/java/org/elasticsearch/consistencylevel/WriteConsistencyLevelIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class WriteConsistencyLevelIT extends ElasticsearchIntegrationTest { +public class WriteConsistencyLevelIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java b/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java index de2bb6f0e6..344abee3da 100644 --- a/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java +++ b/core/src/test/java/org/elasticsearch/count/simple/SimpleCountIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -42,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.is; -public class SimpleCountIT extends ElasticsearchIntegrationTest { +public class SimpleCountIT extends ESIntegTestCase { @Test public void testCountRandomPreference() throws InterruptedException, ExecutionException { diff --git a/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java b/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java index 2ba71a4012..92e68cec43 100644 --- a/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java +++ b/core/src/test/java/org/elasticsearch/deps/jackson/JacksonLocationTests.java @@ -24,7 +24,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JacksonLocationTests extends ElasticsearchTestCase { +public class JacksonLocationTests extends ESTestCase { @Test public void testLocationExtraction() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java b/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java index 21c16d81b4..b1bddc1c54 100644 --- a/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java +++ b/core/src/test/java/org/elasticsearch/deps/joda/SimpleJodaTests.java @@ -22,11 +22,9 @@ package org.elasticsearch.deps.joda; import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.Joda; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.index.mapper.core.DateFieldMapper; import org.elasticsearch.index.mapper.object.RootObjectMapper; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; -import org.joda.time.DateTimeFieldType; import org.joda.time.DateTimeZone; import org.joda.time.LocalDateTime; import org.joda.time.MutableDateTime; @@ -41,7 +39,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleJodaTests extends ElasticsearchTestCase { +public class SimpleJodaTests extends ESTestCase { @Test public void testMultiParsers() { diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java b/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java index 5929c7b551..d410c86890 100644 --- a/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java +++ b/core/src/test/java/org/elasticsearch/deps/lucene/SimpleLuceneTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleLuceneTests extends ElasticsearchTestCase { +public class SimpleLuceneTests extends ESTestCase { @Test public void testSortValues() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java b/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java index f3b2944a49..0e0ff0f84e 100644 --- a/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java +++ b/core/src/test/java/org/elasticsearch/deps/lucene/VectorHighlighterTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.vectorhighlight.FastVectorHighlighter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class VectorHighlighterTests extends ElasticsearchTestCase { +public class VectorHighlighterTests extends ESTestCase { @Test public void testVectorHighlighter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java b/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java index a4de39bc97..1332a4fb13 100644 --- a/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/BlockingClusterStatePublishResponseHandlerTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Arrays; import java.util.HashSet; @@ -33,7 +33,7 @@ import java.util.concurrent.CyclicBarrier; import static org.hamcrest.Matchers.*; -public class BlockingClusterStatePublishResponseHandlerTests extends ElasticsearchTestCase { +public class BlockingClusterStatePublishResponseHandlerTests extends ESTestCase { static private class PublishResponder extends AbstractRunnable { diff --git a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java index 4386b20685..2db457c408 100644 --- a/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/DiscoveryWithServiceDisruptionsIT.java @@ -48,7 +48,7 @@ import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.discovery.zen.ping.ZenPingService; import org.elasticsearch.discovery.zen.ping.unicast.UnicastZenPing; import org.elasticsearch.discovery.zen.publish.PublishClusterStateAction; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.discovery.ClusterDiscoveryConfiguration; import org.elasticsearch.test.disruption.*; @@ -56,7 +56,6 @@ import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.*; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -67,13 +66,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0) -public class DiscoveryWithServiceDisruptionsIT extends ElasticsearchIntegrationTest { +public class DiscoveryWithServiceDisruptionsIT extends ESIntegTestCase { private static final TimeValue DISRUPTION_HEALING_OVERHEAD = TimeValue.timeValueSeconds(40); // we use 30s as timeout in many places. @@ -972,7 +971,7 @@ public class DiscoveryWithServiceDisruptionsIT extends ElasticsearchIntegrationT } // tests if indices are really deleted even if a master transition inbetween - @Ignore("https://github.com/elastic/elasticsearch/issues/11665") + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/11665") @Test public void testIndicesDeleted() throws Exception { configureCluster(3, 2); diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java b/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java index ae240b6847..1471b5b9b6 100644 --- a/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/ZenFaultDetectionTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.zen.fd.FaultDetection; import org.elasticsearch.discovery.zen.fd.MasterFaultDetection; import org.elasticsearch.discovery.zen.fd.NodesFaultDetection; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cluster.NoopClusterService; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.threadpool.ThreadPool; @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.equalTo; -public class ZenFaultDetectionTests extends ElasticsearchTestCase { +public class ZenFaultDetectionTests extends ESTestCase { protected ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java b/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java index 6a5ab52732..891d538a67 100644 --- a/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/ZenUnicastDiscoveryIT.java @@ -22,9 +22,9 @@ package org.elasticsearch.discovery; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.discovery.ClusterDiscoveryConfiguration; import org.junit.Before; import org.junit.Test; @@ -35,7 +35,7 @@ import java.util.concurrent.ExecutionException; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class ZenUnicastDiscoveryIT extends ElasticsearchIntegrationTest { +public class ZenUnicastDiscoveryIT extends ESIntegTestCase { private ClusterDiscoveryConfiguration discoveryConfig; diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java index 4552109bd4..884d238827 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java @@ -24,12 +24,12 @@ import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.discovery.zen.elect.ElectMasterService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.*; -public class ElectMasterServiceTest extends ElasticsearchTestCase { +public class ElectMasterServiceTest extends ESTestCase { ElectMasterService electMasterService() { return new ElectMasterService(Settings.EMPTY, Version.CURRENT); diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java index 856ca6398a..70c9430b53 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/NodeJoinControllerTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.common.util.concurrent.BaseFuture; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.discovery.zen.membership.MembershipAction; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cluster.TestClusterService; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Before; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; @TestLogging("discovery.zen:TRACE") -public class NodeJoinControllerTests extends ElasticsearchTestCase { +public class NodeJoinControllerTests extends ESTestCase { private TestClusterService clusterService; private NodeJoinController nodeJoinController; diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java index d8e6ea415e..943b0549a2 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryIT.java @@ -38,7 +38,7 @@ import org.elasticsearch.discovery.zen.elect.ElectMasterService; import org.elasticsearch.discovery.zen.fd.FaultDetection; import org.elasticsearch.discovery.zen.membership.MembershipAction; import org.elasticsearch.discovery.zen.publish.PublishClusterStateAction; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.BytesTransportRequest; @@ -65,8 +65,8 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0) -public class ZenDiscoveryIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0) +public class ZenDiscoveryIT extends ESIntegTestCase { @Test public void testChangeRejoinOnMasterOptionIsDynamic() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java index bbd970c8b4..cc6bc2b235 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java @@ -22,7 +22,7 @@ package org.elasticsearch.discovery.zen; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Collections; import java.util.LinkedList; @@ -35,7 +35,7 @@ import static org.hamcrest.core.IsNull.nullValue; /** */ -public class ZenDiscoveryUnitTest extends ElasticsearchTestCase { +public class ZenDiscoveryUnitTest extends ESTestCase { public void testShouldIgnoreNewClusterState() { ClusterName clusterName = new ClusterName("abc"); diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java index 6ded8a9f95..e35f8d55c8 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenPingTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.discovery.zen.ping.ZenPing; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.Collections; import static org.hamcrest.Matchers.equalTo; -public class ZenPingTests extends ElasticsearchTestCase { +public class ZenPingTests extends ESTestCase { @Test public void testPingCollection() { diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java index f3e3612ee5..73ba27ddc4 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ping/multicast/MulticastZenPingIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.discovery.zen.ping.PingContextProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.local.LocalTransport; @@ -43,7 +43,7 @@ import java.net.MulticastSocket; import static org.hamcrest.Matchers.equalTo; -public class MulticastZenPingIT extends ElasticsearchTestCase { +public class MulticastZenPingIT extends ESTestCase { private Settings buildRandomMulticast(Settings settings) { Settings.Builder builder = Settings.builder().put(settings); diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java b/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java index e0788e9506..d3a0ac82d9 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPingIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.discovery.zen.elect.ElectMasterService; import org.elasticsearch.discovery.zen.ping.PingContextProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.TransportService; import org.elasticsearch.transport.netty.NettyTransport; @@ -40,7 +40,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class UnicastZenPingIT extends ElasticsearchTestCase { +public class UnicastZenPingIT extends ESTestCase { @Test public void testSimplePings() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/document/BulkIT.java b/core/src/test/java/org/elasticsearch/document/BulkIT.java index 77cbf00565..3c13b3fe31 100644 --- a/core/src/test/java/org/elasticsearch/document/BulkIT.java +++ b/core/src/test/java/org/elasticsearch/document/BulkIT.java @@ -44,7 +44,7 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class BulkIT extends ElasticsearchIntegrationTest { +public class BulkIT extends ESIntegTestCase { @Test public void testBulkUpdate_simple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java b/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java index 404f27224a..dc64ffd2de 100644 --- a/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java +++ b/core/src/test/java/org/elasticsearch/document/DocumentActionsIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class DocumentActionsIT extends ElasticsearchIntegrationTest { +public class DocumentActionsIT extends ESIntegTestCase { protected void createIndex() { createIndex(getConcreteIndexName()); diff --git a/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java b/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java index 0cd41570ec..f1c6d476eb 100644 --- a/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java +++ b/core/src/test/java/org/elasticsearch/document/ShardInfoIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class ShardInfoIT extends ElasticsearchIntegrationTest { +public class ShardInfoIT extends ESIntegTestCase { private int numCopies; private int numNodes; diff --git a/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java b/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java index a2ba2d3988..8535f0fd8f 100644 --- a/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java +++ b/core/src/test/java/org/elasticsearch/env/EnvironmentTests.java @@ -22,7 +22,7 @@ import com.google.common.base.Charsets; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.BufferedReader; @@ -37,7 +37,7 @@ import static org.hamcrest.CoreMatchers.nullValue; /** * Simple unit-tests for Environment.java */ -public class EnvironmentTests extends ElasticsearchTestCase { +public class EnvironmentTests extends ESTestCase { public Environment newEnvironment() throws IOException { return newEnvironment(Settings.EMPTY); diff --git a/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java b/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java index 1651966ea2..ea9d5232dd 100644 --- a/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java +++ b/core/src/test/java/org/elasticsearch/env/NodeEnvironmentTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -44,7 +44,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.CoreMatchers.equalTo; @LuceneTestCase.SuppressFileSystems("ExtrasFS") // TODO: fix test to allow extras -public class NodeEnvironmentTests extends ElasticsearchTestCase { +public class NodeEnvironmentTests extends ESTestCase { private final Settings idxSettings = Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).build(); diff --git a/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java b/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java index 4da69fa51b..3046a85be0 100644 --- a/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java +++ b/core/src/test/java/org/elasticsearch/exists/SimpleExistsIT.java @@ -22,14 +22,14 @@ package org.elasticsearch.exists; import org.elasticsearch.action.exists.ExistsResponse; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertExists; -public class SimpleExistsIT extends ElasticsearchIntegrationTest { +public class SimpleExistsIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java b/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java index 685c19c688..be998b18a2 100644 --- a/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java +++ b/core/src/test/java/org/elasticsearch/explain/ExplainActionIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -public class ExplainActionIT extends ElasticsearchIntegrationTest { +public class ExplainActionIT extends ESIntegTestCase { @Test public void testSimple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java index b8823b0e00..d3d1d8b46c 100644 --- a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsIntegrationIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.action.fieldstats.FieldStatsResponse; import org.elasticsearch.action.fieldstats.IndexConstraint; import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class FieldStatsIntegrationIT extends ElasticsearchIntegrationTest { +public class FieldStatsIntegrationIT extends ESIntegTestCase { public void testRandom() throws Exception { assertAcked(prepareCreate("test").addMapping( diff --git a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java index 68d136d1cb..5db3130913 100644 --- a/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java +++ b/core/src/test/java/org/elasticsearch/fieldstats/FieldStatsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.fieldstats.FieldStats; import org.elasticsearch.action.fieldstats.FieldStatsResponse; import org.elasticsearch.action.fieldstats.IndexConstraint; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class FieldStatsTests extends ElasticsearchSingleNodeTest { +public class FieldStatsTests extends ESSingleNodeTestCase { public void testByte() { testNumberRange("field1", "byte", 12, 18); diff --git a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java b/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java index ece5757355..fcada2d5f2 100644 --- a/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/AsyncShardFetchTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.After; import org.junit.Before; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.sameInstance; /** */ -public class AsyncShardFetchTests extends ElasticsearchTestCase { +public class AsyncShardFetchTests extends ESTestCase { private final DiscoveryNode node1 = new DiscoveryNode("node1", DummyTransportAddress.INSTANCE, Version.CURRENT); private final Response response1 = new Response(node1); diff --git a/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java index 1983094dcc..e9b0e4a89f 100644 --- a/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.hasSize; /** */ -public class DanglingIndicesStateTests extends ElasticsearchTestCase { +public class DanglingIndicesStateTests extends ESTestCase { private static Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java b/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java index 13d42b0a91..8c6e7a1dbf 100644 --- a/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/GatewayIndexStateIT.java @@ -32,21 +32,21 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.indices.IndexClosedException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster.RestartCallback; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class GatewayIndexStateIT extends ElasticsearchIntegrationTest { +public class GatewayIndexStateIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(GatewayIndexStateIT.class); diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java index 594dee7c57..22850e13cb 100644 --- a/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/GatewayMetaStateTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Test; import java.util.*; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo; * - node is master eligible * for data only nodes: shard initializing on shard */ -public class GatewayMetaStateTests extends ElasticsearchAllocationTestCase { +public class GatewayMetaStateTests extends ESAllocationTestCase { ClusterChangedEvent generateEvent(boolean initializing, boolean versionChanged, boolean masterEligible) { //ridiculous settings to make sure we don't run into uninitialized because fo default diff --git a/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java b/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java index 8034870680..ccb0746101 100644 --- a/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/GatewayServiceTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.gateway; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cluster.NoopClusterService; import org.hamcrest.Matchers; import org.junit.Test; @@ -29,7 +29,7 @@ import org.junit.Test; import java.io.IOException; -public class GatewayServiceTests extends ElasticsearchTestCase { +public class GatewayServiceTests extends ESTestCase { private GatewayService createService(Settings.Builder settings) { diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java index 036a89c730..8650fd5cd1 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java @@ -40,7 +40,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.InputStream; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; @LuceneTestCase.SuppressFileSystems("ExtrasFS") // TODO: fix test to work with ExtrasFS -public class MetaDataStateFormatTest extends ElasticsearchTestCase { +public class MetaDataStateFormatTest extends ESTestCase { /** diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java index 54637f0f9e..abe4ac3ff4 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataWriteDataNodesIT.java @@ -28,8 +28,8 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.routing.allocation.decider.FilterAllocationDecider; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster; import org.junit.Test; @@ -37,13 +37,13 @@ import java.util.LinkedHashMap; import java.util.concurrent.Future; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.InternalTestCluster.RestartCallback; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class MetaDataWriteDataNodesIT extends ElasticsearchIntegrationTest { +public class MetaDataWriteDataNodesIT extends ESIntegTestCase { @Test public void testMetaWrittenAlsoOnDataNode() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java b/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java index 7386d6e50b..de66f9519c 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class MetaStateServiceTests extends ElasticsearchTestCase { +public class MetaStateServiceTests extends ESTestCase { private static Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) diff --git a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java b/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java index b77784e8f4..be48fc7a58 100644 --- a/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/PrimaryShardAllocatorTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Before; import org.junit.Test; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class PrimaryShardAllocatorTests extends ElasticsearchAllocationTestCase { +public class PrimaryShardAllocatorTests extends ESAllocationTestCase { private final ShardId shardId = new ShardId("test", 0); private final DiscoveryNode node1 = newNode("node1"); diff --git a/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java b/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java index aaf1bc0e25..a846bc2cc9 100644 --- a/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java @@ -21,13 +21,13 @@ package org.elasticsearch.gateway; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.routing.*; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.HashMap; import java.util.Locale; import java.util.Map; -public class PriorityComparatorTests extends ElasticsearchTestCase { +public class PriorityComparatorTests extends ESTestCase { public void testPriorityComparatorSort() { RoutingNodes.UnassignedShards shards = new RoutingNodes.UnassignedShards((RoutingNodes) null); diff --git a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java b/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java index 042827b632..fb7a255f87 100644 --- a/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/QuorumGatewayIT.java @@ -25,8 +25,8 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster.RestartCallback; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(numDataNodes =0, scope= Scope.TEST) -public class QuorumGatewayIT extends ElasticsearchIntegrationTest { +public class QuorumGatewayIT extends ESIntegTestCase { @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java b/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java index 0ce2509158..458bb69c2b 100644 --- a/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/RecoverAfterNodesIT.java @@ -25,17 +25,17 @@ import org.elasticsearch.cluster.block.ClusterBlock; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasItem; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class RecoverAfterNodesIT extends ElasticsearchIntegrationTest { +public class RecoverAfterNodesIT extends ESIntegTestCase { private final static TimeValue BLOCK_WAIT_TIMEOUT = TimeValue.timeValueSeconds(10); diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityIT.java index 390829acad..745c98f664 100644 --- a/core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/RecoveryBackwardsCompatibilityIT.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.gateway; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse; import org.elasticsearch.action.admin.indices.recovery.ShardRecoveryResponse; import org.elasticsearch.action.count.CountResponse; @@ -29,8 +28,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -40,8 +39,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -@ElasticsearchIntegrationTest.ClusterScope(numDataNodes = 0, scope = ElasticsearchIntegrationTest.Scope.TEST, numClientNodes = 0, transportClientRatio = 0.0) -public class RecoveryBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +@ESIntegTestCase.ClusterScope(numDataNodes = 0, scope = ESIntegTestCase.Scope.TEST, numClientNodes = 0, transportClientRatio = 0.0) +public class RecoveryBackwardsCompatibilityIT extends ESBackcompatTestCase { @Override diff --git a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java index 1794713591..aa229305a2 100644 --- a/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java +++ b/core/src/test/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java @@ -33,8 +33,8 @@ import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.flush.SyncedFlushUtil; import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster.RestartCallback; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.store.MockFSDirectoryService; @@ -46,7 +46,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; @ClusterScope(numDataNodes = 0, scope = Scope.TEST) -public class RecoveryFromGatewayIT extends ElasticsearchIntegrationTest { +public class RecoveryFromGatewayIT extends ESIntegTestCase { @Test public void testOneNodeRecoverFromGateway() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java index 61dc147c9d..be6be39ee3 100644 --- a/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java +++ b/core/src/test/java/org/elasticsearch/gateway/ReplicaShardAllocatorTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; import org.elasticsearch.index.store.StoreFileMetaData; import org.elasticsearch.indices.store.TransportNodesListShardStoreMetaData; -import org.elasticsearch.test.ElasticsearchAllocationTestCase; +import org.elasticsearch.test.ESAllocationTestCase; import org.junit.Before; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class ReplicaShardAllocatorTests extends ElasticsearchAllocationTestCase { +public class ReplicaShardAllocatorTests extends ESAllocationTestCase { private final ShardId shardId = new ShardId("test", 0); private final DiscoveryNode node1 = newNode("node1"); diff --git a/core/src/test/java/org/elasticsearch/get/GetActionIT.java b/core/src/test/java/org/elasticsearch/get/GetActionIT.java index c76c77e2f1..15242ab6fb 100644 --- a/core/src/test/java/org/elasticsearch/get/GetActionIT.java +++ b/core/src/test/java/org/elasticsearch/get/GetActionIT.java @@ -42,7 +42,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; @@ -56,7 +56,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class GetActionIT extends ElasticsearchIntegrationTest { +public class GetActionIT extends ESIntegTestCase { @Test public void simpleGetTests() { diff --git a/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java b/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java index 4df65284c6..687c01520d 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java +++ b/core/src/test/java/org/elasticsearch/http/netty/HttpPublishPortIT.java @@ -24,16 +24,16 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.BoundTransportAddress; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class HttpPublishPortIT extends ElasticsearchIntegrationTest { +public class HttpPublishPortIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpChannelTests.java b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpChannelTests.java index c40f31f9ac..a2eb9565f7 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpChannelTests.java +++ b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpChannelTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.rest.RestResponse; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.elasticsearch.test.cache.recycler.MockPageCacheRecycler; import org.elasticsearch.threadpool.ThreadPool; @@ -44,7 +44,7 @@ import java.util.List; import static org.hamcrest.Matchers.*; -public class NettyHttpChannelTests extends ElasticsearchTestCase { +public class NettyHttpChannelTests extends ESTestCase { private NetworkService networkService; private ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java index 53666c0d2c..07678d9598 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java +++ b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java @@ -28,7 +28,7 @@ import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.http.netty.pipelining.OrderedDownstreamChannelEvent; import org.elasticsearch.http.netty.pipelining.OrderedUpstreamMessageEvent; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.elasticsearch.test.cache.recycler.MockPageCacheRecycler; import org.elasticsearch.threadpool.ThreadPool; @@ -57,7 +57,7 @@ import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1; /** * This test just tests, if he pipelining works in general with out any connection the elasticsearch handler */ -public class NettyHttpServerPipeliningTest extends ElasticsearchTestCase { +public class NettyHttpServerPipeliningTest extends ESTestCase { private NetworkService networkService; private ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java index 0c789b860a..5587967199 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java +++ b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningDisabledIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.jboss.netty.handler.codec.http.HttpResponse; import org.junit.Test; @@ -34,15 +34,15 @@ import java.util.Locale; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.http.netty.NettyHttpClient.returnOpaqueIds; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; /** * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 1) -public class NettyPipeliningDisabledIT extends ElasticsearchIntegrationTest { +public class NettyPipeliningDisabledIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java index 1901bdaec0..84a0f9b364 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java +++ b/core/src/test/java/org/elasticsearch/http/netty/NettyPipeliningEnabledIT.java @@ -22,7 +22,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.jboss.netty.handler.codec.http.HttpResponse; import org.junit.Test; @@ -33,14 +33,14 @@ import java.util.Locale; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.http.netty.NettyHttpClient.returnOpaqueIds; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @ClusterScope(scope = Scope.TEST, numDataNodes = 1) -public class NettyPipeliningEnabledIT extends ElasticsearchIntegrationTest { +public class NettyPipeliningEnabledIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java b/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java index 110a2d7316..b6a8df5b69 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java +++ b/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.http.netty.pipelining; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.*; @@ -36,7 +36,6 @@ import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -52,7 +51,7 @@ import static org.jboss.netty.util.CharsetUtil.UTF_8; /** * */ -public class HttpPipeliningHandlerTest extends ElasticsearchTestCase { +public class HttpPipeliningHandlerTest extends ESTestCase { private static final long RESPONSE_TIMEOUT = 10000L; private static final long CONNECTION_TIMEOUT = 10000L; diff --git a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java b/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java index 6ffb789c49..5db3e54669 100644 --- a/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.java +++ b/core/src/test/java/org/elasticsearch/index/IndexRequestBuilderIT.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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; 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 IndexRequestBuilderIT extends ElasticsearchIntegrationTest { +public class IndexRequestBuilderIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java b/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java index d0a7e3f9f6..5c6f7b376c 100644 --- a/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java +++ b/core/src/test/java/org/elasticsearch/index/IndexWithShadowReplicasIT.java @@ -41,7 +41,7 @@ import org.elasticsearch.indices.recovery.RecoveryTarget; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.*; @@ -65,8 +65,8 @@ import static org.hamcrest.Matchers.*; /** * Tests for indices that use shadow replicas and a shared filesystem */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class IndexWithShadowReplicasIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class IndexWithShadowReplicasIT extends ESIntegTestCase { private Settings nodeSettings() { return Settings.builder() diff --git a/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java index 6d3d63a8ef..9426f39c10 100644 --- a/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java +++ b/core/src/test/java/org/elasticsearch/index/TransportIndexFailuresIT.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.discovery.zen.fd.FaultDetection; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.TransportModule; import org.elasticsearch.transport.TransportService; @@ -47,8 +47,8 @@ import static org.hamcrest.Matchers.equalTo; /** * Test failure when index replication actions fail mid-flight */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) -public class TransportIndexFailuresIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0) +public class TransportIndexFailuresIT extends ESIntegTestCase { private static final Settings nodeSettings = Settings.settingsBuilder() .put("discovery.type", "zen") // <-- To override the local setting if set externally diff --git a/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java b/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java index 4d38cdf320..e4a97d2a4b 100644 --- a/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java +++ b/core/src/test/java/org/elasticsearch/index/VersionTypeTests.java @@ -20,12 +20,12 @@ package org.elasticsearch.index; import org.elasticsearch.common.lucene.uid.Versions; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class VersionTypeTests extends ElasticsearchTestCase { +public class VersionTypeTests extends ESTestCase { @Test public void testInternalVersionConflict() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java b/core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java index 806c39eff8..cb6a242506 100644 --- a/core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java +++ b/core/src/test/java/org/elasticsearch/index/aliases/IndexAliasesServiceTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.indices.InvalidAliasNameException; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class IndexAliasesServiceTests extends ElasticsearchSingleNodeTest { +public class IndexAliasesServiceTests extends ESSingleNodeTestCase { public IndexAliasesService newIndexAliasesService() { Settings settings = Settings.builder().put("name", "IndexAliasesServiceTests").build(); diff --git a/core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java index 1e16122af5..d31cc0a5c6 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/ASCIIFoldingTokenFilterFactoryTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -29,7 +29,7 @@ import java.io.StringReader; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class ASCIIFoldingTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class ASCIIFoldingTokenFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testDefault() throws IOException { AnalysisService analysisService = AnalysisTestsHelper.createAnalysisServiceFromSettings(settingsBuilder() diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java index eac199db7e..a79da27a52 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisFactoryTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.index.analysis.compound.DictionaryCompoundWordTokenFilterFactory; import org.elasticsearch.index.analysis.compound.HyphenationCompoundWordTokenFilterFactory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.HashMap; import java.util.Map; @@ -33,7 +33,7 @@ import java.util.TreeSet; * <p> * If we don't want to expose one for a specific reason, just map it to Void */ -public class AnalysisFactoryTests extends ElasticsearchTestCase { +public class AnalysisFactoryTests extends ESTestCase { static final Map<String,Class<?>> KNOWN_TOKENIZERS = new HashMap<String,Class<?>>() {{ // deprecated ones, we dont care about these diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java index c1d260392f..5757cc7a83 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java @@ -42,7 +42,7 @@ import org.elasticsearch.index.analysis.filter1.MyFilterTokenFilterFactory; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class AnalysisModuleTests extends ElasticsearchTestCase { +public class AnalysisModuleTests extends ESTestCase { private Injector injector; diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java index 30050ba6c0..abfe52097e 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.util.CharArraySet; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.is; -public class AnalysisTests extends ElasticsearchTestCase { +public class AnalysisTests extends ESTestCase { @Test public void testParseStemExclusion() { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java b/core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java index e633895e9e..43ec10173b 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/AnalyzerBackwardsCompatTests.java @@ -19,20 +19,16 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; -import org.junit.Ignore; +import org.elasticsearch.test.ESTokenStreamTestCase; import java.io.IOException; import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_VERSION_CREATED; -/** - */ -public class AnalyzerBackwardsCompatTests extends ElasticsearchTokenStreamTestCase { +public class AnalyzerBackwardsCompatTests extends ESTokenStreamTestCase { - @Ignore - private void testNoStopwordsAfter(org.elasticsearch.Version noStopwordVersion, String type) throws IOException { + private void assertNoStopwordsAfter(org.elasticsearch.Version noStopwordVersion, String type) throws IOException { final int iters = scaledRandomIntBetween(10, 100); org.elasticsearch.Version version = org.elasticsearch.Version.CURRENT; for (int i = 0; i < iters; i++) { @@ -58,14 +54,14 @@ public class AnalyzerBackwardsCompatTests extends ElasticsearchTokenStreamTestCa } public void testPatternAnalyzer() throws IOException { - testNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_RC1, "pattern"); + assertNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_RC1, "pattern"); } public void testStandardHTMLStripAnalyzer() throws IOException { - testNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_RC1, "standard_html_strip"); + assertNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_RC1, "standard_html_strip"); } public void testStandardAnalyzer() throws IOException { - testNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_Beta1, "standard"); + assertNoStopwordsAfter(org.elasticsearch.Version.V_1_0_0_Beta1, "standard"); } } diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java index bfa4c5ed59..418cd2b30a 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/CJKFilterFactoryTests.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; import java.io.StringReader; -public class CJKFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class CJKFilterFactoryTests extends ESTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/cjk_analysis.json"; diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java index e2ce99d833..ef2c6d4e7f 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/CharFilterTests.java @@ -31,14 +31,14 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** */ -public class CharFilterTests extends ElasticsearchTokenStreamTestCase { +public class CharFilterTests extends ESTokenStreamTestCase { @Test public void testMappingCharFilter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java index 3f1edbbdd4..e5c7943935 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/CompoundAnalysisTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.analysis.compound.DictionaryCompoundWordTokenFilt import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class CompoundAnalysisTests extends ElasticsearchTestCase { +public class CompoundAnalysisTests extends ESTestCase { @Test public void testDefaultsCompoundAnalysis() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java index cb8a8975e7..f81fef1f81 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/HunspellTokenFilterFactoryTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -28,7 +28,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class HunspellTokenFilterFactoryTests extends ElasticsearchTestCase { +public class HunspellTokenFilterFactoryTests extends ESTestCase { @Test public void testDedup() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java index a9a07af9d9..14f3b6fe0d 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/KeepFilterFactoryTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.FailedToResolveConfigException; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Assert; import org.junit.Test; @@ -32,7 +32,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class KeepFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class KeepFilterFactoryTests extends ESTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/keep_analysis.json"; diff --git a/core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java index 966d550a55..fd8f70f6f7 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/KeepTypesFilterFactoryTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -30,7 +30,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class KeepTypesFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class KeepTypesFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testKeepTypes() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java index e75120d9ee..6f283f9555 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/LimitTokenCountFilterFactoryTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; import java.io.StringReader; -public class LimitTokenCountFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class LimitTokenCountFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java index 39a2372e3b..11fcf066fe 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/NGramTokenizerFactoryTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings.Builder; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -44,7 +44,7 @@ import java.util.Random; import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween; import static org.hamcrest.Matchers.instanceOf; -public class NGramTokenizerFactoryTests extends ElasticsearchTokenStreamTestCase { +public class NGramTokenizerFactoryTests extends ESTokenStreamTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java index 7f7b363cf9..a9ca96cc5f 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/NumericAnalyzerTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.NumericTokenStream; import org.apache.lucene.analysis.NumericTokenStream.NumericTermAttribute; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +31,7 @@ import java.io.IOException; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class NumericAnalyzerTests extends ElasticsearchTestCase { +public class NumericAnalyzerTests extends ESTestCase { @Test public void testAttributeEqual() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java b/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java index 98197a15c0..2f420e5646 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java @@ -26,12 +26,12 @@ import java.util.regex.Pattern; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.StopAnalyzer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; /** * Verifies the behavior of PatternAnalyzer. */ -public class PatternAnalyzerTest extends ElasticsearchTokenStreamTestCase { +public class PatternAnalyzerTest extends ESTokenStreamTestCase { /** * Test PatternAnalyzer when it is configured with a non-word pattern. diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java index 11a4f8745c..0a1d7e5e19 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PatternCaptureTokenFilterTests.java @@ -32,12 +32,12 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class PatternCaptureTokenFilterTests extends ElasticsearchTokenStreamTestCase { +public class PatternCaptureTokenFilterTests extends ESTokenStreamTestCase { @Test public void testPatternCaptureTokenFilter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java index 78b1bb9d67..c18e4fd760 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerProviderFactoryTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.is; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.not; /** * */ -public class PreBuiltAnalyzerProviderFactoryTests extends ElasticsearchTestCase { +public class PreBuiltAnalyzerProviderFactoryTests extends ESTestCase { @Test public void testVersioningInFactoryProvider() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java index cf9f09204d..77eb0cda1d 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltAnalyzerTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.indices.analysis.PreBuiltAnalyzers; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class PreBuiltAnalyzerTests extends ElasticsearchSingleNodeTest { +public class PreBuiltAnalyzerTests extends ESSingleNodeTestCase { @Test public void testThatDefaultAndStandardAnalyzerAreTheSameInstance() { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java index 5690315f7a..863ed96198 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltCharFilterFactoryFactoryTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.PreBuiltCharFilters; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.*; @@ -31,7 +31,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * */ -public class PreBuiltCharFilterFactoryFactoryTests extends ElasticsearchTestCase { +public class PreBuiltCharFilterFactoryFactoryTests extends ESTestCase { @Test public void testThatDifferentVersionsCanBeLoaded() { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java index 8531dc81c3..c1cbc1267c 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenFilterFactoryFactoryTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.PreBuiltTokenFilters; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.*; @@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.*; /** * */ -public class PreBuiltTokenFilterFactoryFactoryTests extends ElasticsearchTestCase { +public class PreBuiltTokenFilterFactoryFactoryTests extends ESTestCase { @Test public void testThatCachingWorksForCachingStrategyOne() { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java index d60155e0e0..a9e8f7b29f 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PreBuiltTokenizerFactoryFactoryTests.java @@ -22,7 +22,7 @@ import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.PreBuiltTokenizers; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.*; @@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.*; /** * */ -public class PreBuiltTokenizerFactoryFactoryTests extends ElasticsearchTestCase { +public class PreBuiltTokenizerFactoryFactoryTests extends ESTestCase { @Test public void testThatDifferentVersionsCanBeLoaded() { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java index 866aad321f..d8b6905d77 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/ShingleTokenFilterFactoryTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.StopFilter; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; @ThreadLeakScope(Scope.NONE) -public class ShingleTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class ShingleTokenFilterFactoryTests extends ESTokenStreamTestCase { private static final String RESOURCE = "org/elasticsearch/index/analysis/shingle_analysis.json"; diff --git a/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java index a34a5c674a..632233e6f2 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/SnowballAnalyzerTests.java @@ -21,9 +21,9 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; -public class SnowballAnalyzerTests extends ElasticsearchTokenStreamTestCase { +public class SnowballAnalyzerTests extends ESTokenStreamTestCase { public void testEnglish() throws Exception { Analyzer a = new SnowballAnalyzer("English"); diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java index 6b5fb9fa34..22a7effdaa 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/StemmerTokenFilterFactoryTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class StemmerTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class StemmerTokenFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testEnglishBackwardsCompatibility() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java index 0b4dc23b79..e520fd1c55 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/StopAnalyzerTests.java @@ -32,12 +32,12 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class StopAnalyzerTests extends ElasticsearchTokenStreamTestCase { +public class StopAnalyzerTests extends ESTokenStreamTestCase { @Test public void testDefaultsCompoundAnalysis() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java b/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java index f61a50ea2d..2d52599c6c 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/StopTokenFilterTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.util.Version; import org.elasticsearch.common.inject.ProvisionException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings.Builder; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -38,7 +38,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class StopTokenFilterTests extends ElasticsearchTokenStreamTestCase { +public class StopTokenFilterTests extends ESTokenStreamTestCase { @Test(expected = ProvisionException.class) public void testPositionIncrementSetting() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java index cb67e657dd..d29b2ebae9 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/WordDelimiterTokenFilterFactoryTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -29,7 +29,7 @@ import java.io.StringReader; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -public class WordDelimiterTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class WordDelimiterTokenFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java index d4bf9058bc..6aadf4d137 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/commongrams/CommonGramsTokenFilterFactoryTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Assert; import org.junit.Test; @@ -34,7 +34,7 @@ import java.io.IOException; import java.io.StringReader; import static org.hamcrest.Matchers.instanceOf; -public class CommonGramsTokenFilterFactoryTests extends ElasticsearchTokenStreamTestCase { +public class CommonGramsTokenFilterFactoryTests extends ESTokenStreamTestCase { @Test public void testDefault() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java index 289c1a20b7..beb5ae3b51 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.analysis.AnalysisService; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SynonymsAnalysisTest extends ElasticsearchTestCase { +public class SynonymsAnalysisTest extends ESTestCase { protected final ESLogger logger = Loggers.getLogger(getClass()); private AnalysisService analysisService; diff --git a/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java b/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java index 4125c34790..389b2095ba 100644 --- a/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java +++ b/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java @@ -38,14 +38,14 @@ import org.apache.lucene.search.join.BitDocIdSetFilter; import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.Index; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; /** */ -public class BitSetFilterCacheTest extends ElasticsearchTestCase { +public class BitSetFilterCacheTest extends ESTestCase { @Test public void testInvalidateEntries() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java index f5fc8c9934..fc96718948 100644 --- a/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/core/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -39,13 +39,13 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.instanceOf; @SuppressCodecs("*") // we test against default codec so never get a random one here! -public class CodecTests extends ElasticsearchSingleNodeTest { +public class CodecTests extends ESSingleNodeTestCase { @Test public void testResolveDefaultCodecs() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java b/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTest.java index 58bbe5825f..efaa557cc8 100644 --- a/core/src/test/java/org/elasticsearch/index/codec/postingformat/ElasticsearchPostingsFormatTest.java +++ b/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTest.java @@ -34,7 +34,7 @@ import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; }) @TimeoutSuite(millis = TimeUnits.HOUR) @LuceneTestCase.SuppressSysoutChecks(bugUrl = "we log a lot on purpose") -public class ElasticsearchPostingsFormatTest extends BasePostingsFormatTestCase { +public class PostingsFormatTest extends BasePostingsFormatTestCase { @Override protected Codec getCodec() { diff --git a/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java b/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java index cf21ea84b9..a7d80e74a5 100644 --- a/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java +++ b/core/src/test/java/org/elasticsearch/index/deletionpolicy/SnapshotDeletionPolicyTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; /** * A set of tests for {@link org.elasticsearch.index.deletionpolicy.SnapshotDeletionPolicy}. */ -public class SnapshotDeletionPolicyTests extends ElasticsearchTestCase { +public class SnapshotDeletionPolicyTests extends ESTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java b/core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java index 75aa4ed9b4..8d9c313a9a 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/CommitStatsTests.java @@ -23,7 +23,7 @@ package org.elasticsearch.index.engine; import org.apache.lucene.index.SegmentInfos; import org.elasticsearch.common.io.stream.InputStreamStreamInput; import org.elasticsearch.common.io.stream.OutputStreamStreamOutput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -32,7 +32,7 @@ import java.io.IOException; import static org.elasticsearch.test.VersionUtils.randomVersion; -public class CommitStatsTests extends ElasticsearchTestCase { +public class CommitStatsTests extends ESTestCase { public void testStreamingWithNullId() throws IOException { SegmentInfos segmentInfos = new SegmentInfos(); CommitStats commitStats = new CommitStats(segmentInfos); diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java index ebd6965eb3..bae6be5ad4 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.indices.segments.IndexShardSegments; import org.elasticsearch.action.admin.indices.segments.IndicesSegmentResponse; import org.elasticsearch.action.admin.indices.segments.ShardSegments; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -32,7 +32,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -public class InternalEngineIT extends ElasticsearchIntegrationTest { +public class InternalEngineIT extends ESIntegTestCase { @Test public void testSetIndexCompoundOnFlush() { diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java index 1274df7ebc..8f8ce8c848 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java @@ -19,15 +19,13 @@ package org.elasticsearch.index.engine; import com.google.common.base.Predicate; -import org.apache.lucene.index.LogByteSizeMergePolicy; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.index.shard.MergePolicyConfig; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -35,13 +33,13 @@ import java.io.IOException; import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; @ClusterScope(numDataNodes = 1, scope = Scope.SUITE) -public class InternalEngineMergeIT extends ElasticsearchIntegrationTest { +public class InternalEngineMergeIT extends ESIntegTestCase { @Test public void testMergesHappening() throws InterruptedException, IOException, ExecutionException { diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java index 856a275a5b..21211fe353 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java @@ -21,14 +21,14 @@ package org.elasticsearch.index.engine; import org.apache.lucene.index.LiveIndexWriterConfig; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class InternalEngineSettingsTest extends ElasticsearchSingleNodeTest { +public class InternalEngineSettingsTest extends ESSingleNodeTestCase { public void testSettingsUpdate() { final IndexService service = createIndex("foo"); diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 7e9906087f..52de4859ff 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -79,7 +79,7 @@ import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.index.translog.TranslogTests; import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.hamcrest.MatcherAssert; import org.junit.After; @@ -102,7 +102,7 @@ import static org.elasticsearch.index.engine.Engine.Operation.Origin.PRIMARY; import static org.elasticsearch.index.engine.Engine.Operation.Origin.REPLICA; import static org.hamcrest.Matchers.*; -public class InternalEngineTests extends ElasticsearchTestCase { +public class InternalEngineTests extends ESTestCase { private static final Pattern PARSE_LEGACY_ID_PATTERN = Pattern.compile("^" + Translog.TRANSLOG_FILE_PREFIX + "(\\d+)((\\.recovering))?$"); diff --git a/core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java index bf89a5a7ba..1634d21ee3 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java +++ b/core/src/test/java/org/elasticsearch/index/engine/ShadowEngineTests.java @@ -56,7 +56,7 @@ import org.elasticsearch.index.store.Store; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.hamcrest.MatcherAssert; import org.junit.After; @@ -76,7 +76,7 @@ import static org.hamcrest.Matchers.*; /** * TODO: document me! */ -public class ShadowEngineTests extends ElasticsearchTestCase { +public class ShadowEngineTests extends ESTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java index eff42dd040..6908a6738d 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/AbstractFieldDataTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.mapper.MapperBuilders; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.internal.ParentFieldMapper; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.After; import org.junit.Before; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.sameInstance; -public abstract class AbstractFieldDataTests extends ElasticsearchSingleNodeTest { +public abstract class AbstractFieldDataTests extends ESSingleNodeTestCase { protected IndexService indexService; protected IndexFieldDataService ifdService; diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java index 9124f6c450..0601a30242 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/DisabledFieldDataFormatTests.java @@ -25,13 +25,13 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -public class DisabledFieldDataFormatTests extends ElasticsearchSingleNodeTest { +public class DisabledFieldDataFormatTests extends ESSingleNodeTestCase { public void test() throws Exception { createIndex("test", Settings.EMPTY, "type", "s", "type=string"); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java index 602ab03498..393f481e17 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataFilterIntegrationIT.java @@ -21,12 +21,11 @@ package org.elasticsearch.index.fielddata; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -36,7 +35,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -public class FieldDataFilterIntegrationIT extends ElasticsearchIntegrationTest { +public class FieldDataFilterIntegrationIT extends ESIntegTestCase { @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java index 07fa7e44c3..12aeb70df2 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataLoadingIT.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.fielddata; import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.greaterThan; /** */ -public class FieldDataLoadingIT extends ElasticsearchIntegrationTest { +public class FieldDataLoadingIT extends ESIntegTestCase { @Test public void testEagerFieldDataLoading() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java index 46d3ce955e..33ddc80868 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java @@ -23,9 +23,9 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; -public class FieldDataTests extends ElasticsearchTestCase { +public class FieldDataTests extends ESTestCase { public void testSortableLongBitsToDoubles() { final double value = randomDouble(); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java index 2823566fdd..002a82ef35 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.mapper.Mapper.BuilderContext; import org.elasticsearch.index.mapper.MapperBuilders; import org.elasticsearch.index.mapper.core.*; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Arrays; import java.util.Collections; @@ -42,7 +42,7 @@ import java.util.Set; import static org.hamcrest.Matchers.instanceOf; -public class IndexFieldDataServiceTests extends ElasticsearchSingleNodeTest { +public class IndexFieldDataServiceTests extends ESSingleNodeTestCase { private static Settings DOC_VALUES_SETTINGS = Settings.builder().put(FieldDataType.FORMAT_KEY, FieldDataType.DOC_VALUES_FORMAT_VALUE).build(); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java index a51af09f76..00823199f7 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/ScriptDocValuesTests.java @@ -22,11 +22,11 @@ package org.elasticsearch.index.fielddata; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.unit.DistanceUnit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Arrays; -public class ScriptDocValuesTests extends ElasticsearchTestCase { +public class ScriptDocValuesTests extends ESTestCase { private static MultiGeoPointValues wrap(final GeoPoint... points) { return new MultiGeoPointValues() { diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java index 08a960e769..e25b5c73c6 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/fieldcomparator/ReplaceMissingTests.java @@ -24,9 +24,9 @@ import org.apache.lucene.document.SortedDocValuesField; import org.apache.lucene.index.*; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; -public class ReplaceMissingTests extends ElasticsearchTestCase { +public class ReplaceMissingTests extends ESTestCase { public void test() throws Exception { Directory dir = newDirectory(); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java index dd84f1515f..f855d3f9d7 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinalsTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.util.packed.PackedInts; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class MultiOrdinalsTests extends ElasticsearchTestCase { +public class MultiOrdinalsTests extends ESTestCase { protected final Ordinals creationMultiOrdinals(OrdinalsBuilder builder) { return this.creationMultiOrdinals(builder, Settings.builder()); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java index ebb8eb361f..59be0f9a4f 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/ordinals/SingleOrdinalsTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.RandomAccessOrds; import org.apache.lucene.index.SortedDocValues; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class SingleOrdinalsTests extends ElasticsearchTestCase { +public class SingleOrdinalsTests extends ESTestCase { @Test public void testSvValues() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java b/core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java index 48c95aa3f6..7a1aad2182 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/plain/ParentChildFilteredTermsEnumTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Locale; @@ -37,7 +37,7 @@ import static org.hamcrest.core.IsNull.notNullValue; /** */ -public class ParentChildFilteredTermsEnumTests extends ElasticsearchTestCase { +public class ParentChildFilteredTermsEnumTests extends ESTestCase { @Test public void testSimple_twoFieldEachUniqueValue() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java index 9d0ae62a31..8afdea2745 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingIntegrationIT.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; import java.util.Map; @@ -30,7 +30,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -public class DynamicMappingIntegrationIT extends ElasticsearchIntegrationTest { +public class DynamicMappingIntegrationIT extends ESIntegTestCase { public void testConflictingDynamicMappings() { // we don't use indexRandom because the order of requests is important here diff --git a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java index 2c7e2b3734..02841f7f57 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.core.IntegerFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class DynamicMappingTests extends ElasticsearchSingleNodeTest { +public class DynamicMappingTests extends ESSingleNodeTestCase { public void testDynamicTrue() throws IOException { String mapping = jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java index a3b3ea12af..ca31a789f2 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java @@ -24,14 +24,14 @@ import com.google.common.collect.Lists; import org.elasticsearch.Version; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.Collection; import java.util.Iterator; import java.util.List; -public class FieldTypeLookupTests extends ElasticsearchTestCase { +public class FieldTypeLookupTests extends ESTestCase { public void testEmpty() { FieldTypeLookup lookup = new FieldTypeLookup(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java index 4d7e9c7137..a27a4344c5 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java @@ -22,13 +22,13 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.similarity.BM25SimilarityProvider; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; import java.util.List; /** Base test case for subclasses of MappedFieldType */ -public abstract class FieldTypeTestCase extends ElasticsearchTestCase { +public abstract class FieldTypeTestCase extends ESTestCase { /** Create a default constructed fieldtype */ protected abstract MappedFieldType createDefaultFieldType(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java b/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java index fb0bdf8855..8e88cbb3d3 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/TransformOnIndexMapperIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.search.suggest.SuggestBuilders; import org.elasticsearch.search.suggest.completion.CompletionSuggestion; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.not; * Tests for transforming the source document before indexing. */ @SuppressCodecs("*") // requires custom completion format -public class TransformOnIndexMapperIT extends ElasticsearchIntegrationTest { +public class TransformOnIndexMapperIT extends ESIntegTestCase { @Test public void searchOnTransformed() throws Exception { setup(true); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java b/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java index 1d2be4592f..d6a5c9f553 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/UidTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class UidTests extends ElasticsearchTestCase { +public class UidTests extends ESTestCase { @Test public void testCreateAndSplitId() { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java index b0dcad3630..e80dcec3e9 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/all/SimpleAllMapperTests.java @@ -44,9 +44,8 @@ import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.AllFieldMapper; -import org.elasticsearch.index.mapper.internal.IndexFieldMapper; import org.elasticsearch.index.mapper.internal.SizeFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -68,7 +67,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class SimpleAllMapperTests extends ElasticsearchSingleNodeTest { +public class SimpleAllMapperTests extends ESSingleNodeTestCase { public void testSimpleAllMappers() throws Exception { String mapping = copyToStringFromClasspath("/org/elasticsearch/index/mapper/all/mapping.json"); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java index ac71875b72..b5a002d331 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/binary/BinaryMappingTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.core.BinaryFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; import java.util.Arrays; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.instanceOf; /** */ -public class BinaryMappingTests extends ElasticsearchSingleNodeTest { +public class BinaryMappingTests extends ESSingleNodeTestCase { public void testDefaultMapping() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java index c4f55cb419..d18acfe56a 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/boost/CustomBoostMappingTests.java @@ -22,12 +22,12 @@ package org.elasticsearch.index.mapper.boost; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class CustomBoostMappingTests extends ElasticsearchSingleNodeTest { +public class CustomBoostMappingTests extends ESSingleNodeTestCase { @Test public void testCustomBoostValues() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java b/core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java index a160883ac6..5c5ce7bdae 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/boost/FieldLevelBoostTests.java @@ -25,14 +25,14 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.closeTo; /** */ -public class FieldLevelBoostTests extends ElasticsearchSingleNodeTest { +public class FieldLevelBoostTests extends ESSingleNodeTestCase { @Test public void testFieldLevelBoost() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java b/core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java index 76cebd6b75..89e186445d 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/camelcase/CamelCaseFieldNameTests.java @@ -23,13 +23,13 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; /** * */ -public class CamelCaseFieldNameTests extends ElasticsearchSingleNodeTest { +public class CamelCaseFieldNameTests extends ESSingleNodeTestCase { @Test public void testCamelCaseFieldNameStaysAsIs() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java index e0031cf1d0..717823d9ff 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/completion/CompletionFieldMapperTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.core.CompletionFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -public class CompletionFieldMapperTests extends ElasticsearchSingleNodeTest { +public class CompletionFieldMapperTests extends ESSingleNodeTestCase { @Test public void testDefaultConfiguration() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java b/core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java index 0c78bae6d7..fa2e1a1237 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/compound/CompoundTypesTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.index.mapper.compound; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.equalTo; -public class CompoundTypesTests extends ElasticsearchSingleNodeTest { +public class CompoundTypesTests extends ESSingleNodeTestCase { @Test public void testStringType() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java index 5265b1b640..5919c52bc3 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperIntegrationIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class CopyToMapperIntegrationIT extends ElasticsearchIntegrationTest { +public class CopyToMapperIntegrationIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java index 870ab31321..419dde456d 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/copyto/CopyToMapperTests.java @@ -19,8 +19,6 @@ package org.elasticsearch.index.mapper.copyto; -import com.google.common.collect.ImmutableList; - import org.apache.lucene.index.IndexableField; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; @@ -39,7 +37,7 @@ import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.Arrays; @@ -55,7 +53,7 @@ import static org.hamcrest.Matchers.startsWith; /** * */ -public class CopyToMapperTests extends ElasticsearchSingleNodeTest { +public class CopyToMapperTests extends ESSingleNodeTestCase { @SuppressWarnings("unchecked") @Test diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java index b9790e8069..53b930b87f 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/core/BooleanFieldMapperTests.java @@ -36,12 +36,12 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; import java.io.IOException; -public class BooleanFieldMapperTests extends ElasticsearchSingleNodeTest { +public class BooleanFieldMapperTests extends ESSingleNodeTestCase { IndexService indexService; DocumentMapperParser parser; diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java index d28609e5be..d4cfcb8ccd 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/core/Murmur3FieldMapperTests.java @@ -28,10 +28,10 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; -public class Murmur3FieldMapperTests extends ElasticsearchSingleNodeTest { +public class Murmur3FieldMapperTests extends ESSingleNodeTestCase { IndexService indexService; DocumentMapperParser parser; diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java index d9f02ec123..837a7a060c 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperIntegrationIT.java @@ -22,7 +22,6 @@ package org.elasticsearch.index.mapper.core; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import com.google.common.collect.ImmutableList; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; @@ -32,7 +31,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +41,7 @@ import java.util.List; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.*; -public class TokenCountFieldMapperIntegrationIT extends ElasticsearchIntegrationTest { +public class TokenCountFieldMapperIntegrationIT extends ESIntegTestCase { @ParametersFactory public static Iterable<Object[]> buildParameters() { List<Object[]> parameters = new ArrayList<>(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java index 4c5c7cfd23..818366647d 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/core/TokenCountFieldMapperTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MergeResult; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Test for {@link TokenCountFieldMapper}. */ -public class TokenCountFieldMapperTests extends ElasticsearchSingleNodeTest { +public class TokenCountFieldMapperTests extends ESSingleNodeTestCase { @Test public void testMerge() throws IOException { String stage1Mapping = XContentFactory.jsonBuilder().startObject() diff --git a/core/src/test/java/org/elasticsearch/index/mapper/date/DateBackwardsCompatibilityTests.java b/core/src/test/java/org/elasticsearch/index/mapper/date/DateBackwardsCompatibilityTests.java index 05dd79de1e..b6ecb24d42 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/date/DateBackwardsCompatibilityTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/date/DateBackwardsCompatibilityTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; import java.util.List; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.is; * Test class to check for all the conditions defined in * https://github.com/elastic/elasticsearch/issues/10971 */ -public class DateBackwardsCompatibilityTests extends ElasticsearchSingleNodeTest { +public class DateBackwardsCompatibilityTests extends ESSingleNodeTestCase { private String index = "testindex"; private String type = "testtype"; diff --git a/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index ebc638b33f..aacf34b7ba 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.mapper.core.DateFieldMapper; import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.TestSearchContext; import org.elasticsearch.test.VersionUtils; import org.joda.time.DateTime; @@ -60,7 +60,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.index.mapper.string.SimpleStringMappingTests.docValuesType; import static org.hamcrest.Matchers.*; -public class SimpleDateMappingTests extends ElasticsearchSingleNodeTest { +public class SimpleDateMappingTests extends ESSingleNodeTestCase { public void testAutomaticDateParser() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java index 44fad3b612..83a14687b3 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/genericstore/GenericStoreDynamicTemplateTests.java @@ -24,10 +24,9 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.FieldMappers; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -37,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class GenericStoreDynamicTemplateTests extends ElasticsearchSingleNodeTest { +public class GenericStoreDynamicTemplateTests extends ESSingleNodeTestCase { @Test public void testSimple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java index 1c36e6959a..b4c1ba668f 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/pathmatch/PathMatchDynamicTemplateTests.java @@ -24,11 +24,9 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.FieldMappers; -import org.elasticsearch.index.mapper.MapperUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -38,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PathMatchDynamicTemplateTests extends ElasticsearchSingleNodeTest { +public class PathMatchDynamicTemplateTests extends ESSingleNodeTestCase { @Test public void testSimple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java index b106086157..c136f4d989 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/dynamictemplate/simple/SimpleDynamicTemplatesTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleDynamicTemplatesTests extends ElasticsearchSingleNodeTest { +public class SimpleDynamicTemplatesTests extends ESSingleNodeTestCase { @Test public void testMatchTypeOnly() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java index 4eed5a677b..101b3d6b16 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/ExternalValuesMapperIntegrationIT.java @@ -25,12 +25,12 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class ExternalValuesMapperIntegrationIT extends ElasticsearchIntegrationTest { +public class ExternalValuesMapperIntegrationIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java index 26e8da59d7..bc808ab5b0 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/externalvalues/SimpleExternalMappingTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.is; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -public class SimpleExternalMappingTests extends ElasticsearchSingleNodeTest { +public class SimpleExternalMappingTests extends ESSingleNodeTestCase { @Test public void testExternalValues() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java index f52363e89a..08b6e0d716 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoEncodingTests.java @@ -23,14 +23,14 @@ import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.unit.DistanceUnit.Distance; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Arrays; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class GeoEncodingTests extends ElasticsearchTestCase { +public class GeoEncodingTests extends ESTestCase { public void test() { for (int i = 0; i < 10000; ++i) { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java index 4d721abf5e..2584e86164 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapperTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MergeResult; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -public class GeoPointFieldMapperTests extends ElasticsearchSingleNodeTest { +public class GeoPointFieldMapperTests extends ESSingleNodeTestCase { @Test public void testLatLonValues() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java index 24e9be49b6..b30589b8c9 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeoShapeFieldMapperTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MergeResult; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.isIn; -public class GeoShapeFieldMapperTests extends ElasticsearchSingleNodeTest { +public class GeoShapeFieldMapperTests extends ESSingleNodeTestCase { @Test public void testDefaultConfiguration() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java index 6274d0fb46..537df6b932 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/geo/GeohashMappingGeoPointTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class GeohashMappingGeoPointTests extends ElasticsearchSingleNodeTest { +public class GeohashMappingGeoPointTests extends ESSingleNodeTestCase { @Test public void testLatLonValues() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java index 1acae6fbae..2688674f85 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/id/IdMappingTests.java @@ -32,13 +32,13 @@ import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.index.mapper.internal.IdFieldMapper; import org.elasticsearch.index.mapper.internal.UidFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class IdMappingTests extends ElasticsearchSingleNodeTest { +public class IdMappingTests extends ESSingleNodeTestCase { public void testId() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java index 8bafd2f15d..bfb0147695 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperTests.java @@ -27,11 +27,11 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.IndexFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.hamcrest.Matchers.*; -public class IndexTypeMapperTests extends ElasticsearchSingleNodeTest { +public class IndexTypeMapperTests extends ESSingleNodeTestCase { private Settings bwcSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_4_2.id).build(); public void testSimpleIndexMapperEnabledBackcompat() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java index ad8cff4c2a..4753f903cb 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/internal/FieldNamesFieldMapperTests.java @@ -27,13 +27,13 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Arrays; import java.util.SortedSet; import java.util.TreeSet; -public class FieldNamesFieldMapperTests extends ElasticsearchSingleNodeTest { +public class FieldNamesFieldMapperTests extends ESSingleNodeTestCase { private static SortedSet<String> extract(String path) { SortedSet<String> set = new TreeSet<>(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java index 31bf53da1c..07d0940b3b 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/ip/SimpleIpMappingTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SimpleIpMappingTests extends ElasticsearchSingleNodeTest { +public class SimpleIpMappingTests extends ESSingleNodeTestCase { @Test public void testSimpleMapping() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java b/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java index 5dfa9abeaa..5584501018 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java @@ -24,14 +24,12 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.elasticsearch.common.logging.ESLoggerFactory; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MapperUtils; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -39,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class DoubleIndexingDocTest extends ElasticsearchSingleNodeTest { +public class DoubleIndexingDocTest extends ESSingleNodeTestCase { @Test public void testDoubleIndexingSameDoc() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java b/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java index 21597f4182..558ba25739 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.fieldvisitor.CustomFieldsVisitor; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.Arrays; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class StoredNumericValuesTest extends ElasticsearchSingleNodeTest { +public class StoredNumericValuesTest extends ESSingleNodeTestCase { @Test public void testBytesAndNumericRepresentation() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java index 15a61a01b6..1a66879c44 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/merge/TestMergeMapperTests.java @@ -23,7 +23,6 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.analysis.FieldNameAnalyzer; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.mapper.DocumentFieldMappers; import org.elasticsearch.index.mapper.DocumentMapper; @@ -34,8 +33,7 @@ import org.elasticsearch.index.mapper.MergeResult; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.core.StringFieldMapper; import org.elasticsearch.index.mapper.object.ObjectMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; -import org.junit.Test; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicBoolean; @@ -45,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class TestMergeMapperTests extends ElasticsearchSingleNodeTest { +public class TestMergeMapperTests extends ESSingleNodeTestCase { public void test1Merge() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java index 0dc9ac6242..8511bf96c0 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; import org.elasticsearch.index.mapper.core.TokenCountFieldMapper; import org.elasticsearch.index.mapper.geo.GeoPointFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.Arrays; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class MultiFieldTests extends ElasticsearchSingleNodeTest { +public class MultiFieldTests extends ESSingleNodeTestCase { @Test public void testMultiField_multiFieldType() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java index ee38e42b83..f3636bf4c4 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/multifield/MultiFieldsIntegrationIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.unit.DistanceUnit; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class MultiFieldsIntegrationIT extends ElasticsearchIntegrationTest { +public class MultiFieldsIntegrationIT extends ESIntegTestCase { @Test public void testMultiFields() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java index b8bb32266b..5405aee6ec 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/multifield/merge/JavaMultiFieldMergeTests.java @@ -21,26 +21,24 @@ package org.elasticsearch.index.mapper.multifield.merge; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; -import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.MergeResult; import org.elasticsearch.index.mapper.ParseContext.Document; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.Arrays; -import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; import static org.hamcrest.Matchers.*; /** * */ -public class JavaMultiFieldMergeTests extends ElasticsearchSingleNodeTest { +public class JavaMultiFieldMergeTests extends ESSingleNodeTestCase { @Test public void testMergeMultiField() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java index 5f7e8f75b8..5ae90bd5a0 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/nested/NestedMappingTests.java @@ -25,13 +25,13 @@ import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.internal.TypeFieldMapper; import org.elasticsearch.index.mapper.object.ObjectMapper; import org.elasticsearch.index.mapper.object.ObjectMapper.Dynamic; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class NestedMappingTests extends ElasticsearchSingleNodeTest { +public class NestedMappingTests extends ESSingleNodeTestCase { @Test public void emptyNested() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java b/core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java index ec8b3b077d..d7aa84c2df 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/null_value/NullValueTests.java @@ -24,14 +24,14 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; /** */ -public class NullValueTests extends ElasticsearchSingleNodeTest { +public class NullValueTests extends ESSingleNodeTestCase { @Test public void testNullNull_Value() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java b/core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java index 2da6f3a607..728152afdb 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/numeric/SimpleNumericTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.mapper.core.LongFieldMapper; import org.elasticsearch.index.mapper.core.NumberFieldMapper; import org.elasticsearch.index.mapper.core.StringFieldMapper; import org.elasticsearch.index.mapper.string.SimpleStringMappingTests; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class SimpleNumericTests extends ElasticsearchSingleNodeTest { +public class SimpleNumericTests extends ESSingleNodeTestCase { @Test public void testNumericDetectionEnabled() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java index 9a5ffe070a..f2b0b19af5 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/object/NullValueObjectMappingTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper.object; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class NullValueObjectMappingTests extends ElasticsearchSingleNodeTest { +public class NullValueObjectMappingTests extends ESSingleNodeTestCase { @Test public void testNullValueObject() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java index 6392eb4f2c..ee604e006b 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/object/SimpleObjectMappingTests.java @@ -20,16 +20,15 @@ package org.elasticsearch.index.mapper.object; import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; /** */ -public class SimpleObjectMappingTests extends ElasticsearchSingleNodeTest { +public class SimpleObjectMappingTests extends ESSingleNodeTestCase { @Test public void testDifferentInnerObjectTokenFailure() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java index e748510ee3..bdfb0e475b 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/parent/ParentMappingTests.java @@ -26,11 +26,11 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.hamcrest.Matchers.nullValue; -public class ParentMappingTests extends ElasticsearchSingleNodeTest { +public class ParentMappingTests extends ESSingleNodeTestCase { public void testParentNotSet() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java index 9a19a449c8..4bd12550d8 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/path/PathMapperTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.mapper.path; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PathMapperTests extends ElasticsearchSingleNodeTest { +public class PathMapperTests extends ESSingleNodeTestCase { @Test public void testPathMapping() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java index 9b053858a4..30fcb5f3d6 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/routing/RoutingTypeMapperTests.java @@ -34,13 +34,13 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Map; import static org.hamcrest.Matchers.*; -public class RoutingTypeMapperTests extends ElasticsearchSingleNodeTest { +public class RoutingTypeMapperTests extends ESSingleNodeTestCase { public void testRoutingMapper() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java index 7b479e909c..5c4bd28a02 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/simple/SimpleMapperTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.elasticsearch.common.io.Streams.copyToBytesFromClasspath; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleMapperTests extends ElasticsearchSingleNodeTest { +public class SimpleMapperTests extends ESSingleNodeTestCase { @Test public void testSimpleMapper() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java index 9d574574ed..6e004c4d0e 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper.size; import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class SizeMappingIntegrationIT extends ElasticsearchIntegrationTest { +public class SizeMappingIntegrationIT extends ESIntegTestCase { @Test // issue 5053 public void testThatUpdatingMappingShouldNotRemoveSizeMappingConfiguration() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java index 35208ba2a1..6f66c515b2 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java @@ -28,11 +28,11 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import static org.hamcrest.Matchers.*; -public class SizeMappingTests extends ElasticsearchSingleNodeTest { +public class SizeMappingTests extends ESSingleNodeTestCase { public void testSizeEnabled() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java index 82067a303c..56c188b7aa 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/source/CompressSourceMappingTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class CompressSourceMappingTests extends ElasticsearchSingleNodeTest { +public class CompressSourceMappingTests extends ESSingleNodeTestCase { Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_4_2.id).build(); @Test diff --git a/core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java index 0640f7ba2d..6e055f7403 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/source/DefaultSourceMappingTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.*; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; import java.util.ArrayList; @@ -40,7 +40,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class DefaultSourceMappingTests extends ElasticsearchSingleNodeTest { +public class DefaultSourceMappingTests extends ESSingleNodeTestCase { public void testNoFormat() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") diff --git a/core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java index 4204596901..a540dd8e6a 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java @@ -26,10 +26,6 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.IndexableFieldType; -import org.apache.lucene.index.Term; -import org.apache.lucene.queries.TermsQuery; -import org.apache.lucene.search.TermQuery; -import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -47,12 +43,11 @@ import org.elasticsearch.index.mapper.MergeResult; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.core.StringFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Before; import org.junit.Test; import java.util.Arrays; -import java.util.Collections; import java.util.Map; import static org.elasticsearch.index.mapper.core.StringFieldMapper.Builder; @@ -62,7 +57,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class SimpleStringMappingTests extends ElasticsearchSingleNodeTest { +public class SimpleStringMappingTests extends ESSingleNodeTestCase { private static Settings DOC_VALUES_SETTINGS = Settings.builder().put(FieldDataType.FORMAT_KEY, FieldDataType.DOC_VALUES_FORMAT_VALUE).build(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java index edf8f7cfd2..e33f898427 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/timestamp/TimestampMappingTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.internal.TimestampFieldMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class TimestampMappingTests extends ElasticsearchSingleNodeTest { +public class TimestampMappingTests extends ESSingleNodeTestCase { Settings BWC_SETTINGS = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.V_1_4_2.id).build(); @Test diff --git a/core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java index c148cfb510..c9b6131900 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/ttl/TTLMappingTests.java @@ -29,13 +29,12 @@ import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.*; import org.elasticsearch.index.mapper.internal.TTLFieldMapper; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -45,7 +44,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class TTLMappingTests extends ElasticsearchSingleNodeTest { +public class TTLMappingTests extends ESSingleNodeTestCase { @Test public void testSimpleDisabled() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java index 061abaeea7..21ee96522c 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseDocumentTypeLevelsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper.typelevels; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class ParseDocumentTypeLevelsTests extends ElasticsearchSingleNodeTest { +public class ParseDocumentTypeLevelsTests extends ESSingleNodeTestCase { @Test public void testNoLevel() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java index a874c87273..0dcbacedf4 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/typelevels/ParseMappingTypeLevelTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.index.mapper.typelevels; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; // TODO: move this test...it doesn't need to be by itself -public class ParseMappingTypeLevelTests extends ElasticsearchSingleNodeTest { +public class ParseMappingTypeLevelTests extends ESSingleNodeTestCase { @Test public void testTypeLevel() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java index 923473c8b7..7478b79bf7 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingOnClusterIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.mapper.MergeMappingException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -36,7 +36,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -public class UpdateMappingOnClusterIT extends ElasticsearchIntegrationTest { +public class UpdateMappingOnClusterIT extends ESIntegTestCase { private static final String INDEX = "index"; private static final String TYPE = "type"; diff --git a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java index e842543a6f..a45d4a34a1 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/update/UpdateMappingTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MergeResult; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; import static org.hamcrest.CoreMatchers.equalTo; -public class UpdateMappingTests extends ElasticsearchSingleNodeTest { +public class UpdateMappingTests extends ESSingleNodeTestCase { @Test public void test_all_enabled_after_disabled() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java b/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java index b7acdf8c17..7a4d1d9a53 100644 --- a/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/GeoShapeQueryBuilderTests.java @@ -22,10 +22,10 @@ package org.elasticsearch.index.query; import org.elasticsearch.common.geo.builders.EnvelopeBuilder; import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; -public class GeoShapeQueryBuilderTests extends ElasticsearchTestCase { +public class GeoShapeQueryBuilderTests extends ESTestCase { @Test // see #3878 public void testThatXContentSerializationInsideOfArrayWorks() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java index ca79a273a6..4a60a2da46 100644 --- a/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeFormatTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.TestSearchContext; import org.joda.time.DateTime; import org.junit.Before; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class IndexQueryParserFilterDateRangeFormatTests extends ElasticsearchSingleNodeTest { +public class IndexQueryParserFilterDateRangeFormatTests extends ESSingleNodeTestCase { private Injector injector; private IndexQueryParserService queryParser; diff --git a/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java index fba5c021e2..5c7b122096 100644 --- a/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/IndexQueryParserFilterDateRangeTimezoneTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.TestSearchContext; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class IndexQueryParserFilterDateRangeTimezoneTests extends ElasticsearchSingleNodeTest { +public class IndexQueryParserFilterDateRangeTimezoneTests extends ESSingleNodeTestCase { private Injector injector; private IndexQueryParserService queryParser; diff --git a/core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java b/core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java index d2ed0425eb..b17282ee41 100644 --- a/core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java +++ b/core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java @@ -30,7 +30,6 @@ import org.apache.lucene.queries.ExtendedCommonTermsQuery; import org.apache.lucene.queries.TermsQuery; import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.MultiTermQuery.RewriteMethod; import org.apache.lucene.search.join.ToParentBlockJoinQuery; import org.apache.lucene.search.spans.*; import org.apache.lucene.spatial.prefix.IntersectsPrefixTreeFilter; @@ -64,7 +63,7 @@ import org.elasticsearch.index.search.geo.GeoPolygonQuery; import org.elasticsearch.index.search.geo.InMemoryGeoBoundingBoxQuery; import org.elasticsearch.index.search.morelikethis.MoreLikeThisFetchService; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; @@ -81,7 +80,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBooleanSubQuery; import static org.hamcrest.Matchers.*; -public class SimpleIndexQueryParserTests extends ElasticsearchSingleNodeTest { +public class SimpleIndexQueryParserTests extends ESSingleNodeTestCase { private IndexQueryParserService queryParser; diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java index 692f414780..c7441199fc 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java @@ -22,7 +22,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import java.util.Map; /** * Test building and serialising a template search request. * */ -public class TemplateQueryBuilderTest extends ElasticsearchTestCase { +public class TemplateQueryBuilderTest extends ESTestCase { @Test public void testJSONGeneration() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java index d1fb07e714..51fd769110 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java @@ -36,7 +36,7 @@ import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; import org.elasticsearch.script.mustache.MustacheScriptEngineService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; import org.junit.Test; @@ -57,8 +57,8 @@ import static org.hamcrest.Matchers.is; /** * Full integration test of the template query plugin. */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class TemplateQueryIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class TemplateQueryIT extends ESIntegTestCase { @Before public void setup() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java index 65174b3ace..ccb9cd1113 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java @@ -44,7 +44,7 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.query.IndicesQueriesModule; import org.elasticsearch.script.ScriptModule; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.junit.After; @@ -56,8 +56,8 @@ import java.io.IOException; /** * Test parsing and executing a template request. */ -// NOTE: this can't be migrated to ElasticsearchSingleNodeTest because of the custom path.conf -public class TemplateQueryParserTest extends ElasticsearchTestCase { +// NOTE: this can't be migrated to ESSingleNodeTestCase because of the custom path.conf +public class TemplateQueryParserTest extends ESTestCase { private Injector injector; private QueryParseContext context; diff --git a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java b/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java index 080998c97a..e4d345e80b 100644 --- a/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java +++ b/core/src/test/java/org/elasticsearch/index/query/plugin/CustomQueryParserIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.IndexQueryParserService; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.instanceOf; -public class CustomQueryParserIT extends ElasticsearchIntegrationTest { +public class CustomQueryParserIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java b/core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTestCase.java index 6488423fb6..c7dd274796 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTestCase.java @@ -37,17 +37,15 @@ import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryParseContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.hamcrest.Description; import org.hamcrest.StringDescription; -import org.junit.Ignore; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -@Ignore -public abstract class AbstractChildTests extends ElasticsearchSingleNodeTest { +public abstract class AbstractChildTestCase extends ESSingleNodeTestCase { /** * The name of the field within the child type that stores a score to use in test queries. diff --git a/core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java index 0bae685e52..2a74fb986e 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java @@ -72,7 +72,7 @@ import static org.elasticsearch.index.query.QueryBuilders.notQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.hamcrest.Matchers.equalTo; -public class ChildrenConstantScoreQueryTests extends AbstractChildTests { +public class ChildrenConstantScoreQueryTests extends AbstractChildTestCase { @BeforeClass public static void before() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java index 603ff559ae..9e70f66750 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java @@ -89,7 +89,7 @@ import static org.elasticsearch.index.query.QueryBuilders.typeQuery; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThanOrEqualTo; -public class ChildrenQueryTests extends AbstractChildTests { +public class ChildrenQueryTests extends AbstractChildTestCase { @BeforeClass public static void before() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java index df5d8f6538..ac5c3a46ec 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/ParentConstantScoreQueryTests.java @@ -72,7 +72,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery; /** */ -public class ParentConstantScoreQueryTests extends AbstractChildTests { +public class ParentConstantScoreQueryTests extends AbstractChildTestCase { @BeforeClass public static void before() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java index 6c79ce5f15..836ddf3b6a 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/ParentQueryTests.java @@ -76,7 +76,7 @@ import static org.elasticsearch.index.query.QueryBuilders.hasParentQuery; import static org.elasticsearch.index.query.QueryBuilders.notQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -public class ParentQueryTests extends AbstractChildTests { +public class ParentQueryTests extends AbstractChildTestCase { @BeforeClass public static void before() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java b/core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java index 27d8641789..de74b532c4 100644 --- a/core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/child/ScoreTypeTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.search.child; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests {@link ScoreType} to ensure backward compatibility of any changes. */ -public class ScoreTypeTests extends ElasticsearchTestCase { +public class ScoreTypeTests extends ESTestCase { @Test public void minFromString() { assertThat("fromString(min) != MIN", ScoreType.MIN, equalTo(ScoreType.fromString("min"))); diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java index a20ee88173..fdb11a0cfd 100644 --- a/core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/geo/GeoDistanceTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoDistance; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.unit.DistanceUnit; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class GeoDistanceTests extends ElasticsearchTestCase { +public class GeoDistanceTests extends ESTestCase { @Test public void testDistanceCheck() { diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java index 49e1b4d0dc..4410981662 100644 --- a/core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/geo/GeoHashUtilsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.search.geo; import org.elasticsearch.common.geo.GeoHashUtils; import org.elasticsearch.common.geo.GeoPoint; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.List; /** * */ -public class GeoHashUtilsTests extends ElasticsearchTestCase { +public class GeoHashUtilsTests extends ESTestCase { /** * Pass condition: lat=42.6, lng=-5.6 should be encoded as "ezs42e44yx96", diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java index 3614cf6e2e..3089884cc7 100644 --- a/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/geo/GeoPointParsingTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import java.io.IOException; import static org.hamcrest.Matchers.closeTo; -public class GeoPointParsingTests extends ElasticsearchTestCase { +public class GeoPointParsingTests extends ESTestCase { // mind geohash precision and error private static final double ERROR = 0.00001d; diff --git a/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java b/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java index 34c30be922..cd9783448e 100644 --- a/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/index/search/geo/GeoUtilsTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.geo.GeoUtils; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser.Token; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -39,7 +39,7 @@ import java.io.IOException; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.*; -public class GeoUtilsTests extends ElasticsearchTestCase { +public class GeoUtilsTests extends ESTestCase { private static final char[] BASE_32 = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'j', 'k', 'm', 'n', diff --git a/core/src/test/java/org/elasticsearch/index/shard/CommitPointsTests.java b/core/src/test/java/org/elasticsearch/index/shard/CommitPointsTests.java index 64c53861a5..5a84bb0cec 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/CommitPointsTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/CommitPointsTests.java @@ -23,7 +23,7 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class CommitPointsTests extends ElasticsearchTestCase { +public class CommitPointsTests extends ESTestCase { private final ESLogger logger = Loggers.getLogger(CommitPointsTests.class); diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java index b5ac0cce40..e488905710 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexShardModuleTests.java @@ -21,11 +21,11 @@ package org.elasticsearch.index.shard; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; /** Unit test(s) for IndexShardModule */ -public class IndexShardModuleTests extends ElasticsearchTestCase { +public class IndexShardModuleTests extends ESTestCase { @Test public void testDetermineShadowEngineShouldBeUsed() { diff --git a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index dbedad7507..48e4e1b007 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -20,7 +20,6 @@ package org.elasticsearch.index.shard; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.LockObtainFailedException; -import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.stats.IndexStats; import org.elasticsearch.action.search.SearchResponse; @@ -29,7 +28,6 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; @@ -43,14 +41,13 @@ import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Test; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardCopyOption; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; @@ -65,7 +62,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Simple unit-test IndexShard related operations. */ -public class IndexShardTests extends ElasticsearchSingleNodeTest { +public class IndexShardTests extends ESSingleNodeTestCase { public void testFlushOnDeleteSetting() throws Exception { boolean initValue = randomBoolean(); diff --git a/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java b/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java index 7ccb91183d..49ec5c2901 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java +++ b/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java @@ -18,23 +18,14 @@ */ package org.elasticsearch.index.shard; -import org.apache.lucene.index.LogByteSizeMergePolicy; -import org.apache.lucene.index.LogDocMergePolicy; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.TieredMergePolicy; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettingsService; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.MergePolicyConfig; -import org.elasticsearch.index.store.DirectoryService; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +33,7 @@ import java.io.IOException; import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS; import static org.hamcrest.Matchers.equalTo; -public class MergePolicySettingsTest extends ElasticsearchTestCase { +public class MergePolicySettingsTest extends ESTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java b/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java index 075bad2832..e03698f62e 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/ShardPathTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.shard; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +31,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** */ -public class ShardPathTests extends ElasticsearchTestCase { +public class ShardPathTests extends ESTestCase { public void testLoadShardPath() throws IOException { try (final NodeEnvironment env = newNodeEnvironment(settingsBuilder().build())) { diff --git a/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java index e2163fa89b..3422c66a3e 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java @@ -25,11 +25,11 @@ import org.apache.lucene.index.*; import org.apache.lucene.store.BaseDirectoryWrapper; import org.apache.lucene.util.IOUtils; import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; -public class ShardUtilsTests extends ElasticsearchTestCase { +public class ShardUtilsTests extends ESTestCase { public void testExtractShardId() throws IOException { BaseDirectoryWrapper dir = newDirectory(); diff --git a/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java b/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java index 6162267ba6..cf25c1c891 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java +++ b/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java @@ -36,11 +36,10 @@ import org.apache.lucene.util.TestUtil; import org.elasticsearch.common.Numbers; import org.elasticsearch.index.mapper.internal.UidFieldMapper; import org.elasticsearch.index.mapper.internal.VersionFieldMapper; -import org.elasticsearch.index.shard.VersionFieldUpgrader; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; /** Tests upgrading old document versions from _uid payloads to _version docvalues */ -public class VersionFieldUpgraderTest extends ElasticsearchTestCase { +public class VersionFieldUpgraderTest extends ESTestCase { /** Simple test: one doc in the old format, check that it looks correct */ public void testUpgradeOneDocument() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java b/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java index 3f4119b473..6a42ba7e8c 100644 --- a/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java +++ b/core/src/test/java/org/elasticsearch/index/similarity/SimilarityTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.similarities.*; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; @@ -31,7 +31,7 @@ import java.io.IOException; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class SimilarityTests extends ElasticsearchSingleNodeTest { +public class SimilarityTests extends ESSingleNodeTestCase { @Test public void testResolveDefaultSimilarities() { diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java index 3480ca84ae..297c228d8b 100644 --- a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java +++ b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java @@ -24,7 +24,7 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.xcontent.*; import org.elasticsearch.index.store.StoreFileMetaData; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo.Fields; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; /** */ -public class FileInfoTest extends ElasticsearchTestCase { +public class FileInfoTest extends ESTestCase { @Test public void testToFromXContent() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java index ea2b51ab97..8adc7f645f 100644 --- a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java +++ b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.snapshots.blobstore; import com.carrotsearch.randomizedtesting.generators.RandomInts; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.*; @@ -27,7 +27,7 @@ import java.util.Random; import static org.hamcrest.Matchers.equalTo; -public class SlicedInputStreamTest extends ElasticsearchTestCase { +public class SlicedInputStreamTest extends ESTestCase { @Test public void readRandom() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java index 5a37666da7..c80621c986 100644 --- a/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java +++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java @@ -62,7 +62,7 @@ import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoveryTarget; import org.elasticsearch.monitor.fs.FsInfo; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.store.MockFSDirectoryService; import org.elasticsearch.test.transport.MockTransportService; @@ -89,8 +89,8 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class CorruptedFileIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class CorruptedFileIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java index 1e35a9656e..5b3227c8a8 100644 --- a/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java +++ b/core/src/test/java/org/elasticsearch/index/store/CorruptedTranslogIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.monitor.fs.FsInfo; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.engine.MockEngineSupport; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; @@ -57,8 +57,8 @@ import static org.hamcrest.Matchers.notNullValue; /** * Integration test for corrupted translog files */ -@ElasticsearchIntegrationTest.ClusterScope(scope= ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 0) -public class CorruptedTranslogIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE, numDataNodes = 0) +public class CorruptedTranslogIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java b/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java index 950de0e27a..3cfdaa26f1 100644 --- a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java +++ b/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.store; import org.apache.lucene.store.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -29,7 +29,7 @@ import java.util.Set; import static org.hamcrest.CoreMatchers.*; -public class DirectoryUtilsTest extends ElasticsearchTestCase { +public class DirectoryUtilsTest extends ESTestCase { @Test public void testGetLeave() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java b/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java index d1beafd827..c42e320c6d 100644 --- a/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java +++ b/core/src/test/java/org/elasticsearch/index/store/ExceptionRetryIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.discovery.Discovery; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.*; import org.junit.Test; @@ -47,8 +47,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class ExceptionRetryIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class ExceptionRetryIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java b/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java index 1286a7322f..9f22decd00 100644 --- a/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java +++ b/core/src/test/java/org/elasticsearch/index/store/IndexStoreTests.java @@ -24,14 +24,14 @@ import org.apache.lucene.util.Constants; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.nio.file.Path; /** */ -public class IndexStoreTests extends ElasticsearchTestCase { +public class IndexStoreTests extends ESTestCase { public void testStoreDirectory() throws IOException { final Path tempDir = createTempDir(); diff --git a/core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java b/core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java index f870cfa123..3d9c4f732b 100644 --- a/core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java +++ b/core/src/test/java/org/elasticsearch/index/store/LegacyVerificationTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.Directory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; /** * Simple tests for LegacyVerification (old segments) @@ -34,7 +34,7 @@ import org.elasticsearch.test.ElasticsearchTestCase; * segments is not longer needed. */ @Deprecated -public class LegacyVerificationTests extends ElasticsearchTestCase { +public class LegacyVerificationTests extends ESTestCase { public void testAdler32() throws Exception { Adler32 expected = new Adler32(); diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTest.java b/core/src/test/java/org/elasticsearch/index/store/StoreTest.java index 95c043ae70..524d069957 100644 --- a/core/src/test/java/org/elasticsearch/index/store/StoreTest.java +++ b/core/src/test/java/org/elasticsearch/index/store/StoreTest.java @@ -46,7 +46,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.indices.store.TransportNodesListShardStoreMetaData; import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -65,7 +65,7 @@ import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.*; -public class StoreTest extends ElasticsearchTestCase { +public class StoreTest extends ESTestCase { @Test public void testRefCount() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java index ed189eb54a..02d5279abb 100644 --- a/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java +++ b/core/src/test/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; import org.elasticsearch.search.suggest.term.TermSuggestionBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashSet; @@ -45,8 +45,8 @@ import static org.hamcrest.Matchers.*; /** */ -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class SuggestStatsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class SuggestStatsIT extends ESIntegTestCase { @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 26b444764e..06fa074b05 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.index.Index; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; @@ -70,7 +70,7 @@ import static org.hamcrest.Matchers.*; * */ @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class TranslogTests extends ElasticsearchTestCase { +public class TranslogTests extends ESTestCase { private static final Pattern PARSE_LEGACY_ID_PATTERN = Pattern.compile("^" + Translog.TRANSLOG_FILE_PREFIX + "(\\d+)((\\.recovering))?$"); diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java index b5603a2fa4..451fdf3402 100644 --- a/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java +++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogVersionTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.translog; import org.apache.lucene.util.IOUtils; import org.elasticsearch.index.VersionType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for reading old and new translog files */ -public class TranslogVersionTests extends ElasticsearchTestCase { +public class TranslogVersionTests extends ESTestCase { @Test public void testV0LegacyTranslogVersion() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java index 55f99e9a7f..970084146a 100644 --- a/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java +++ b/core/src/test/java/org/elasticsearch/indexing/IndexActionIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.cluster.metadata.MetaDataCreateIndexService; import org.elasticsearch.index.VersionType; import org.elasticsearch.indices.InvalidIndexNameException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class IndexActionIT extends ElasticsearchIntegrationTest { +public class IndexActionIT extends ESIntegTestCase { /** * This test tries to simulate load while creating an index and indexing documents diff --git a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java b/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java index 4521bd93dd..e2991159a8 100644 --- a/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java +++ b/core/src/test/java/org/elasticsearch/indexlifecycle/IndexLifecycleActionIT.java @@ -32,8 +32,8 @@ import org.elasticsearch.cluster.routing.RoutingNodes; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster; import org.junit.Test; @@ -45,7 +45,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.routing.ShardRoutingState.*; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class IndexLifecycleActionIT extends ElasticsearchIntegrationTest { +public class IndexLifecycleActionIT extends ESIntegTestCase { @Test public void testIndexLifecycleActionsWith11Shards1Backup() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java index 0531e3942a..6868137dcd 100644 --- a/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/DateMathIndexExpressionsIntegrationIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class DateMathIndexExpressionsIntegrationIT extends ElasticsearchIntegrationTest { +public class DateMathIndexExpressionsIntegrationIT extends ESIntegTestCase { public void testIndexNameDateMathExpressions() { DateTime now = new DateTime(DateTimeZone.UTC); diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java b/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java index b3deb7de47..22a0d89713 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesCustomDataPathIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.After; import org.junit.Before; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for custom data path locations and templates */ -public class IndicesCustomDataPathIT extends ElasticsearchIntegrationTest { +public class IndicesCustomDataPathIT extends ESIntegTestCase { private String path; diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java index a2e8fbaf7e..115642aed0 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.IndexShardState; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,15 +51,15 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF import static org.elasticsearch.cluster.routing.allocation.decider.DisableAllocationDecider.CLUSTER_ROUTING_ALLOCATION_DISABLE_ALLOCATION; import static org.elasticsearch.common.settings.Settings.builder; import static org.elasticsearch.index.shard.IndexShardState.*; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class IndicesLifecycleListenerIT extends ElasticsearchIntegrationTest { +public class IndicesLifecycleListenerIT extends ESIntegTestCase { @Test public void testBeforeIndexAddedToCluster() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java index 910902b7b4..9f9ed46f69 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesLifecycleListenerSingleNodeTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.settings.IndexSettings; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; @@ -32,7 +32,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; -public class IndicesLifecycleListenerSingleNodeTests extends ElasticsearchSingleNodeTest { +public class IndicesLifecycleListenerSingleNodeTests extends ESSingleNodeTestCase { @Override protected boolean resetNodeAfterTest() { diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java index f9eeb7fef4..9cf2034e05 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesOptionsIntegrationIT.java @@ -18,7 +18,6 @@ */ package org.elasticsearch.indices; -import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionRequestBuilder; import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResponse; import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotRequestBuilder; @@ -55,7 +54,7 @@ import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.suggest.SuggestBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.action.percolate.PercolateSourceBuilder.docBuilder; @@ -64,7 +63,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; -public class IndicesOptionsIntegrationIT extends ElasticsearchIntegrationTest { +public class IndicesOptionsIntegrationIT extends ESIntegTestCase { @Test public void testSpecifiedIndexUnavailable_multipleIndices() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java index 415d806278..89f12904d2 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java @@ -29,7 +29,7 @@ import org.elasticsearch.gateway.GatewayMetaState; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; import java.util.concurrent.TimeUnit; @@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -public class IndicesServiceTest extends ElasticsearchSingleNodeTest { +public class IndicesServiceTest extends ESSingleNodeTestCase { public IndicesService getIndicesService() { return getInstanceFromNode(IndicesService.class); diff --git a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java index 74143af252..839fc598d0 100644 --- a/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/analysis/PreBuiltAnalyzerIntegrationIT.java @@ -25,8 +25,8 @@ import org.apache.lucene.analysis.Analyzer; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.lang.reflect.Field; @@ -39,9 +39,9 @@ import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -@ElasticsearchBackwardsCompatIntegrationTest.CompatibilityVersion(version = Version.V_1_2_0_ID) // we throw an exception if we create an index with _field_names that is 1.3 -public class PreBuiltAnalyzerIntegrationIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +@ESBackcompatTestCase.CompatibilityVersion(version = Version.V_1_2_0_ID) // we throw an exception if we create an index with _field_names that is 1.3 +public class PreBuiltAnalyzerIntegrationIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java index 119d5d2f9f..db46e8201d 100644 --- a/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java +++ b/core/src/test/java/org/elasticsearch/indices/analyze/AnalyzeActionIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.*; import org.elasticsearch.rest.action.admin.indices.analyze.RestAnalyzeAction; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class AnalyzeActionIT extends ElasticsearchIntegrationTest { +public class AnalyzeActionIT extends ESIntegTestCase { @Test public void simpleAnalyzerTests() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java b/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java index da813f96b6..d21a840c42 100644 --- a/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java +++ b/core/src/test/java/org/elasticsearch/indices/analyze/HunspellServiceIT.java @@ -23,9 +23,9 @@ import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.analysis.HunspellService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.hamcrest.Matchers; import org.junit.Test; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.notNullValue; * */ @ClusterScope(scope= Scope.TEST, numDataNodes=0) -public class HunspellServiceIT extends ElasticsearchIntegrationTest { +public class HunspellServiceIT extends ESIntegTestCase { @Test public void testLocaleDirectoryWithNodeLevelConfig() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java b/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java index 5332959fbc..ffb86c77c7 100644 --- a/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java +++ b/core/src/test/java/org/elasticsearch/indices/cache/query/IndicesRequestCacheIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.indices.cache.request.IndicesRequestCache; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.List; @@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.greaterThan; -public class IndicesRequestCacheIT extends ElasticsearchIntegrationTest { +public class IndicesRequestCacheIT extends ESIntegTestCase { // One of the primary purposes of the query cache is to cache aggs results public void testCacheAggs() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java b/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java index 5f65990ffe..199f4b6f77 100644 --- a/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/exists/indices/IndicesExistsIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.indices.exists.indices; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.cluster.block.ClusterBlockException; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -30,7 +30,7 @@ import java.util.Arrays; import static org.elasticsearch.cluster.metadata.IndexMetaData.*; import static org.hamcrest.Matchers.equalTo; -public class IndicesExistsIT extends ElasticsearchIntegrationTest { +public class IndicesExistsIT extends ESIntegTestCase { @Test // Indices exists never throws IndexMissingException, the indices options control its behaviour (return true or false) diff --git a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java b/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java index 261698d1d8..ffb2e2e186 100644 --- a/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/exists/types/TypesExistsIT.java @@ -18,13 +18,12 @@ */ package org.elasticsearch.indices.exists.types; -import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.exists.types.TypesExistsResponse; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -36,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.equalTo; -public class TypesExistsIT extends ElasticsearchIntegrationTest { +public class TypesExistsIT extends ESIntegTestCase { @Test public void testSimple() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java index f3c2977685..96b145a9be 100644 --- a/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java +++ b/core/src/test/java/org/elasticsearch/indices/flush/FlushIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationComman import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.Matchers.emptyIterable; import static org.hamcrest.Matchers.equalTo; -public class FlushIT extends ElasticsearchIntegrationTest { +public class FlushIT extends ESIntegTestCase { @Test public void testWaitIfOngoing() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java index 8cd791b5c0..80cc14392f 100644 --- a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java +++ b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java @@ -23,21 +23,20 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.Strings; -import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardNotFoundException; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.List; import java.util.Map; /** */ -public class SyncedFlushSingleNodeTest extends ElasticsearchSingleNodeTest { +public class SyncedFlushSingleNodeTest extends ESSingleNodeTestCase { public void testModificationPreventsFlushing() throws InterruptedException { createIndex("test"); diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java index 9e43cef81b..19cce93c6e 100644 --- a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java +++ b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushUnitTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.flush.IndicesSyncedFlushResult.ShardCounts; import org.elasticsearch.indices.flush.SyncedFlushService.SyncedFlushResponse; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.ArrayList; @@ -40,7 +40,7 @@ import static org.elasticsearch.test.XContentTestUtils.convertToMap; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -public class SyncedFlushUnitTests extends ElasticsearchTestCase { +public class SyncedFlushUnitTests extends ESTestCase { private static class TestPlan { diff --git a/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java b/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java index 50c9827c2d..422fee6879 100644 --- a/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java +++ b/core/src/test/java/org/elasticsearch/indices/leaks/IndicesLeaksIT.java @@ -25,21 +25,21 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.nullValue; /** */ @ClusterScope(scope= Scope.TEST, numDataNodes =1) -public class IndicesLeaksIT extends ElasticsearchIntegrationTest { +public class IndicesLeaksIT extends ESIntegTestCase { @SuppressWarnings({"ConstantConditions", "unchecked"}) diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java index a418325e36..f9d597cdc6 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/ConcurrentDynamicTemplateIT.java @@ -20,18 +20,15 @@ package org.elasticsearch.indices.mapping; -import com.google.common.collect.Sets; import org.elasticsearch.action.ActionListener; -import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; @@ -40,8 +37,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.emptyIterable; -@ElasticsearchIntegrationTest.ClusterScope(randomDynamicTemplates = false) // this test takes a long time to delete the idx if all fields are eager loading -public class ConcurrentDynamicTemplateIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(randomDynamicTemplates = false) // this test takes a long time to delete the idx if all fields are eager loading +public class ConcurrentDynamicTemplateIT extends ESIntegTestCase { private final String mappingType = "test-mapping"; diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java index d456501848..62745a6424 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/DedicatedMasterGetFieldMappingIT.java @@ -23,8 +23,8 @@ import org.elasticsearch.common.settings.Settings; import org.junit.Before; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; @ClusterScope(scope = Scope.TEST, numDataNodes = 0) public class DedicatedMasterGetFieldMappingIT extends SimpleGetFieldMappingsIT { diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java index 1cdd368961..974599f069 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetFieldMappingsIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsRespon import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.*; -public class SimpleGetFieldMappingsIT extends ElasticsearchIntegrationTest { +public class SimpleGetFieldMappingsIT extends ESIntegTestCase { public void testGetMappingsWhereThereAreNone() { createIndex("index"); diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java index 90437638a9..504d9a5840 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/SimpleGetMappingsIT.java @@ -23,8 +23,8 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue; * */ @ClusterScope(randomDynamicTemplates = false) -public class SimpleGetMappingsIT extends ElasticsearchIntegrationTest { +public class SimpleGetMappingsIT extends ESIntegTestCase { @Test public void getMappingsWhereThereAreNone() { diff --git a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java index 080a65b82c..71ccf68e41 100644 --- a/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java @@ -34,8 +34,8 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.hamcrest.Matchers; import org.junit.Test; @@ -50,7 +50,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; @ClusterScope(randomDynamicTemplates = false) -public class UpdateMappingIntegrationIT extends ElasticsearchIntegrationTest { +public class UpdateMappingIntegrationIT extends ESIntegTestCase { @Test public void dynamicUpdates() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java index 850d899343..ca13c07d6b 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/IndexingMemoryControllerIT.java @@ -28,12 +28,12 @@ import org.elasticsearch.index.engine.EngineConfig; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.node.internal.InternalSettingsPreparer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class IndexingMemoryControllerIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class IndexingMemoryControllerIT extends ESIntegTestCase { @Test public void testIndexBufferSizeUpdateAfterCreationRemoval() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java index 3d96ff9a1e..29e057d612 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerNoopIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.List; @@ -37,8 +37,8 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.cardinal import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; /** Tests for the noop breakers, which are non-dynamic settings */ -@ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes=0) -public class CircuitBreakerNoopIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE, numDataNodes=0) +public class CircuitBreakerNoopIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java index 6bbd5673da..fb9e9cb935 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java @@ -19,13 +19,10 @@ package org.elasticsearch.indices.memory.breaker; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.node.stats.NodeStats; import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse; import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.action.search.SearchRequestBuilder; -import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreakingException; @@ -37,13 +34,12 @@ import org.elasticsearch.indices.breaker.CircuitBreakerStats; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -52,7 +48,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.cardinality; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.TEST; +import static org.elasticsearch.test.ESIntegTestCase.Scope.TEST; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFailures; import static org.hamcrest.CoreMatchers.containsString; @@ -63,7 +59,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; * Integration tests for InternalCircuitBreakerService */ @ClusterScope(scope = TEST, randomDynamicTemplates = false) -public class CircuitBreakerServiceIT extends ElasticsearchIntegrationTest { +public class CircuitBreakerServiceIT extends ESIntegTestCase { /** Reset all breaker settings back to their defaults */ private void reset() { diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java index c2296c363f..013bc718ec 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerUnitTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.indices.breaker.BreakerSettings; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.*; /** * Unit tests for the circuit breaker */ -public class CircuitBreakerUnitTests extends ElasticsearchTestCase { +public class CircuitBreakerUnitTests extends ESTestCase { public static long pctBytes(String percentString) { return Settings.EMPTY.getAsMemory("", percentString).bytes(); diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java index 9703d36a64..053b239153 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/RandomExceptionCircuitBreakerIT.java @@ -36,7 +36,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.engine.MockEngineSupport; import org.elasticsearch.test.engine.ThrowingLeafReaderWrapper; import org.junit.Test; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for the circuit breaker while random exceptions are happening */ -public class RandomExceptionCircuitBreakerIT extends ElasticsearchIntegrationTest { +public class RandomExceptionCircuitBreakerIT extends ESIntegTestCase { @Test public void testBreakerWithRandomExceptions() throws IOException, InterruptedException, ExecutionException { diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java index e1f1d7ec0a..084862acf7 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java @@ -48,8 +48,8 @@ import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.recovery.RecoveryState.Stage; import org.elasticsearch.indices.recovery.RecoveryState.Type; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.store.MockFSDirectoryService; import org.elasticsearch.test.transport.MockTransportService; @@ -64,7 +64,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.*; @@ -73,7 +73,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class IndexRecoveryIT extends ElasticsearchIntegrationTest { +public class IndexRecoveryIT extends ESIntegTestCase { private static final String INDEX_NAME = "test-idx-1"; private static final String INDEX_TYPE = "test-type-1"; diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java index d0adffc383..3f0fe79623 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.io.stream.Streamable; import org.elasticsearch.common.transport.DummyTransportAddress; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.recovery.RecoveryState.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.concurrent.atomic.AtomicReference; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.*; -public class RecoveryStateTest extends ElasticsearchTestCase { +public class RecoveryStateTest extends ESTestCase { abstract class Streamer<T extends Streamable> extends Thread { diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java index a86230248b..35847f51ab 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStatusTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.store.StoreFileMetaData; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; import java.util.Set; @@ -34,7 +34,7 @@ import java.util.regex.Pattern; /** */ -public class RecoveryStatusTests extends ElasticsearchSingleNodeTest { +public class RecoveryStatusTests extends ESSingleNodeTestCase { public void testRenameTempFiles() throws IOException { IndexService service = createIndex("foo"); diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java index 4a1586e5c4..52c46c70a4 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.recovery; -import org.apache.lucene.index.IndexFileNames; import org.elasticsearch.Version; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.common.io.stream.InputStreamStreamInput; @@ -27,15 +26,11 @@ import org.elasticsearch.common.io.stream.OutputStreamStreamOutput; import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.store.Store; -import org.elasticsearch.index.store.StoreFileMetaData; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.Matchers.equalTo; @@ -43,7 +38,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class StartRecoveryRequestTest extends ElasticsearchTestCase { +public class StartRecoveryRequestTest extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java b/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java index 3e0d128295..357e87f069 100644 --- a/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/indices/settings/GetSettingsBlocksIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.indices.settings; import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBloc import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -public class GetSettingsBlocksIT extends ElasticsearchIntegrationTest { +public class GetSettingsBlocksIT extends ESIntegTestCase { @Test public void testGetSettingsWithBlocks() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java index ac6ba50d23..9d3a6773c3 100644 --- a/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java +++ b/core/src/test/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.count.CountResponse; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -37,8 +37,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class UpdateNumberOfReplicasIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class UpdateNumberOfReplicasIT extends ESIntegTestCase { @Override protected int maximumNumberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java index 0aff442fe8..f26a5b2586 100644 --- a/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.index.shard.MergePolicyConfig; import org.elasticsearch.index.store.IndexStore; import org.elasticsearch.index.store.Store; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -45,7 +45,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class UpdateSettingsIT extends ElasticsearchIntegrationTest { +public class UpdateSettingsIT extends ESIntegTestCase { @Test public void testOpenCloseUpdateSettings() throws Exception { @@ -261,7 +261,7 @@ public class UpdateSettingsIT extends ElasticsearchIntegrationTest { assertEquals(sumThrottleTime, newSumThrottleTime); // Optimize & flush and wait; else we sometimes get a "Delete Index failed - not acked" - // when ElasticsearchIntegrationTest.after tries to remove indices created by the test: + // when ESIntegTestCase.after tries to remove indices created by the test: // Wait for merges to finish client().admin().indices().prepareOptimize("test").get(); diff --git a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java b/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java index 419d850ce7..daebe71ac5 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/CloseIndexDisableCloseAllIT.java @@ -24,17 +24,17 @@ import org.elasticsearch.action.admin.indices.close.CloseIndexResponse; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; @ClusterScope(scope= Scope.TEST, numDataNodes =2) -public class CloseIndexDisableCloseAllIT extends ElasticsearchIntegrationTest { +public class CloseIndexDisableCloseAllIT extends ESIntegTestCase { @Test // Combined multiple tests into one, because cluster scope is test. diff --git a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java index 11cb30e955..9f2dca3d9e 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/OpenCloseIndexIT.java @@ -19,7 +19,6 @@ package org.elasticsearch.indices.state; -import org.elasticsearch.ResourceNotFoundException; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; @@ -34,7 +33,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -46,7 +45,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class OpenCloseIndexIT extends ElasticsearchIntegrationTest { +public class OpenCloseIndexIT extends ESIntegTestCase { @Test public void testSimpleCloseOpen() { diff --git a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java index 36144b0fcd..24a438bbe6 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/RareClusterStateIT.java @@ -49,7 +49,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.disruption.BlockClusterStateProcessing; import org.elasticsearch.test.junit.annotations.TestLogging; import org.junit.Test; @@ -64,8 +64,8 @@ import static org.hamcrest.Matchers.*; /** */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0) -public class RareClusterStateIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0) +public class RareClusterStateIT extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java b/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java index b6f24e5c6c..3001c03848 100644 --- a/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.indices.IndexClosedException; import org.elasticsearch.indices.IndexPrimaryShardNotAllocatedException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; @@ -44,8 +44,8 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class SimpleIndexStateIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class SimpleIndexStateIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(SimpleIndexStateIT.class); diff --git a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java index 5a2885f4a9..8aeb6f65b9 100644 --- a/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java +++ b/core/src/test/java/org/elasticsearch/indices/stats/IndexStatsIT.java @@ -48,9 +48,9 @@ import org.elasticsearch.index.shard.MergePolicyConfig; import org.elasticsearch.index.store.IndexStore; import org.elasticsearch.indices.cache.request.IndicesRequestCache; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.io.IOException; @@ -72,7 +72,7 @@ import static org.hamcrest.Matchers.nullValue; @ClusterScope(scope = Scope.SUITE, numDataNodes = 2, numClientNodes = 0, randomDynamicTemplates = false) @SuppressCodecs("*") // requires custom completion format -public class IndexStatsIT extends ElasticsearchIntegrationTest { +public class IndexStatsIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { @@ -354,7 +354,7 @@ public class IndexStatsIT extends ElasticsearchIntegrationTest { } // Optimize & flush and wait; else we sometimes get a "Delete Index failed - not acked" - // when ElasticsearchIntegrationTest.after tries to remove indices created by the test: + // when ESIntegTestCase.after tries to remove indices created by the test: logger.info("test: now optimize"); client().admin().indices().prepareOptimize("test").get(); flush(); diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java index aad99cfe31..5886e9b91d 100644 --- a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreIntegrationIT.java @@ -47,8 +47,8 @@ import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.recovery.RecoverySource; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.disruption.BlockClusterStateProcessing; import org.elasticsearch.test.disruption.SingleNodeDisruption; @@ -70,7 +70,7 @@ import java.util.concurrent.TimeUnit; import static java.lang.Thread.sleep; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; @@ -78,7 +78,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class IndicesStoreIntegrationIT extends ElasticsearchIntegrationTest { +public class IndicesStoreIntegrationIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { // simplify this and only use a single data path diff --git a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java index bf34648d64..890b94d158 100644 --- a/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java +++ b/core/src/test/java/org/elasticsearch/indices/store/IndicesStoreTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.*; import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.junit.Test; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.is; /** */ -public class IndicesStoreTests extends ElasticsearchTestCase { +public class IndicesStoreTests extends ESTestCase { private final static ShardRoutingState[] NOT_STARTED_STATES; diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java index 28a6043479..c1c41cf6c3 100644 --- a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateBlocksIT.java @@ -22,8 +22,8 @@ package org.elasticsearch.indices.template; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.template.get.GetIndexTemplatesResponse; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.io.IOException; @@ -31,8 +31,8 @@ import java.io.IOException; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.hasSize; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class IndexTemplateBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class IndexTemplateBlocksIT extends ESIntegTestCase { @Test public void testIndexTemplatesWithBlocks() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java index 5c8582287f..fdabe10888 100644 --- a/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java +++ b/core/src/test/java/org/elasticsearch/indices/template/IndexTemplateFilteringIT.java @@ -28,9 +28,9 @@ import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.AbstractPlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; @ClusterScope(scope = Scope.SUITE) -public class IndexTemplateFilteringIT extends ElasticsearchIntegrationTest{ +public class IndexTemplateFilteringIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java index 0d5921f115..1cbe5eb56d 100644 --- a/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java +++ b/core/src/test/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.query.QueryParsingException; import org.elasticsearch.indices.IndexTemplateAlreadyExistsException; import org.elasticsearch.indices.InvalidAliasNameException; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SimpleIndexTemplateIT extends ElasticsearchIntegrationTest { +public class SimpleIndexTemplateIT extends ESIntegTestCase { @Test public void simpleIndexTemplateTests() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java b/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java index 381141e2d6..1c1b193986 100644 --- a/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/warmer/GatewayIndicesWarmerIT.java @@ -26,20 +26,20 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.InternalTestCluster.RestartCallback; import org.hamcrest.Matchers; import org.junit.Test; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; /** */ @ClusterScope(numDataNodes =0, scope= Scope.TEST) -public class GatewayIndicesWarmerIT extends ElasticsearchIntegrationTest { +public class GatewayIndicesWarmerIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(GatewayIndicesWarmerIT.class); diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java b/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java index 8337307e2b..e6afa4c259 100644 --- a/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java +++ b/core/src/test/java/org/elasticsearch/indices/warmer/IndicesWarmerBlocksIT.java @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableList; import org.elasticsearch.action.admin.indices.warmer.get.GetWarmersResponse; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.Arrays; @@ -37,8 +37,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.hamcrest.Matchers.equalTo; -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class IndicesWarmerBlocksIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class IndicesWarmerBlocksIT extends ESIntegTestCase { @Test public void testPutWarmerWithBlocks() { diff --git a/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java b/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java index 98ee75cc2f..6179af72d3 100644 --- a/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java +++ b/core/src/test/java/org/elasticsearch/indices/warmer/SimpleIndicesWarmerIT.java @@ -42,7 +42,7 @@ import org.elasticsearch.indices.cache.request.IndicesRequestCache; import org.elasticsearch.search.SearchService; import org.elasticsearch.search.warmer.IndexWarmerMissingException; import org.elasticsearch.search.warmer.IndexWarmersMetaData; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,7 +51,7 @@ import java.util.Locale; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class SimpleIndicesWarmerIT extends ElasticsearchIntegrationTest { +public class SimpleIndicesWarmerIT extends ESIntegTestCase { @Test public void simpleWarmerTests() { diff --git a/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java b/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java index cf67024ad9..7716bf7300 100644 --- a/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java +++ b/core/src/test/java/org/elasticsearch/mget/SimpleMgetIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.fetch.source.FetchSourceContext; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -38,7 +38,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class SimpleMgetIT extends ElasticsearchIntegrationTest { +public class SimpleMgetIT extends ESIntegTestCase { @Test public void testThatMgetShouldWorkWithOneIndexMissing() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java b/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java index 82c9097d69..383bd0c891 100644 --- a/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java +++ b/core/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java @@ -21,14 +21,14 @@ package org.elasticsearch.monitor.fs; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; import static org.hamcrest.Matchers.*; -public class FsProbeTests extends ElasticsearchTestCase { +public class FsProbeTests extends ESTestCase { @Test public void testFsInfo() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java b/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java index bd7629fca9..d5d14e993f 100644 --- a/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java +++ b/core/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java @@ -20,13 +20,12 @@ package org.elasticsearch.monitor.os; import org.apache.lucene.util.Constants; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.*; -public class OsProbeTests extends ElasticsearchTestCase { +public class OsProbeTests extends ESTestCase { OsProbe probe = OsProbe.getInstance(); diff --git a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java b/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java index 4aa4e64dbd..910e51fdda 100644 --- a/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java +++ b/core/src/test/java/org/elasticsearch/monitor/process/ProcessProbeTests.java @@ -20,13 +20,13 @@ package org.elasticsearch.monitor.process; import org.elasticsearch.bootstrap.Bootstrap; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.monitor.jvm.JvmInfo.jvmInfo; import static org.hamcrest.Matchers.*; -public class ProcessProbeTests extends ElasticsearchTestCase { +public class ProcessProbeTests extends ESTestCase { ProcessProbe probe = ProcessProbe.getInstance(); diff --git a/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java b/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java index 1329537cdd..c876ebf090 100644 --- a/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java +++ b/core/src/test/java/org/elasticsearch/nested/SimpleNestedIT.java @@ -25,7 +25,6 @@ import org.elasticsearch.action.admin.cluster.stats.ClusterStatsResponse; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.delete.DeleteResponse; import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -34,24 +33,20 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.support.QueryInnerHitBuilder; import org.elasticsearch.script.Script; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Assert; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; - import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -public class SimpleNestedIT extends ElasticsearchIntegrationTest { +public class SimpleNestedIT extends ESIntegTestCase { @Test public void simpleNested() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java b/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java index 6ebf02bea1..6d79de9377 100644 --- a/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java +++ b/core/src/test/java/org/elasticsearch/network/DirectBufferNetworkIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC /** */ -public class DirectBufferNetworkIT extends ElasticsearchIntegrationTest { +public class DirectBufferNetworkIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java b/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java index 2830435055..a299be4109 100644 --- a/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java +++ b/core/src/test/java/org/elasticsearch/node/internal/InternalSettingsPreparerTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.cli.Terminal; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.*; -public class InternalSettingsPreparerTests extends ElasticsearchTestCase { +public class InternalSettingsPreparerTests extends ESTestCase { @Before public void setupSystemProperties() { diff --git a/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java b/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java index 68f0281b62..21d292e4d6 100644 --- a/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java +++ b/core/src/test/java/org/elasticsearch/nodesinfo/SimpleNodesInfoTests.java @@ -19,26 +19,17 @@ package org.elasticsearch.nodesinfo; -import com.google.common.collect.Lists; - import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.cluster.ClusterService; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.nodesinfo.plugin.dummy1.TestPlugin; -import org.elasticsearch.nodesinfo.plugin.dummy2.TestNoVersionPlugin; import org.elasticsearch.plugins.PluginTestCase; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; -import java.net.URISyntaxException; -import java.util.Collections; import java.util.List; -import static org.elasticsearch.client.Requests.clusterHealthRequest; import static org.elasticsearch.client.Requests.nodesInfoRequest; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; /** diff --git a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java b/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java index bfd2dc5915..3e2d0e70d9 100644 --- a/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/operateAllIndices/DestructiveOperationsIntegrationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.operateAllIndices; import org.elasticsearch.action.support.DestructiveOperations; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -29,8 +29,8 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class DestructiveOperationsIntegrationIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class DestructiveOperationsIntegrationIT extends ESIntegTestCase { @Test // One test for test performance, since cluster scope is test diff --git a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java index 1835226ca6..e6282d803b 100644 --- a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java +++ b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsDisabledIT.java @@ -24,9 +24,9 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.http.netty.NettyHttpServerTransport; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.rest.client.http.HttpDeleteWithEntity; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is; * Tests that when disabling detailed errors, a request with the error_trace parameter returns a HTTP 400 */ @ClusterScope(scope = Scope.TEST, numDataNodes = 1) -public class DetailedErrorsDisabledIT extends ElasticsearchIntegrationTest { +public class DetailedErrorsDisabledIT extends ESIntegTestCase { // Build our cluster settings @Override diff --git a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java index 5422f0103a..af3e57075c 100644 --- a/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java +++ b/core/src/test/java/org/elasticsearch/options/detailederrors/DetailedErrorsEnabledIT.java @@ -23,9 +23,9 @@ import org.apache.http.impl.client.HttpClients; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.http.HttpServerTransport; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.rest.client.http.HttpDeleteWithEntity; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.containsString; * Tests that by default the error_trace parameter can be used to show stacktraces */ @ClusterScope(scope = Scope.TEST, numDataNodes = 1) -public class DetailedErrorsEnabledIT extends ElasticsearchIntegrationTest { +public class DetailedErrorsEnabledIT extends ESIntegTestCase { // Build our cluster settings @Override diff --git a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java index 08eb692b1c..9efd001b98 100644 --- a/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/ConcurrentPercolatorIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Random; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class ConcurrentPercolatorIT extends ElasticsearchIntegrationTest { +public class ConcurrentPercolatorIT extends ESIntegTestCase { @Test public void testSimpleConcurrentPercolator() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java index d72e0f8ffe..77a4b63cfc 100644 --- a/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/MultiPercolatorIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class MultiPercolatorIT extends ElasticsearchIntegrationTest { +public class MultiPercolatorIT extends ESIntegTestCase { @Test public void testBasics() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java index ada1915842..ecee1933fb 100644 --- a/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorBackwardsCompatibilityIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.percolate.PercolateResponse; import org.elasticsearch.action.percolate.PercolateSourceBuilder; import org.elasticsearch.index.percolator.PercolatorException; import org.elasticsearch.index.query.QueryParsingException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.instanceOf; /** */ -public class PercolatorBackwardsCompatibilityIT extends ElasticsearchIntegrationTest { +public class PercolatorBackwardsCompatibilityIT extends ESIntegTestCase { @Test public void testPercolatorUpgrading() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java index a6246bcae3..c1326845b4 100644 --- a/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorFacetsAndAggregationsIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders; import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class PercolatorFacetsAndAggregationsIT extends ElasticsearchIntegrationTest { +public class PercolatorFacetsAndAggregationsIT extends ESIntegTestCase { @Test // Just test the integration with facets and aggregations, not the facet and aggregation functionality! diff --git a/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java index 2b1eb762e9..b75eb093b3 100644 --- a/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java @@ -50,7 +50,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.script.Script; import org.elasticsearch.search.highlight.HighlightBuilder; import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -95,7 +95,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class PercolatorIT extends ElasticsearchIntegrationTest { +public class PercolatorIT extends ESIntegTestCase { @Test public void testSimple1() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.java index 839300c5d2..617c964364 100644 --- a/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/RecoveryPercolatorIT.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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -50,8 +50,8 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.percolator.PercolatorIT.convertFromTextArray; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertMatchCount; @@ -63,7 +63,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0) -public class RecoveryPercolatorIT extends ElasticsearchIntegrationTest { +public class RecoveryPercolatorIT extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java b/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java index 066409be0e..af77b029e6 100644 --- a/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java +++ b/core/src/test/java/org/elasticsearch/percolator/TTLPercolatorIT.java @@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.AlreadyExpiredException; import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.hamcrest.Matchers; import org.junit.Test; @@ -46,8 +46,8 @@ import static org.hamcrest.Matchers.*; /** */ -@ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class TTLPercolatorIT extends ElasticsearchIntegrationTest { +@ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class TTLPercolatorIT extends ESIntegTestCase { private static final long PURGE_INTERVAL = 200; diff --git a/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java b/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java index da0f647100..b418081c89 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluggableTransportModuleIT.java @@ -22,7 +22,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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.transport.AssertingLocalTransport; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; @@ -32,15 +32,15 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; /** * */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 2) -public class PluggableTransportModuleIT extends ElasticsearchIntegrationTest { +public class PluggableTransportModuleIT extends ESIntegTestCase { public static final AtomicInteger SENT_REQUEST_COUNTER = new AtomicInteger(0); diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java index 525b3bf4a0..2cdf82322b 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java @@ -23,9 +23,7 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import org.elasticsearch.Version; import org.elasticsearch.action.admin.cluster.node.info.PluginsInfo; -import org.elasticsearch.plugins.PluginInfo; -import org.elasticsearch.test.ElasticsearchTestCase; -import org.junit.Test; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.io.OutputStream; @@ -36,7 +34,7 @@ import java.util.Properties; import static org.hamcrest.Matchers.contains; -public class PluginInfoTests extends ElasticsearchTestCase { +public class PluginInfoTests extends ESTestCase { static void writeProperties(Path pluginDir, String... stringProps) throws IOException { assert stringProps.length % 2 == 0; diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java index 34bcbb6d85..31f088498b 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginManagerIT.java @@ -27,8 +27,8 @@ import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.node.internal.InternalSettingsPreparer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.junit.annotations.Network; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; @@ -55,7 +55,7 @@ import static org.elasticsearch.common.cli.CliToolTestCase.args; import static org.elasticsearch.common.io.FileSystemUtilsTests.assertFileContent; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.plugins.PluginInfoTests.writeProperties; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertDirectoryExists; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFileExists; import static org.hamcrest.Matchers.*; @@ -64,7 +64,7 @@ import static org.hamcrest.Matchers.*; @LuceneTestCase.SuppressFileSystems("*") // TODO: clean up this test to allow extra files // TODO: jimfs is really broken here (throws wrong exception from detection method). // if its in your classpath, then do not use plugins!!!!!! -public class PluginManagerIT extends ElasticsearchIntegrationTest { +public class PluginManagerIT extends ESIntegTestCase { private Tuple<Settings, Environment> initialSettings; private CaptureOutputTerminal terminal = new CaptureOutputTerminal(); diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java index 3d4c9d5790..75d680c1ab 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginManagerUnitTests.java @@ -23,7 +23,7 @@ import com.google.common.io.Files; import org.elasticsearch.Version; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class PluginManagerUnitTests extends ElasticsearchTestCase { +public class PluginManagerUnitTests extends ESTestCase { @Test public void testThatConfigDirectoryCanBeOutsideOfElasticsearchHomeDirectory() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java b/core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java index dd3cb164aa..dffcba6e69 100644 --- a/core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java +++ b/core/src/test/java/org/elasticsearch/plugins/PluginTestCase.java @@ -21,8 +21,7 @@ package org.elasticsearch.plugins; import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.junit.Ignore; +import org.elasticsearch.test.ESIntegTestCase; import java.net.URISyntaxException; import java.net.URL; @@ -33,8 +32,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** * Base class that lets you start a node with plugins. */ -@Ignore -public abstract class PluginTestCase extends ElasticsearchIntegrationTest { +public abstract class PluginTestCase extends ESIntegTestCase { public String startNodeWithPlugins(Settings nodeSettings, String pluginDir, String ... pluginClassNames) throws URISyntaxException { URL resource = getClass().getResource(pluginDir); diff --git a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java index 1b3260ae5e..b171278d65 100644 --- a/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/ResponseHeaderPluginIT.java @@ -20,14 +20,14 @@ package org.elasticsearch.plugins; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugins.responseheader.TestResponseHeaderPlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; import static org.elasticsearch.rest.RestStatus.OK; import static org.elasticsearch.rest.RestStatus.UNAUTHORIZED; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasStatus; import static org.hamcrest.Matchers.equalTo; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; * Test a rest action that sets special response headers */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class ResponseHeaderPluginIT extends ElasticsearchIntegrationTest { +public class ResponseHeaderPluginIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java index 505d3ee322..6e62fd9e67 100644 --- a/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/SitePluginIT.java @@ -23,8 +23,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.http.HttpServerTransport; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; @@ -36,7 +36,7 @@ import java.util.Locale; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.rest.RestStatus.*; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasStatus; import static org.hamcrest.Matchers.containsString; @@ -44,7 +44,7 @@ import static org.hamcrest.Matchers.containsString; * We want to test site plugins */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class SitePluginIT extends ElasticsearchIntegrationTest { +public class SitePluginIT extends ESIntegTestCase { @Override diff --git a/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java b/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java index 86e39bb43c..ed3062620b 100644 --- a/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java +++ b/core/src/test/java/org/elasticsearch/plugins/SitePluginRelativePathConfigIT.java @@ -23,8 +23,8 @@ import org.apache.http.impl.client.HttpClients; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.http.HttpServerTransport; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; @@ -34,11 +34,11 @@ import java.nio.file.Path; import static org.apache.lucene.util.Constants.WINDOWS; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.rest.RestStatus.OK; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasStatus; @ClusterScope(scope = SUITE, numDataNodes = 1) -public class SitePluginRelativePathConfigIT extends ElasticsearchIntegrationTest { +public class SitePluginRelativePathConfigIT extends ESIntegTestCase { private final Path root = PathUtils.get(".").toAbsolutePath().getRoot(); diff --git a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java index 882b445c86..c0d6453372 100644 --- a/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/FullRollingRestartIT.java @@ -25,19 +25,19 @@ import org.elasticsearch.common.Priority; import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.zen.ZenDiscovery; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; /** * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0) -public class FullRollingRestartIT extends ElasticsearchIntegrationTest { +public class FullRollingRestartIT extends ESIntegTestCase { protected void assertTimeout(ClusterHealthRequestBuilder requestBuilder) { ClusterHealthResponse clusterHealth = requestBuilder.get(); diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java index 37bf22aa47..354a63c3b0 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java +++ b/core/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.recovery.*; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Test; @@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.lessThan; -public class RecoveriesCollectionTests extends ElasticsearchSingleNodeTest { +public class RecoveriesCollectionTests extends ESSingleNodeTestCase { final static RecoveryTarget.RecoveryListener listener = new RecoveryTarget.RecoveryListener() { @Override diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java b/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java index f1610f5b19..3d678865e4 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java +++ b/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java @@ -21,12 +21,12 @@ package org.elasticsearch.recovery; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.concurrent.TimeUnit; -public class RecoverySettingsTest extends ElasticsearchSingleNodeTest { +public class RecoverySettingsTest extends ESSingleNodeTestCase { @Override protected boolean resetNodeAfterTest() { diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java index a0c37439a3..60a6acb7ed 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.index.translog.TranslogConfig; import org.elasticsearch.test.BackgroundIndexer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -48,7 +48,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; import static org.hamcrest.Matchers.equalTo; -public class RecoveryWhileUnderLoadIT extends ElasticsearchIntegrationTest { +public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { private final ESLogger logger = Loggers.getLogger(RecoveryWhileUnderLoadIT.class); diff --git a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java index e295444271..54afe037ca 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/RelocationIT.java @@ -57,8 +57,8 @@ import org.elasticsearch.indices.recovery.RecoveryTarget; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.test.BackgroundIndexer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.Transport; @@ -83,7 +83,7 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; @@ -96,7 +96,7 @@ import static org.hamcrest.Matchers.startsWith; */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) @TestLogging("indices.recovery:TRACE,index.shard.service:TRACE") -public class RelocationIT extends ElasticsearchIntegrationTest { +public class RelocationIT extends ESIntegTestCase { private final TimeValue ACCEPTABLE_RELOCATION_TIME = new TimeValue(5, TimeUnit.MINUTES); @Override diff --git a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java b/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java index 208dfb275f..d19117e1d2 100644 --- a/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/SimpleRecoveryIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.indices.flush.FlushResponse; import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.client.Requests.*; @@ -31,7 +31,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class SimpleRecoveryIT extends ElasticsearchIntegrationTest { +public class SimpleRecoveryIT extends ESIntegTestCase { @Override public Settings indexSettings() { diff --git a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java index c407ae64b8..335da8601d 100644 --- a/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java +++ b/core/src/test/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.recovery.RecoveryFileChunkRequest; import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoveryTarget; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.*; import org.junit.Test; @@ -51,9 +51,9 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@ElasticsearchIntegrationTest.ClusterScope(numDataNodes = 2, numClientNodes = 0, scope = ElasticsearchIntegrationTest.Scope.TEST) +@ESIntegTestCase.ClusterScope(numDataNodes = 2, numClientNodes = 0, scope = ESIntegTestCase.Scope.TEST) @SuppressCodecs("*") // test relies on exact file extensions -public class TruncatedRecoveryIT extends ElasticsearchIntegrationTest { +public class TruncatedRecoveryIT extends ESIntegTestCase { protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder builder = Settings.builder() diff --git a/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java b/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java index 478d77b663..683229c87e 100644 --- a/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java +++ b/core/src/test/java/org/elasticsearch/rest/BytesRestResponseTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.TestQueryParsingException; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.elasticsearch.transport.RemoteTransportException; import org.junit.Test; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class BytesRestResponseTests extends ElasticsearchTestCase { +public class BytesRestResponseTests extends ESTestCase { @Test public void testWithHeaders() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java index feb57e8740..fa7eccd665 100644 --- a/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java +++ b/core/src/test/java/org/elasticsearch/rest/CorsRegexDefaultIT.java @@ -20,7 +20,7 @@ package org.elasticsearch.rest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class CorsRegexDefaultIT extends ElasticsearchIntegrationTest { +public class CorsRegexDefaultIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java b/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java index 8ef8217e5b..d0e0282f2c 100644 --- a/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java +++ b/core/src/test/java/org/elasticsearch/rest/CorsRegexIT.java @@ -22,15 +22,15 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.Test; import static org.elasticsearch.http.netty.NettyHttpServerTransport.SETTING_CORS_ALLOW_ORIGIN; import static org.elasticsearch.http.netty.NettyHttpServerTransport.SETTING_CORS_ALLOW_CREDENTIALS; import static org.elasticsearch.http.netty.NettyHttpServerTransport.SETTING_CORS_ENABLED; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.is; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class CorsRegexIT extends ElasticsearchIntegrationTest { +public class CorsRegexIT extends ESIntegTestCase { protected static final ESLogger logger = Loggers.getLogger(CorsRegexIT.class); diff --git a/core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java b/core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java index 6a110cd5da..2faabe76ba 100644 --- a/core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java +++ b/core/src/test/java/org/elasticsearch/rest/HeadersAndContextCopyClientTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.junit.Test; @@ -53,7 +53,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.is; -public class HeadersAndContextCopyClientTests extends ElasticsearchTestCase { +public class HeadersAndContextCopyClientTests extends ESTestCase { @Test public void testRegisterRelevantHeaders() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java b/core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java index 087bc30632..a8ad99d3b3 100644 --- a/core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java +++ b/core/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.junit.Test; @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.CoreMatchers.equalTo; -public class RestFilterChainTests extends ElasticsearchTestCase { +public class RestFilterChainTests extends ESTestCase { @Test public void testRestFilters() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java b/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java index 1565455b60..12bbef4735 100644 --- a/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java +++ b/core/src/test/java/org/elasticsearch/rest/RestRequestTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.rest; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class RestRequestTests extends ElasticsearchTestCase { +public class RestRequestTests extends ESTestCase { @Test public void testContext() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeIT.java b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeIT.java index e93296175b..82d88aeb95 100644 --- a/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeIT.java +++ b/core/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeIT.java @@ -36,8 +36,8 @@ import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Segment; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.BeforeClass; import java.util.ArrayList; @@ -47,8 +47,8 @@ import java.util.List; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) // test scope since we set cluster wide settings -public class UpgradeIT extends ElasticsearchBackwardsCompatIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) // test scope since we set cluster wide settings +public class UpgradeIT extends ESBackcompatTestCase { @BeforeClass public static void checkUpgradeVersion() { diff --git a/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java b/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java index 3faa0ea367..3df6c256e2 100644 --- a/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java +++ b/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java @@ -20,7 +20,7 @@ package org.elasticsearch.rest.action.support; import org.elasticsearch.common.Table; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; import org.junit.Before; import org.junit.Test; @@ -31,7 +31,7 @@ import java.util.List; import static org.elasticsearch.rest.action.support.RestTable.buildDisplayHeaders; import static org.hamcrest.Matchers.*; -public class RestTableTest extends ElasticsearchTestCase { +public class RestTableTest extends ESTestCase { private Table table = new Table(); private FakeRestRequest restRequest = new FakeRestRequest(); diff --git a/core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java b/core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java index b3bf486b1d..980d4a1bdc 100644 --- a/core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/rest/util/RestUtilsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.rest.util; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.rest.support.RestUtils; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Locale; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class RestUtilsTests extends ElasticsearchTestCase { +public class RestUtilsTests extends ESTestCase { @Test public void testDecodeQueryString() { diff --git a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java b/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java index b79ec6a926..a3868e33ab 100644 --- a/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java +++ b/core/src/test/java/org/elasticsearch/routing/AliasResolveRoutingIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.routing; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.common.Priority; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Map; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class AliasResolveRoutingIT extends ElasticsearchIntegrationTest { +public class AliasResolveRoutingIT extends ESIntegTestCase { @Test public void testResolveIndexRouting() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java b/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java index b596f75f4b..b7b44afd43 100644 --- a/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java +++ b/core/src/test/java/org/elasticsearch/routing/AliasRoutingIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.cluster.metadata.AliasAction.newAddAliasAction; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class AliasRoutingIT extends ElasticsearchIntegrationTest { +public class AliasRoutingIT extends ESIntegTestCase { @Override protected int minimumNumberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java b/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java index f288a75609..24f0df4f5d 100644 --- a/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java +++ b/core/src/test/java/org/elasticsearch/routing/SimpleRoutingIT.java @@ -36,12 +36,11 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.mapper.MapperParsingException; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.*; -public class SimpleRoutingIT extends ElasticsearchIntegrationTest { +public class SimpleRoutingIT extends ESIntegTestCase { @Override protected int minimumNumberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java b/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java index fc92731b28..ef9c4e3ced 100644 --- a/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java +++ b/core/src/test/java/org/elasticsearch/script/CustomScriptContextIT.java @@ -27,13 +27,13 @@ import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.script.expression.ExpressionScriptEngineService; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.script.mustache.MustacheScriptEngineService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.notNullValue; -public class CustomScriptContextIT extends ElasticsearchIntegrationTest { +public class CustomScriptContextIT extends ESIntegTestCase { private static final ImmutableSet<String> LANG_SET = ImmutableSet.of(GroovyScriptEngineService.NAME, MustacheScriptEngineService.NAME, ExpressionScriptEngineService.NAME); diff --git a/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java b/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java index 155d0a9cd8..8df2c205b3 100644 --- a/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java +++ b/core/src/test/java/org/elasticsearch/script/GroovyScriptIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.lucene.search.function.CombineFunction; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.groovy.GroovyScriptEngineService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.List; @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Various tests for Groovy scripting */ -public class GroovyScriptIT extends ElasticsearchIntegrationTest { +public class GroovyScriptIT extends ESIntegTestCase { @Test public void testGroovyBigDecimalTransformation() { diff --git a/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java b/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java index 0ab1a87430..847fe28fbb 100644 --- a/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java +++ b/core/src/test/java/org/elasticsearch/script/GroovySecurityIT.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.Constants; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.nio.file.Path; @@ -35,8 +35,8 @@ import static org.hamcrest.CoreMatchers.equalTo; /** * Tests for the Groovy security permissions */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0) -public class GroovySecurityIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0) +public class GroovySecurityIT extends ESIntegTestCase { @Override public void setUp() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java b/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java index 5e4788bdbd..36128824a9 100644 --- a/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java +++ b/core/src/test/java/org/elasticsearch/script/IndexLookupIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -public class IndexLookupIT extends ElasticsearchIntegrationTest { +public class IndexLookupIT extends ESIntegTestCase { String includeAllFlag = "_FREQUENCIES | _OFFSETS | _PAYLOADS | _POSITIONS | _CACHE"; String includeAllWithoutRecordFlag = "_FREQUENCIES | _OFFSETS | _PAYLOADS | _POSITIONS "; diff --git a/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java b/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java index 78be0b6fa5..1142206ee8 100644 --- a/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java +++ b/core/src/test/java/org/elasticsearch/script/IndexedScriptIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.script.expression.ExpressionScriptEngineService; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class IndexedScriptIT extends ElasticsearchIntegrationTest { +public class IndexedScriptIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java b/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java index 9d07b17a91..6ac8f198c9 100644 --- a/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java +++ b/core/src/test/java/org/elasticsearch/script/NativeScriptTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.env.Environment; import org.elasticsearch.env.EnvironmentModule; import org.elasticsearch.script.ScriptService.ScriptType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPoolModule; import org.elasticsearch.watcher.ResourceWatcherService; @@ -44,7 +44,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class NativeScriptTests extends ElasticsearchTestCase { +public class NativeScriptTests extends ESTestCase { @Test public void testNativeScript() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java b/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java index 4d556b7a99..636c8335df 100644 --- a/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java +++ b/core/src/test/java/org/elasticsearch/script/OnDiskScriptIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.mustache.MustacheScriptEngineService; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -36,8 +36,8 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; //Use Suite scope so that paths get set correctly -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class OnDiskScriptIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class OnDiskScriptIT extends ESIntegTestCase { @Override public Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java b/core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java index b96391682f..8bb77b48fe 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptContextRegistryTests.java @@ -20,13 +20,13 @@ package org.elasticsearch.script; import com.google.common.collect.Lists; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; import java.io.IOException; -public class ScriptContextRegistryTests extends ElasticsearchTestCase { +public class ScriptContextRegistryTests extends ESTestCase { @Test public void testValidateCustomScriptContextsOperation() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java index eaddeeba78..2acfb553e4 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptFieldIT.java @@ -26,19 +26,18 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.plugins.AbstractPlugin; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import java.util.Map; import java.util.concurrent.ExecutionException; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = Scope.SUITE, numDataNodes = 3) -public class ScriptFieldIT extends ElasticsearchIntegrationTest { +public class ScriptFieldIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java b/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java index 7b86ea5ba4..0c0bf9aeea 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptIndexSettingsIT.java @@ -27,11 +27,11 @@ import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptResponse; import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class ScriptIndexSettingsIT extends ElasticsearchIntegrationTest{ +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class ScriptIndexSettingsIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/script/ScriptModesTests.java b/core/src/test/java/org/elasticsearch/script/ScriptModesTests.java index 188cd8d765..0fc73d8087 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptModesTests.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptModesTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.script.expression.ExpressionScriptEngineService; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.script.mustache.MustacheScriptEngineService; import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,7 +37,7 @@ import java.util.*; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -public class ScriptModesTests extends ElasticsearchTestCase { +public class ScriptModesTests extends ESTestCase { private static final Set<String> ALL_LANGS = ImmutableSet.of(GroovyScriptEngineService.NAME, MustacheScriptEngineService.NAME, ExpressionScriptEngineService.NAME, "custom", "test"); diff --git a/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java b/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java index 8c13bb997c..70c6617592 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.script.Script.ScriptParseException; import org.elasticsearch.script.ScriptParameterParser.ScriptParameterValue; import org.elasticsearch.script.ScriptService.ScriptType; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -38,7 +38,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class ScriptParameterParserTest extends ElasticsearchTestCase { +public class ScriptParameterParserTest extends ESTestCase { @Test public void testTokenDefaultInline() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java index ca7401e2f3..96f2a45b2b 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.script.expression.ExpressionScriptEngineService; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.script.mustache.MustacheScriptEngineService; import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.watcher.ResourceWatcherService; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.sameInstance; -public class ScriptServiceTests extends ElasticsearchTestCase { +public class ScriptServiceTests extends ESTestCase { private ResourceWatcherService resourceWatcherService; private Set<ScriptEngineService> scriptEngineServices; diff --git a/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java index 056d185386..70d958de88 100644 --- a/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java +++ b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java @@ -45,7 +45,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.pipeline.SimpleValue; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import java.util.HashMap; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; -public class ExpressionScriptIT extends ElasticsearchIntegrationTest { +public class ExpressionScriptIT extends ESIntegTestCase { private SearchRequestBuilder buildRequest(String script, Object... params) { ensureGreen("test"); diff --git a/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java b/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java index beea87ec60..c2060b915f 100644 --- a/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java +++ b/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java @@ -22,7 +22,7 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Mustache based templating test */ -public class MustacheScriptEngineTest extends ElasticsearchTestCase { +public class MustacheScriptEngineTest extends ESTestCase { private MustacheScriptEngineService qe; private JsonEscapingMustacheFactory escaper; diff --git a/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java b/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java index a793b279ec..7dea0846df 100644 --- a/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java +++ b/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java @@ -21,7 +21,7 @@ package org.elasticsearch.script.mustache; import com.github.mustachejava.DefaultMustacheFactory; import com.github.mustachejava.Mustache; import com.github.mustachejava.MustacheFactory; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.StringReader; @@ -31,7 +31,7 @@ import java.util.HashMap; /** * Figure out how Mustache works for the simplest use case. Leaving in here for now for reference. * */ -public class MustacheTest extends ElasticsearchTestCase { +public class MustacheTest extends ESTestCase { @Test public void test() { diff --git a/core/src/test/java/org/elasticsearch/search/CountSearchIT.java b/core/src/test/java/org/elasticsearch/search/CountSearchIT.java index 4ecbff7c1a..61d887da36 100644 --- a/core/src/test/java/org/elasticsearch/search/CountSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/CountSearchIT.java @@ -23,14 +23,14 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; /** * {@link SearchType#COUNT} is deprecated but let's make sure it still works as expected. */ -public class CountSearchIT extends ElasticsearchIntegrationTest { +public class CountSearchIT extends ESIntegTestCase { public void testDuelCountQueryThenFetch() throws Exception { createIndex("idx"); diff --git a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java index 197c6f8cba..5bf1a0e913 100644 --- a/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java +++ b/core/src/test/java/org/elasticsearch/search/MultiValueModeTests.java @@ -28,12 +28,12 @@ import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.Arrays; -public class MultiValueModeTests extends ElasticsearchTestCase { +public class MultiValueModeTests extends ESTestCase { private static FixedBitSet randomRootDocs(int maxDoc) { FixedBitSet set = new FixedBitSet(maxDoc); diff --git a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java index 2578257af7..a222ff5272 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/core/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.search; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.concurrent.ExecutionException; @@ -28,7 +28,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -public class SearchServiceTests extends ElasticsearchSingleNodeTest { +public class SearchServiceTests extends ESSingleNodeTestCase { @Override protected boolean resetNodeAfterTest() { diff --git a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java b/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java index 417108bb2a..b5b4b94a8a 100644 --- a/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java +++ b/core/src/test/java/org/elasticsearch/search/SearchWithRejectionsIT.java @@ -20,12 +20,11 @@ package org.elasticsearch.search; import com.google.common.base.Predicate; -import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.concurrent.Future; @@ -34,10 +33,9 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class SearchWithRejectionsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class SearchWithRejectionsIT extends ESIntegTestCase { @Override public Settings nodeSettings(int nodeOrdinal) { return settingsBuilder().put(super.nodeSettings(nodeOrdinal)) diff --git a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java b/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java index cd760b5f61..c97e29a0f9 100644 --- a/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java +++ b/core/src/test/java/org/elasticsearch/search/StressSearchServiceReaperIT.java @@ -23,19 +23,19 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.concurrent.ExecutionException; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; @ClusterScope(scope = SUITE) -public class StressSearchServiceReaperIT extends ElasticsearchIntegrationTest { +public class StressSearchServiceReaperIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java index dcb3dc2f16..1172170ca1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationCollectorTests.java @@ -24,11 +24,11 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexService; import org.elasticsearch.search.aggregations.support.AggregationContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; -public class AggregationCollectorTests extends ElasticsearchSingleNodeTest { +public class AggregationCollectorTests extends ESSingleNodeTestCase { public void testNeedsScores() throws Exception { IndexService index = createIndex("idx"); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java index 8cd52c3f80..631f705bf5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsBinaryIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -40,8 +40,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class AggregationsBinaryIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class AggregationsBinaryIT extends ESIntegTestCase { private static final String STRING_FIELD_NAME = "s_value"; private static final String INT_FIELD_NAME = "i_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java index 50302a731a..8944294fd4 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsIntegrationIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.List; @@ -35,8 +35,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class AggregationsIntegrationIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class AggregationsIntegrationIT extends ESIntegTestCase { static int numDocs; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java index a2b24b3d1a..8282a538be 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/CombiIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.missing.Missing; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -public class CombiIT extends ElasticsearchIntegrationTest { +public class CombiIT extends ESIntegTestCase { /** * Making sure that if there are multiple aggregations, working on the same field, yet require different diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java index 438dd9f323..abe88af10a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/EquivalenceIT.java @@ -40,7 +40,7 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregatorFactory; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.ArrayList; import java.util.HashMap; @@ -69,7 +69,7 @@ import static org.hamcrest.core.IsNull.notNullValue; * Additional tests that aim at testing more complex aggregation trees on larger random datasets, so that things like * the growth of dynamic arrays is tested. */ -public class EquivalenceIT extends ElasticsearchIntegrationTest { +public class EquivalenceIT extends ESIntegTestCase { // Make sure that unordered, reversed, disjoint and/or overlapping ranges are supported // Duel with filters diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java index a18893f80d..c83ad5777b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/MetaDataIT.java @@ -24,7 +24,7 @@ import com.carrotsearch.hppc.IntIntHashMap; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.missing.Missing; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -38,7 +38,7 @@ import static org.hamcrest.CoreMatchers.equalTo; /** * */ -public class MetaDataIT extends ElasticsearchIntegrationTest { +public class MetaDataIT extends ESIntegTestCase { /** * Making sure that if there are multiple aggregations, working on the same field, yet require different diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java index e14f2ee7b7..f76e1ad9e5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/MissingValueIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.metrics.cardinality.Cardinality; import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBounds; import org.elasticsearch.search.aggregations.metrics.percentiles.Percentiles; import org.elasticsearch.search.aggregations.metrics.stats.Stats; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import static org.elasticsearch.search.aggregations.AggregationBuilders.cardinality; import static org.elasticsearch.search.aggregations.AggregationBuilders.dateHistogram; @@ -40,8 +40,8 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class MissingValueIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class MissingValueIT extends ESIntegTestCase { @Override protected int maximumNumberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java index 4c5232c232..64f80d66e1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/ParsingIT.java @@ -22,14 +22,14 @@ package org.elasticsearch.search.aggregations; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.security.SecureRandom; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class ParsingIT extends ElasticsearchIntegrationTest { +public class ParsingIT extends ESIntegTestCase { @Test(expected=SearchPhaseExecutionException.class) public void testTwoTypes() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java index 2394795646..f12e8db5cb 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/AbstractTermsTests.java @@ -23,14 +23,12 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregatorFactory.ExecutionMode; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.junit.Ignore; +import org.elasticsearch.test.ESIntegTestCase; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; -@Ignore -public abstract class AbstractTermsTests extends ElasticsearchIntegrationTest { +public abstract class AbstractTermsTests extends ESIntegTestCase { public String randomExecutionHint() { return randomBoolean() ? null : randomFrom(ExecutionMode.values()).toString(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java index c96f65f7e8..b4c28ac352 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/BooleanTermsIT.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -34,8 +34,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class BooleanTermsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class BooleanTermsIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "b_value"; private static final String MULTI_VALUED_FIELD_NAME = "b_values"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java index 4cfe02eab0..169901aad5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ChildrenIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.metrics.tophits.TopHits; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -48,8 +48,8 @@ import static org.hamcrest.Matchers.*; /** */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class ChildrenIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class ChildrenIT extends ESIntegTestCase { private final static Map<String, Control> categoryToControl = new HashMap<>(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java index 36a29f49fb..4e81448ab6 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -63,8 +63,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class DateHistogramIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class DateHistogramIT extends ESIntegTestCase { private DateTime date(int month, int day) { return new DateTime(2012, month, day, 0, 0, DateTimeZone.UTC); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java index 284c130797..d0d91b8d66 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramOffsetIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.core.DateFieldMapper; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.transport.AssertingLocalTransport; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -48,9 +48,9 @@ import static org.hamcrest.core.IsNull.notNullValue; * serialisation of negative offsets in these tests would break in pre 1.4 versions. These tests are separated from the other DateHistogramTests so the * AssertingLocalTransport for these tests can be set to only use versions 1.4 onwards while keeping the other tests using all versions */ -@ElasticsearchIntegrationTest.SuiteScopeTest -@ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE) -public class DateHistogramOffsetIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE) +public class DateHistogramOffsetIT extends ESIntegTestCase { private static final String DATE_FORMAT = "yyyy-MM-dd:hh-mm-ss"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java index 0b82296710..caef65714f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.min.Min; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -55,8 +55,8 @@ import static org.hamcrest.core.IsNull.nullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class DateRangeIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class DateRangeIT extends ESIntegTestCase { private static IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception { return client().prepareIndex("idx", "type").setSource(jsonBuilder() diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java index 3e073c53bc..941cf238d5 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.aggregations.bucket; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class DedicatedAggregationIT extends ElasticsearchIntegrationTest { +public class DedicatedAggregationIT extends ESIntegTestCase { // https://github.com/elasticsearch/elasticsearch/issues/7240 @Test diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java index c7d38ad53e..a7791f8437 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -65,7 +65,7 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest +@ESIntegTestCase.SuiteScopeTestCase public class DoubleTermsTests extends AbstractTermsTests { private static final int NUM_DOCS = 5; // TODO: randomize the size? diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java index b254472724..e881200d52 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FilterIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.metrics.avg.Avg; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -48,8 +48,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class FilterIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class FilterIT extends ESIntegTestCase { static int numDocs, numTag1Docs; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java index b0640c2529..cd66d34b22 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/FiltersIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.aggregations.bucket.filters.Filters; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.metrics.avg.Avg; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,8 +51,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class FiltersIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class FiltersIT extends ESIntegTestCase { static int numDocs, numTag1Docs, numTag2Docs, numOtherDocs; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java index 254b6e16fc..f6dff6ecf9 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoDistanceIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.range.Range; import org.elasticsearch.search.aggregations.bucket.range.Range.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -53,8 +53,8 @@ import static org.hamcrest.core.IsNull.nullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GeoDistanceIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GeoDistanceIT extends ESIntegTestCase { private IndexRequestBuilder indexCity(String idx, String name, String... latLons) throws Exception { XContentBuilder source = jsonBuilder().startObject().field("city", name); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java index 1c35a776ef..d385ea9f29 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GeoHashGridIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.geogrid.GeoHashGrid; import org.elasticsearch.search.aggregations.bucket.geogrid.GeoHashGrid.Bucket; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -49,8 +49,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GeoHashGridIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GeoHashGridIT extends ESIntegTestCase { static ObjectIntMap<String> expectedDocCountsForGeoHash = null; static ObjectIntMap<String> multiValuedExpectedDocCountsForGeoHash = null; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java index e03b7925be..a313d15721 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/GlobalIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.metrics.stats.Stats; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -42,8 +42,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GlobalIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GlobalIT extends ESIntegTestCase { static int numDocs; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java index ee698b25c2..e244d97cb7 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -60,8 +60,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class HistogramIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class HistogramIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; private static final String MULTI_VALUED_FIELD_NAME = "l_values"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java index 78b4192f6e..ddbc885cb1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/IPv4RangeIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.bucket.range.Range; import org.elasticsearch.search.aggregations.bucket.range.Range.Bucket; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -50,8 +50,8 @@ import static org.hamcrest.core.IsNull.nullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class IPv4RangeIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class IPv4RangeIT extends ESIntegTestCase { @Override public void setupSuiteScopeCluster() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java index dee56814e7..2d27ad4c7a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/LongTermsTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -63,7 +63,7 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest +@ESIntegTestCase.SuiteScopeTestCase public class LongTermsTests extends AbstractTermsTests { private static final int NUM_DOCS = 5; // TODO randomize the size? diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java index 6afcd45505..76b1ca5ae0 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MinDocCountTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInter import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -53,7 +53,7 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; -@ElasticsearchIntegrationTest.SuiteScopeTest +@ESIntegTestCase.SuiteScopeTestCase public class MinDocCountTests extends AbstractTermsTests { private static final QueryBuilder QUERY = QueryBuilders.termQuery("match", true); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java index 04c0653aa3..9b5df37cd8 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/MissingIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.missing.Missing; import org.elasticsearch.search.aggregations.metrics.avg.Avg; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -43,8 +43,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class MissingIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class MissingIT extends ESIntegTestCase { static int numDocs, numDocsMissing, numDocsUnmapped; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java index 0764e94d4e..3825901d54 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NaNSortingIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.MetricsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.avg.Avg; import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -40,8 +40,8 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class NaNSortingIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class NaNSortingIT extends ESIntegTestCase { private enum SubAggregation { AVG("avg") { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java index 7484c6a894..7842fd847a 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/NestedIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket; import org.elasticsearch.search.aggregations.metrics.max.Max; import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -66,8 +66,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class NestedIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class NestedIT extends ESIntegTestCase { static int numParents; static int[] numChildren; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java index 116bec9a55..75751c1fa4 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ParentIdAggIT.java @@ -22,7 +22,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -34,7 +34,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; -public class ParentIdAggIT extends ElasticsearchIntegrationTest { +public class ParentIdAggIT extends ESIntegTestCase { @Test public void testParentIdAggregation() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java index 391c22a9cf..567844b727 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.range.Range.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.avg.Avg; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,8 +51,8 @@ import static org.hamcrest.core.IsNull.nullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class RangeIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class RangeIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; private static final String MULTI_VALUED_FIELD_NAME = "l_values"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java index 4e1a8b7c95..2a7be3b8b0 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ReverseNestedIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.nested.Nested; import org.elasticsearch.search.aggregations.bucket.nested.ReverseNested; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCount; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -58,8 +58,8 @@ import static org.hamcrest.core.IsNull.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class ReverseNestedIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class ReverseNestedIT extends ESIntegTestCase { @Override public void setupSuiteScopeCluster() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java index 9891290431..5898722090 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SamplerIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; import org.elasticsearch.search.aggregations.metrics.max.Max; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Collection; @@ -49,8 +49,8 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * Tests the Sampler aggregation */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class SamplerIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class SamplerIT extends ESIntegTestCase { public static final int NUM_SHARDS = 2; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java index 108c57cc26..3436b4ccfa 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardReduceIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.aggregations.bucket.missing.Missing; import org.elasticsearch.search.aggregations.bucket.nested.Nested; import org.elasticsearch.search.aggregations.bucket.range.Range; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -57,8 +57,8 @@ import static org.hamcrest.Matchers.equalTo; * compute empty buckets, its {@code reduce()} method must be called. So by adding the date histogram under other buckets, * we can make sure that the reduce is properly propagated by checking that empty buckets were created. */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class ShardReduceIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class ShardReduceIT extends ESIntegTestCase { private IndexRequestBuilder indexDoc(String date, int value) throws Exception { return client().prepareIndex("idx", "type").setSource(jsonBuilder() diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java index df449ea7c2..25c7ae3df7 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTermsTests.java @@ -32,7 +32,7 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; import static org.hamcrest.Matchers.equalTo; -public class ShardSizeTermsTests extends ShardSizeTests { +public class ShardSizeTermsTests extends ShardSizeTestCase { @Test public void noShardSize_string() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java index 68da2bc384..0dce2000f1 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/ShardSizeTestCase.java @@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.bucket; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Ignore; import java.util.ArrayList; @@ -31,14 +31,12 @@ import java.util.List; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; import static org.hamcrest.Matchers.is; -@Ignore -@ClusterScope(scope = SUITE) -public abstract class ShardSizeTests extends ElasticsearchIntegrationTest { +public abstract class ShardSizeTestCase extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityIT.java index 4134da233a..556c012c98 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsBackwardCompatibilityIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.search.aggregations.bucket.significant.SignificantTerms import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.io.IOException; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SignificantTermsBackwardCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class SignificantTermsBackwardCompatibilityIT extends ESBackcompatTestCase { static final String INDEX_NAME = "testidx"; static final String DOC_TYPE = "doc"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java index 147699e89b..882f2b7318 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.Mutua import org.elasticsearch.search.aggregations.bucket.significant.heuristics.PercentageScore; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -54,8 +54,8 @@ import static org.hamcrest.Matchers.is; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class SignificantTermsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class SignificantTermsIT extends ESIntegTestCase { public String randomExecutionHint() { return randomBoolean() ? null : randomFrom(ExecutionMode.values()).toString(); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java index e6b053d40f..941fcb3600 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java @@ -48,7 +48,7 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.*; import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -65,8 +65,8 @@ import static org.hamcrest.Matchers.*; /** * */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class SignificantTermsSignificanceScoreIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { static final String INDEX_NAME = "testidx"; static final String DOC_TYPE = "doc"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java index a2daafdc13..6975300338 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/StringTermsTests.java @@ -37,7 +37,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.Stats; import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCount; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -71,7 +71,7 @@ import static org.hamcrest.core.IsNull.nullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest +@ESIntegTestCase.SuiteScopeTestCase public class StringTermsTests extends AbstractTermsTests { private static final String SINGLE_VALUED_FIELD_NAME = "s_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java index f5c561a67e..db6f5be902 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsDocCountErrorIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregatorFactory.ExecutionMode; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -46,8 +46,8 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class TermsDocCountErrorIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class TermsDocCountErrorIT extends ESIntegTestCase { private static final String STRING_FIELD_NAME = "s_value"; private static final String LONG_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java index 040819c877..03aebd6058 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.significant.SignificantTerms import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class TermsShardMinDocCountIT extends ElasticsearchIntegrationTest { +public class TermsShardMinDocCountIT extends ESIntegTestCase { private static final String index = "someindex"; private static final String type = "testtype"; public String randomExecutionHint() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java index 2f8b355ecf..e0d56d1e03 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/TopHitsIT.java @@ -42,7 +42,7 @@ import org.elasticsearch.search.highlight.HighlightBuilder; import org.elasticsearch.search.highlight.HighlightField; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -78,8 +78,8 @@ import static org.hamcrest.Matchers.sameInstance; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest() -public class TopHitsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase() +public class TopHitsIT extends ESIntegTestCase { private static final String TERMS_AGGS_FIELD = "terms"; private static final String SORT_FIELD = "sort"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java index a3da35401e..15da498fb6 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java @@ -44,7 +44,7 @@ import org.elasticsearch.search.aggregations.BucketCollector; import org.elasticsearch.search.aggregations.SearchContextAggregations; import org.elasticsearch.search.aggregations.support.AggregationContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.util.ArrayList; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class NestedAggregatorTest extends ElasticsearchSingleNodeTest { +public class NestedAggregatorTest extends ESSingleNodeTestCase { @Test public void testResetRootDocId() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java index 13491b4662..67c02bcafd 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/bucket/significant/SignificanceHeuristicTests.java @@ -42,7 +42,7 @@ import org.elasticsearch.search.aggregations.bucket.significant.heuristics.Signi import org.elasticsearch.search.aggregations.bucket.significant.heuristics.SignificanceHeuristicStreams; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.TestSearchContext; import org.junit.Test; @@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class SignificanceHeuristicTests extends ElasticsearchTestCase { +public class SignificanceHeuristicTests extends ESTestCase { static class SignificantTermsTestSearchContext extends TestSearchContext { @Override public int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java index e8c42fb974..d36a2d6f5d 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractNumericTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.search.aggregations.metrics; import org.elasticsearch.action.index.IndexRequestBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.ArrayList; import java.util.List; @@ -29,8 +29,8 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public abstract class AbstractNumericTests extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public abstract class AbstractNumericTests extends ESIntegTestCase { protected static long minValue, maxValue, minValues, maxValues; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java index 2fe87192df..491e4f694c 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.Aggregator.SubAggCollectionMode; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.cardinality.Cardinality; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -40,8 +40,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class CardinalityIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class CardinalityIT extends ESIntegTestCase { @Override public Settings indexSettings() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java index 93d9a27ba3..6d2d61e707 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/GeoBoundsIT.java @@ -36,7 +36,7 @@ import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBounds; import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsAggregator; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -59,8 +59,8 @@ import static org.hamcrest.Matchers.sameInstance; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GeoBoundsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GeoBoundsIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "geo_value"; private static final String MULTI_VALUED_FIELD_NAME = "geo_values"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java index 8944a215f9..197da9dff8 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java @@ -32,9 +32,9 @@ import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetric; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.util.ArrayList; @@ -59,8 +59,8 @@ import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.sameInstance; @ClusterScope(scope = Scope.SUITE) -@ElasticsearchIntegrationTest.SuiteScopeTest -public class ScriptedMetricIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class ScriptedMetricIT extends ESIntegTestCase { private static long numDocs; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java index 70ea3ea98a..6fd4e833b9 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCount; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -@ElasticsearchIntegrationTest.SuiteScopeTest -public class ValueCountIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class ValueCountIT extends ESIntegTestCase { @Override public void setupSuiteScopeCluster() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java index 91ad947ddb..684a433660 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/cardinality/HyperLogLogPlusPlusTests.java @@ -22,14 +22,14 @@ package org.elasticsearch.search.aggregations.metrics.cardinality; import com.carrotsearch.hppc.BitMixer; import com.carrotsearch.hppc.IntHashSet; import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.search.aggregations.metrics.cardinality.HyperLogLogPlusPlus.MAX_PRECISION; import static org.elasticsearch.search.aggregations.metrics.cardinality.HyperLogLogPlusPlus.MIN_PRECISION; import static org.hamcrest.Matchers.closeTo; -public class HyperLogLogPlusPlusTests extends ElasticsearchTestCase { +public class HyperLogLogPlusPlusTests extends ESTestCase { @Test public void encodeDecode() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java index 909a36ee92..a18f1296dd 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/AvgBucketIT.java @@ -26,9 +26,8 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -46,8 +45,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class AvgBucketIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class AvgBucketIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java index 05239efb75..2e3117e76f 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketScriptIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram; import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram.Bucket; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -48,8 +48,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class BucketScriptIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class BucketScriptIT extends ESIntegTestCase { private static final String FIELD_1_NAME = "field1"; private static final String FIELD_2_NAME = "field2"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java index 70fc2879ee..faf43f0996 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSelectorIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram; import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram.Bucket; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -49,8 +49,8 @@ import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class BucketSelectorIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class BucketSelectorIT extends ESIntegTestCase { private static final String FIELD_1_NAME = "field1"; private static final String FIELD_2_NAME = "field2"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java index e49172c68c..1d844e17af 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/CumulativeSumIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -40,8 +40,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSear import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class CumulativeSumIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class CumulativeSumIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java index dadc7a7ffd..569830b0a9 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DateDerivativeIT.java @@ -27,10 +27,9 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.bucket.histogram.InternalHistogram; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.search.aggregations.pipeline.SimpleValue; import org.elasticsearch.search.aggregations.pipeline.derivative.Derivative; import org.elasticsearch.search.aggregations.support.AggregationPath; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -53,8 +52,8 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class DateDerivativeIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class DateDerivativeIT extends ESIntegTestCase { private DateTime date(int month, int day) { return new DateTime(2012, month, day, 0, 0, DateTimeZone.UTC); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java index 7134dc4ea1..fbbb173ee7 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/DerivativeIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; import org.elasticsearch.search.aggregations.pipeline.derivative.Derivative; import org.elasticsearch.search.aggregations.support.AggregationPath; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -56,8 +56,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class DerivativeIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class DerivativeIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java index 6d52cab4b0..bacb6bda9b 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MaxBucketIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -48,8 +48,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class MaxBucketIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class MaxBucketIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java index f8ba15e7ee..cb83f60f23 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/MinBucketIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.InternalBucketMetricValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -45,8 +45,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class MinBucketIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class MinBucketIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java index 6105d6da98..c26ac8db81 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/PipelineAggregationHelperTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder; import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder; import org.elasticsearch.search.aggregations.metrics.min.MinBuilder; import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.ArrayList; * Provides helper methods and classes for use in PipelineAggregation tests, * such as creating mock histograms or computing simple metrics */ -public class PipelineAggregationHelperTests extends ElasticsearchTestCase { +public class PipelineAggregationHelperTests extends ESTestCase { /** * Generates a mock histogram to use for testing. Each MockBucket holds a doc count, key and document values diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java index f5f0f96124..be11f90fa6 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/SumBucketIT.java @@ -26,9 +26,8 @@ import org.elasticsearch.search.aggregations.bucket.histogram.Histogram.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order; import org.elasticsearch.search.aggregations.metrics.sum.Sum; -import org.elasticsearch.search.aggregations.pipeline.InternalSimpleValue; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -46,8 +45,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.core.IsNull.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class SumBucketIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class SumBucketIT extends ESIntegTestCase { private static final String SINGLE_VALUED_FIELD_NAME = "l_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java index 795eccc384..d139e38a78 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.pipeline.PipelineAggregationHelperT import org.elasticsearch.search.aggregations.pipeline.SimpleValue; import org.elasticsearch.search.aggregations.pipeline.derivative.Derivative; import org.elasticsearch.search.aggregations.pipeline.movavg.models.*; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -54,8 +54,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class MovAvgIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class MovAvgIT extends ESIntegTestCase { private static final String INTERVAL_FIELD = "l_value"; private static final String VALUE_FIELD = "v_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java index fb9e5fa09a..65e44b92a9 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/moving/avg/MovAvgUnitTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.aggregations.pipeline.moving.avg; import com.google.common.collect.EvictingQueue; import org.elasticsearch.common.ParseFieldMatcher; import org.elasticsearch.search.aggregations.pipeline.movavg.models.*; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.text.ParseException; @@ -30,7 +30,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; -public class MovAvgUnitTests extends ElasticsearchTestCase { +public class MovAvgUnitTests extends ESTestCase { @Test public void testSimpleMovAvgModel() { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java index c5e7cd5c63..af686674c7 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/serialdiff/SerialDiffIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.metrics.ValuesSourceMetricsAggregat import org.elasticsearch.search.aggregations.pipeline.BucketHelpers; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregationHelperTests; import org.elasticsearch.search.aggregations.pipeline.SimpleValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -44,8 +44,8 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsNull.nullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class SerialDiffIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class SerialDiffIT extends ESIntegTestCase { private static final String INTERVAL_FIELD = "l_value"; private static final String VALUE_FIELD = "v_value"; diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java index cd72d7f069..7a359ceb39 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/support/MissingValuesTests.java @@ -31,13 +31,13 @@ import org.elasticsearch.index.fielddata.AbstractRandomAccessOrds; import org.elasticsearch.index.fielddata.MultiGeoPointValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -public class MissingValuesTests extends ElasticsearchTestCase { +public class MissingValuesTests extends ESTestCase { public void testMissingBytes() { final int numDocs = TestUtil.nextInt(random(), 1, 100); diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java index 98ebe55e7b..77a3e12362 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/support/PathTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.aggregations.support; import org.elasticsearch.search.aggregations.AggregationExecutionException; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PathTests extends ElasticsearchTestCase { +public class PathTests extends ESTestCase { @Test public void testInvalidPaths() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java index c9e9d4f078..d1a97c7616 100644 --- a/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java +++ b/core/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java @@ -27,13 +27,13 @@ import org.elasticsearch.script.LeafSearchScript; import org.elasticsearch.search.aggregations.support.values.ScriptBytesValues; import org.elasticsearch.search.aggregations.support.values.ScriptDoubleValues; import org.elasticsearch.search.aggregations.support.values.ScriptLongValues; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Arrays; import java.util.Map; -public class ScriptValuesTests extends ElasticsearchTestCase { +public class ScriptValuesTests extends ESTestCase { private static class FakeSearchScript implements LeafSearchScript { diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java index 7031a02367..cea6f92f3a 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileCreatingIndexIT.java @@ -24,7 +24,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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; @@ -35,7 +35,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 SearchWhileCreatingIndexIT extends ElasticsearchIntegrationTest { +public class SearchWhileCreatingIndexIT extends ESIntegTestCase { @Test public void testIndexCausesIndexCreation() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java index de530cd61f..86b27f25e7 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWhileRelocatingIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.common.Priority; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -42,8 +42,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTi import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class SearchWhileRelocatingIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class SearchWhileRelocatingIT extends ESIntegTestCase { @Test @Nightly diff --git a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java b/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java index 98f37091dc..93fbd80b52 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/SearchWithRandomExceptionsIT.java @@ -37,7 +37,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.engine.MockEngineSupport; import org.elasticsearch.test.engine.ThrowingLeafReaderWrapper; import org.elasticsearch.test.junit.annotations.TestLogging; @@ -53,7 +53,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; -public class SearchWithRandomExceptionsIT extends ElasticsearchIntegrationTest { +public class SearchWithRandomExceptionsIT extends ESIntegTestCase { @Test @TestLogging("action.search.type:TRACE,index.shard:TRACE") diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java b/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java index aaff1c9ae4..5ea8b40958 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/TransportSearchFailuresIT.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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -public class TransportSearchFailuresIT extends ElasticsearchIntegrationTest { +public class TransportSearchFailuresIT extends ESIntegTestCase { @Override protected int maximumNumberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java b/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java index 9fad1e6e11..246da2508d 100644 --- a/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/basic/TransportTwoNodesSearchIT.java @@ -44,7 +44,7 @@ import org.elasticsearch.search.aggregations.bucket.filter.Filter; import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -63,7 +63,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; -public class TransportTwoNodesSearchIT extends ElasticsearchIntegrationTest { +public class TransportTwoNodesSearchIT extends ESIntegTestCase { @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java index 378e45058c..27d81f434c 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.builder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -29,7 +29,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class SearchSourceBuilderTest extends ElasticsearchTestCase { +public class SearchSourceBuilderTest extends ESTestCase { SearchSourceBuilder builder = new SearchSourceBuilder(); diff --git a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java index cc6179e144..ff6d740971 100644 --- a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java +++ b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java @@ -27,8 +27,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.fielddata.FieldDataType; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; diff --git a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java index 04a0dab535..5f89af3866 100644 --- a/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java @@ -45,9 +45,9 @@ import org.elasticsearch.search.aggregations.bucket.global.Global; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.hamcrest.Matchers; import org.junit.Test; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.*; * */ @ClusterScope(scope = Scope.SUITE) -public class ChildQuerySearchIT extends ElasticsearchIntegrationTest { +public class ChildQuerySearchIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java index c7a55ff884..feb1828683 100644 --- a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java +++ b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingBwcIT.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.MergePolicyConfig; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; @@ -51,7 +51,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class ParentFieldLoadingBwcIT extends ElasticsearchIntegrationTest { +public class ParentFieldLoadingBwcIT extends ESIntegTestCase { private final Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) diff --git a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java index 4a79d0ca5b..86596648c3 100644 --- a/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java +++ b/core/src/test/java/org/elasticsearch/search/child/ParentFieldLoadingIT.java @@ -33,8 +33,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.MergePolicyConfig; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.junit.Test; +import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; @@ -43,7 +42,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class ParentFieldLoadingIT extends ElasticsearchIntegrationTest { +public class ParentFieldLoadingIT extends ESIntegTestCase { private final Settings indexSettings = Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) diff --git a/core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java b/core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java index 5cd5a9acc3..b6d335318c 100644 --- a/core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java +++ b/core/src/test/java/org/elasticsearch/search/compress/SearchSourceCompressTests.java @@ -31,14 +31,14 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import java.io.IOException; import static org.hamcrest.Matchers.equalTo; -public class SearchSourceCompressTests extends ElasticsearchSingleNodeTest { +public class SearchSourceCompressTests extends ESSingleNodeTestCase { @Test public void testSourceCompressionLZF() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java index a9cb67fb73..c7d10df57f 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/FetchSubPhasePluginIT.java @@ -35,9 +35,9 @@ import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.internal.InternalSearchHit; import org.elasticsearch.search.internal.InternalSearchHitField; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.io.IOException; @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class FetchSubPhasePluginIT extends ElasticsearchIntegrationTest { +public class FetchSubPhasePluginIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java b/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java index 87e43db68e..977ce01b3c 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java @@ -39,7 +39,7 @@ import org.apache.lucene.search.join.BitDocIdSetFilter; import org.apache.lucene.store.Directory; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.innerhits.InnerHitsContext.NestedInnerHits.NestedChildrenQuery; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class NestedChildrenFilterTest extends ElasticsearchTestCase { +public class NestedChildrenFilterTest extends ESTestCase { @Test public void testNestedChildrenFilter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java b/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java index 346d5e39f7..15abcc9ef5 100644 --- a/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java +++ b/core/src/test/java/org/elasticsearch/search/fields/SearchFieldsIT.java @@ -41,7 +41,7 @@ import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHitField; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -68,7 +68,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SearchFieldsIT extends ElasticsearchIntegrationTest { +public class SearchFieldsIT extends ESIntegTestCase { @Test public void testStoredFields() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java index 9d0f54b91f..0848c89ac3 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/DecayFunctionScoreIT.java @@ -33,7 +33,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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.junit.Test; @@ -53,7 +53,7 @@ import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -public class DecayFunctionScoreIT extends ElasticsearchIntegrationTest { +public class DecayFunctionScoreIT extends ESIntegTestCase { @Test public void testDistanceScoreGeoLinGaussExp() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java index efed64f2cd..3fbc9b6ba4 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/ExplainableScriptIT.java @@ -34,9 +34,9 @@ import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class ExplainableScriptIT extends ElasticsearchIntegrationTest { +public class ExplainableScriptIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityIT.java index d2378709f0..80c4968fda 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreBackwardCompatibilityIT.java @@ -20,11 +20,10 @@ package org.elasticsearch.search.functionscore; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.geo.GeoPoint; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.Script; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +41,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; /** */ -public class FunctionScoreBackwardCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class FunctionScoreBackwardCompatibilityIT extends ESBackcompatTestCase { /** * Simple upgrade test for function score diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java index 2f583cb3df..577b3eaea3 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.functionscore; import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.lucene.search.function.FieldValueFactorFunction; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -35,7 +35,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; /** * Tests for the {@code field_value_factor} function in a function_score query. */ -public class FunctionScoreFieldValueIT extends ElasticsearchIntegrationTest { +public class FunctionScoreFieldValueIT extends ESIntegTestCase { @Test public void testFieldValueFactor() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java index 7ac7f45211..7e138162aa 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScoreIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder; import org.elasticsearch.index.query.functionscore.weight.WeightBuilder; import org.elasticsearch.script.Script; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -60,7 +60,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; -public class FunctionScoreIT extends ElasticsearchIntegrationTest { +public class FunctionScoreIT extends ESIntegTestCase { static final String TYPE = "type"; static final String INDEX = "index"; diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java index d3cd012e8c..e78befd179 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/FunctionScorePluginIT.java @@ -31,9 +31,9 @@ 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.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -50,7 +50,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class FunctionScorePluginIT extends ElasticsearchIntegrationTest { +public class FunctionScorePluginIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java b/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java index 3267d22d83..f00e95d6e4 100644 --- a/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java +++ b/core/src/test/java/org/elasticsearch/search/functionscore/RandomScoreFunctionIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.index.query.functionscore.random.RandomScoreFunctionBui import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.CoreMatchers; import org.junit.Ignore; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.nullValue; -public class RandomScoreFunctionIT extends ElasticsearchIntegrationTest { +public class RandomScoreFunctionIT extends ESIntegTestCase { public void testConsistentHitsWithSameSeed() throws Exception { createIndex("test"); @@ -265,7 +265,6 @@ public class RandomScoreFunctionIT extends ElasticsearchIntegrationTest { .execute().actionGet()); } - @Ignore public void checkDistribution() throws Exception { int count = 10000; diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java index c46a238d9b..cc8471519d 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoBoundingBoxIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class GeoBoundingBoxIT extends ElasticsearchIntegrationTest { +public class GeoBoundingBoxIT extends ESIntegTestCase { @Test public void simpleBoundingBoxTest() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java index c06754d14d..b1e959a582 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoDistanceIT.java @@ -33,7 +33,7 @@ import org.elasticsearch.script.Script; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -62,7 +62,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class GeoDistanceIT extends ElasticsearchIntegrationTest { +public class GeoDistanceIT extends ESIntegTestCase { @Test public void simpleDistanceTests() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java index 431819ade1..325fcde4c0 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoFilterIT.java @@ -45,9 +45,8 @@ import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.GeohashCellQuery; -import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.BeforeClass; import org.junit.Test; @@ -60,14 +59,13 @@ import java.util.zip.GZIPInputStream; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.index.query.QueryBuilders.*; -import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** * */ -public class GeoFilterIT extends ElasticsearchIntegrationTest { +public class GeoFilterIT extends ESIntegTestCase { private static boolean intersectSupport; private static boolean disjointSupport; diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java index c878baf2e6..d841701421 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoPolygonIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; @@ -34,8 +34,8 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class GeoPolygonIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class GeoPolygonIT extends ESIntegTestCase { @Override protected void setupSuiteScopeCluster() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java index 64b11866d1..59282e971d 100644 --- a/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/search/geo/GeoShapeIntegrationIT.java @@ -30,13 +30,12 @@ import org.elasticsearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.mapper.FieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.geo.GeoShapeFieldMapper; import org.elasticsearch.index.query.GeoShapeQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.geo.RandomShapeGenerator; import org.junit.Test; @@ -56,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; -public class GeoShapeIntegrationIT extends ElasticsearchIntegrationTest { +public class GeoShapeIntegrationIT extends ESIntegTestCase { @Test public void testNullShape() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java index ad7aed2f5b..e254b4a080 100644 --- a/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/highlight/CustomHighlighterSearchIT.java @@ -22,9 +22,9 @@ import com.google.common.collect.Maps; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; * */ @ClusterScope(scope = Scope.SUITE, numDataNodes = 1) -public class CustomHighlighterSearchIT extends ElasticsearchIntegrationTest { +public class CustomHighlighterSearchIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java index f279b2cf33..d9f69de694 100644 --- a/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/highlight/HighlighterSearchIT.java @@ -39,7 +39,7 @@ import org.elasticsearch.rest.RestStatus; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.highlight.HighlightBuilder.Field; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.Test; @@ -85,7 +85,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.startsWith; -public class HighlighterSearchIT extends ElasticsearchIntegrationTest { +public class HighlighterSearchIT extends ESIntegTestCase { @Test public void testHighlightingWithWildcardName() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java b/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java index ae3f7b43a0..589f79a876 100644 --- a/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/indicesboost/SimpleIndicesBoostSearchIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.indicesboost; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.client.Requests.indexRequest; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class SimpleIndicesBoostSearchIT extends ElasticsearchIntegrationTest { +public class SimpleIndicesBoostSearchIT extends ESIntegTestCase { @Test public void testIndicesBoost() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java index 1c867bda10..1384b33bff 100644 --- a/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java +++ b/core/src/test/java/org/elasticsearch/search/innerhits/InnerHitsIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.fetch.innerhits.InnerHitsBuilder; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class InnerHitsIT extends ElasticsearchIntegrationTest { +public class InnerHitsIT extends ESIntegTestCase { @Test public void testSimpleNested() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java index 158eafb27e..c64e840bd4 100644 --- a/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java +++ b/core/src/test/java/org/elasticsearch/search/matchedqueries/MatchedQueriesIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.*; @@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.hasItemInArray; /** * */ -public class MatchedQueriesIT extends ElasticsearchIntegrationTest { +public class MatchedQueriesIT extends ESIntegTestCase { @Test public void simpleMatchedQueryFromFilteredQuery() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java b/core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java index d1fbb9cf54..91a1731fed 100644 --- a/core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/search/morelikethis/ItemSerializationTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.index.query.MoreLikeThisQueryBuilder; import org.elasticsearch.index.query.MoreLikeThisQueryBuilder.Item; import org.elasticsearch.search.fetch.source.FetchSourceContext; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.Random; import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; import static org.hamcrest.Matchers.is; -public class ItemSerializationTests extends ElasticsearchTestCase { +public class ItemSerializationTests extends ESTestCase { private Item generateRandomItem(int arraySize, int stringSize) { String index = randomAsciiOfLength(stringSize); diff --git a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java b/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java index 2efc1b721a..52df893229 100644 --- a/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java +++ b/core/src/test/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.MoreLikeThisQueryBuilder; import org.elasticsearch.index.query.MoreLikeThisQueryBuilder.Item; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class MoreLikeThisIT extends ElasticsearchIntegrationTest { +public class MoreLikeThisIT extends ESIntegTestCase { @Test public void testSimpleMoreLikeThis() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java b/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java index 3517fdf05b..53f7e615ad 100644 --- a/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/msearch/SimpleMultiSearchIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.msearch; import org.elasticsearch.action.search.MultiSearchResponse; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; @@ -29,7 +29,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SimpleMultiSearchIT extends ElasticsearchIntegrationTest { +public class SimpleMultiSearchIT extends ESIntegTestCase { @Test public void simpleMultiSearch() { diff --git a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java b/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java index 705ceeecaf..a9cd6de06a 100644 --- a/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java +++ b/core/src/test/java/org/elasticsearch/search/preference/SearchPreferenceIT.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.Client; import org.elasticsearch.rest.RestStatus; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -34,8 +34,8 @@ import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class SearchPreferenceIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class SearchPreferenceIT extends ESIntegTestCase { @Test // see #2896 public void testStopOneNodePreferenceWithRedState() throws InterruptedException, IOException { diff --git a/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java b/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java index 595240cf00..c232a7c4a1 100644 --- a/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/ExistsMissingIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.mapper.internal.FieldNamesFieldMapper; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -43,7 +43,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitC import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; -public class ExistsMissingIT extends ElasticsearchIntegrationTest { +public class ExistsMissingIT extends ESIntegTestCase { // TODO: move this to a unit test somewhere... public void testEmptyIndex() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java index 42fea05c64..b9099d05c5 100644 --- a/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/MultiMatchQueryIT.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.elasticsearch.index.query.QueryBuilders.*; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; -public class MultiMatchQueryIT extends ElasticsearchIntegrationTest { +public class MultiMatchQueryIT extends ESIntegTestCase { @Before public void init() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java index 5ad7eeca4c..f1ed9bb8e5 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SearchQueryIT.java @@ -46,7 +46,7 @@ import org.elasticsearch.script.Script; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; @@ -83,7 +83,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; -public class SearchQueryIT extends ElasticsearchIntegrationTest { +public class SearchQueryIT extends ESIntegTestCase { @Override protected int maximumNumberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java index a267339064..f660decbb9 100644 --- a/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java +++ b/core/src/test/java/org/elasticsearch/search/query/SimpleQueryStringIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.SimpleQueryStringBuilder; import org.elasticsearch.index.query.SimpleQueryStringFlag; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Tests for the {@code simple_query_string} query */ -public class SimpleQueryStringIT extends ElasticsearchIntegrationTest { +public class SimpleQueryStringIT extends ESIntegTestCase { @Test public void testSimpleQueryString() throws ExecutionException, InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java index fce8bb7e24..6aa31ca277 100644 --- a/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java +++ b/core/src/test/java/org/elasticsearch/search/rescore/QueryRescorerIT.java @@ -39,7 +39,7 @@ import org.elasticsearch.script.Script; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.rescore.RescoreBuilder.QueryRescorer; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -65,7 +65,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * */ -public class QueryRescorerIT extends ElasticsearchIntegrationTest { +public class QueryRescorerIT extends ESIntegTestCase { @Test public void testEnforceWindowSize() { diff --git a/core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java b/core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java index 4a43b867ba..918bdd696c 100644 --- a/core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java +++ b/core/src/test/java/org/elasticsearch/search/scan/ScanContextTests.java @@ -33,14 +33,14 @@ import org.apache.lucene.search.Sort; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.elasticsearch.search.scan.ScanContext.MinDocQuery; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class ScanContextTests extends ElasticsearchTestCase { +public class ScanContextTests extends ESTestCase { public void testMinDocQueryBasics() { MinDocQuery query1 = new MinDocQuery(42); diff --git a/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java index 45cd36d676..e98a3c4d80 100644 --- a/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java +++ b/core/src/test/java/org/elasticsearch/search/scan/SearchScanIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Set; @@ -34,7 +34,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 SearchScanIT extends ElasticsearchIntegrationTest { +public class SearchScanIT extends ESIntegTestCase { @Test public void testNarrowingQuery() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java b/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java index e5eefb83f7..8c7a31140b 100644 --- a/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java +++ b/core/src/test/java/org/elasticsearch/search/scan/SearchScanScrollingIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; 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 SearchScanScrollingIT extends ElasticsearchIntegrationTest { +public class SearchScanScrollingIT extends ESIntegTestCase { @Test public void testRandomized() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java b/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java index 04e2bb5a38..d82e12ecc1 100644 --- a/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/scriptfilter/ScriptQuerySearchIT.java @@ -27,10 +27,9 @@ import org.elasticsearch.index.cache.query.index.IndexQueryCache; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -44,8 +43,8 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -@ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE) -public class ScriptQuerySearchIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE) +public class ScriptQuerySearchIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java index e2562f3943..d4e354a108 100644 --- a/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java +++ b/core/src/test/java/org/elasticsearch/search/scroll/DuelScrollIT.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Arrays; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class DuelScrollIT extends ElasticsearchIntegrationTest { +public class DuelScrollIT extends ESIntegTestCase { @Test public void testDuel_queryThenFetch() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java index 3b592df6b7..54f6f14e51 100644 --- a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java +++ b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollIT.java @@ -34,7 +34,7 @@ import org.elasticsearch.rest.action.search.RestSearchScrollAction; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.FieldSortBuilder; import org.elasticsearch.search.sort.SortOrder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class SearchScrollIT extends ElasticsearchIntegrationTest { +public class SearchScrollIT extends ESIntegTestCase { @Test public void testSimpleScrollQueryThenFetch() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java index 9247714e85..a037a6d9ae 100644 --- a/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java +++ b/core/src/test/java/org/elasticsearch/search/scroll/SearchScrollWithFailingNodesIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -38,8 +38,8 @@ import static org.hamcrest.Matchers.*; /** */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, numDataNodes = 0, numClientNodes = 0) -public class SearchScrollWithFailingNodesIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0) +public class SearchScrollWithFailingNodesIT extends ESIntegTestCase { @Override protected int numberOfShards() { diff --git a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java b/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java index f9c2f8a280..ebf8b756e8 100644 --- a/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/simple/SimpleSearchIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchPhaseExecutionException; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -41,7 +41,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.containsString; -public class SimpleSearchIT extends ElasticsearchIntegrationTest { +public class SimpleSearchIT extends ESIntegTestCase { @Test public void testSearchNullIndex() { diff --git a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java b/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java index 599d65c206..b2cdbfab58 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java +++ b/core/src/test/java/org/elasticsearch/search/sort/SimpleSortIT.java @@ -43,7 +43,7 @@ import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders; import org.elasticsearch.script.Script; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHitField; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.hamcrest.Matchers; import org.junit.Test; @@ -92,7 +92,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class SimpleSortIT extends ElasticsearchIntegrationTest { +public class SimpleSortIT extends ESIntegTestCase { @TestLogging("action.search.type:TRACE") @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/9421") diff --git a/core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java b/core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java index cad9db7085..84295b7b19 100644 --- a/core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java +++ b/core/src/test/java/org/elasticsearch/search/sort/SortParserTests.java @@ -27,13 +27,13 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.IndexService; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.TestSearchContext; import org.junit.Test; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -public class SortParserTests extends ElasticsearchSingleNodeTest { +public class SortParserTests extends ESSingleNodeTestCase { @Test public void testGeoDistanceSortParserManyPointsNoException() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java b/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java index 73d5235e1e..d6a8e86032 100644 --- a/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java +++ b/core/src/test/java/org/elasticsearch/search/source/SourceFetchingIT.java @@ -20,14 +20,14 @@ package org.elasticsearch.search.source; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; 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 SourceFetchingIT extends ElasticsearchIntegrationTest { +public class SourceFetchingIT extends ESIntegTestCase { @Test public void testSourceDefaultBehavior() { diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java index 79fc32b492..3a6af88a68 100644 --- a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java +++ b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsIT.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.stats.SearchStats.Stats; import org.elasticsearch.script.Script; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashSet; @@ -55,8 +55,8 @@ import static org.hamcrest.Matchers.nullValue; /** */ -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class SearchStatsIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class SearchStatsIT extends ESIntegTestCase { @Override protected int numberOfReplicas() { diff --git a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java index 7128991b24..7c1b443a0d 100644 --- a/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java +++ b/core/src/test/java/org/elasticsearch/search/stats/SearchStatsUnitTests.java @@ -21,13 +21,13 @@ package org.elasticsearch.search.stats; import org.elasticsearch.index.search.stats.SearchStats; import org.elasticsearch.index.search.stats.SearchStats.Stats; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.HashMap; import java.util.Map; -public class SearchStatsUnitTests extends ElasticsearchTestCase { +public class SearchStatsUnitTests extends ESTestCase { @Test // https://github.com/elasticsearch/elasticsearch/issues/7644 diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java index 1b30598a3b..672dc5e081 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java @@ -47,7 +47,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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.io.IOException; @@ -67,7 +67,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllS import static org.hamcrest.Matchers.*; @SuppressCodecs("*") // requires custom completion format -public class CompletionSuggestSearchIT extends ElasticsearchIntegrationTest { +public class CompletionSuggestSearchIT extends ESIntegTestCase { 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/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java index af36c5739f..53e1796696 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java @@ -33,7 +33,7 @@ import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.IntsRef; import org.elasticsearch.search.suggest.completion.CompletionTokenStream; import org.elasticsearch.search.suggest.completion.CompletionTokenStream.ByteTermAttribute; -import org.elasticsearch.test.ElasticsearchTokenStreamTestCase; +import org.elasticsearch.test.ESTokenStreamTestCase; import org.junit.Test; import java.io.IOException; @@ -42,7 +42,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class CompletionTokenStreamTest extends ElasticsearchTokenStreamTestCase { +public class CompletionTokenStreamTest extends ESTokenStreamTestCase { final XAnalyzingSuggester suggester = new XAnalyzingSuggester(new SimpleAnalyzer()); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java index a56187eef9..83c8b362d8 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/ContextSuggestSearchIT.java @@ -37,7 +37,7 @@ import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder; import org.elasticsearch.search.suggest.completion.CompletionSuggestionFuzzyBuilder; import org.elasticsearch.search.suggest.context.ContextBuilder; import org.elasticsearch.search.suggest.context.ContextMapping; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.hamcrest.Matchers; import org.junit.Test; @@ -51,7 +51,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchGeoAssertions.assertD import static org.hamcrest.Matchers.containsString; @SuppressCodecs("*") // requires custom completion format -public class ContextSuggestSearchIT extends ElasticsearchIntegrationTest { +public class ContextSuggestSearchIT extends ESIntegTestCase { private static final String INDEX = "test"; private static final String TYPE = "testType"; diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java index 7bafe64007..1d7ad85832 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CustomSuggesterSearchIT.java @@ -23,15 +23,15 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.List; import java.util.Locale; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.*; +import static org.elasticsearch.test.ESIntegTestCase.*; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope= Scope.SUITE, numDataNodes =1) -public class CustomSuggesterSearchIT extends ElasticsearchIntegrationTest { +public class CustomSuggesterSearchIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java index 27cc57c625..d00658709b 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java @@ -34,7 +34,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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.junit.Test; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.*; * 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 SuggestSearchIT extends ElasticsearchIntegrationTest { +public class SuggestSearchIT extends ESIntegTestCase { @Test // see #3196 public void testSuggestAcrossMultipleIndices() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java index 1cd9745c49..1b29173973 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java @@ -59,7 +59,7 @@ import org.elasticsearch.index.mapper.core.CompletionFieldMapper; import org.elasticsearch.search.suggest.SuggestUtils; import org.elasticsearch.search.suggest.completion.Completion090PostingsFormat.LookupFactory; import org.elasticsearch.search.suggest.context.ContextMapping; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -73,7 +73,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class CompletionPostingsFormatTest extends ElasticsearchTestCase { +public class CompletionPostingsFormatTest extends ESTestCase { Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT.id).build(); static final CompletionFieldMapper.CompletionFieldType FIELD_TYPE = CompletionFieldMapper.Defaults.FIELD_TYPE.clone(); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java b/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java index 1f6bd5eea7..f1c1761855 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.suggest.context.ContextMapping.ContextConfig; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.ArrayList; @@ -36,7 +36,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; /** * */ -public class GeoLocationContextMappingTest extends ElasticsearchTestCase { +public class GeoLocationContextMappingTest extends ESTestCase { @Test public void testThatParsingGeoPointsWorksWithCoercion() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java b/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java index c4d4b48e28..574e1635ab 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java @@ -41,9 +41,8 @@ import org.apache.lucene.search.spell.DirectSpellChecker; import org.apache.lucene.search.spell.SuggestMode; import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.Version; import org.elasticsearch.search.suggest.phrase.NoisyChannelSpellChecker.Result; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.*; @@ -53,7 +52,7 @@ import java.util.Map; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class NoisyChannelSpellCheckerTests extends ElasticsearchTestCase{ +public class NoisyChannelSpellCheckerTests extends ESTestCase { private final BytesRef space = new BytesRef(" "); private final BytesRef preTag = new BytesRef("<em>"); private final BytesRef postTag = new BytesRef("</em>"); diff --git a/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java b/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java index 7a37ded1ab..f0cbfd65c0 100644 --- a/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java +++ b/core/src/test/java/org/elasticsearch/search/timeout/SearchTimeoutIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.timeout; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.Script; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.filteredQuery; @@ -32,8 +32,8 @@ import static org.hamcrest.Matchers.equalTo; /** */ -@ElasticsearchIntegrationTest.ClusterScope(scope=ElasticsearchIntegrationTest.Scope.SUITE) -public class SearchTimeoutIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope= ESIntegTestCase.Scope.SUITE) +public class SearchTimeoutIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java b/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java index 8b1eee953f..229f2a8ed6 100644 --- a/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java +++ b/core/src/test/java/org/elasticsearch/similarity/SimilarityIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.similarity; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; 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 SimilarityIT extends ElasticsearchIntegrationTest { +public class SimilarityIT extends ESIntegTestCase { @Test diff --git a/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIT.java b/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java index 840bc4b0ed..7aedb95863 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -19,20 +19,22 @@ package org.elasticsearch.snapshots; import com.google.common.base.Predicate; - import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksResponse; -import org.elasticsearch.cluster.*; -import org.elasticsearch.cluster.metadata.SnapshotId; +import org.elasticsearch.cluster.ClusterChangedEvent; +import org.elasticsearch.cluster.ClusterService; +import org.elasticsearch.cluster.ClusterState; +import org.elasticsearch.cluster.ClusterStateListener; +import org.elasticsearch.cluster.ClusterStateUpdateTask; import org.elasticsearch.cluster.SnapshotsInProgress; +import org.elasticsearch.cluster.metadata.SnapshotId; import org.elasticsearch.cluster.service.PendingClusterTask; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.repositories.RepositoriesService; import org.elasticsearch.snapshots.mockstore.MockRepository; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.junit.Ignore; +import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; import java.nio.file.FileVisitResult; @@ -48,10 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -/** - */ -@Ignore -public abstract class AbstractSnapshotIT extends ElasticsearchIntegrationTest { +public abstract class AbstractSnapshotIntegTestCase extends ESIntegTestCase { public static long getFailureCount(String repository) { long failureCount = 0; diff --git a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatTests.java b/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatTests.java index 1e4a5f61fa..4a16d2ff17 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatTests.java +++ b/core/src/test/java/org/elasticsearch/snapshots/BlobStoreFormatTests.java @@ -49,7 +49,7 @@ import java.util.concurrent.*; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.greaterThan; -public class BlobStoreFormatTests extends AbstractSnapshotIT { +public class BlobStoreFormatTests extends AbstractSnapshotIntegTestCase { private static final ParseFieldMatcher parseFieldMatcher = new ParseFieldMatcher(Settings.EMPTY); diff --git a/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java index cba9831cca..6f4e4e217d 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java @@ -45,7 +45,6 @@ import org.elasticsearch.cluster.metadata.MetaData.Custom; import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.MetaDataIndexStateService; import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; -import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Priority; import org.elasticsearch.common.io.stream.StreamInput; @@ -84,8 +83,8 @@ import java.util.concurrent.atomic.AtomicReference; import static com.google.common.collect.Lists.newArrayList; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertBlocked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertThrows; @@ -94,7 +93,7 @@ import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0) -public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIT { +public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCase { @Test public void restorePersistentSettingsTest() throws Exception { @@ -692,7 +691,7 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIT { } @Test - @Ignore + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/12621") public void chaosSnapshotTest() throws Exception { final List<String> indices = new CopyOnWriteArrayList<>(); Settings settings = settingsBuilder().put("action.write_consistency", "one").build(); diff --git a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java b/core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java index 9c36d34b24..ff67973a61 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java +++ b/core/src/test/java/org/elasticsearch/snapshots/RepositoriesTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.repositories.RepositoryException; import org.elasticsearch.repositories.RepositoryVerificationException; import org.elasticsearch.snapshots.mockstore.MockRepositoryModule; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.nio.file.Path; @@ -47,8 +47,8 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 2) -public class RepositoriesTests extends AbstractSnapshotIT { +@ESIntegTestCase.ClusterScope(minNumDataNodes = 2) +public class RepositoriesTests extends AbstractSnapshotIntegTestCase { @Test public void testRepositoryCreation() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index 70607aa1e3..85fd0c7c2f 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -104,7 +104,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.startsWith; -public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIT { +public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCase { @Test public void basicWorkFlowTest() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java index dea168a2d7..21401d091f 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SnapshotBackwardsCompatibilityIT.java @@ -29,11 +29,10 @@ import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.metadata.IndexMetaData; -import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.io.FileSystemUtils; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; -import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest; +import org.elasticsearch.test.ESBackcompatTestCase; import org.junit.Test; import java.io.IOException; @@ -50,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.lessThan; -public class SnapshotBackwardsCompatibilityIT extends ElasticsearchBackwardsCompatIntegrationTest { +public class SnapshotBackwardsCompatibilityIT extends ESBackcompatTestCase { @Test public void testSnapshotAndRestore() throws ExecutionException, InterruptedException, IOException { diff --git a/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java b/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java index 71957c5cc2..76f057a60f 100644 --- a/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/snapshots/SnapshotUtilsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.snapshots; import com.google.common.collect.ImmutableList; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.List; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.containsInAnyOrder; /** */ -public class SnapshotUtilsTests extends ElasticsearchTestCase { +public class SnapshotUtilsTests extends ESTestCase { @Test public void testIndexNameFiltering() { assertIndexNameFiltering(new String[]{"foo", "bar", "baz"}, new String[]{}, new String[]{"foo", "bar", "baz"}); diff --git a/core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java b/core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationBenchmark.java index 75109210ed..a0f883bd76 100644 --- a/core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/stresstest/search1/ConcurrentSearchSerializationBenchmark.java @@ -38,8 +38,7 @@ import java.util.concurrent.ThreadLocalRandom; * <p/> * See: https://github.com/elasticsearch/elasticsearch/issues/1686. */ -@Ignore("Stress Test") -public class ConcurrentSearchSerializationTests { +public class ConcurrentSearchSerializationBenchmark { public static void main(String[] args) throws Exception { diff --git a/core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java b/core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressBenchmark.java index 0963717e99..001c234ec6 100644 --- a/core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressTest.java +++ b/core/src/test/java/org/elasticsearch/stresstest/search1/Search1StressBenchmark.java @@ -41,11 +41,7 @@ import java.util.concurrent.atomic.AtomicLong; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -/** - * - */ -@Ignore("Stress Test") -public class Search1StressTest { +public class Search1StressBenchmark { private final ESLogger logger = Loggers.getLogger(getClass()); @@ -73,67 +69,67 @@ public class Search1StressTest { private Node client; - public Search1StressTest setNumberOfNodes(int numberOfNodes) { + public Search1StressBenchmark setNumberOfNodes(int numberOfNodes) { this.numberOfNodes = numberOfNodes; return this; } - public Search1StressTest setPreIndexDocs(SizeValue preIndexDocs) { + public Search1StressBenchmark setPreIndexDocs(SizeValue preIndexDocs) { this.preIndexDocs = preIndexDocs; return this; } - public Search1StressTest setIndexers(int indexers) { + public Search1StressBenchmark setIndexers(int indexers) { this.indexers = indexers; return this; } - public Search1StressTest setIndexerThrottle(TimeValue indexerThrottle) { + public Search1StressBenchmark setIndexerThrottle(TimeValue indexerThrottle) { this.indexerThrottle = indexerThrottle; return this; } - public Search1StressTest setSearchers(int searchers) { + public Search1StressBenchmark setSearchers(int searchers) { this.searchers = searchers; return this; } - public Search1StressTest setSearcherThrottle(TimeValue searcherThrottle) { + public Search1StressBenchmark setSearcherThrottle(TimeValue searcherThrottle) { this.searcherThrottle = searcherThrottle; return this; } - public Search1StressTest setNumberOfIndices(int numberOfIndices) { + public Search1StressBenchmark setNumberOfIndices(int numberOfIndices) { this.numberOfIndices = numberOfIndices; return this; } - public Search1StressTest setNumberOfTypes(int numberOfTypes) { + public Search1StressBenchmark setNumberOfTypes(int numberOfTypes) { this.numberOfTypes = numberOfTypes; return this; } - public Search1StressTest setNumberOfValues(int numberOfValues) { + public Search1StressBenchmark setNumberOfValues(int numberOfValues) { this.numberOfValues = numberOfValues; return this; } - public Search1StressTest setNumberOfHits(int numberOfHits) { + public Search1StressBenchmark setNumberOfHits(int numberOfHits) { this.numberOfHits = numberOfHits; return this; } - public Search1StressTest setFlusherThrottle(TimeValue flusherThrottle) { + public Search1StressBenchmark setFlusherThrottle(TimeValue flusherThrottle) { this.flusherThrottle = flusherThrottle; return this; } - public Search1StressTest setSettings(Settings settings) { + public Search1StressBenchmark setSettings(Settings settings) { this.settings = settings; return this; } - public Search1StressTest setPeriod(TimeValue period) { + public Search1StressBenchmark setPeriod(TimeValue period) { this.period = period; return this; } @@ -359,7 +355,7 @@ public class Search1StressTest { } public static void main(String[] args) throws Exception { - Search1StressTest test = new Search1StressTest() + Search1StressBenchmark test = new Search1StressBenchmark() .setPeriod(TimeValue.timeValueMinutes(10)) .setNumberOfNodes(2) .setPreIndexDocs(SizeValue.parseSizeValue("100")) diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java b/core/src/test/java/org/elasticsearch/test/ESAllocationTestCase.java index 7692d4d932..533dfd80ea 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchAllocationTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/ESAllocationTestCase.java @@ -49,7 +49,7 @@ import static org.hamcrest.CoreMatchers.is; /** */ -public abstract class ElasticsearchAllocationTestCase extends ElasticsearchTestCase { +public abstract class ESAllocationTestCase extends ESTestCase { public static AllocationService createAllocationService() { return createAllocationService(Settings.Builder.EMPTY_SETTINGS); diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java b/core/src/test/java/org/elasticsearch/test/ESBackcompatTestCase.java index 082d756d9a..1468efed8b 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java +++ b/core/src/test/java/org/elasticsearch/test/ESBackcompatTestCase.java @@ -86,10 +86,9 @@ import static org.hamcrest.Matchers.is; * */ // the transportClientRatio is tricky here since we don't fully control the cluster nodes -@ElasticsearchBackwardsCompatIntegrationTest.Backwards -@ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 0, maxNumDataNodes = 2, scope = ElasticsearchIntegrationTest.Scope.SUITE, numClientNodes = 0, transportClientRatio = 0.0) -@Ignore -public abstract class ElasticsearchBackwardsCompatIntegrationTest extends ElasticsearchIntegrationTest { +@ESBackcompatTestCase.Backwards +@ESIntegTestCase.ClusterScope(minNumDataNodes = 0, maxNumDataNodes = 2, scope = ESIntegTestCase.Scope.SUITE, numClientNodes = 0, transportClientRatio = 0.0) +public abstract class ESBackcompatTestCase extends ESIntegTestCase { /** * Key used to set the path for the elasticsearch executable used to run backwards compatibility tests from @@ -150,7 +149,7 @@ public abstract class ElasticsearchBackwardsCompatIntegrationTest extends Elasti } private Version compatibilityVersion(Class<?> clazz) { - if (clazz == Object.class || clazz == ElasticsearchIntegrationTest.class) { + if (clazz == Object.class || clazz == ESIntegTestCase.class) { return globalCompatibilityVersion(); } CompatibilityVersion annotation = clazz.getAnnotation(CompatibilityVersion.class); @@ -270,7 +269,7 @@ public abstract class ElasticsearchBackwardsCompatIntegrationTest extends Elasti @Inherited @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - @TestGroup(enabled = false, sysProperty = ElasticsearchBackwardsCompatIntegrationTest.TESTS_BACKWARDS_COMPATIBILITY) + @TestGroup(enabled = false, sysProperty = ESBackcompatTestCase.TESTS_BACKWARDS_COMPATIBILITY) public @interface Backwards { } @@ -280,7 +279,6 @@ public abstract class ElasticsearchBackwardsCompatIntegrationTest extends Elasti */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) - @Ignore public @interface CompatibilityVersion { int version(); } diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java index 9f08eb7ff0..b83d7a24a9 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java +++ b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java @@ -146,7 +146,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; /** - * {@link ElasticsearchIntegrationTest} is an abstract base class to run integration + * {@link ESIntegTestCase} is an abstract base class to run integration * tests against a JVM private Elasticsearch Cluster. The test class supports 2 different * cluster scopes. * <ul> @@ -161,7 +161,7 @@ import static org.hamcrest.Matchers.*; * should be used, here is an example: * <pre> * - * @ClusterScope(scope=Scope.TEST) public class SomeIntegrationTest extends ElasticsearchIntegrationTest { + * @ClusterScope(scope=Scope.TEST) public class SomeIntegrationTest extends ESIntegTestCase { * @Test public void testMethod() {} * } * </pre> @@ -174,12 +174,12 @@ import static org.hamcrest.Matchers.*; * <p/> * <pre> * @ClusterScope(scope=Scope.SUITE, numDataNodes=3) - * public class SomeIntegrationTest extends ElasticsearchIntegrationTest { + * public class SomeIntegrationTest extends ESIntegTestCase { * @Test public void testMethod() {} * } * </pre> * <p/> - * Note, the {@link ElasticsearchIntegrationTest} uses randomized settings on a cluster and index level. For instance + * Note, the {@link ESIntegTestCase} uses randomized settings on a cluster and index level. For instance * each test might use different directory implementation for each test or will return a random client to one of the * nodes in the cluster for each call to {@link #client()}. Test failures might only be reproducible if the correct * system properties are passed to the test execution environment. @@ -194,9 +194,8 @@ import static org.hamcrest.Matchers.*; * </ul> * </p> */ -@Ignore @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet -public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase { +public abstract class ESIntegTestCase extends ESTestCase { /** * Property that controls whether ThirdParty Integration tests are run (not the default). @@ -214,7 +213,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase @Inherited @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - @TestGroup(enabled = false, sysProperty = ElasticsearchIntegrationTest.SYSPROP_THIRDPARTY) + @TestGroup(enabled = false, sysProperty = ESIntegTestCase.SYSPROP_THIRDPARTY) public @interface ThirdParty { } @@ -279,7 +278,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase private static final Map<Class<?>, TestCluster> clusters = new IdentityHashMap<>(); - private static ElasticsearchIntegrationTest INSTANCE = null; // see @SuiteScope + private static ESIntegTestCase INSTANCE = null; // see @SuiteScope private static Long SUITE_SEED = null; @BeforeClass @@ -309,7 +308,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase printTestMessage("before"); } catch (OutOfMemoryError e) { if (e.getMessage().contains("unable to create new native thread")) { - ElasticsearchTestCase.printStackDump(logger); + ESTestCase.printStackDump(logger); } throw e; } @@ -1446,7 +1445,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase /** * The scope of a test cluster used together with - * {@link org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope} annotations on {@link org.elasticsearch.test.ElasticsearchIntegrationTest} subclasses. + * {@link ESIntegTestCase.ClusterScope} annotations on {@link ESIntegTestCase} subclasses. */ public enum Scope { /** @@ -1460,15 +1459,15 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase } /** - * Defines a cluster scope for a {@link org.elasticsearch.test.ElasticsearchIntegrationTest} subclass. - * By default if no {@link ClusterScope} annotation is present {@link org.elasticsearch.test.ElasticsearchIntegrationTest.Scope#SUITE} is used + * Defines a cluster scope for a {@link ESIntegTestCase} subclass. + * By default if no {@link ClusterScope} annotation is present {@link ESIntegTestCase.Scope#SUITE} is used * together with randomly chosen settings like number of nodes etc. */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) public @interface ClusterScope { /** - * Returns the scope. {@link org.elasticsearch.test.ElasticsearchIntegrationTest.Scope#SUITE} is default. + * Returns the scope. {@link ESIntegTestCase.Scope#SUITE} is default. */ Scope scope() default Scope.SUITE; @@ -1563,7 +1562,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase } private static ClusterScope getAnnotation(Class<?> clazz) { - if (clazz == Object.class || clazz == ElasticsearchIntegrationTest.class) { + if (clazz == Object.class || clazz == ESIntegTestCase.class) { return null; } ClusterScope annotation = clazz.getAnnotation(ClusterScope.class); @@ -1911,7 +1910,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase assert INSTANCE == null; if (isSuiteScopedTest(targetClass)) { // note we need to do this this way to make sure this is reproducible - INSTANCE = (ElasticsearchIntegrationTest) targetClass.newInstance(); + INSTANCE = (ESIntegTestCase) targetClass.newInstance(); boolean success = false; try { INSTANCE.beforeInternal(); @@ -1989,27 +1988,26 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase } /** - * This method is executed iff the test is annotated with {@link SuiteScopeTest} + * This method is executed iff the test is annotated with {@link SuiteScopeTestCase} * before the first test of this class is executed. * - * @see SuiteScopeTest + * @see SuiteScopeTestCase */ protected void setupSuiteScopeCluster() throws Exception { } private static boolean isSuiteScopedTest(Class<?> clazz) { - return clazz.getAnnotation(SuiteScopeTest.class) != null; + return clazz.getAnnotation(SuiteScopeTestCase.class) != null; } /** - * If a test is annotated with {@link org.elasticsearch.test.ElasticsearchIntegrationTest.SuiteScopeTest} + * If a test is annotated with {@link SuiteScopeTestCase} * the checks and modifications that are applied to the used test cluster are only done after all tests * of this class are executed. This also has the side-effect of a suite level setup method {@link #setupSuiteScopeCluster()} * that is executed in a separate test instance. Variables that need to be accessible across test instances must be static. */ @Retention(RetentionPolicy.RUNTIME) @Inherited - @Ignore - public @interface SuiteScopeTest { + public @interface SuiteScopeTestCase { } } diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java b/core/src/test/java/org/elasticsearch/test/ESSingleNodeTestCase.java index 28f99c45e5..7f83f41cbf 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchSingleNodeTest.java +++ b/core/src/test/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -56,8 +56,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; * A test that keep a singleton node started for all tests that can be used to get * references to Guice injectors in unit tests. */ -@Ignore -public abstract class ElasticsearchSingleNodeTest extends ElasticsearchTestCase { +public abstract class ESSingleNodeTestCase extends ESTestCase { private static Node NODE = null; diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java b/core/src/test/java/org/elasticsearch/test/ESTestCase.java index a25ca6f26c..462a98b03e 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/ESTestCase.java @@ -98,7 +98,7 @@ import static com.google.common.collect.Lists.newArrayList; "LuceneVarGapFixedInterval", "LuceneVarGapDocFreqInterval", "Lucene50" }) @LuceneTestCase.SuppressReproduceLine -public abstract class ElasticsearchTestCase extends LuceneTestCase { +public abstract class ESTestCase extends LuceneTestCase { static { BootstrapForTesting.ensureInitialized(); @@ -114,13 +114,13 @@ public abstract class ElasticsearchTestCase extends LuceneTestCase { public RuleChain failureAndSuccessEvents = RuleChain.outerRule(new TestRuleAdapter() { @Override protected void afterIfSuccessful() throws Throwable { - ElasticsearchTestCase.this.afterIfSuccessful(); + ESTestCase.this.afterIfSuccessful(); } @Override protected void afterAlways(List<Throwable> errors) throws Throwable { if (errors != null && errors.isEmpty() == false) { - ElasticsearchTestCase.this.afterIfFailed(errors); + ESTestCase.this.afterIfFailed(errors); } super.afterAlways(errors); } diff --git a/core/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java b/core/src/test/java/org/elasticsearch/test/ESTokenStreamTestCase.java index 68d44ec4ac..685b158862 100644 --- a/core/src/test/java/org/elasticsearch/test/ElasticsearchTokenStreamTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/ESTokenStreamTestCase.java @@ -46,7 +46,7 @@ import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; * Basic test case for token streams. the assertion methods in this class will * run basic checks to enforce correct behavior of the token streams. */ -public abstract class ElasticsearchTokenStreamTestCase extends BaseTokenStreamTestCase { +public abstract class ESTokenStreamTestCase extends BaseTokenStreamTestCase { static { BootstrapForTesting.ensureInitialized(); diff --git a/core/src/test/java/org/elasticsearch/test/ExternalNode.java b/core/src/test/java/org/elasticsearch/test/ExternalNode.java index 4116632fd2..0d969db234 100644 --- a/core/src/test/java/org/elasticsearch/test/ExternalNode.java +++ b/core/src/test/java/org/elasticsearch/test/ExternalNode.java @@ -155,7 +155,7 @@ final class ExternalNode implements Closeable { } static boolean waitForNode(final Client client, final String name) throws InterruptedException { - return ElasticsearchTestCase.awaitBusy(new Predicate<Object>() { + return ESTestCase.awaitBusy(new Predicate<Object>() { @Override public boolean apply(java.lang.Object input) { final NodesInfoResponse nodeInfos = client.admin().cluster().prepareNodesInfo().get(); diff --git a/core/src/test/java/org/elasticsearch/test/InternalTestCluster.java b/core/src/test/java/org/elasticsearch/test/InternalTestCluster.java index 938a080f43..ee3071cce6 100644 --- a/core/src/test/java/org/elasticsearch/test/InternalTestCluster.java +++ b/core/src/test/java/org/elasticsearch/test/InternalTestCluster.java @@ -94,7 +94,6 @@ import org.elasticsearch.indices.store.IndicesStore; import org.elasticsearch.node.Node; import org.elasticsearch.node.internal.InternalSettingsPreparer; import org.elasticsearch.node.service.NodeService; -import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.script.ScriptService; import org.elasticsearch.search.SearchService; import org.elasticsearch.search.SearchServiceModule; @@ -127,7 +126,7 @@ import static junit.framework.Assert.fail; import static org.apache.lucene.util.LuceneTestCase.*; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.node.NodeBuilder.nodeBuilder; -import static org.elasticsearch.test.ElasticsearchTestCase.assertBusy; +import static org.elasticsearch.test.ESTestCase.assertBusy; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoTimeout; import static org.hamcrest.Matchers.*; import static org.junit.Assert.assertFalse; @@ -141,7 +140,7 @@ import static org.junit.Assert.assertThat; * The Cluster is bound to a test lifecycle where tests must call {@link #beforeTest(java.util.Random, double)} and * {@link #afterTest()} to initialize and reset the cluster in order to be more reproducible. The term "more" relates * to the async nature of Elasticsearch in combination with randomized testing. Once Threads and asynchronous calls - * are involved reproducibility is very limited. This class should only be used through {@link ElasticsearchIntegrationTest}. + * are involved reproducibility is very limited. This class should only be used through {@link ESIntegTestCase}. * </p> */ public final class InternalTestCluster extends TestCluster { @@ -155,7 +154,7 @@ public final class InternalTestCluster extends TestCluster { * system without asserting modules that to make sure they don't hide any bugs in * production. * - * @see ElasticsearchIntegrationTest + * @see ESIntegTestCase */ public static final String TESTS_ENABLE_MOCK_MODULES = "tests.enable_mock_modules"; diff --git a/core/src/test/java/org/elasticsearch/test/TestCluster.java b/core/src/test/java/org/elasticsearch/test/TestCluster.java index 322ed74197..593ceee9bb 100644 --- a/core/src/test/java/org/elasticsearch/test/TestCluster.java +++ b/core/src/test/java/org/elasticsearch/test/TestCluster.java @@ -153,7 +153,7 @@ public abstract class TestCluster implements Iterable<Client>, Closeable { } catch (AssertionError ae) { // Try to see what threads are doing when we hit the "Delete index failed - not acked": logger.info("dump all threads on AssertionError"); - ElasticsearchTestCase.printStackDump(logger); + ESTestCase.printStackDump(logger); logger.info("done dump all threads on AssertionError"); throw ae; } diff --git a/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java index 08f86a7004..4c67fbcd08 100644 --- a/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java +++ b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockBigArrays.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.util.IntArray; import org.elasticsearch.common.util.LongArray; import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import java.util.Collection; import java.util.Collections; @@ -68,7 +68,7 @@ public class MockBigArrays extends BigArrays { // not empty, we might be executing on a shared cluster that keeps on obtaining // and releasing arrays, lets make sure that after a reasonable timeout, all master // copy (snapshot) have been released - boolean success = ElasticsearchTestCase.awaitBusy(new Predicate<Object>() { + boolean success = ESTestCase.awaitBusy(new Predicate<Object>() { @Override public boolean apply(Object input) { return Sets.intersection(masterCopy.keySet(), ACQUIRED_ARRAYS.keySet()).isEmpty(); diff --git a/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java index eea29f8230..482575d7a2 100644 --- a/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java +++ b/core/src/test/java/org/elasticsearch/test/cache/recycler/MockPageCacheRecycler.java @@ -26,7 +26,7 @@ import org.elasticsearch.cache.recycler.PageCacheRecycler; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.recycler.Recycler.V; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.threadpool.ThreadPool; @@ -46,7 +46,7 @@ public class MockPageCacheRecycler extends PageCacheRecycler { // not empty, we might be executing on a shared cluster that keeps on obtaining // and releasing pages, lets make sure that after a reasonable timeout, all master // copy (snapshot) have been released - boolean success = ElasticsearchTestCase.awaitBusy(new Predicate<Object>() { + boolean success = ESTestCase.awaitBusy(new Predicate<Object>() { @Override public boolean apply(Object input) { return Sets.intersection(masterCopy.keySet(), ACQUIRED_PAGES.keySet()).isEmpty(); diff --git a/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java b/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java index ddcef10b80..84aa300fb8 100644 --- a/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java +++ b/core/src/test/java/org/elasticsearch/test/disruption/NetworkPartitionIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.test.disruption; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.transport.TransportModule; @@ -30,7 +30,7 @@ import org.junit.Test; import java.io.IOException; -public class NetworkPartitionIT extends ElasticsearchIntegrationTest { +public class NetworkPartitionIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java b/core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java index 9ebecc68c4..e448bfa070 100644 --- a/core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java +++ b/core/src/test/java/org/elasticsearch/test/engine/MockEngineSupport.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.EngineConfig; import org.elasticsearch.index.engine.EngineException; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.io.Closeable; import java.io.IOException; @@ -84,7 +84,7 @@ public final class MockEngineSupport { shardId = config.getShardId(); filterCache = config.getQueryCache(); filterCachingPolicy = config.getQueryCachingPolicy(); - final long seed = indexSettings.getAsLong(ElasticsearchIntegrationTest.SETTING_INDEX_SEED, 0l); + final long seed = indexSettings.getAsLong(ESIntegTestCase.SETTING_INDEX_SEED, 0l); Random random = new Random(seed); final double ratio = indexSettings.getAsDouble(WRAP_READER_RATIO, 0.0d); // DISABLED by default - AssertingDR is crazy slow Class<? extends AssertingDirectoryReader> wrapper = indexSettings.getAsClass(READER_WRAPPER_TYPE, AssertingDirectoryReader.class); diff --git a/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index 076297c392..8678f20ac1 100644 --- a/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/core/src/test/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -79,7 +79,7 @@ import java.nio.file.Path; import java.util.*; import static com.google.common.base.Predicates.isNull; -import static org.elasticsearch.test.ElasticsearchTestCase.*; +import static org.elasticsearch.test.ESTestCase.*; import static org.elasticsearch.test.VersionUtils.randomVersion; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index d63a0797f2..8d2caadbcd 100644 --- a/core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/core/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -25,7 +25,7 @@ import com.carrotsearch.randomizedtesting.TraceFormatting; import org.elasticsearch.common.Strings; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalTestCluster; import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; @@ -38,11 +38,11 @@ import java.util.TimeZone; import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_ITERATIONS; import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_PREFIX; import static com.carrotsearch.randomizedtesting.SysGlobals.SYSPROP_TESTMETHOD; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.TESTS_CLUSTER; -import static org.elasticsearch.test.rest.ElasticsearchRestTestCase.REST_TESTS_BLACKLIST; -import static org.elasticsearch.test.rest.ElasticsearchRestTestCase.REST_TESTS_SPEC; -import static org.elasticsearch.test.rest.ElasticsearchRestTestCase.REST_TESTS_SUITE; -import static org.elasticsearch.test.rest.ElasticsearchRestTestCase.Rest; +import static org.elasticsearch.test.ESIntegTestCase.TESTS_CLUSTER; +import static org.elasticsearch.test.rest.ESRestTestCase.REST_TESTS_BLACKLIST; +import static org.elasticsearch.test.rest.ESRestTestCase.REST_TESTS_SPEC; +import static org.elasticsearch.test.rest.ESRestTestCase.REST_TESTS_SUITE; +import static org.elasticsearch.test.rest.ESRestTestCase.Rest; /** * A {@link RunListener} that emits to {@link System#err} a string with command @@ -50,7 +50,7 @@ import static org.elasticsearch.test.rest.ElasticsearchRestTestCase.Rest; */ public class ReproduceInfoPrinter extends RunListener { - protected final ESLogger logger = Loggers.getLogger(ElasticsearchTestCase.class); + protected final ESLogger logger = Loggers.getLogger(ESTestCase.class); @Override public void testStarted(Description description) throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java b/core/src/test/java/org/elasticsearch/test/rest/ESRestTestCase.java index 2aa2d43aed..9315fff0a2 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -34,8 +34,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.node.Node; import org.elasticsearch.repositories.uri.URLRepository; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.rest.client.RestException; import org.elasticsearch.test.rest.parser.RestTestParseException; import org.elasticsearch.test.rest.parser.RestTestSuiteParser; @@ -77,12 +77,12 @@ import java.util.Set; /** * Runs the clients test suite against an elasticsearch cluster. */ -@ElasticsearchRestTestCase.Rest +@ESRestTestCase.Rest @SuppressFsync // we aren't trying to test this here, and it can make the test slow @SuppressCodecs("*") // requires custom completion postings format @ClusterScope(randomDynamicTemplates = false) @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // timeout the suite after 40min and fail the test. -public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegrationTest { +public abstract class ESRestTestCase extends ESIntegTestCase { /** * Property that allows to control whether the REST tests are run (default) or not @@ -95,7 +95,7 @@ public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegration @Inherited @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) - @TestGroup(enabled = true, sysProperty = ElasticsearchRestTestCase.TESTS_REST) + @TestGroup(enabled = true, sysProperty = ESRestTestCase.TESTS_REST) public @interface Rest { } @@ -130,7 +130,7 @@ public abstract class ElasticsearchRestTestCase extends ElasticsearchIntegration private final RestTestCandidate testCandidate; - public ElasticsearchRestTestCase(RestTestCandidate testCandidate) { + public ESRestTestCase(RestTestCandidate testCandidate) { this.testCandidate = testCandidate; String[] blacklist = resolvePathsProperty(REST_TESTS_BLACKLIST, null); if (blacklist != null) { diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java index 729d878974..e73bf34709 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest0IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 0 */ -public class Rest0IT extends ElasticsearchRestTestCase { +public class Rest0IT extends ESRestTestCase { public Rest0IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java index af11d547a1..bc80123deb 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest1IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 1 */ -public class Rest1IT extends ElasticsearchRestTestCase { +public class Rest1IT extends ESRestTestCase { public Rest1IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java index 31a4bfb0f9..a2fb5ad922 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest2IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 2 */ -public class Rest2IT extends ElasticsearchRestTestCase { +public class Rest2IT extends ESRestTestCase { public Rest2IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java index 48937cdd02..7cbc974de0 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest3IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 3 */ -public class Rest3IT extends ElasticsearchRestTestCase { +public class Rest3IT extends ESRestTestCase { public Rest3IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java index a565171059..3910167702 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest4IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 4 */ -public class Rest4IT extends ElasticsearchRestTestCase { +public class Rest4IT extends ESRestTestCase { public Rest4IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java index fd69bf5cca..748b06c2c2 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest5IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 5 */ -public class Rest5IT extends ElasticsearchRestTestCase { +public class Rest5IT extends ESRestTestCase { public Rest5IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java index 3ec543f44b..e8fbcd4826 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest6IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 6 */ -public class Rest6IT extends ElasticsearchRestTestCase { +public class Rest6IT extends ESRestTestCase { public Rest6IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java b/core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java index 2f0b07a84d..cf68bdb560 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java +++ b/core/src/test/java/org/elasticsearch/test/rest/Rest7IT.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest API tests subset 7 */ -public class Rest7IT extends ElasticsearchRestTestCase { +public class Rest7IT extends ESRestTestCase { public Rest7IT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/core/src/test/java/org/elasticsearch/test/rest/support/Features.java b/core/src/test/java/org/elasticsearch/test/rest/support/Features.java index 68e0848a1a..3b86726268 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/support/Features.java +++ b/core/src/test/java/org/elasticsearch/test/rest/support/Features.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.rest.support; import com.google.common.collect.Lists; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import java.util.List; @@ -45,7 +45,7 @@ public final class Features { */ public static boolean areAllSupported(List<String> features) { for (String feature : features) { - if ("requires_replica".equals(feature) && ElasticsearchIntegrationTest.cluster().numDataNodes() >= 2) { + if ("requires_replica".equals(feature) && ESIntegTestCase.cluster().numDataNodes() >= 2) { continue; } if (!SUPPORTED.contains(feature)) { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTestCase.java index 1a84178e3c..cbe14f8e9c 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/AbstractParserTestCase.java @@ -20,14 +20,13 @@ package org.elasticsearch.test.rest.test; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Ignore; import static org.hamcrest.Matchers.nullValue; -@Ignore -public abstract class AbstractParserTests extends ElasticsearchTestCase { +public abstract class AbstractParserTestCase extends ESTestCase { protected XContentParser parser; diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java index ac1090e01d..b316ae0fac 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/AssertionParsersTests.java @@ -28,7 +28,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class AssertionParsersTests extends AbstractParserTests { +public class AssertionParsersTests extends AbstractParserTestCase { @Test public void testParseIsTrue() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java index e48dd5e908..c3aba8114a 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/DoSectionParserTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class DoSectionParserTests extends AbstractParserTests { +public class DoSectionParserTests extends AbstractParserTestCase { @Test public void testParseDoSectionNoBody() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java index 10db051e2b..2aad874774 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/FileUtilsTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.rest.test; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.support.FileUtils; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.greaterThan; -public class FileUtilsTests extends ElasticsearchTestCase { +public class FileUtilsTests extends ESTestCase { @Test public void testLoadSingleYamlSuite() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java index 73892ee4c7..dfc12253ed 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/JsonPathTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.rest.test; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.Stash; import org.elasticsearch.test.rest.json.JsonPath; import org.junit.Test; @@ -29,7 +29,7 @@ import java.util.Set; import static org.hamcrest.Matchers.*; -public class JsonPathTests extends ElasticsearchTestCase { +public class JsonPathTests extends ESTestCase { @Test public void testEvaluateObjectPathEscape() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java index c86660f5c8..c25ebd42ff 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserFailingTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.rest.test; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.spec.RestApiParser; import org.junit.Test; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.containsString; /** * */ -public class RestApiParserFailingTests extends ElasticsearchTestCase { +public class RestApiParserFailingTests extends ESTestCase { @Test public void brokenSpecShouldThrowUsefulExceptionWhenParsingFailsOnParams() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java index 5558041505..7f4cdf10ab 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/RestApiParserTests.java @@ -27,7 +27,7 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class RestApiParserTests extends AbstractParserTests { +public class RestApiParserTests extends AbstractParserTestCase { @Test public void testParseRestSpecIndexApi() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java index 34b2e9462f..5a31bfb0ba 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/RestTestParserTests.java @@ -21,8 +21,7 @@ package org.elasticsearch.test.rest.test; import org.elasticsearch.Version; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.test.ElasticsearchTestCase; -import org.elasticsearch.test.VersionUtils; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.parser.RestTestParseException; import org.elasticsearch.test.rest.parser.RestTestSuiteParseContext; import org.elasticsearch.test.rest.parser.RestTestSuiteParser; @@ -37,7 +36,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class RestTestParserTests extends ElasticsearchTestCase { +public class RestTestParserTests extends ESTestCase { private XContentParser parser; diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java index 7e2724a167..ba28a48663 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/SetSectionParserTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class SetSectionParserTests extends AbstractParserTests { +public class SetSectionParserTests extends AbstractParserTestCase { @Test public void testParseSetSectionSingleValue() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java index d2427e0bb4..beb7449d83 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/SetupSectionParserTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -public class SetupSectionParserTests extends AbstractParserTests { +public class SetupSectionParserTests extends AbstractParserTestCase { @Test public void testParseSetupSection() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java index 1e71ae9181..a697427f85 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/SkipSectionParserTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import static org.hamcrest.Matchers.*; -public class SkipSectionParserTests extends AbstractParserTests { +public class SkipSectionParserTests extends AbstractParserTestCase { @Test public void testParseSkipSectionVersionNoFeature() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java b/core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java index 374ade56c9..ac6a3c129f 100644 --- a/core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java +++ b/core/src/test/java/org/elasticsearch/test/rest/test/TestSectionParserTests.java @@ -29,7 +29,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class TestSectionParserTests extends AbstractParserTests { +public class TestSectionParserTests extends AbstractParserTestCase { @Test public void testParseTestSectionWithDoSection() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java b/core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java index 5be741b9dc..3e1415b859 100644 --- a/core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java +++ b/core/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java @@ -42,8 +42,8 @@ import org.elasticsearch.index.store.IndexStoreModule; import org.elasticsearch.index.store.Store; import org.elasticsearch.indices.IndicesLifecycle; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Assert; import java.io.Closeable; @@ -79,7 +79,7 @@ public class MockFSDirectoryService extends FsDirectoryService { @Inject public MockFSDirectoryService(@IndexSettings Settings indexSettings, IndexStore indexStore, final IndicesService service, final ShardPath path) { super(indexSettings, indexStore, path); - final long seed = indexSettings.getAsLong(ElasticsearchIntegrationTest.SETTING_INDEX_SEED, 0l); + final long seed = indexSettings.getAsLong(ESIntegTestCase.SETTING_INDEX_SEED, 0l); this.random = new Random(seed); checkIndexOnClose = indexSettings.getAsBoolean(CHECK_INDEX_ON_CLOSE, true); randomIOExceptionRate = indexSettings.getAsDouble(RANDOM_IO_EXCEPTION_RATE, 0.0d); @@ -145,7 +145,7 @@ public class MockFSDirectoryService extends FsDirectoryService { return; } if (IndexWriter.isLocked(dir)) { - ElasticsearchTestCase.checkIndexFailed = true; + ESTestCase.checkIndexFailed = true; throw new IllegalStateException("IndexWriter is still open on shard " + shardId); } try (CheckIndex checkIndex = new CheckIndex(dir)) { @@ -155,7 +155,7 @@ public class MockFSDirectoryService extends FsDirectoryService { out.flush(); CheckIndex.Status status = checkIndex.checkIndex(); if (!status.clean) { - ElasticsearchTestCase.checkIndexFailed = true; + ESTestCase.checkIndexFailed = true; logger.warn("check index [failure] index files={}\n{}", Arrays.toString(dir.listAll()), new String(os.bytes().toBytes(), Charsets.UTF_8)); diff --git a/core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index d7ffab9311..97854f408c 100644 --- a/core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/core/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.SettingsSource; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.hasEntry; * configuration given the same seed / input. */ @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet -public class InternalTestClusterTests extends ElasticsearchTestCase { +public class InternalTestClusterTests extends ESTestCase { public void testInitializiationIsConsistent() { long clusterSeed = randomLong(); diff --git a/core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java b/core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java index 70de553c76..e4c5f2edaf 100644 --- a/core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java +++ b/core/src/test/java/org/elasticsearch/test/test/LoggingListenerTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.test.test; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.junit.listeners.LoggingListener; import org.junit.Test; @@ -33,7 +33,7 @@ import java.lang.reflect.Method; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; -public class LoggingListenerTests extends ElasticsearchTestCase { +public class LoggingListenerTests extends ESTestCase { @Test public void testCustomLevelPerMethod() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java b/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java index f17542c112..55d86aa4c9 100644 --- a/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java +++ b/core/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.test.test; import com.carrotsearch.randomizedtesting.annotations.Repeat; import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -33,8 +33,8 @@ import static org.hamcrest.Matchers.equalTo; * This test ensures that the cluster initializion for suite scope is not influencing * the tests random sequence due to initializtion using the same random instance. */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) -public class SuiteScopeClusterIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE) +public class SuiteScopeClusterIT extends ESIntegTestCase { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; private static Long CLUSTER_SEED = null; diff --git a/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java b/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java index 8130a2b4be..5233bae7c7 100644 --- a/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java +++ b/core/src/test/java/org/elasticsearch/test/test/TestScopeClusterIT.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.test; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.TestCluster; import org.junit.Test; @@ -30,8 +30,8 @@ import static org.hamcrest.Matchers.equalTo; * This test ensures that the cluster initializion for TEST scope is not influencing * the tests random sequence due to initializtion using the same random instance. */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST) -public class TestScopeClusterIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) +public class TestScopeClusterIT extends ESIntegTestCase { private static int ITER = 0; private static long[] SEQUENCE = new long[100]; private static Long CLUSTER_SEED = null; diff --git a/core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java b/core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java index e368a063b6..cc2f613eb2 100644 --- a/core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java +++ b/core/src/test/java/org/elasticsearch/test/test/VersionUtilsTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.test.test; import org.elasticsearch.Version; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import java.util.List; -public class VersionUtilsTests extends ElasticsearchTestCase { +public class VersionUtilsTests extends ESTestCase { public void testAllVersionsSorted() { List<Version> allVersions = VersionUtils.allVersions(); diff --git a/core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java b/core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java index f5dc92ba3d..3becbd2cf4 100644 --- a/core/src/test/java/org/elasticsearch/test/transport/AssertingLocalTransport.java +++ b/core/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.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; import org.elasticsearch.threadpool.ThreadPool; @@ -47,7 +47,7 @@ public class AssertingLocalTransport extends LocalTransport { @Inject public AssertingLocalTransport(Settings settings, ThreadPool threadPool, Version version) { super(settings, threadPool, version); - final long seed = settings.getAsLong(ElasticsearchIntegrationTest.SETTING_INDEX_SEED, 0l); + final long seed = settings.getAsLong(ESIntegTestCase.SETTING_INDEX_SEED, 0l); random = new Random(seed); minVersion = settings.getAsVersion(ASSERTING_TRANSPORT_MIN_VERSION_KEY, Version.V_0_18_0); maxVersion = settings.getAsVersion(ASSERTING_TRANSPORT_MAX_VERSION_KEY, Version.CURRENT); diff --git a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java b/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java index 1d51b26bd5..d0f1fa2027 100644 --- a/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java +++ b/core/src/test/java/org/elasticsearch/threadpool/SimpleThreadPoolIT.java @@ -32,9 +32,9 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.NodeBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.hamcrest.RegexMatcher; import org.elasticsearch.threadpool.ThreadPool.Names; @@ -52,14 +52,14 @@ import java.util.regex.Pattern; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures; import static org.hamcrest.Matchers.*; /** */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0) -public class SimpleThreadPoolIT extends ElasticsearchIntegrationTest { +public class SimpleThreadPoolIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { @@ -111,15 +111,15 @@ public class SimpleThreadPoolIT extends ElasticsearchIntegrationTest { logger.info("post node *new* threads are {}", threadNames); for (String threadName : threadNames) { // ignore some shared threads we know that are created within the same VM, like the shared discovery one - // or the ones that are occasionally come up from ElasticsearchSingleNodeTest + // or the ones that are occasionally come up from ESSingleNodeTestCase if (threadName.contains("[" + MulticastChannel.SHARED_CHANNEL_NAME + "]") - || threadName.contains("[" + ElasticsearchSingleNodeTest.nodeName() + "]") + || threadName.contains("[" + ESSingleNodeTestCase.nodeName() + "]") || threadName.contains("Keep-Alive-Timer")) { continue; } String nodePrefix = "(" + Pattern.quote(InternalTestCluster.TRANSPORT_CLIENT_PREFIX) + ")?(" + - Pattern.quote(ElasticsearchIntegrationTest.SUITE_CLUSTER_NODE_PREFIX) + "|" + - Pattern.quote(ElasticsearchIntegrationTest.TEST_CLUSTER_NODE_PREFIX) + "|" + + Pattern.quote(ESIntegTestCase.SUITE_CLUSTER_NODE_PREFIX) + "|" + + Pattern.quote(ESIntegTestCase.TEST_CLUSTER_NODE_PREFIX) + "|" + Pattern.quote(TribeIT.SECOND_CLUSTER_NODE_PREFIX) + ")"; assertThat(threadName, RegexMatcher.matches("\\[" + nodePrefix + "\\d+\\]")); } diff --git a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java b/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java index 632f37eff6..3226662f68 100644 --- a/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/threadpool/ThreadPoolSerializationTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.Map; @@ -43,7 +43,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ThreadPoolSerializationTests extends ElasticsearchTestCase { +public class ThreadPoolSerializationTests extends ESTestCase { BytesStreamOutput output = new BytesStreamOutput(); diff --git a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java index 27a379e5de..9330f71996 100644 --- a/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java +++ b/core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.threadpool; import com.google.common.util.concurrent.MoreExecutors; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool.Names; import org.junit.Test; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class UpdateThreadPoolSettingsTests extends ElasticsearchTestCase { +public class UpdateThreadPoolSettingsTests extends ESTestCase { private ThreadPool.Info info(ThreadPool threadPool, String name) { for (ThreadPool.Info info : threadPool.info()) { diff --git a/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java b/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java index ee7886174f..3cfbd42e2e 100644 --- a/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java +++ b/core/src/test/java/org/elasticsearch/timestamp/SimpleTimestampIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.common.Priority; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Locale; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.notNullValue; /** */ -public class SimpleTimestampIT extends ElasticsearchIntegrationTest { +public class SimpleTimestampIT extends ESIntegTestCase { @Test public void testSimpleTimestamp() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java b/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java index cf70f6ad2f..48b9e9fcc0 100644 --- a/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java +++ b/core/src/test/java/org/elasticsearch/transport/AbstractSimpleTransportTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.junit.annotations.TestLogging; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.threadpool.ThreadPool; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public abstract class AbstractSimpleTransportTests extends ElasticsearchTestCase { +public abstract class AbstractSimpleTransportTests extends ESTestCase { protected ThreadPool threadPool; diff --git a/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java b/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java index 89e3323219..d3b8533d55 100644 --- a/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java +++ b/core/src/test/java/org/elasticsearch/transport/ActionNamesIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.transport; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.either; @@ -41,7 +41,7 @@ import static org.hamcrest.CoreMatchers.startsWith; * When an api exposes multiple transport handlers, some of which are invoked internally during the execution of the api, * we use the `[n]` suffix to identify node actions and the `[s]` suffix to identify shard actions. */ -public class ActionNamesIT extends ElasticsearchIntegrationTest { +public class ActionNamesIT extends ESIntegTestCase { @Test @SuppressWarnings("unchecked") diff --git a/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java b/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java index 3ed7cdf18b..ff6a21b1ce 100644 --- a/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java +++ b/core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java @@ -47,8 +47,8 @@ import org.elasticsearch.rest.RestController; import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.groovy.GroovyScriptEngineService; import org.elasticsearch.script.mustache.MustacheScriptEngineService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpResponse; import org.junit.After; @@ -63,12 +63,12 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.elasticsearch.node.Node.HTTP_ENABLED; import static org.elasticsearch.rest.RestStatus.OK; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.*; @ClusterScope(scope = SUITE) -public class ContextAndHeaderTransportIT extends ElasticsearchIntegrationTest { +public class ContextAndHeaderTransportIT extends ESIntegTestCase { private static final List<ActionRequest> requests = new CopyOnWriteArrayList<>(); private String randomHeaderKey = randomAsciiOfLength(10); diff --git a/core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java b/core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java index 0002c5f46a..71f4885e32 100644 --- a/core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java +++ b/core/src/test/java/org/elasticsearch/transport/NettySizeHeaderFrameDecoderTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.node.settings.NodeSettingsService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.elasticsearch.test.cache.recycler.MockPageCacheRecycler; import org.elasticsearch.threadpool.ThreadPool; @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.is; * This test checks, if a HTTP look-alike request (starting with a HTTP method and a space) * actually returns text response instead of just dropping the connection */ -public class NettySizeHeaderFrameDecoderTests extends ElasticsearchTestCase { +public class NettySizeHeaderFrameDecoderTests extends ESTestCase { private final Settings settings = settingsBuilder().put("name", "foo").put("transport.host", "127.0.0.1").build(); diff --git a/core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java b/core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java index 4fdd076f7c..bb907e5fb2 100644 --- a/core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java +++ b/core/src/test/java/org/elasticsearch/transport/TransportMessageTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.transport; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; @@ -31,7 +31,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class TransportMessageTests extends ElasticsearchTestCase { +public class TransportMessageTests extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java b/core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java index 592c912724..43d03729bf 100644 --- a/core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java +++ b/core/src/test/java/org/elasticsearch/transport/netty/KeyedLockTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.transport.netty; import org.elasticsearch.common.util.concurrent.KeyedLock; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; -public class KeyedLockTests extends ElasticsearchTestCase { +public class KeyedLockTests extends ESTestCase { @Test public void checkIfMapEmptyAfterLotsOfAcquireAndReleases() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java index 6b885c21a7..e3f515b3b4 100644 --- a/core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java +++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyScheduledPingTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.lease.Releasables; import org.elasticsearch.common.network.NetworkService; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.BigArrays; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.greaterThan; /** */ -public class NettyScheduledPingTests extends ElasticsearchTestCase { +public class NettyScheduledPingTests extends ESTestCase { @Test public void testScheduledPing() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java index 227f84a349..97515ce57e 100644 --- a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java +++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportIT.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.transport.*; import org.jboss.netty.channel.Channel; @@ -44,8 +44,8 @@ import java.io.IOException; import java.net.InetSocketAddress; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope = Scope.TEST, numDataNodes = 1) -public class NettyTransportIT extends ElasticsearchIntegrationTest { +public class NettyTransportIT extends ESIntegTestCase { // static so we can use it in anonymous classes private static String channelProfileName = null; diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java index ae6640a32d..7e883c9fb0 100644 --- a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java +++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortIntegrationIT.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.junit.annotations.Network; import org.elasticsearch.transport.TransportModule; import org.junit.Test; @@ -33,12 +33,12 @@ import org.junit.Test; import java.util.Locale; import static org.elasticsearch.common.settings.Settings.settingsBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.hamcrest.Matchers.*; @ClusterScope(scope = Scope.SUITE, numDataNodes = 1, numClientNodes = 0) -public class NettyTransportMultiPortIntegrationIT extends ElasticsearchIntegrationTest { +public class NettyTransportMultiPortIntegrationIT extends ESIntegTestCase { private static int randomPort = -1; private static String randomPortRange; diff --git a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java index 016dfe4b83..55925dbd76 100644 --- a/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java +++ b/core/src/test/java/org/elasticsearch/transport/netty/NettyTransportMultiPortTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.elasticsearch.test.junit.rule.RepeatOnExceptionRule; import org.elasticsearch.threadpool.ThreadPool; @@ -49,7 +49,7 @@ import java.net.Socket; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.is; -public class NettyTransportMultiPortTests extends ElasticsearchTestCase { +public class NettyTransportMultiPortTests extends ESTestCase { private static final int MAX_RETRIES = 10; diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java index 9e0d1bb10f..5b8d8f32d9 100644 --- a/core/src/test/java/org/elasticsearch/tribe/TribeIT.java +++ b/core/src/test/java/org/elasticsearch/tribe/TribeIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.TestCluster; import org.junit.After; @@ -57,7 +57,7 @@ import static org.hamcrest.Matchers.notNullValue; * does it by default. */ @LuceneTestCase.SuppressFileSystems("ExtrasFS") // doesn't work with potential multi data path from test cluster yet -public class TribeIT extends ElasticsearchIntegrationTest { +public class TribeIT extends ESIntegTestCase { public static final String SECOND_CLUSTER_NODE_PREFIX = "node_tribe2"; @@ -68,7 +68,7 @@ public class TribeIT extends ElasticsearchIntegrationTest { @BeforeClass public static void setupSecondCluster() throws Exception { - ElasticsearchIntegrationTest.beforeClass(); + ESIntegTestCase.beforeClass(); // create another cluster cluster2 = new InternalTestCluster(randomLong(), createTempDir(), 2, 2, Strings.randomBase64UUID(getRandom()), 0, false, SECOND_CLUSTER_NODE_PREFIX); cluster2.beforeTest(getRandom(), 0.1); diff --git a/core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java b/core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java index 1eb962bb86..7bcbd996a5 100644 --- a/core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java +++ b/core/src/test/java/org/elasticsearch/tribe/TribeUnitTests.java @@ -26,7 +26,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; import org.elasticsearch.node.NodeBuilder; import org.elasticsearch.node.internal.InternalSettingsPreparer; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalTestCluster; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -38,11 +39,11 @@ import static org.hamcrest.CoreMatchers.either; import static org.hamcrest.CoreMatchers.equalTo; /** - * This test doesn't extend {@link org.elasticsearch.test.ElasticsearchIntegrationTest} as the internal cluster ignores system properties + * This test doesn't extend {@link ESIntegTestCase} as the internal cluster ignores system properties * all the time, while we need to make the tribe node accept them in this case, so that we can verify that they are not read again as part * of the tribe client nodes initialization. Note that the started nodes will obey to the 'node.mode' settings as the internal cluster does. */ -public class TribeUnitTests extends ElasticsearchTestCase { +public class TribeUnitTests extends ESTestCase { private static Node tribe1; private static Node tribe2; diff --git a/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java b/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java index 9240e0c0e7..6c4bd96995 100644 --- a/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java +++ b/core/src/test/java/org/elasticsearch/ttl/SimpleTTLIT.java @@ -28,8 +28,8 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.io.IOException; @@ -39,12 +39,12 @@ import java.util.concurrent.TimeUnit; import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import static org.elasticsearch.test.ESIntegTestCase.Scope; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.*; @ClusterScope(scope= Scope.SUITE, numDataNodes = 1) -public class SimpleTTLIT extends ElasticsearchIntegrationTest { +public class SimpleTTLIT extends ESIntegTestCase { static private final long PURGE_INTERVAL = 200; diff --git a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java index 27a9ab6c71..0c3e7de3a6 100644 --- a/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java +++ b/core/src/test/java/org/elasticsearch/update/UpdateByNativeScriptIT.java @@ -28,9 +28,9 @@ import org.elasticsearch.script.NativeScriptEngineService; import org.elasticsearch.script.NativeScriptFactory; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import java.util.Map; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.is; * */ @ClusterScope(scope= Scope.SUITE, numDataNodes =1) -public class UpdateByNativeScriptIT extends ElasticsearchIntegrationTest { +public class UpdateByNativeScriptIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/core/src/test/java/org/elasticsearch/update/UpdateIT.java b/core/src/test/java/org/elasticsearch/update/UpdateIT.java index 5d7eb7777a..da988b8c33 100644 --- a/core/src/test/java/org/elasticsearch/update/UpdateIT.java +++ b/core/src/test/java/org/elasticsearch/update/UpdateIT.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.engine.VersionConflictEngineException; import org.elasticsearch.index.shard.MergePolicyConfig; import org.elasticsearch.script.Script; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.ArrayList; @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -public class UpdateIT extends ElasticsearchIntegrationTest { +public class UpdateIT extends ESIntegTestCase { private void createTestIndex() throws Exception { logger.info("--> creating index test"); diff --git a/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java b/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java index bf9031203e..3f0b1bcc1e 100644 --- a/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java +++ b/core/src/test/java/org/elasticsearch/update/UpdateNoopIT.java @@ -22,7 +22,7 @@ package org.elasticsearch.update; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; import org.junit.Test; @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.notNullValue; /** * Tests for noop updates. */ -public class UpdateNoopIT extends ElasticsearchIntegrationTest { +public class UpdateNoopIT extends ESIntegTestCase { @Test public void singleField() throws Exception { updateAndCheckSource(1, fields("bar", "baz")); diff --git a/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java b/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java index b4d05aeb3c..b22dff7c76 100644 --- a/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java +++ b/core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.script.ScriptService.ScriptType; import org.elasticsearch.script.Template; import org.elasticsearch.script.mustache.MustacheScriptEngineService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.HashMap; @@ -38,8 +38,8 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.SuiteScopeTest -public class RenderSearchTemplateIT extends ElasticsearchIntegrationTest { +@ESIntegTestCase.SuiteScopeTestCase +public class RenderSearchTemplateIT extends ESIntegTestCase { private static final String TEMPLATE_CONTENTS = "{\"size\":\"{{size}}\",\"query\":{\"match\":{\"foo\":\"{{value}}\"}},\"aggs\":{\"objects\":{\"terms\":{\"field\":\"{{value}}\",\"size\":\"{{size}}\"}}}}"; diff --git a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java index edfbcf04c3..be493cd242 100644 --- a/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java +++ b/core/src/test/java/org/elasticsearch/validate/SimpleValidateQueryIT.java @@ -30,9 +30,9 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.hamcrest.Matcher; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; @@ -53,7 +53,7 @@ import static org.hamcrest.Matchers.nullValue; * */ @ClusterScope(randomDynamicTemplates = false, scope = Scope.SUITE) -public class SimpleValidateQueryIT extends ElasticsearchIntegrationTest { +public class SimpleValidateQueryIT extends ESIntegTestCase { @Test public void simpleValidateQuery() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index 8edf2f2335..402ec0d8dc 100644 --- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -21,7 +21,7 @@ package org.elasticsearch.versioning; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import java.util.Map; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.nullValue; /** * */ -public class ConcurrentDocumentOperationIT extends ElasticsearchIntegrationTest { +public class ConcurrentDocumentOperationIT extends ESIntegTestCase { @Test public void concurrentOperationOnSameDocTest() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index a1cec0cbad..5296e763cc 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.DocumentAlreadyExistsException; import org.elasticsearch.index.engine.FlushNotAllowedEngineException; import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.lessThanOrEqualTo; /** * */ -public class SimpleVersioningIT extends ElasticsearchIntegrationTest { +public class SimpleVersioningIT extends ESIntegTestCase { @Test public void testExternalVersioningInitialDelete() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java b/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java index c5c2856f3e..457f7578f9 100644 --- a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java +++ b/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java @@ -20,7 +20,7 @@ package org.elasticsearch.watcher; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.BufferedWriter; @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class FileWatcherTest extends ElasticsearchTestCase { +public class FileWatcherTest extends ESTestCase { private class RecordingChangeListener extends FileChangesListener { diff --git a/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java index ebb4cdaf76..b503436add 100644 --- a/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java +++ b/core/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.watcher; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Test; @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.*; /** * */ -public class ResourceWatcherServiceTests extends ElasticsearchTestCase { +public class ResourceWatcherServiceTests extends ESTestCase { @Test public void testSettings() throws Exception { diff --git a/dev-tools/src/main/resources/forbidden/test-signatures.txt b/dev-tools/src/main/resources/forbidden/test-signatures.txt index 07ebf1712e..3cde735261 100644 --- a/dev-tools/src/main/resources/forbidden/test-signatures.txt +++ b/dev-tools/src/main/resources/forbidden/test-signatures.txt @@ -20,3 +20,4 @@ com.carrotsearch.randomizedtesting.annotations.Repeat @ Don't commit hardcoded r org.apache.lucene.codecs.Codec#setDefault(org.apache.lucene.codecs.Codec) @ Use the SuppressCodecs("*") annotation instead org.apache.lucene.util.LuceneTestCase$Slow @ Don't write slow tests +org.junit.Ignore @ Use AwaitsFix instead diff --git a/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java index 167a5f04f9..fd12fd2e51 100644 --- a/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/deb/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest integration test. runs against external cluster in 'mvn verify' */ -public class RestIT extends ElasticsearchRestTestCase { +public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java index 167a5f04f9..fd12fd2e51 100644 --- a/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/tar/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest integration test. runs against external cluster in 'mvn verify' */ -public class RestIT extends ElasticsearchRestTestCase { +public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java b/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java index 167a5f04f9..fd12fd2e51 100644 --- a/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java +++ b/distribution/zip/src/test/java/org/elasticsearch/test/rest/RestIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; /** Rest integration test. runs against external cluster in 'mvn verify' */ -public class RestIT extends ElasticsearchRestTestCase { +public class RestIT extends ESRestTestCase { public RestIT(RestTestCandidate testCandidate) { super(testCandidate); } diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/AnalysisICURestIT.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/AnalysisICURestIT.java index 481d6c3f3a..8da56d5a72 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/AnalysisICURestIT.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/AnalysisICURestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class AnalysisICURestIT extends ElasticsearchRestTestCase { +public class AnalysisICURestIT extends ESRestTestCase { public AnalysisICURestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class AnalysisICURestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java index 672cf7c651..3516a1342d 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; @@ -28,7 +28,7 @@ import static org.elasticsearch.index.analysis.AnalysisTestUtils.createAnalysisS import static org.hamcrest.Matchers.instanceOf; /** */ -public class SimpleIcuAnalysisTests extends ElasticsearchTestCase { +public class SimpleIcuAnalysisTests extends ESTestCase { @Test public void testDefaultsIcuAnalysis() { diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java index 9f2d3fbf65..6be0b2f23a 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -37,7 +37,7 @@ import static org.elasticsearch.index.analysis.AnalysisTestUtils.createAnalysisS import static org.hamcrest.Matchers.equalTo; // Tests borrowed from Solr's Icu collation key filter factory test. -public class SimpleIcuCollationTokenFilterTests extends ElasticsearchTestCase { +public class SimpleIcuCollationTokenFilterTests extends ESTestCase { /* * Turkish has some funny casing. diff --git a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuNormalizerCharFilterTests.java b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuNormalizerCharFilterTests.java index ef747e6f56..748b439a9e 100644 --- a/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuNormalizerCharFilterTests.java +++ b/plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/SimpleIcuNormalizerCharFilterTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.analysis; import com.ibm.icu.text.Normalizer2; import org.apache.lucene.analysis.CharFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.StringReader; @@ -32,7 +32,7 @@ import static org.elasticsearch.index.analysis.AnalysisTestUtils.createAnalysisS /** * Test */ -public class SimpleIcuNormalizerCharFilterTests extends ElasticsearchTestCase { +public class SimpleIcuNormalizerCharFilterTests extends ESTestCase { @Test public void testDefaultSetting() throws Exception { diff --git a/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/AnalysisKuromojiRestIT.java b/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/AnalysisKuromojiRestIT.java index 857e66fef3..ae51e491d6 100644 --- a/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/AnalysisKuromojiRestIT.java +++ b/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/AnalysisKuromojiRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class AnalysisKuromojiRestIT extends ElasticsearchRestTestCase { +public class AnalysisKuromojiRestIT extends ESRestTestCase { public AnalysisKuromojiRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class AnalysisKuromojiRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java b/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java index 0f6b5095e2..3468a8e2bd 100644 --- a/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java +++ b/plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; import org.elasticsearch.plugin.analysis.kuromoji.AnalysisKuromojiPlugin; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.*; /** */ -public class KuromojiAnalysisTests extends ElasticsearchTestCase { +public class KuromojiAnalysisTests extends ESTestCase { @Test public void testDefaultsKuromojiAnalysis() throws IOException { diff --git a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java index f211e23c59..9d66bf2435 100644 --- a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java +++ b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class AnalysisPhoneticRestIT extends ElasticsearchRestTestCase { +public class AnalysisPhoneticRestIT extends ESRestTestCase { public AnalysisPhoneticRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class AnalysisPhoneticRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java index 45c3d7cf0e..ed3da95757 100644 --- a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java +++ b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -41,7 +41,7 @@ import static org.hamcrest.Matchers.instanceOf; /** */ -public class SimplePhoneticAnalysisTests extends ElasticsearchTestCase { +public class SimplePhoneticAnalysisTests extends ESTestCase { @Test public void testPhoneticTokenFilterFactory() { diff --git a/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/AnalysisSmartChineseRestIT.java b/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/AnalysisSmartChineseRestIT.java index bd46d53659..16113b2b7a 100644 --- a/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/AnalysisSmartChineseRestIT.java +++ b/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/AnalysisSmartChineseRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class AnalysisSmartChineseRestIT extends ElasticsearchRestTestCase { +public class AnalysisSmartChineseRestIT extends ESRestTestCase { public AnalysisSmartChineseRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class AnalysisSmartChineseRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/SimpleSmartChineseAnalysisTests.java b/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/SimpleSmartChineseAnalysisTests.java index 859cd40367..7065615968 100644 --- a/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/SimpleSmartChineseAnalysisTests.java +++ b/plugins/analysis-smartcn/src/test/java/org/elasticsearch/index/analysis/SimpleSmartChineseAnalysisTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.IndexNameModule; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.instanceOf; /** */ -public class SimpleSmartChineseAnalysisTests extends ElasticsearchTestCase { +public class SimpleSmartChineseAnalysisTests extends ESTestCase { @Test public void testDefaultsIcuAnalysis() { diff --git a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishRestIT.java b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishRestIT.java index c9bee3127e..330ad87af7 100644 --- a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishRestIT.java +++ b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.analysis; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class AnalysisPolishRestIT extends ElasticsearchRestTestCase { +public class AnalysisPolishRestIT extends ESRestTestCase { public AnalysisPolishRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class AnalysisPolishRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java index 56276721d0..a6a60d59a7 100644 --- a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java +++ b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.analysis.pl.PolishStemTokenFilterFactory; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.hamcrest.MatcherAssert; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.instanceOf; /** */ -public class PolishAnalysisTests extends ElasticsearchTestCase { +public class PolishAnalysisTests extends ESTestCase { @Test public void testDefaultsPolishAnalysis() { diff --git a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/SimplePolishTokenFilterTests.java b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/SimplePolishTokenFilterTests.java index 192eeb9b0d..2e1638836a 100644 --- a/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/SimplePolishTokenFilterTests.java +++ b/plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/SimplePolishTokenFilterTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.analysis.pl.PolishAnalysisBinderProcessor; import org.elasticsearch.index.settings.IndexSettingsModule; import org.elasticsearch.indices.analysis.IndicesAnalysisModule; import org.elasticsearch.indices.analysis.IndicesAnalysisService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.IOException; @@ -46,7 +46,7 @@ import java.io.StringReader; import static org.hamcrest.Matchers.equalTo; -public class SimplePolishTokenFilterTests extends ElasticsearchTestCase { +public class SimplePolishTokenFilterTests extends ESTestCase { @Test public void testBasicUsage() throws Exception { diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java index 4cad35a28c..f0a10c0604 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java @@ -20,12 +20,12 @@ package org.elasticsearch.cloud.aws; import com.amazonaws.ClientConfiguration; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; -public class AWSSignersTest extends ElasticsearchTestCase { +public class AWSSignersTest extends ESTestCase { @Test public void testSigners() { diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java index a31a6525a7..12abdbe71b 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java @@ -19,23 +19,16 @@ package org.elasticsearch.cloud.aws; -import com.carrotsearch.randomizedtesting.annotations.TestGroup; - import org.elasticsearch.common.Strings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.env.FailedToResolveConfigException; import org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ThirdParty; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ThirdParty; import org.junit.After; import org.junit.Before; -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; import java.util.HashMap; import java.util.Map; @@ -46,7 +39,7 @@ import java.util.Map; * in order to run these tests. */ @ThirdParty -public abstract class AbstractAwsTest extends ElasticsearchIntegrationTest { +public abstract class AbstractAwsTest extends ESIntegTestCase { /** * Those properties are set by the AWS SDK v1.9.4 and if not ignored, diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java index d4d99218b0..ce47b60bb2 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.cloud.aws; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class CloudAWSRestIT extends ElasticsearchRestTestCase { +public class CloudAWSRestIT extends ESRestTestCase { public CloudAWSRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class CloudAWSRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java index 3b1ecb8310..b2dc66b808 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java @@ -19,7 +19,7 @@ package org.elasticsearch.cloud.aws.blobstore; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.io.ByteArrayOutputStream; @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Unit test for {@link S3OutputStream}. */ -public class S3OutputStreamTest extends ElasticsearchTestCase { +public class S3OutputStreamTest extends ESTestCase { private static final int BUFFER_SIZE = S3BlobStore.MIN_BUFFER_SIZE.bytesAsInt(); diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java index c450a5920b..463131522a 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java @@ -23,9 +23,8 @@ package org.elasticsearch.discovery.ec2; import org.elasticsearch.cloud.aws.AbstractAwsTest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java index 2af8b89531..9857611820 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java @@ -24,9 +24,8 @@ import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResp import org.elasticsearch.cloud.aws.AbstractAwsTest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.junit.Test; import static org.elasticsearch.common.settings.Settings.settingsBuilder; diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java index df619b8af3..25dd8b96de 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java @@ -34,13 +34,12 @@ import org.elasticsearch.cloud.aws.AwsS3Service; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin; -import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.repositories.RepositoryMissingException; import org.elasticsearch.repositories.RepositoryVerificationException; import org.elasticsearch.snapshots.SnapshotMissingException; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; -import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase.Scope; import org.elasticsearch.test.store.MockFSDirectoryService; import org.junit.After; import org.junit.Before; diff --git a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/ElasticSearchBaseDirectoryTestCase.java b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/ESBaseDirectoryTestCase.java index 32805f4f3a..4c6c230c5d 100644 --- a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/ElasticSearchBaseDirectoryTestCase.java +++ b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/ESBaseDirectoryTestCase.java @@ -36,7 +36,7 @@ import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; @TimeoutSuite(millis = TimeUnits.HOUR) @LuceneTestCase.SuppressReproduceLine @LuceneTestCase.SuppressSysoutChecks(bugUrl = "we log a lot on purpose") -public abstract class ElasticSearchBaseDirectoryTestCase extends BaseDirectoryTestCase { +public abstract class ESBaseDirectoryTestCase extends BaseDirectoryTestCase { static { BootstrapForTesting.ensureInitialized(); } diff --git a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTest.java b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTest.java index 2b0124c2fb..eecaa4c13a 100644 --- a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTest.java +++ b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTest.java @@ -22,7 +22,7 @@ package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; -public class SmbMMapDirectoryTest extends ElasticSearchBaseDirectoryTestCase { +public class SmbMMapDirectoryTest extends ESBaseDirectoryTestCase { @Override protected Directory getDirectory(Path file) throws IOException { diff --git a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTest.java b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTest.java index ae65cd7447..58cdb5f8cb 100644 --- a/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTest.java +++ b/plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTest.java @@ -22,7 +22,7 @@ package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; -public class SmbSimpleFSDirectoryTest extends ElasticSearchBaseDirectoryTestCase { +public class SmbSimpleFSDirectoryTest extends ESBaseDirectoryTestCase { @Override protected Directory getDirectory(Path file) throws IOException { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleITest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleITest.java index 2ab09adac9..da916d5b71 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleITest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleITest.java @@ -22,7 +22,7 @@ package org.elasticsearch.azure.itest; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cloud.azure.AbstractAzureTest; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -31,8 +31,8 @@ import org.junit.Test; * and -Des.config=/path/to/elasticsearch.yml * @see org.elasticsearch.cloud.azure.AbstractAzureTest */ -@ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.TEST, +@ESIntegTestCase.ClusterScope( + scope = ESIntegTestCase.Scope.TEST, numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0) diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureTest.java index c366db9ab1..acd163f96b 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureTest.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.env.FailedToResolveConfigException; import org.elasticsearch.plugin.cloud.azure.CloudAzurePlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ThirdParty; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ThirdParty; /** * Base class for Azure tests that require credentials. @@ -34,7 +34,7 @@ import org.elasticsearch.test.ElasticsearchIntegrationTest.ThirdParty; * in order to run these tests. */ @ThirdParty -public abstract class AbstractAzureTest extends ElasticsearchIntegrationTest { +public abstract class AbstractAzureTest extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java index 3a5da94f06..aac8f9dea2 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.cloud.azure; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class CloudAzureRestIT extends ElasticsearchRestTestCase { +public class CloudAzureRestIT extends ESRestTestCase { public CloudAzureRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class CloudAzureRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java index 106f51383d..b12b8bf1d4 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AbstractAzureComputeServiceTest.java @@ -25,9 +25,9 @@ import org.elasticsearch.cloud.azure.management.AzureComputeService.Discovery; import org.elasticsearch.cloud.azure.management.AzureComputeService.Management; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugin.cloud.azure.CloudAzurePlugin; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; -public abstract class AbstractAzureComputeServiceTest extends ElasticsearchIntegrationTest { +public abstract class AbstractAzureComputeServiceTest extends ESIntegTestCase { private Class<? extends AzureComputeService> mock; diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java index 6cdbae94fe..296c3ed44a 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java @@ -22,7 +22,7 @@ package org.elasticsearch.discovery.azure; import org.elasticsearch.cloud.azure.management.AzureComputeServiceTwoNodesMock; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.MasterNotDiscoveredException; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import org.apache.lucene.util.LuceneTestCase.AwaitsFix; @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.nullValue; * Reported issue in #15 * (https://github.com/elasticsearch/elasticsearch-cloud-azure/issues/15) */ -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE, +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java index 14084d33a7..b859701b08 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java @@ -23,12 +23,12 @@ import org.elasticsearch.cloud.azure.management.AzureComputeService.Discovery; import org.elasticsearch.cloud.azure.management.AzureComputeService.Management; import org.elasticsearch.cloud.azure.management.AzureComputeServiceSimpleMock; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java index 3bb539d4e3..a80ac5ba44 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java @@ -23,12 +23,12 @@ import org.elasticsearch.cloud.azure.management.AzureComputeService.Discovery; import org.elasticsearch.cloud.azure.management.AzureComputeService.Management; import org.elasticsearch.cloud.azure.management.AzureComputeServiceTwoNodesMock; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.TEST, +@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/AbstractAzureFsTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/AbstractAzureFsTest.java index 497e807d60..047a0faecf 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/AbstractAzureFsTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/AbstractAzureFsTest.java @@ -20,12 +20,12 @@ package org.elasticsearch.index.store; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.is; -abstract public class AbstractAzureFsTest extends ElasticsearchIntegrationTest { +abstract public class AbstractAzureFsTest extends ESIntegTestCase { @Test public void testAzureFs() { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java index 876d1202cb..1326a0e66d 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java @@ -39,7 +39,7 @@ import org.elasticsearch.repositories.RepositoryVerificationException; import org.elasticsearch.repositories.azure.AzureRepository.Repository; import org.elasticsearch.snapshots.SnapshotMissingException; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.store.MockFSDirectoryService; import org.junit.After; import org.junit.Before; @@ -57,8 +57,8 @@ import static org.hamcrest.Matchers.greaterThan; * and -Dtests.config=/path/to/elasticsearch.yml * @see org.elasticsearch.cloud.azure.AbstractAzureTest */ -@ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.SUITE, +@ESIntegTestCase.ClusterScope( + scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1, transportClientRatio = 0.0) public class AzureSnapshotRestoreITest extends AbstractAzureTest { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java index 3c77b0dd4d..1b8a908335 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java @@ -29,14 +29,14 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.snapshots.SnapshotState; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -@ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.SUITE, +@ESIntegTestCase.ClusterScope( + scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0) diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/AbstractGceTest.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/AbstractGceTest.java index fe648be539..1e94d90272 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/AbstractGceTest.java +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/AbstractGceTest.java @@ -24,15 +24,14 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.env.FailedToResolveConfigException; import org.elasticsearch.plugin.cloud.gce.CloudGcePlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ThirdParty; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ThirdParty; /** * */ @ThirdParty -public abstract class AbstractGceTest extends ElasticsearchIntegrationTest { +public abstract class AbstractGceTest extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java index 0439e129c1..644a2e4aca 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.cloud.gce; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class CloudGCERestIT extends ElasticsearchRestTestCase { +public class CloudGCERestIT extends ESRestTestCase { public CloudGCERestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class CloudGCERestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeEngineTest.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeEngineTest.java index fe231cabd1..489ae3a4c7 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeEngineTest.java +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceComputeEngineTest.java @@ -21,14 +21,14 @@ package org.elasticsearch.discovery.gce; import com.google.common.collect.Lists; +import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.cloud.gce.GceComputeService; import org.elasticsearch.cloud.gce.GceComputeService.Fields; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.gce.mock.*; import org.elasticsearch.plugin.cloud.gce.CloudGcePlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.junit.Ignore; import org.junit.Test; @@ -36,12 +36,13 @@ import java.io.IOException; import static org.hamcrest.Matchers.notNullValue; -@ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.TEST, +@ESIntegTestCase.ClusterScope( + scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0) -public class GceComputeEngineTest extends ElasticsearchIntegrationTest { +@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/12622") +public class GceComputeEngineTest extends ESIntegTestCase { public static int getPort(int nodeOrdinal) { try { @@ -91,7 +92,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { assertThat(client().admin().cluster().prepareState().setMasterNodeTimeout("1s").execute().actionGet().getState().nodes().masterNodeId(), notNullValue()); } - @Test @Ignore + @Test public void nodes_with_different_tags_and_no_tag_set() { startNode(1, GceComputeServiceTwoNodesDifferentTagsMock.class, @@ -107,10 +108,10 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { /** * We need to ignore this test from elasticsearch version 1.2.1 as * expected nodes running is 2 and this test will create 2 clusters with one node each. - * @see org.elasticsearch.test.ElasticsearchIntegrationTest#ensureClusterSizeConsistency() + * @see ESIntegTestCase#ensureClusterSizeConsistency() * TODO Reactivate when it will be possible to set the number of running nodes */ - @Test @Ignore + @Test public void nodes_with_different_tags_and_one_tag_set() { startNode(1, GceComputeServiceTwoNodesDifferentTagsMock.class, @@ -126,10 +127,10 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { /** * We need to ignore this test from elasticsearch version 1.2.1 as * expected nodes running is 2 and this test will create 2 clusters with one node each. - * @see org.elasticsearch.test.ElasticsearchIntegrationTest#ensureClusterSizeConsistency() + * @see ESIntegTestCase#ensureClusterSizeConsistency() * TODO Reactivate when it will be possible to set the number of running nodes */ - @Test @Ignore + @Test public void nodes_with_different_tags_and_two_tag_set() { startNode(1, GceComputeServiceTwoNodesDifferentTagsMock.class, @@ -142,7 +143,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { checkNumberOfNodes(1); } - @Test @Ignore + @Test public void nodes_with_same_tags_and_no_tag_set() { startNode(1, GceComputeServiceTwoNodesSameTagsMock.class, @@ -155,7 +156,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { checkNumberOfNodes(2); } - @Test @Ignore + @Test public void nodes_with_same_tags_and_one_tag_set() { startNode(1, GceComputeServiceTwoNodesSameTagsMock.class, @@ -168,7 +169,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { checkNumberOfNodes(2); } - @Test @Ignore + @Test public void nodes_with_same_tags_and_two_tags_set() { startNode(1, GceComputeServiceTwoNodesSameTagsMock.class, @@ -181,7 +182,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { checkNumberOfNodes(2); } - @Test @Ignore + @Test public void multiple_zones_and_two_nodes_in_same_zone() { startNode(1, GceComputeServiceTwoNodesOneZoneMock.class, @@ -196,7 +197,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { checkNumberOfNodes(2); } - @Test @Ignore + @Test public void multiple_zones_and_two_nodes_in_different_zones() { startNode(1, GceComputeServiceTwoNodesTwoZonesMock.class, @@ -214,7 +215,7 @@ public class GceComputeEngineTest extends ElasticsearchIntegrationTest { /** * For issue https://github.com/elastic/elasticsearch-cloud-gce/issues/43 */ - @Test @Ignore + @Test public void zero_node_43() { startNode(1, GceComputeServiceZeroNodeMock.class, diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java index a6b77538f6..00684ba6b6 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java @@ -23,8 +23,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cloud.gce.AbstractGceTest; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.plugin.cloud.gce.CloudGcePlugin; -import org.elasticsearch.plugins.PluginsService; -import org.elasticsearch.test.ElasticsearchIntegrationTest; +import org.elasticsearch.test.ESIntegTestCase; import org.hamcrest.Matchers; import org.junit.Test; @@ -35,8 +34,8 @@ import org.junit.Test; * See https://github.com/elasticsearch/elasticsearch-cloud-gce/issues/10 * @see org.elasticsearch.cloud.gce.AbstractGceTest */ -@ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.SUITE, +@ESIntegTestCase.ClusterScope( + scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1, transportClientRatio = 0.0) public class GceSimpleITest extends AbstractGceTest { diff --git a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponseTests.java b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponseTests.java index f59a6b51fe..f11a0043c3 100644 --- a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponseTests.java +++ b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/IndexDeleteByQueryResponseTests.java @@ -22,13 +22,13 @@ package org.elasticsearch.action.deletebyquery; import org.elasticsearch.Version; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Test; import static org.hamcrest.Matchers.equalTo; -public class IndexDeleteByQueryResponseTests extends ElasticsearchTestCase { +public class IndexDeleteByQueryResponseTests extends ESTestCase { @Test public void testIncrements() { diff --git a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java index c7eeea5d98..f1edc8d8b8 100644 --- a/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java +++ b/plugins/delete-by-query/src/test/java/org/elasticsearch/action/deletebyquery/TransportDeleteByQueryActionTests.java @@ -38,7 +38,7 @@ import org.elasticsearch.common.util.concurrent.CountDown; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.internal.InternalSearchHit; -import org.elasticsearch.test.ElasticsearchSingleNodeTest; +import org.elasticsearch.test.ESSingleNodeTestCase; import org.junit.Test; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; @@ -46,7 +46,7 @@ import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; -public class TransportDeleteByQueryActionTests extends ElasticsearchSingleNodeTest { +public class TransportDeleteByQueryActionTests extends ESSingleNodeTestCase { @Test public void testExecuteScanFailsOnMissingIndex() { diff --git a/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryTests.java b/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryTests.java index 3960cfe8a5..9d79a230b2 100644 --- a/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryTests.java +++ b/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/DeleteByQueryTests.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.test.ElasticsearchIntegrationTest; -import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; +import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -44,13 +44,13 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.test.ElasticsearchIntegrationTest.Scope.SUITE; +import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @ClusterScope(scope = SUITE, transportClientRatio = 0) -public class DeleteByQueryTests extends ElasticsearchIntegrationTest { +public class DeleteByQueryTests extends ESIntegTestCase { protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder settings = Settings.builder() diff --git a/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/test/rest/DeleteByQueryRestIT.java b/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/test/rest/DeleteByQueryRestIT.java index ec3931fd87..9674d54135 100644 --- a/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/test/rest/DeleteByQueryRestIT.java +++ b/plugins/delete-by-query/src/test/java/org/elasticsearch/plugin/deletebyquery/test/rest/DeleteByQueryRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.plugin.deletebyquery.test.rest; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class DeleteByQueryRestIT extends ElasticsearchRestTestCase { +public class DeleteByQueryRestIT extends ESRestTestCase { public DeleteByQueryRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class DeleteByQueryRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java index e596bf8b3a..13fe23787d 100644 --- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java +++ b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptEngineTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class JavaScriptScriptEngineTests extends ElasticsearchTestCase { +public class JavaScriptScriptEngineTests extends ESTestCase { private JavaScriptScriptEngineService se; diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java index baf10625cd..e56ff8337e 100644 --- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java +++ b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.Test; import java.util.HashMap; @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JavaScriptScriptMultiThreadedTest extends ElasticsearchTestCase { +public class JavaScriptScriptMultiThreadedTest extends ESTestCase { @Test public void testExecutableNoRuntimeParams() throws Exception { diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java index 3bc18af4c7..8039715c3d 100644 --- a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java +++ b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.script.javascript; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class LangJavaScriptRestIT extends ElasticsearchRestTestCase { +public class LangJavaScriptRestIT extends ESRestTestCase { public LangJavaScriptRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class LangJavaScriptRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java index d9a0bdd8ab..ee0a707644 100644 --- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java +++ b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.script.python; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class LangPythonScriptRestIT extends ElasticsearchRestTestCase { +public class LangPythonScriptRestIT extends ESRestTestCase { public LangPythonScriptRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class LangPythonScriptRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java index 94528f2b0e..5634ec3ef6 100644 --- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java +++ b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptEngineTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.instanceOf; /** * */ -public class PythonScriptEngineTests extends ElasticsearchTestCase { +public class PythonScriptEngineTests extends ESTestCase { private PythonScriptEngineService se; diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java index 13d1d2b7a0..c4eb9851d0 100644 --- a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java +++ b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.CompiledScript; import org.elasticsearch.script.ExecutableScript; import org.elasticsearch.script.ScriptService; -import org.elasticsearch.test.ElasticsearchTestCase; +import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Test; @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PythonScriptMultiThreadedTest extends ElasticsearchTestCase { +public class PythonScriptMultiThreadedTest extends ESTestCase { @After public void close() { diff --git a/plugins/site-example/src/test/java/org/elasticsearch/example/SiteRestIT.java b/plugins/site-example/src/test/java/org/elasticsearch/example/SiteRestIT.java index 5e6184670c..e3df9ce92d 100644 --- a/plugins/site-example/src/test/java/org/elasticsearch/example/SiteRestIT.java +++ b/plugins/site-example/src/test/java/org/elasticsearch/example/SiteRestIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.example; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.RestTestCandidate; import org.elasticsearch.test.rest.parser.RestTestParseException; import java.io.IOException; -public class SiteRestIT extends ElasticsearchRestTestCase { +public class SiteRestIT extends ESRestTestCase { public SiteRestIT(@Name("yaml") RestTestCandidate testCandidate) { super(testCandidate); @@ -35,7 +35,7 @@ public class SiteRestIT extends ElasticsearchRestTestCase { @ParametersFactory public static Iterable<Object[]> parameters() throws IOException, RestTestParseException { - return ElasticsearchRestTestCase.createParameters(0, 1); + return ESRestTestCase.createParameters(0, 1); } } |