resource (for call chaining).
- */
- @Override
- public resource (for call chaining).
- */
- public static min to max (inclusive).
- *
- * @see #scaledRandomIntBetween(int, int)
- */
- public static int randomIntBetween(int min, int max) {
- return RandomInts.randomIntBetween(random(), min, max);
- }
-
- /**
- * Returns a "scaled" number of iterations for loops which can have a variable
- * iteration count. This method is effectively
- * an alias to {@link #scaledRandomIntBetween(int, int)}.
- */
- public static int iterations(int min, int max) {
- return scaledRandomIntBetween(min, max);
- }
-
- /**
- * An alias for {@link #randomIntBetween(int, int)}.
- *
- * @see #scaledRandomIntBetween(int, int)
- */
- public static int between(int min, int max) {
- return randomIntBetween(min, max);
- }
-
- /**
- * The exact opposite of {@link #rarely()}.
- */
- public static boolean frequently() {
- return !rarely();
- }
-
- public static boolean randomBoolean() {
- return random().nextBoolean();
- }
- public static byte randomByte() { return (byte) getRandom().nextInt(); }
- public static short randomShort() { return (short) getRandom().nextInt(); }
- public static int randomInt() { return getRandom().nextInt(); }
- public static float randomFloat() { return getRandom().nextFloat(); }
- public static double randomDouble() { return getRandom().nextDouble(); }
- public static long randomLong() { return getRandom().nextLong(); }
-
- /**
- * Making {@link Assume#assumeNotNull(Object...)} directly available.
- */
- public static void assumeNotNull(Object... objects) {
- Assume.assumeNotNull(objects);
- }
-
- /**
- * Pick a random object from the given array. The array must not be empty.
- */
- public static It is recommended that specific methods are used to pick random values. - */ - public static Random getRandom() { - return random(); - } - - /** - * A random integer from 0..max (inclusive). - */ - public static int randomInt(int max) { - return RandomInts.randomInt(getRandom(), max); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomAsciiOfLengthBetween(int minCodeUnits, int maxCodeUnits) { - return RandomStrings.randomAsciiOfLengthBetween(getRandom(), minCodeUnits, - maxCodeUnits); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomAsciiOfLength(int codeUnits) { - return RandomStrings.randomAsciiOfLength(getRandom(), codeUnits); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomUnicodeOfLengthBetween(int minCodeUnits, int maxCodeUnits) { - return RandomStrings.randomUnicodeOfLengthBetween(getRandom(), - minCodeUnits, maxCodeUnits); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomUnicodeOfLength(int codeUnits) { - return RandomStrings.randomUnicodeOfLength(getRandom(), codeUnits); - } - - /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ - public static String randomUnicodeOfCodepointLengthBetween(int minCodePoints, int maxCodePoints) { - return RandomStrings.randomUnicodeOfCodepointLengthBetween(getRandom(), - minCodePoints, maxCodePoints); - } - - /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ - public static String randomUnicodeOfCodepointLength(int codePoints) { - return RandomStrings - .randomUnicodeOfCodepointLength(getRandom(), codePoints); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomRealisticUnicodeOfLengthBetween(int minCodeUnits, int maxCodeUnits) { - return RandomStrings.randomRealisticUnicodeOfLengthBetween(getRandom(), - minCodeUnits, maxCodeUnits); - } - - /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ - public static String randomRealisticUnicodeOfLength(int codeUnits) { - return RandomStrings.randomRealisticUnicodeOfLength(getRandom(), codeUnits); - } - - /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ - public static String randomRealisticUnicodeOfCodepointLengthBetween( - int minCodePoints, int maxCodePoints) { - return RandomStrings.randomRealisticUnicodeOfCodepointLengthBetween( - getRandom(), minCodePoints, maxCodePoints); - } - - /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ - public static String randomRealisticUnicodeOfCodepointLength(int codePoints) { - return RandomStrings.randomRealisticUnicodeOfCodepointLength(getRandom(), - codePoints); - } - - /** - * Return a random TimeZone from the available timezones on the system. - * - *
Warning: This test assumes the returned array of time zones is repeatable from jvm execution - * to jvm execution. It _may_ be different from jvm to jvm and as such, it can render - * tests execute in a different way.
- */ - public static TimeZone randomTimeZone() { - final String[] availableIDs = TimeZone.getAvailableIDs(); - Arrays.sort(availableIDs); - return TimeZone.getTimeZone(randomFrom(availableIDs)); - } - - /** - * Shortcut for {@link RandomizedContext#current()}. - */ - public static RandomizedContext getContext() { - return RandomizedContext.current(); - } - - /** - * Returns true if we're running nightly tests. - * @see Nightly - */ - public static boolean isNightly() { - return getContext().isNightly(); - } - - /** - * Returns a non-negative random value smaller or equalmax. The value
- * picked is affected by {@link #isNightly()} and {@link #multiplier()}.
- *
- * This method is effectively an alias to: - *
- * scaledRandomIntBetween(0, max) - *- * - * @see #scaledRandomIntBetween(int, int) - */ - public static int atMost(int max) { - if (max < 0) throw new IllegalArgumentException("atMost requires non-negative argument: " + max); - return scaledRandomIntBetween(0, max); - } - - /** - * Making {@link Assume#assumeTrue(boolean)} directly available. - */ - public void assumeTrue(boolean condition) { - assumeTrue("caller was too lazy to provide a reason", condition); - } -} diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java index ca25dc3d514..0ba1f875813 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchBackwardsCompatIntegrationTest.java @@ -81,7 +81,7 @@ import static org.hamcrest.Matchers.is; * */ // the transportClientRatio is tricky here since we don't fully control the cluster nodes -@ESTestCase.Backwards +@ElasticsearchTestCase.Backwards @ElasticsearchIntegrationTest.ClusterScope(minNumDataNodes = 0, maxNumDataNodes = 2, scope = ElasticsearchIntegrationTest.Scope.SUITE, numClientNodes = 0, transportClientRatio = 0.0) @Ignore public abstract class ElasticsearchBackwardsCompatIntegrationTest extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java index 80442497217..ce29d5cbf5d 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java @@ -226,7 +226,7 @@ import static org.hamcrest.Matchers.notNullValue; * */ @Ignore -@ESTestCase.Integration +@ElasticsearchTestCase.Integration public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase { /** node names of the corresponding clusters will start with these prefixes */ diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java index 15be49ec75a..5fe1b704965 100644 --- a/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java +++ b/src/test/java/org/elasticsearch/test/ElasticsearchTestCase.java @@ -18,13 +18,29 @@ */ package org.elasticsearch.test; +import com.carrotsearch.randomizedtesting.LifecycleScope; +import com.carrotsearch.randomizedtesting.RandomizedContext; +import com.carrotsearch.randomizedtesting.SysGlobals; +import com.carrotsearch.randomizedtesting.annotations.Listeners; +import com.carrotsearch.randomizedtesting.annotations.TestGroup; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; +import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope; +import com.carrotsearch.randomizedtesting.generators.RandomInts; +import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomStrings; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; +import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.MockDirectoryWrapper; +import org.apache.lucene.uninverting.UninvertingReader; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; +import org.apache.lucene.util.TimeUnits; +import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.elasticsearch.Version; import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.metadata.IndexMetaData; @@ -36,32 +52,46 @@ import org.elasticsearch.common.logging.Loggers; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsAbortPolicy; +import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.test.cache.recycler.MockBigArrays; import org.elasticsearch.test.cache.recycler.MockPageCacheRecycler; +import org.elasticsearch.test.junit.listeners.LoggingListener; +import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter; import org.elasticsearch.test.search.MockSearchService; import org.elasticsearch.test.store.MockDirectoryHelper; import org.elasticsearch.threadpool.ThreadPool; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assume; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; import java.io.Closeable; import java.io.IOException; import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.NoSuchFileException; import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Formatter; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.TimeZone; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -73,7 +103,426 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllS /** * Base testcase for randomized unit testing with Elasticsearch */ -public abstract class ElasticsearchTestCase extends ESTestCase { +@Listeners({ + ReproduceInfoPrinter.class, + LoggingListener.class +}) +@ThreadLeakScope(Scope.SUITE) +@ThreadLeakLingering(linger = 5000) // 5 sec lingering +@TimeoutSuite(millis = 20 * TimeUnits.MINUTE) +@LuceneTestCase.SuppressSysoutChecks(bugUrl = "we log a lot on purpose") +@Ignore +@SuppressCodecs({"SimpleText", "Memory", "CheapBastard", "Direct"}) // slow ones +@LuceneTestCase.SuppressReproduceLine +public abstract class ElasticsearchTestCase extends LuceneTestCase { + + static { + SecurityHack.ensureInitialized(); + } + + // setup mock filesystems for this test run. we change PathUtils + // so that all accesses are plumbed thru any mock wrappers + + @BeforeClass + public static void setUpFileSystem() { + try { + Field field = PathUtils.class.getDeclaredField("DEFAULT"); + field.setAccessible(true); + field.set(null, LuceneTestCase.getBaseTempDirForTestClass().getFileSystem()); + } catch (ReflectiveOperationException e) { + throw new RuntimeException(); + } + } + + @AfterClass + public static void restoreFileSystem() { + try { + Field field1 = PathUtils.class.getDeclaredField("ACTUAL_DEFAULT"); + field1.setAccessible(true); + Field field2 = PathUtils.class.getDeclaredField("DEFAULT"); + field2.setAccessible(true); + field2.set(null, field1.get(null)); + } catch (ReflectiveOperationException e) { + throw new RuntimeException(); + } + } + + @BeforeClass + public static void setUpProcessors() { + int numCpu = TestUtil.nextInt(random(), 1, 4); + System.setProperty(EsExecutors.DEFAULT_SYSPROP, Integer.toString(numCpu)); + assertEquals(numCpu, EsExecutors.boundedNumberOfProcessors(ImmutableSettings.EMPTY)); + } + + @AfterClass + public static void restoreProcessors() { + System.clearProperty(EsExecutors.DEFAULT_SYSPROP); + } + + @Before + public void disableQueryCache() { + // TODO: Parent/child and other things does not work with the query cache + IndexSearcher.setDefaultQueryCache(null); + } + + @After + public void ensureNoFieldCacheUse() { + // field cache should NEVER get loaded. + String[] entries = UninvertingReader.getUninvertedStats(); + assertEquals("fieldcache must never be used, got=" + Arrays.toString(entries), 0, entries.length); + } + + // old shit: + + /** + * The number of concurrent JVMs used to run the tests, Default is 1 + */ + public static final int CHILD_JVM_COUNT = Integer.parseInt(System.getProperty(SysGlobals.CHILDVM_SYSPROP_JVM_COUNT, "1")); + /** + * The child JVM ordinal of this JVM. Default is 0 + */ + public static final int CHILD_JVM_ID = Integer.parseInt(System.getProperty(SysGlobals.CHILDVM_SYSPROP_JVM_ID, "0")); + + /** + * Annotation for backwards compat tests + */ + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @TestGroup(enabled = false, sysProperty = TESTS_BACKWARDS_COMPATIBILITY) + public @interface Backwards { + } + + /** + * Key used to set the path for the elasticsearch executable used to run backwards compatibility tests from + * via the commandline -D{@value #TESTS_BACKWARDS_COMPATIBILITY} + */ + public static final String TESTS_BACKWARDS_COMPATIBILITY = "tests.bwc"; + + public static final String TESTS_BACKWARDS_COMPATIBILITY_VERSION = "tests.bwc.version"; + + /** + * Key used to set the path for the elasticsearch executable used to run backwards compatibility tests from + * via the commandline -D{@value #TESTS_BACKWARDS_COMPATIBILITY_PATH} + */ + public static final String TESTS_BACKWARDS_COMPATIBILITY_PATH = "tests.bwc.path"; + + /** + * Annotation for REST tests + */ + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @TestGroup(enabled = true, sysProperty = TESTS_REST) + public @interface Rest { + } + + /** + * Property that allows to control whether the REST tests are run (default) or not + */ + public static final String TESTS_REST = "tests.rest"; + + /** + * Annotation for integration tests + */ + @Inherited + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.TYPE) + @TestGroup(enabled = true, sysProperty = SYSPROP_INTEGRATION) + public @interface Integration { + } + + // -------------------------------------------------------------------- + // Test groups, system properties and other annotations modifying tests + // -------------------------------------------------------------------- + + /** + * @see #ignoreAfterMaxFailures + */ + public static final String SYSPROP_MAXFAILURES = "tests.maxfailures"; + + /** + * @see #ignoreAfterMaxFailures + */ + public static final String SYSPROP_FAILFAST = "tests.failfast"; + + public static final String SYSPROP_INTEGRATION = "tests.integration"; + // ----------------------------------------------------------------- + // Suite and test case setup/ cleanup. + // ----------------------------------------------------------------- + + /** MockFSDirectoryService sets this: */ + public static boolean checkIndexFailed; + + /** + * For subclasses to override. Overrides must call {@code super.setUp()}. + */ + @Override + public void setUp() throws Exception { + super.setUp(); + checkIndexFailed = false; + } + + /** + * For subclasses to override. Overrides must call {@code super.tearDown()}. + */ + @After + public void tearDown() throws Exception { + assertFalse("at least one shard failed CheckIndex", checkIndexFailed); + super.tearDown(); + } + + + // ----------------------------------------------------------------- + // Test facilities and facades for subclasses. + // ----------------------------------------------------------------- + + /** + * Registers a {@link Closeable} resource that should be closed after the test + * completes. + * + * @return
resource (for call chaining).
+ */
+ @Override
+ public resource (for call chaining).
+ */
+ public static min to max (inclusive).
+ *
+ * @see #scaledRandomIntBetween(int, int)
+ */
+ public static int randomIntBetween(int min, int max) {
+ return RandomInts.randomIntBetween(random(), min, max);
+ }
+
+ /**
+ * Returns a "scaled" number of iterations for loops which can have a variable
+ * iteration count. This method is effectively
+ * an alias to {@link #scaledRandomIntBetween(int, int)}.
+ */
+ public static int iterations(int min, int max) {
+ return scaledRandomIntBetween(min, max);
+ }
+
+ /**
+ * An alias for {@link #randomIntBetween(int, int)}.
+ *
+ * @see #scaledRandomIntBetween(int, int)
+ */
+ public static int between(int min, int max) {
+ return randomIntBetween(min, max);
+ }
+
+ /**
+ * The exact opposite of {@link #rarely()}.
+ */
+ public static boolean frequently() {
+ return !rarely();
+ }
+
+ public static boolean randomBoolean() {
+ return random().nextBoolean();
+ }
+ public static byte randomByte() { return (byte) getRandom().nextInt(); }
+ public static short randomShort() { return (short) getRandom().nextInt(); }
+ public static int randomInt() { return getRandom().nextInt(); }
+ public static float randomFloat() { return getRandom().nextFloat(); }
+ public static double randomDouble() { return getRandom().nextDouble(); }
+ public static long randomLong() { return getRandom().nextLong(); }
+
+ /**
+ * Making {@link Assume#assumeNotNull(Object...)} directly available.
+ */
+ public static void assumeNotNull(Object... objects) {
+ Assume.assumeNotNull(objects);
+ }
+
+ /**
+ * Pick a random object from the given array. The array must not be empty.
+ */
+ public static It is recommended that specific methods are used to pick random values. + */ + public static Random getRandom() { + return random(); + } + + /** + * A random integer from 0..max (inclusive). + */ + public static int randomInt(int max) { + return RandomInts.randomInt(getRandom(), max); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomAsciiOfLengthBetween(int minCodeUnits, int maxCodeUnits) { + return RandomStrings.randomAsciiOfLengthBetween(getRandom(), minCodeUnits, + maxCodeUnits); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomAsciiOfLength(int codeUnits) { + return RandomStrings.randomAsciiOfLength(getRandom(), codeUnits); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomUnicodeOfLengthBetween(int minCodeUnits, int maxCodeUnits) { + return RandomStrings.randomUnicodeOfLengthBetween(getRandom(), + minCodeUnits, maxCodeUnits); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomUnicodeOfLength(int codeUnits) { + return RandomStrings.randomUnicodeOfLength(getRandom(), codeUnits); + } + + /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ + public static String randomUnicodeOfCodepointLengthBetween(int minCodePoints, int maxCodePoints) { + return RandomStrings.randomUnicodeOfCodepointLengthBetween(getRandom(), + minCodePoints, maxCodePoints); + } + + /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ + public static String randomUnicodeOfCodepointLength(int codePoints) { + return RandomStrings + .randomUnicodeOfCodepointLength(getRandom(), codePoints); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomRealisticUnicodeOfLengthBetween(int minCodeUnits, int maxCodeUnits) { + return RandomStrings.randomRealisticUnicodeOfLengthBetween(getRandom(), + minCodeUnits, maxCodeUnits); + } + + /** @see StringGenerator#ofCodeUnitsLength(Random, int, int) */ + public static String randomRealisticUnicodeOfLength(int codeUnits) { + return RandomStrings.randomRealisticUnicodeOfLength(getRandom(), codeUnits); + } + + /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ + public static String randomRealisticUnicodeOfCodepointLengthBetween( + int minCodePoints, int maxCodePoints) { + return RandomStrings.randomRealisticUnicodeOfCodepointLengthBetween( + getRandom(), minCodePoints, maxCodePoints); + } + + /** @see StringGenerator#ofCodePointsLength(Random, int, int) */ + public static String randomRealisticUnicodeOfCodepointLength(int codePoints) { + return RandomStrings.randomRealisticUnicodeOfCodepointLength(getRandom(), + codePoints); + } + + /** + * Return a random TimeZone from the available timezones on the system. + * + *
Warning: This test assumes the returned array of time zones is repeatable from jvm execution + * to jvm execution. It _may_ be different from jvm to jvm and as such, it can render + * tests execute in a different way.
+ */ + public static TimeZone randomTimeZone() { + final String[] availableIDs = TimeZone.getAvailableIDs(); + Arrays.sort(availableIDs); + return TimeZone.getTimeZone(randomFrom(availableIDs)); + } + + /** + * Shortcut for {@link RandomizedContext#current()}. + */ + public static RandomizedContext getContext() { + return RandomizedContext.current(); + } + + /** + * Returns true if we're running nightly tests. + * @see Nightly + */ + public static boolean isNightly() { + return getContext().isNightly(); + } + + /** + * Returns a non-negative random value smaller or equalmax. The value
+ * picked is affected by {@link #isNightly()} and {@link #multiplier()}.
+ *
+ * This method is effectively an alias to: + *
+ * scaledRandomIntBetween(0, max) + *+ * + * @see #scaledRandomIntBetween(int, int) + */ + public static int atMost(int max) { + if (max < 0) throw new IllegalArgumentException("atMost requires non-negative argument: " + max); + return scaledRandomIntBetween(0, max); + } + + /** + * Making {@link Assume#assumeTrue(boolean)} directly available. + */ + public void assumeTrue(boolean condition) { + assumeTrue("caller was too lazy to provide a reason", condition); + } private static Thread.UncaughtExceptionHandler defaultHandler; diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index 914665592b3..023296152c8 100644 --- a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/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.ESTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.InternalTestCluster; import org.junit.internal.AssumptionViolatedException; diff --git a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTests.java b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTests.java index 1d052b3a4ae..7dddfd69839 100644 --- a/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTests.java +++ b/src/test/java/org/elasticsearch/test/rest/ElasticsearchRestTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.node.Node; -import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.elasticsearch.test.ElasticsearchIntegrationTest.ClusterScope; import org.elasticsearch.test.rest.client.RestException; @@ -58,7 +58,7 @@ import java.util.*; //tests distribution disabled for now since it causes reporting problems, // due to the non unique suite name //@ReplicateOnEachVm -@ESTestCase.Rest +@ElasticsearchTestCase.Rest @ClusterScope(randomDynamicTemplates = false) @TimeoutSuite(millis = 40 * TimeUnits.MINUTE) // timeout the suite after 40min and fail the test. public class ElasticsearchRestTests extends ElasticsearchIntegrationTest { diff --git a/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java b/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java index dec9dff7f6f..66af8d912da 100644 --- a/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java +++ b/src/test/java/org/elasticsearch/test/store/MockFSDirectoryService.java @@ -44,7 +44,7 @@ import org.elasticsearch.index.store.distributor.Distributor; import org.elasticsearch.index.store.fs.FsDirectoryService; import org.elasticsearch.indices.IndicesLifecycle; import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.test.ESTestCase; +import org.elasticsearch.test.ElasticsearchTestCase; import org.elasticsearch.test.ElasticsearchIntegrationTest; import java.io.IOException; @@ -131,7 +131,7 @@ public class MockFSDirectoryService extends FsDirectoryService { return; } if (IndexWriter.isLocked(dir)) { - ESTestCase.checkIndexFailed = true; + ElasticsearchTestCase.checkIndexFailed = true; throw new IllegalStateException("IndexWriter is still open on shard " + shardId); } try (CheckIndex checkIndex = new CheckIndex(dir)) { @@ -141,7 +141,7 @@ public class MockFSDirectoryService extends FsDirectoryService { out.flush(); CheckIndex.Status status = checkIndex.checkIndex(); if (!status.clean) { - ESTestCase.checkIndexFailed = true; + ElasticsearchTestCase.checkIndexFailed = true; logger.warn("check index [failure] index files={}\n{}", Arrays.toString(dir.listAll()), new String(os.bytes().toBytes(), Charsets.UTF_8));