diff --git a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java b/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java similarity index 99% rename from core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java rename to core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java index 74eb4babc6c..ec66a53f1e4 100644 --- a/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTest.java +++ b/core/src/test/java/org/apache/lucene/queries/BlendedTermQueryTests.java @@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class BlendedTermQueryTest extends ESTestCase { +public class BlendedTermQueryTests extends ESTestCase { @Test public void testBooleanQuery() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java index 9587846ec1d..dc0dd76e414 100644 --- a/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java +++ b/core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java @@ -38,6 +38,7 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.stream.*; import org.elasticsearch.common.transport.LocalTransportAddress; import org.elasticsearch.common.unit.ByteSizeValue; +import org.elasticsearch.common.util.CancellableThreadsTests; import org.elasticsearch.common.xcontent.*; import org.elasticsearch.discovery.DiscoverySettings; import org.elasticsearch.index.AlreadyExpiredException; @@ -95,7 +96,7 @@ public class ExceptionSerializationTests extends ESTestCase { org.elasticsearch.test.rest.parser.RestTestParseException.class, org.elasticsearch.index.query.TestQueryParsingException.class, org.elasticsearch.test.rest.client.RestException.class, - org.elasticsearch.common.util.CancellableThreadsTest.CustomException.class, + CancellableThreadsTests.CustomException.class, org.elasticsearch.rest.BytesRestResponseTests.WithHeadersException.class, AbstractClientHeadersTestCase.InternalException.class); FileVisitor visitor = new FileVisitor() { diff --git a/core/src/test/java/org/elasticsearch/NamingConventionTests.java b/core/src/test/java/org/elasticsearch/NamingConventionTests.java index 2d0c8d885b7..b317152c377 100644 --- a/core/src/test/java/org/elasticsearch/NamingConventionTests.java +++ b/core/src/test/java/org/elasticsearch/NamingConventionTests.java @@ -73,8 +73,7 @@ public class NamingConventionTests extends ESTestCase { String filename = file.getFileName().toString(); if (filename.endsWith(".class")) { Class clazz = loadClass(filename); - if (clazz.getName().endsWith("Tests") || - clazz.getName().endsWith("Test")) { // don't worry about the ones that match the pattern + if (clazz.getName().endsWith("Tests")) { // don't worry about the ones that match the pattern if (ESIntegTestCase.class.isAssignableFrom(clazz)) { integTestsInDisguise.add(clazz); @@ -147,7 +146,6 @@ public class NamingConventionTests extends ESTestCase { assertTrue(notRunnable.remove(DummyInterfaceTests.class)); assertTrue(innerClasses.remove(InnerTests.class)); assertTrue(notImplementing.remove(NotImplementingTests.class)); - assertTrue(notImplementing.remove(NotImplementingTest.class)); assertTrue(pureUnitTest.remove(PlainUnit.class)); assertTrue(pureUnitTest.remove(PlainUnitTheSecond.class)); @@ -177,8 +175,6 @@ public class NamingConventionTests extends ESTestCase { public static final class NotImplementingTests {} - public static final class NotImplementingTest {} - public static final class WrongName extends ESTestCase {} public static abstract class DummyAbstractTests extends ESTestCase {} 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/ClusterStateRequestTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTest.java rename to core/src/test/java/org/elasticsearch/action/admin/cluster/state/ClusterStateRequestTests.java index 1b5a4ef41bc..5c0627555ad 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/ClusterStateRequestTests.java @@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.equalTo; /** * Unit tests for the {@link ClusterStateRequest}. */ -public class ClusterStateRequestTest extends ESTestCase { +public class ClusterStateRequestTests extends ESTestCase { @Test public void testSerialization() throws Exception { 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/CreateIndexRequestBuilderTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTest.java rename to core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilderTests.java index 2fff8357fd3..98569b7db8f 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/CreateIndexRequestBuilderTests.java @@ -33,7 +33,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class CreateIndexRequestBuilderTest extends ESTestCase { +public class CreateIndexRequestBuilderTests 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/shards/IndicesShardStoreResponseTest.java b/core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTest.java rename to core/src/test/java/org/elasticsearch/action/admin/indices/shards/IndicesShardStoreResponseTests.java index 925e01e8f2e..777555f5b73 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/IndicesShardStoreResponseTests.java @@ -36,7 +36,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; -public class IndicesShardStoreResponseTest extends ESTestCase { +public class IndicesShardStoreResponseTests extends ESTestCase { @Test public void testBasicSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java b/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java rename to core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTests.java index dd562a9bccd..e33fba69b8b 100644 --- a/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTest.java +++ b/core/src/test/java/org/elasticsearch/action/fieldstats/FieldStatsRequestTests.java @@ -28,7 +28,7 @@ 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 ESTestCase { +public class FieldStatsRequestTests extends ESTestCase { public void testFieldsParsing() throws Exception { byte[] data = StreamsUtils.copyToBytesFromClasspath("/org/elasticsearch/action/fieldstats/fieldstats-index-constraints-request.json"); diff --git a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java b/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java rename to core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java index 8e3b8b2a575..f9dc86b59e9 100644 --- a/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/action/index/IndexRequestBuilderTests.java @@ -33,7 +33,7 @@ import java.io.ByteArrayOutputStream; import java.util.HashMap; import java.util.Map; -public class IndexRequestBuilderTest extends ESTestCase { +public class IndexRequestBuilderTests extends ESTestCase { private static final String EXPECTED_SOURCE = "{\"SomeKey\":\"SomeValue\"}"; private NoOpClient testClient; diff --git a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTest.java b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java similarity index 97% rename from core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTest.java rename to core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java index e83e68b335e..88f27bcf609 100644 --- a/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTest.java +++ b/core/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeServiceTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.test.ESTestCase; import java.util.Arrays; import java.util.Locale; -public class MetaDataIndexUpgradeServiceTest extends ESTestCase { +public class MetaDataIndexUpgradeServiceTests extends ESTestCase { public void testUpgradeStoreSettings() { final String type = RandomPicks.randomFrom(random(), Arrays.asList("nio_fs", "mmap_fs", "simple_fs", "default", "fs")); diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java rename to core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java index 9a0cbb2bcca..ea5dda0128b 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTest.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/RoutingTableTests.java @@ -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 ESAllocationTestCase { +public class RoutingTableTests 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/allocation/BalanceUnbalancedClusterTest.java b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java rename to core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java index 89e0cf8332b..d0e3d727c10 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTest.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceUnbalancedClusterTests.java @@ -40,7 +40,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** * see issue #9023 */ -public class BalanceUnbalancedClusterTest extends CatAllocationTestCase { +public class BalanceUnbalancedClusterTests extends CatAllocationTestCase { @Override protected Path getCatPath() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/Base64Test.java b/core/src/test/java/org/elasticsearch/common/Base64Tests.java similarity index 97% rename from core/src/test/java/org/elasticsearch/common/Base64Test.java rename to core/src/test/java/org/elasticsearch/common/Base64Tests.java index 07a3689130c..6bceec92984 100644 --- a/core/src/test/java/org/elasticsearch/common/Base64Test.java +++ b/core/src/test/java/org/elasticsearch/common/Base64Tests.java @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.is; /** * */ -public class Base64Test extends ESTestCase { +public class Base64Tests extends ESTestCase { @Test // issue #6334 public void testBase64DecodeWithExtraCharactersAfterPadding() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java b/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java rename to core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTests.java index 62daeb7e2b5..57322e2bce0 100644 --- a/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTest.java +++ b/core/src/test/java/org/elasticsearch/common/blobstore/BlobStoreTests.java @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class BlobStoreTest extends ESTestCase { +public class BlobStoreTests extends ESTestCase { @Test public void testWriteRead() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java rename to core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java index 59a3d01255e..802ea7cc628 100644 --- a/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTest.java +++ b/core/src/test/java/org/elasticsearch/common/bytes/PagedBytesReferenceTests.java @@ -42,7 +42,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.Arrays; -public class PagedBytesReferenceTest extends ESTestCase { +public class PagedBytesReferenceTests extends ESTestCase { private static final int PAGE_SIZE = BigArrays.BYTE_PAGE_SIZE; diff --git a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java rename to core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java index 8418befe54a..2fb90c776da 100644 --- a/core/src/test/java/org/elasticsearch/common/lucene/LuceneTest.java +++ b/core/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java @@ -37,7 +37,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * */ -public class LuceneTest extends ESTestCase { +public class LuceneTests extends ESTestCase { /* diff --git a/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java b/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java rename to core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTests.java index 0c4ea861448..bfa08ddfdab 100644 --- a/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTest.java +++ b/core/src/test/java/org/elasticsearch/common/property/PropertyPlaceholderTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import java.util.LinkedHashMap; import java.util.Map; -public class PropertyPlaceholderTest extends ESTestCase { +public class PropertyPlaceholderTests extends ESTestCase { @Test public void testSimple() { diff --git a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java b/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java rename to core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java index 85dd1c14b36..2bdaea34d1e 100644 --- a/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/CancellableThreadsTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import java.util.concurrent.CountDownLatch; -public class CancellableThreadsTest extends ESTestCase { +public class CancellableThreadsTests extends ESTestCase { public static class CustomException extends RuntimeException { diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java rename to core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java index 52fe7247257..6a45bfbd3d2 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/CountDownTests.java @@ -30,7 +30,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; -public class CountDownTest extends ESTestCase { +public class CountDownTests extends ESTestCase { @Test public void testConcurrent() throws InterruptedException { diff --git a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java rename to core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java index 1301c9efcb4..9b01b785f2b 100644 --- a/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTest.java +++ b/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.is; /** */ -public class RefCountedTest extends ESTestCase { +public class RefCountedTests extends ESTestCase { @Test public void testRefCount() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java rename to core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java index 884d238827d..eddc4d9bae7 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTest.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ElectMasterServiceTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import java.util.*; -public class ElectMasterServiceTest extends ESTestCase { +public class ElectMasterServiceTests extends ESTestCase { ElectMasterService electMasterService() { return new ElectMasterService(Settings.EMPTY, Version.CURRENT); diff --git a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java rename to core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java index cc6bc2b235c..6bd2bd7d30e 100644 --- a/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTest.java +++ b/core/src/test/java/org/elasticsearch/discovery/zen/ZenDiscoveryUnitTests.java @@ -35,7 +35,7 @@ import static org.hamcrest.core.IsNull.nullValue; /** */ -public class ZenDiscoveryUnitTest extends ESTestCase { +public class ZenDiscoveryUnitTests extends ESTestCase { public void testShouldIgnoreNewClusterState() { ClusterName clusterName = new ClusterName("abc"); diff --git a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java rename to core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java index 8650fd5cd1a..98630edd176 100644 --- a/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTest.java +++ b/core/src/test/java/org/elasticsearch/gateway/MetaDataStateFormatTests.java @@ -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 ESTestCase { +public class MetaDataStateFormatTests extends ESTestCase { /** @@ -349,7 +349,7 @@ public class MetaDataStateFormatTest extends ESTestCase { if (randomBoolean() && (j < numStates - 1 || dirs.length > 0 && i != 0)) { // corrupt a file that we do not necessarily need here.... Path file = dirs[i].resolve(MetaDataStateFormat.STATE_DIR_NAME).resolve("global-" + j + ".st"); corruptedFiles.add(file); - MetaDataStateFormatTest.corruptFile(file, logger); + MetaDataStateFormatTests.corruptFile(file, logger); } } @@ -377,7 +377,7 @@ public class MetaDataStateFormatTest extends ESTestCase { if (corruptedFiles.contains(file)) { continue; } - MetaDataStateFormatTest.corruptFile(file, logger); + MetaDataStateFormatTests.corruptFile(file, logger); } try { format.loadLatestState(logger, dirList.toArray(new Path[0])); diff --git a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java rename to core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTests.java index e3a5861ea62..3274d4fa70f 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTest.java +++ b/core/src/test/java/org/elasticsearch/http/netty/NettyHttpServerPipeliningTests.java @@ -64,7 +64,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 ESTestCase { +public class NettyHttpServerPipeliningTests extends ESTestCase { private NetworkService networkService; private ThreadPool threadPool; @@ -128,7 +128,7 @@ public class NettyHttpServerPipeliningTest extends ESTestCase { private final ExecutorService executorService; public CustomNettyHttpServerTransport(Settings settings) { - super(settings, NettyHttpServerPipeliningTest.this.networkService, NettyHttpServerPipeliningTest.this.bigArrays); + super(settings, NettyHttpServerPipeliningTests.this.networkService, NettyHttpServerPipeliningTests.this.bigArrays); this.executorService = Executors.newFixedThreadPool(5); } diff --git a/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java b/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java rename to core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTests.java index f0368fba60b..f21153e45a7 100644 --- a/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTest.java +++ b/core/src/test/java/org/elasticsearch/http/netty/pipelining/HttpPipeliningHandlerTests.java @@ -53,7 +53,7 @@ import static org.jboss.netty.util.CharsetUtil.UTF_8; /** * */ -public class HttpPipeliningHandlerTest extends ESTestCase { +public class HttpPipeliningHandlerTests 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/analysis/PatternAnalyzerTest.java b/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java rename to core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java index 2f420e56461..9c578ef6385 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTest.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/PatternAnalyzerTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.test.ESTokenStreamTestCase; /** * Verifies the behavior of PatternAnalyzer. */ -public class PatternAnalyzerTest extends ESTokenStreamTestCase { +public class PatternAnalyzerTests extends ESTokenStreamTestCase { /** * Test PatternAnalyzer when it is configured with a non-word pattern. diff --git a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java rename to core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java index 371a092ff6e..f695b1b197e 100644 --- a/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTest.java +++ b/core/src/test/java/org/elasticsearch/index/analysis/synonyms/SynonymsAnalysisTests.java @@ -54,7 +54,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class SynonymsAnalysisTest extends ESTestCase { +public class SynonymsAnalysisTests 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/BitSetFilterCacheTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java rename to core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java index 389b2095bae..7888704dd89 100644 --- a/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTest.java +++ b/core/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java @@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class BitSetFilterCacheTest extends ESTestCase { +public class BitSetFilterCacheTests extends ESTestCase { @Test public void testInvalidateEntries() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTest.java b/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTests.java similarity index 95% rename from core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTest.java rename to core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTests.java index efaa557cc89..f9884452c62 100644 --- a/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTest.java +++ b/core/src/test/java/org/elasticsearch/index/codec/postingformat/PostingsFormatTests.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 PostingsFormatTest extends BasePostingsFormatTestCase { +public class PostingsFormatTests extends BasePostingsFormatTestCase { @Override protected Codec getCodec() { diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java rename to core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java index 21211fe3534..fa5db4cdeb4 100644 --- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTest.java +++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineSettingsTests.java @@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class InternalEngineSettingsTest extends ESSingleNodeTestCase { +public class InternalEngineSettingsTests extends ESSingleNodeTestCase { public void testSettingsUpdate() { final IndexService service = createIndex("foo"); diff --git a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java b/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java rename to core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java index 493b5a56327..4b9d0e1805c 100644 --- a/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTest.java +++ b/core/src/test/java/org/elasticsearch/index/fielddata/FilterFieldDataTests.java @@ -30,7 +30,7 @@ import java.util.Random; import static org.hamcrest.Matchers.equalTo; -public class FilterFieldDataTest extends AbstractFieldDataTestCase { +public class FilterFieldDataTests extends AbstractFieldDataTestCase { @Override protected FieldDataType getFieldDataType() { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTest.java b/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTest.java rename to core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index d1c78c6b9f9..add7ee6a7f7 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTest.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasToString; -public class MapperServiceTest extends ESSingleNodeTestCase { +public class MapperServiceTests extends ESSingleNodeTestCase { @Rule public ExpectedException expectedException = ExpectedException.none(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java b/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java rename to core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTests.java index 55845010185..9aade61c5b0 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTest.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/lucene/DoubleIndexingDocTests.java @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class DoubleIndexingDocTest extends ESSingleNodeTestCase { +public class DoubleIndexingDocTests 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/StoredNumericValuesTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java rename to core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTests.java index 558ba257399..380e8e34d0f 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTest.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/lucene/StoredNumericValuesTests.java @@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class StoredNumericValuesTest extends ESSingleNodeTestCase { +public class StoredNumericValuesTests extends ESSingleNodeTestCase { @Test public void testBytesAndNumericRepresentation() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTest.java b/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java similarity index 96% rename from core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTest.java rename to core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java index c95477e5a3f..d339a5d6232 100644 --- a/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTest.java +++ b/core/src/test/java/org/elasticsearch/index/query/CommonTermsQueryParserTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import java.io.IOException; -public class CommonTermsQueryParserTest extends ESSingleNodeTestCase { +public class CommonTermsQueryParserTests extends ESSingleNodeTestCase { @Test public void testWhenParsedQueryIsNullNoNullPointerExceptionIsThrown() throws IOException { final String index = "test-index"; diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java similarity index 96% rename from core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java rename to core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java index c7441199fce..647ac44c673 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java @@ -32,7 +32,7 @@ import java.util.Map; /** * Test building and serialising a template search request. * */ -public class TemplateQueryBuilderTest extends ESTestCase { +public class TemplateQueryBuilderTests extends ESTestCase { @Test public void testJSONGeneration() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java rename to core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTests.java index e76c13a834a..df65adc7abf 100644 --- a/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTest.java +++ b/core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTests.java @@ -59,7 +59,7 @@ import java.io.IOException; * Test parsing and executing a template request. */ // NOTE: this can't be migrated to ESSingleNodeTestCase because of the custom path.conf -public class TemplateQueryParserTest extends ESTestCase { +public class TemplateQueryParserTests extends ESTestCase { private Injector injector; private QueryParseContext context; diff --git a/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java b/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java rename to core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTests.java index 49ec5c29012..0f6b2bd8d9e 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTest.java +++ b/core/src/test/java/org/elasticsearch/index/shard/MergePolicySettingsTests.java @@ -33,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 ESTestCase { +public class MergePolicySettingsTests extends ESTestCase { protected final ShardId shardId = new ShardId(new Index("index"), 1); diff --git a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTest.java b/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTest.java rename to core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java index d89c328d9dd..0780cd718ac 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTest.java +++ b/core/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java @@ -58,7 +58,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; /** Separate test class from ShardPathTests because we need static (BeforeClass) setup to install mock filesystems... */ @SuppressForbidden(reason = "ProviderMismatchException if I try to use PathUtils.getDefault instead") -public class NewPathForShardTest extends ESTestCase { +public class NewPathForShardTests extends ESTestCase { // Sneakiness to install mock file stores so we can pretend how much free space we have on each path.data: private static MockFileStore aFileStore = new MockFileStore("mocka"); diff --git a/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java b/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java rename to core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTests.java index cf25c1c8919..2fc02fb0503 100644 --- a/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTest.java +++ b/core/src/test/java/org/elasticsearch/index/shard/VersionFieldUpgraderTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.internal.VersionFieldMapper; import org.elasticsearch.test.ESTestCase; /** Tests upgrading old document versions from _uid payloads to _version docvalues */ -public class VersionFieldUpgraderTest extends ESTestCase { +public class VersionFieldUpgraderTests 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/snapshots/blobstore/FileInfoTest.java b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java rename to core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java index 297c228d8b0..8a72a7723fd 100644 --- a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTest.java +++ b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; /** */ -public class FileInfoTest extends ESTestCase { +public class FileInfoTests 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/SlicedInputStreamTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java rename to core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java index 8adc7f645f0..e9deadb9d04 100644 --- a/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTest.java +++ b/core/src/test/java/org/elasticsearch/index/snapshots/blobstore/SlicedInputStreamTests.java @@ -27,7 +27,7 @@ import java.util.Random; import static org.hamcrest.Matchers.equalTo; -public class SlicedInputStreamTest extends ESTestCase { +public class SlicedInputStreamTests extends ESTestCase { @Test public void readRandom() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java b/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java rename to core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java index 3cfdaa26f17..04ae4676fe4 100644 --- a/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTest.java +++ b/core/src/test/java/org/elasticsearch/index/store/DirectoryUtilsTests.java @@ -29,7 +29,7 @@ import java.util.Set; import static org.hamcrest.CoreMatchers.*; -public class DirectoryUtilsTest extends ESTestCase { +public class DirectoryUtilsTests extends ESTestCase { @Test public void testGetLeave() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTest.java b/core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTest.java rename to core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTests.java index 7bb1a92be30..e53358c6631 100644 --- a/core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTest.java +++ b/core/src/test/java/org/elasticsearch/index/store/IndexStoreBWCTests.java @@ -37,7 +37,7 @@ import java.util.Locale; /** */ -public class IndexStoreBWCTest extends ESSingleNodeTestCase { +public class IndexStoreBWCTests extends ESSingleNodeTestCase { public void testOldCoreTypesFail() { diff --git a/core/src/test/java/org/elasticsearch/index/store/StoreTest.java b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/index/store/StoreTest.java rename to core/src/test/java/org/elasticsearch/index/store/StoreTests.java index 5757764d250..b2e49f34b91 100644 --- a/core/src/test/java/org/elasticsearch/index/store/StoreTest.java +++ b/core/src/test/java/org/elasticsearch/index/store/StoreTests.java @@ -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 ESTestCase { +public class StoreTests extends ESTestCase { @Test public void testRefCount() throws IOException { @@ -693,7 +693,7 @@ public class StoreTest extends ESTestCase { public LuceneManagedDirectoryService(Random random, boolean preventDoubleWrite) { super(new ShardId("fake", 1), Settings.EMPTY); - dir = StoreTest.newDirectory(random); + dir = StoreTests.newDirectory(random); if (dir instanceof MockDirectoryWrapper) { ((MockDirectoryWrapper) dir).setPreventDoubleWrite(preventDoubleWrite); // TODO: fix this test to handle virus checker diff --git a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java rename to core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 89f12904d27..08c33380a2b 100644 --- a/core/src/test/java/org/elasticsearch/indices/IndicesServiceTest.java +++ b/core/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -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 ESSingleNodeTestCase { +public class IndicesServiceTests extends ESSingleNodeTestCase { public IndicesService getIndicesService() { return getInstanceFromNode(IndicesService.class); diff --git a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java rename to core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java index 80cc14392ff..06c2566fc21 100644 --- a/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTest.java +++ b/core/src/test/java/org/elasticsearch/indices/flush/SyncedFlushSingleNodeTests.java @@ -36,7 +36,7 @@ import java.util.Map; /** */ -public class SyncedFlushSingleNodeTest extends ESSingleNodeTestCase { +public class SyncedFlushSingleNodeTests extends ESSingleNodeTestCase { public void testModificationPreventsFlushing() throws InterruptedException { createIndex("test"); diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java rename to core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTests.java index 3f0fe79623b..3a571a6d917 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTest.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/RecoveryStateTests.java @@ -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 ESTestCase { +public class RecoveryStateTests extends ESTestCase { abstract class Streamer extends Thread { diff --git a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java b/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java rename to core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java index 52c46c70a4e..4df825704d7 100644 --- a/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTest.java +++ b/core/src/test/java/org/elasticsearch/indices/recovery/StartRecoveryRequestTests.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.nullValue; /** */ -public class StartRecoveryRequestTest extends ESTestCase { +public class StartRecoveryRequestTests extends ESTestCase { @Test public void testSerialization() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java b/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java rename to core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTests.java index 3d678865e4d..a722e3ab026 100644 --- a/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTest.java +++ b/core/src/test/java/org/elasticsearch/recovery/RecoverySettingsTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import java.util.concurrent.TimeUnit; -public class RecoverySettingsTest extends ESSingleNodeTestCase { +public class RecoverySettingsTests extends ESSingleNodeTestCase { @Override protected boolean resetNodeAfterTest() { diff --git a/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java b/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java rename to core/src/test/java/org/elasticsearch/rest/action/support/RestTableTests.java index 3df6c256e21..237c62d93c7 100644 --- a/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTest.java +++ b/core/src/test/java/org/elasticsearch/rest/action/support/RestTableTests.java @@ -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 ESTestCase { +public class RestTableTests extends ESTestCase { private Table table = new Table(); private FakeRestRequest restRequest = new FakeRestRequest(); diff --git a/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java b/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java rename to core/src/test/java/org/elasticsearch/script/ScriptParameterParserTests.java index 70c6617592d..85dc650c6a3 100644 --- a/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTest.java +++ b/core/src/test/java/org/elasticsearch/script/ScriptParameterParserTests.java @@ -38,7 +38,7 @@ import java.util.*; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; -public class ScriptParameterParserTest extends ESTestCase { +public class ScriptParameterParserTests extends ESTestCase { @Test public void testTokenDefaultInline() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java b/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java rename to core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTests.java index c2060b915fd..b44d180221e 100644 --- a/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTest.java +++ b/core/src/test/java/org/elasticsearch/script/mustache/MustacheScriptEngineTests.java @@ -37,7 +37,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Mustache based templating test */ -public class MustacheScriptEngineTest extends ESTestCase { +public class MustacheScriptEngineTests 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/MustacheTests.java similarity index 97% rename from core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java rename to core/src/test/java/org/elasticsearch/script/mustache/MustacheTests.java index 7dea0846df7..9bda581b6d5 100644 --- a/core/src/test/java/org/elasticsearch/script/mustache/MustacheTest.java +++ b/core/src/test/java/org/elasticsearch/script/mustache/MustacheTests.java @@ -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 ESTestCase { +public class MustacheTests extends ESTestCase { @Test public void test() { 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/NestedAggregatorTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTest.java rename to core/src/test/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index 15da498fb67..ef6112d87df 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/NestedAggregatorTests.java @@ -55,7 +55,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class NestedAggregatorTest extends ESSingleNodeTestCase { +public class NestedAggregatorTests extends ESSingleNodeTestCase { @Test public void testResetRootDocId() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java rename to core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index 27d81f434c2..80a683c5021 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTest.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -29,7 +29,7 @@ import java.util.Map; import static org.hamcrest.Matchers.*; -public class SearchSourceBuilderTest extends ESTestCase { +public class SearchSourceBuilderTests extends ESTestCase { SearchSourceBuilder builder = new SearchSourceBuilder(); diff --git a/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java b/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java rename to core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTests.java index 977ce01b3cc..ee0b52e319f 100644 --- a/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTest.java +++ b/core/src/test/java/org/elasticsearch/search/fetch/innerhits/NestedChildrenFilterTests.java @@ -49,7 +49,7 @@ import static org.hamcrest.Matchers.equalTo; /** */ -public class NestedChildrenFilterTest extends ESTestCase { +public class NestedChildrenFilterTests extends ESTestCase { @Test public void testNestedChildrenFilter() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java rename to core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTests.java index fde5037b850..d7280c89ef4 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionTokenStreamTests.java @@ -42,7 +42,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; -public class CompletionTokenStreamTest extends ESTokenStreamTestCase { +public class CompletionTokenStreamTests extends ESTokenStreamTestCase { final XAnalyzingSuggester suggester = new XAnalyzingSuggester(new SimpleAnalyzer()); diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java index eb78b6599d6..398310d3a0b 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/AnalyzingCompletionLookupProviderV1.java @@ -65,7 +65,7 @@ import static org.apache.lucene.search.suggest.analyzing.XAnalyzingSuggester.HOL /** * This is an older implementation of the AnalyzingCompletionLookupProvider class * We use this to test for backwards compatibility in our tests, namely - * CompletionPostingsFormatTest + * CompletionPostingsFormatTests * This ensures upgrades between versions work smoothly */ public class AnalyzingCompletionLookupProviderV1 extends CompletionLookupProvider { diff --git a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java rename to core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java index 35a222a75e1..672f8bbc673 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/completion/CompletionPostingsFormatTests.java @@ -70,7 +70,7 @@ import java.util.Set; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -public class CompletionPostingsFormatTest extends ESTestCase { +public class CompletionPostingsFormatTests 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/GeoLocationContextMappingTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java rename to core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTests.java index f1c17618556..60d2fd661a0 100644 --- a/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTest.java +++ b/core/src/test/java/org/elasticsearch/search/suggest/context/GeoLocationContextMappingTests.java @@ -36,7 +36,7 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; /** * */ -public class GeoLocationContextMappingTest extends ESTestCase { +public class GeoLocationContextMappingTests extends ESTestCase { @Test public void testThatParsingGeoPointsWorksWithCoercion() throws Exception { diff --git a/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java index 9fc8f9464c4..2dc270cc8c3 100644 --- a/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/core/src/test/java/org/elasticsearch/test/ESIntegTestCase.java @@ -191,7 +191,7 @@ import static org.hamcrest.Matchers.*; * should be used, here is an example: * 
  *
- * @ClusterScope(scope=Scope.TEST) public class SomeIntegrationTest extends ESIntegTestCase {
+ * @ClusterScope(scope=Scope.TEST) public class SomeIT extends ESIntegTestCase {
  * @Test public void testMethod() {}
  * }
  *
@@ -204,7 +204,7 @@ import static org.hamcrest.Matchers.*; *

* 

  * @ClusterScope(scope=Scope.SUITE, numDataNodes=3)
- * public class SomeIntegrationTest extends ESIntegTestCase {
+ * public class SomeIT extends ESIntegTestCase {
  * @Test public void testMethod() {}
  * }
  *
diff --git a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java b/core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java rename to core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java index 537fd873a09..14f7eca6832 100644 --- a/core/src/test/java/org/elasticsearch/watcher/FileWatcherTest.java +++ b/core/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java @@ -35,7 +35,7 @@ import java.util.List; import static org.hamcrest.Matchers.*; @LuceneTestCase.SuppressFileSystems("ExtrasFS") -public class FileWatcherTest extends ESTestCase { +public class FileWatcherTests extends ESTestCase { private class RecordingChangeListener extends FileChangesListener { 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/AWSSignersTests.java similarity index 97% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java index f0a10c06042..1c460c1baa6 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/AWSSignersTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.is; -public class AWSSignersTest extends ESTestCase { +public class AWSSignersTests extends ESTestCase { @Test public void testSigners() { 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/S3OutputStreamTests.java similarity index 98% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTests.java index b2dc66b8081..f40065c4e2b 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/S3OutputStreamTests.java @@ -32,7 +32,7 @@ import static org.hamcrest.Matchers.equalTo; /** * Unit test for {@link S3OutputStream}. */ -public class S3OutputStreamTest extends ESTestCase { +public class S3OutputStreamTests 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/Ec2DiscoveryTests.java similarity index 96% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java index f79b68f289d..8d9c45489ed 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/Ec2DiscoveryTests.java @@ -38,7 +38,7 @@ import static org.elasticsearch.common.settings.Settings.settingsBuilder; * This test requires AWS to run. */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0) -public class Ec2DiscoveryITest extends AbstractAwsTestCase { +public class Ec2DiscoveryTests extends AbstractAwsTestCase { @Override protected Collection> nodePlugins() { 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/Ec2DiscoveryUpdateSettingsTests.java similarity index 97% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java index 1709d48e399..0fa2d0e4779 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/Ec2DiscoveryUpdateSettingsTests.java @@ -40,7 +40,7 @@ import static org.hamcrest.CoreMatchers.is; * This test requires AWS to run. */ @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0) -public class Ec2DiscoveryUpdateSettingsITest extends AbstractAwsTestCase { +public class Ec2DiscoveryUpdateSettingsTests extends AbstractAwsTestCase { @Override protected Collection> nodePlugins() { diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTests.java similarity index 94% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTests.java index a8df3165b4c..0710e12dc4d 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTests.java @@ -27,7 +27,7 @@ import org.junit.Before; * cloud.aws.s3.proxy_host: mys3proxy.company.com * cloud.aws.s3.proxy_port: 8080 */ -public class S3ProxiedSnapshotRestoreOverHttpsTest extends AbstractS3SnapshotRestoreTestCase { +public class S3ProxiedSnapshotRestoreOverHttpsTests extends AbstractS3SnapshotRestoreTestCase { private boolean proxySet = false; diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTests.java similarity index 92% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTests.java index 14eee25146d..cbfa4bdd9f2 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Settings; /** */ -public class S3SnapshotRestoreOverHttpTest extends AbstractS3SnapshotRestoreTestCase { +public class S3SnapshotRestoreOverHttpTests extends AbstractS3SnapshotRestoreTestCase { @Override public Settings nodeSettings(int nodeOrdinal) { Settings.Builder settings = Settings.builder() diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTest.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTests.java similarity index 92% rename from plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTest.java rename to plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTests.java index c039e77be1c..2e0f47d8de5 100644 --- a/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTest.java +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Settings; /** */ -public class S3SnapshotRestoreOverHttpsTest extends AbstractS3SnapshotRestoreTestCase { +public class S3SnapshotRestoreOverHttpsTests extends AbstractS3SnapshotRestoreTestCase { @Override public Settings nodeSettings(int nodeOrdinal) { Settings.Builder settings = Settings.builder() 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/SmbMMapDirectoryTests.java similarity index 93% rename from plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTest.java rename to plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbMMapDirectoryTests.java index eecaa4c13a2..43c61d8c9bb 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/SmbMMapDirectoryTests.java @@ -22,7 +22,7 @@ package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; -public class SmbMMapDirectoryTest extends ESBaseDirectoryTestCase { +public class SmbMMapDirectoryTests 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/SmbSimpleFSDirectoryTests.java similarity index 93% rename from plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTest.java rename to plugins/cloud-azure/src/test/java/org/apache/lucene/store/SmbSimpleFSDirectoryTests.java index 58cdb5f8cb6..208eb6c1447 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/SmbSimpleFSDirectoryTests.java @@ -22,7 +22,7 @@ package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; -public class SmbSimpleFSDirectoryTest extends ESBaseDirectoryTestCase { +public class SmbSimpleFSDirectoryTests 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/AzureSimpleTests.java similarity index 97% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleITest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/azure/itest/AzureSimpleTests.java index 80853862788..389f2a45ef6 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/AzureSimpleTests.java @@ -36,7 +36,7 @@ import org.junit.Test; numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0) -public class AzureSimpleITest extends AbstractAzureTestCase { +public class AzureSimpleTests extends AbstractAzureTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCaseCase.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCase.java similarity index 96% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCaseCase.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCase.java index c798c49a8ca..96fe8ebaec8 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCaseCase.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/AbstractAzureRepositoryServiceTestCase.java @@ -35,7 +35,7 @@ import org.junit.Before; import java.net.URISyntaxException; import java.util.Collection; -public abstract class AbstractAzureRepositoryServiceTestCaseCase extends AbstractAzureTestCase { +public abstract class AbstractAzureRepositoryServiceTestCase extends AbstractAzureTestCase { public static class TestPlugin extends Plugin { @Override @@ -54,7 +54,7 @@ public abstract class AbstractAzureRepositoryServiceTestCaseCase extends Abstrac protected String basePath; private Class mock; - public AbstractAzureRepositoryServiceTestCaseCase(String basePath) { + public AbstractAzureRepositoryServiceTestCase(String basePath) { this.basePath = basePath; } 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/AzureMinimumMasterNodesTests.java similarity index 96% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureMinimumMasterNodesTests.java index fa19137614a..846513623f0 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/AzureMinimumMasterNodesTests.java @@ -41,9 +41,9 @@ import static org.hamcrest.Matchers.nullValue; transportClientRatio = 0.0, numClientNodes = 0) @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch-cloud-azure/issues/89") -public class AzureMinimumMasterNodesTest extends AbstractAzureComputeServiceTestCase { +public class AzureMinimumMasterNodesTests extends AbstractAzureComputeServiceTestCase { - public AzureMinimumMasterNodesTest() { + public AzureMinimumMasterNodesTests() { super(AzureComputeServiceTwoNodesMock.TestPlugin.class); } 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/AzureSimpleTests.java similarity index 96% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureSimpleTests.java index 4dcfacf21a1..74daf1a75e7 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/AzureSimpleTests.java @@ -33,9 +33,9 @@ import static org.hamcrest.Matchers.notNullValue; numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) -public class AzureSimpleTest extends AbstractAzureComputeServiceTestCase { +public class AzureSimpleTests extends AbstractAzureComputeServiceTestCase { - public AzureSimpleTest() { + public AzureSimpleTests() { super(AzureComputeServiceSimpleMock.TestPlugin.class); } 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/AzureTwoStartedNodesTests.java similarity index 96% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/discovery/azure/AzureTwoStartedNodesTests.java index a52deeb0fa8..dbccc4ac452 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/AzureTwoStartedNodesTests.java @@ -33,9 +33,9 @@ import static org.hamcrest.Matchers.notNullValue; numDataNodes = 0, transportClientRatio = 0.0, numClientNodes = 0) -public class AzureTwoStartedNodesTest extends AbstractAzureComputeServiceTestCase { +public class AzureTwoStartedNodesTests extends AbstractAzureComputeServiceTestCase { - public AzureTwoStartedNodesTest() { + public AzureTwoStartedNodesTests() { super(AzureComputeServiceTwoNodesMock.TestPlugin.class); } diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTests.java similarity index 94% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTests.java index 90bc85aac69..0f9e874b713 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbMMapFsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.store; import org.elasticsearch.common.settings.Settings; -public class SmbMMapFsTest extends AbstractAzureFsTestCase { +public class SmbMMapFsTests extends AbstractAzureFsTestCase { @Override public Settings indexSettings() { diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTest.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTests.java similarity index 94% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTests.java index 18be4967361..ed15718bc54 100644 --- a/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTest.java +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/index/store/SmbSimpleFsTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.store; import org.elasticsearch.common.settings.Settings; -public class SmbSimpleFsTest extends AbstractAzureFsTestCase { +public class SmbSimpleFsTests extends AbstractAzureFsTestCase { @Override public Settings indexSettings() { return Settings.builder() 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/AzureSnapshotRestoreServiceTests.java similarity index 97% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreServiceTests.java index b0475335870..37a21a38a8a 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/AzureSnapshotRestoreServiceTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.admin.cluster.repositories.put.PutRepositoryResp import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; import org.elasticsearch.client.Client; -import org.elasticsearch.cloud.azure.AbstractAzureRepositoryServiceTestCaseCase; +import org.elasticsearch.cloud.azure.AbstractAzureRepositoryServiceTestCase; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.ByteSizeUnit; @@ -40,9 +40,9 @@ import static org.hamcrest.Matchers.greaterThan; numDataNodes = 1, numClientNodes = 0, transportClientRatio = 0.0) -public class AzureSnapshotRestoreTest extends AbstractAzureRepositoryServiceTestCaseCase { +public class AzureSnapshotRestoreServiceTests extends AbstractAzureRepositoryServiceTestCase { - public AzureSnapshotRestoreTest() { + public AzureSnapshotRestoreServiceTests() { super("/snapshot-test/repo-" + randomInt()); } 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/AzureSnapshotRestoreTests.java similarity index 99% rename from plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java rename to plugins/cloud-azure/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreTests.java index a0039e2c255..6f8d0d0fac7 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/AzureSnapshotRestoreTests.java @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.greaterThan; scope = ESIntegTestCase.Scope.SUITE, numDataNodes = 1, transportClientRatio = 0.0) -public class AzureSnapshotRestoreITest extends AbstractAzureTestCase { +public class AzureSnapshotRestoreTests extends AbstractAzureTestCase { private String getRepositoryPath() { String testName = "it-".concat(Strings.toUnderscoreCase(getTestName()).replaceAll("_", "-")); diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTest.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java similarity index 98% rename from plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTest.java rename to plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java index a31597b8772..b18cca1d84e 100644 --- a/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTest.java +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java @@ -59,7 +59,7 @@ import static org.hamcrest.Matchers.is; * compute/v1/projects/mynewawesometest/zones/europe-west1-b/instances.json * */ -public class GceDiscoveryTest extends ESTestCase { +public class GceDiscoveryTests extends ESTestCase { protected static ThreadPool threadPool; protected MockTransportService transportService; @@ -68,7 +68,7 @@ public class GceDiscoveryTest extends ESTestCase { @BeforeClass public static void createThreadPool() { - threadPool = new ThreadPool(GceDiscoveryTest.class.getName()); + threadPool = new ThreadPool(GceDiscoveryTests.class.getName()); } @AfterClass 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/JavaScriptScriptMultiThreadedTests.java similarity index 99% rename from plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTest.java rename to plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptMultiThreadedTests.java index e56ff8337ee..1d9090d94b2 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/JavaScriptScriptMultiThreadedTests.java @@ -38,7 +38,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class JavaScriptScriptMultiThreadedTest extends ESTestCase { +public class JavaScriptScriptMultiThreadedTests extends ESTestCase { @Test public void testExecutableNoRuntimeParams() throws Exception { 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/PythonScriptMultiThreadedTests.java similarity index 99% rename from plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTest.java rename to plugins/lang-python/src/test/java/org/elasticsearch/script/python/PythonScriptMultiThreadedTests.java index c4eb9851d05..6798dab8ef0 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/PythonScriptMultiThreadedTests.java @@ -39,7 +39,7 @@ import static org.hamcrest.Matchers.equalTo; /** * */ -public class PythonScriptMultiThreadedTest extends ESTestCase { +public class PythonScriptMultiThreadedTests extends ESTestCase { @After public void close() { diff --git a/pom.xml b/pom.xml index 4baecd6cbe4..b86f2de5a93 100644 --- a/pom.xml +++ b/pom.xml @@ -716,7 +716,6 @@ **/*Tests.class - **/*Test.class **/*$*.class