diff options
author | David Pursehouse <dpursehouse@collab.net> | 2018-12-03 10:47:43 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2018-12-04 08:18:29 +0900 |
commit | 31ee321cd1db93376d3690e48540c676938b5a52 (patch) | |
tree | 9c5e9c70e7cfb08290f026ec5d53a3f7a209e3bb | |
parent | b9c7c39e8bca6f5a2b83d7e685ce0509b08f3dbc (diff) |
Remove redundant "testName" methods from Elasticsearch tests
All the Elasticsearch test classes inherit from GerritBaseTests, which
has a getSanitizedMethodName method. Remove the testName methods defined
in all of the test classes, and use getSanitizedMethodName instead.
Change-Id: Ie834a087130fdecffd8bdc6eaa72fe53ab91d6eb
9 files changed, 9 insertions, 45 deletions
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java index 2349befb2c..04b3dc1019 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java @@ -45,10 +45,6 @@ public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure( elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java index cebe7510ed..ab8d6e457b 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java @@ -45,10 +45,6 @@ public class ElasticV5QueryChangesTest extends AbstractQueryChangesTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV5QueryChangesTest extends AbstractQueryChangesTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure( elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java index a353ec29bd..c620e283b0 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java @@ -45,10 +45,6 @@ public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure( elasticsearchConfig, nodeInfo.port, indicesPrefix, ElasticVersion.V5_6); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java index 5c072760c8..d9b4eca2b7 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java @@ -45,10 +45,6 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java index 7ced86983e..e7081ae18f 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryChangesTest.java @@ -46,10 +46,6 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -60,7 +56,7 @@ public class ElasticV6QueryChangesTest extends AbstractQueryChangesTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java index 3fe6bfb662..a92b9252b0 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java @@ -45,10 +45,6 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 9efe12da2f..5e85e61ad2 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -45,10 +45,6 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 698e01eeae..6eef504cb3 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -46,10 +46,6 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -60,7 +56,7 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index ba4b3b60e9..13174711a9 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -45,10 +45,6 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { } } - private String testName() { - return testName.getMethodName().toLowerCase() + "_"; - } - @Override protected void initAfterLifecycleStart() throws Exception { super.initAfterLifecycleStart(); @@ -59,7 +55,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { protected Injector createInjector() { Config elasticsearchConfig = new Config(config); InMemoryModule.setDefaults(elasticsearchConfig); - String indicesPrefix = testName(); + String indicesPrefix = getSanitizedMethodName(); ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } |