[test] fix test names

For aws s3 and ec2

plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java → plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java

@@ -25,7 +25,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 
-public class AWSSignersTest extends ESTestCase {
+public class AWSSignersTests extends ESTestCase {
 
     @Test
     public void testSigners() {

plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java → plugins/discovery-ec2/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java

@@ -39,7 +39,7 @@
  * in order to run these tests.
  */
 @ThirdParty
-public abstract class AbstractAwsTest extends ESIntegTestCase {
+public abstract class AbstractAwsTestCase extends ESIntegTestCase {
 
     /**
      * Those properties are set by the AWS SDK v1.9.4 and if not ignored,

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java → plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java

@@ -20,7 +20,7 @@
 package org.elasticsearch.discovery.ec2;
 
 
-import org.elasticsearch.cloud.aws.AbstractAwsTest;
+import org.elasticsearch.cloud.aws.AbstractAwsTestCase;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -35,7 +35,7 @@
  * This test requires AWS to run.
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0)
-public class Ec2DiscoveryITest extends AbstractAwsTest {
+public class Ec2DiscoveryTests extends AbstractAwsTestCase {
 
     @Test
     public void testStart() {

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java → plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsTests.java

@@ -21,7 +21,7 @@
 
 
 import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse;
-import org.elasticsearch.cloud.aws.AbstractAwsTest;
+import org.elasticsearch.cloud.aws.AbstractAwsTestCase;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin;
 import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
@@ -37,7 +37,7 @@
  * This test requires AWS to run.
  */
 @ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0.0)
-public class Ec2DiscoveryUpdateSettingsITest extends AbstractAwsTest {
+public class Ec2DiscoveryUpdateSettingsTests extends AbstractAwsTestCase {
 
     @Test
     public void testMinimumMasterNodesStart() {

plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AWSSignersTests.java

@@ -25,7 +25,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 
-public class AWSSignersTest extends ESTestCase {
+public class AWSSignersTests extends ESTestCase {
 
     @Test
     public void testSigners() {

plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTestCase.java

@@ -39,7 +39,7 @@
  * in order to run these tests.
  */
 @ThirdParty
-public abstract class AbstractAwsTest extends ESIntegTestCase {
+public abstract class AbstractAwsTestCase extends ESIntegTestCase {
 
     /**
      * Those properties are set by the AWS SDK v1.9.4 and if not ignored,

plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/cloud/aws/blobstore/S3OutputStreamTests.java

@@ -32,7 +32,7 @@
 /**
  * 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/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java

@@ -29,7 +29,7 @@
 import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ClusterAdminClient;
-import org.elasticsearch.cloud.aws.AbstractAwsTest;
+import org.elasticsearch.cloud.aws.AbstractAwsTestCase;
 import org.elasticsearch.cloud.aws.AwsS3Service;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.common.settings.Settings;
@@ -53,7 +53,7 @@
 /**
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 2, numClientNodes = 0, transportClientRatio = 0.0)
-abstract public class AbstractS3SnapshotRestoreTest extends AbstractAwsTest {
+abstract public class AbstractS3SnapshotRestoreTest extends AbstractAwsTestCase {
 
     @Override
     public Settings indexSettings() {

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3ProxiedSnapshotRestoreOverHttpsTests.java

@@ -27,7 +27,7 @@
  * cloud.aws.s3.proxy_host: mys3proxy.company.com
  * cloud.aws.s3.proxy_port: 8080
  */
-public class S3ProxiedSnapshotRestoreOverHttpsTest extends AbstractS3SnapshotRestoreTest {
+public class S3ProxiedSnapshotRestoreOverHttpsTests extends AbstractS3SnapshotRestoreTest {
 
     private boolean proxySet = false;
 

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTests.java

@@ -23,7 +23,7 @@
 
 /**
  */
-public class S3SnapshotRestoreOverHttpTest extends AbstractS3SnapshotRestoreTest {
+public class S3SnapshotRestoreOverHttpTests extends AbstractS3SnapshotRestoreTest {
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
         Settings.Builder settings = Settings.builder()

plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTest.java → plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTests.java

@@ -23,7 +23,7 @@
 
 /**
  */
-public class S3SnapshotRestoreOverHttpsTest extends AbstractS3SnapshotRestoreTest {
+public class S3SnapshotRestoreOverHttpsTests extends AbstractS3SnapshotRestoreTest {
     @Override
     public Settings nodeSettings(int nodeOrdinal) {
         Settings.Builder settings = Settings.builder()