Merge pull request #13294 from rjernst/no_test_exclusions3

Rename test suffix so we only use "Tests"

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 {

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<Path> visitor = new FileVisitor<Path>() {

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 {}

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 {

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";

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 {

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");

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;

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"));

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";

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 {

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 {

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 {

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;
 

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 {
 
 
     /*

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() {

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 {
 

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 {

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 {

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);

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");

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]));

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);
         }
 

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;

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.

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;

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 {

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() {

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");

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() {

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();
 

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 {

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 {

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";

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 {

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;

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);
 

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");

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 {

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 {

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 {

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 {

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() {

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

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);

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");

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<T extends Streamable> extends Thread {
 

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 {

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() {

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();

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 {

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;
 

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() {

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 {

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();
 

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 {

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());
 

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 {

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();

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 {

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:
  * <pre>
  *
- * @ClusterScope(scope=Scope.TEST) public class SomeIntegrationTest extends ESIntegTestCase {
+ * @ClusterScope(scope=Scope.TEST) public class SomeIT extends ESIntegTestCase {
  * @Test public void testMethod() {}
  * }
  * </pre>
@@ -204,7 +204,7 @@ import static org.hamcrest.Matchers.*;
  * <p/>
  *  <pre>
  * @ClusterScope(scope=Scope.SUITE, numDataNodes=3)
- * public class SomeIntegrationTest extends ESIntegTestCase {
+ * public class SomeIT extends ESIntegTestCase {
  * @Test public void testMethod() {}
  * }
  * </pre>

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 {
 

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() {

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();
 

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<Class<? extends Plugin>> nodePlugins() {

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<Class<? extends Plugin>> nodePlugins() {

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;
 

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()

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()

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 {

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 {

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) {

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<? extends AzureStorageService> mock;
 
-    public AbstractAzureRepositoryServiceTestCaseCase(String basePath) {
+    public AbstractAzureRepositoryServiceTestCase(String basePath) {
         this.basePath = basePath;
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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() {

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()

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());
     }
 

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("_", "-"));

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

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 {

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() {

pom.xml

@@ -716,7 +716,6 @@
                                 </balancers>
                                 <includes>
                                     <include>**/*Tests.class</include>
-                                    <include>**/*Test.class</include>
                                 </includes>
                                 <excludes>
                                     <exclude>**/*$*.class</exclude>