opendev/gerrit
Code Issues Proposed changes

Remove redundant GerritTestName declarations in Elasticsearch tests

Browse Source 
The @Rule declarations of GerritTestName are done in the base classes
and cause 'hiding' warnings when they are also declared in the concrete
test implementation classes.

Change-Id: I6b1a82c4ef03b75d6e03a33ad89ac721c6ef5edf
This commit is contained in:
David Pursehouse
2019-05-07 17:49:55 +09:00
parent 6dd954db55
commit 8de56c49ca
9 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
javatests/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest; import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest { public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest; import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest { public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest; import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV5QueryProjectsTest extends AbstractQueryProjectsTest { public class ElasticV5QueryProjectsTest extends AbstractQueryProjectsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -60,8 +58,6 @@ public class ElasticV5QueryProjectsTest extends AbstractQueryProjectsTest {
ElasticTestUtils.createAllIndexes(injector); ElasticTestUtils.createAllIndexes(injector);
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected Injector createInjector() { protected Injector createInjector() {
Config elasticsearchConfig = new Config(config); Config elasticsearchConfig = new Config(config);

4
javatests/com/google/gerrit/elasticsearch/ElasticV6QueryAccountsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest; import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest { public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV6QueryAccountsTest extends AbstractQueryAccountsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV6QueryGroupsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest; import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest { public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV6QueryGroupsTest extends AbstractQueryGroupsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest; import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest { public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV6QueryProjectsTest extends AbstractQueryProjectsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.account.AbstractQueryAccountsTest; import com.google.gerrit.server.query.account.AbstractQueryAccountsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.group.AbstractQueryGroupsTest; import com.google.gerrit.server.query.group.AbstractQueryGroupsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();

4
javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.elasticsearch;
import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo;
import com.google.gerrit.server.query.project.AbstractQueryProjectsTest; import com.google.gerrit.server.query.project.AbstractQueryProjectsTest;
import com.google.gerrit.testing.ConfigSuite; import com.google.gerrit.testing.ConfigSuite;
import com.google.gerrit.testing.GerritTestName;
import com.google.gerrit.testing.InMemoryModule; import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.IndexConfig; import com.google.gerrit.testing.IndexConfig;
import com.google.inject.Guice; import com.google.inject.Guice;
@@ -25,7 +24,6 @@ import com.google.inject.Injector;
import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Config;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Rule;
public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest { public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
@ConfigSuite.Default @ConfigSuite.Default
@@ -54,8 +52,6 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest {
} }
} }
@Rule public final GerritTestName testName = new GerritTestName();
@Override @Override
protected void initAfterLifecycleStart() throws Exception { protected void initAfterLifecycleStart() throws Exception {
super.initAfterLifecycleStart(); super.initAfterLifecycleStart();