Move method to get code owner config file name up to base test class
This avoids having this method in mutliple test classes.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Iee3f64a962561ff308dd655e22a7d15fb3e3c2ac
diff --git a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
index c85c506..b632510 100644
--- a/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
+++ b/java/com/google/gerrit/plugins/codeowners/acceptance/AbstractCodeOwnersTest.java
@@ -36,8 +36,12 @@
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.plugins.codeowners.acceptance.testsuite.CodeOwnerConfigOperations;
import com.google.gerrit.plugins.codeowners.acceptance.testsuite.TestCodeOwnerConfigCreation.Builder;
+import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend;
+import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig;
import com.google.gerrit.plugins.codeowners.backend.config.CodeOwnersPluginConfiguration;
import com.google.gerrit.plugins.codeowners.backend.config.StatusConfig;
+import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend;
+import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.util.JgitPath;
import com.google.inject.Inject;
import java.nio.file.Path;
@@ -67,11 +71,13 @@
@Inject private ProjectOperations projectOperations;
private CodeOwnerConfigOperations codeOwnerConfigOperations;
+ private BackendConfig backendConfig;
@Before
public void testSetup() throws Exception {
codeOwnerConfigOperations =
plugin.getSysInjector().getInstance(CodeOwnerConfigOperations.class);
+ backendConfig = plugin.getSysInjector().getInstance(BackendConfig.class);
}
protected String createChangeWithFileDeletion(Path filePath) throws Exception {
@@ -303,4 +309,14 @@
PushOneCommit push = pushFactory.create(admin.newIdent(), testRepo, subject, files);
return push.to("refs/for/master");
}
+
+ protected String getCodeOwnerConfigFileName() {
+ CodeOwnerBackend backend = backendConfig.getDefaultBackend();
+ if (backend instanceof FindOwnersBackend) {
+ return FindOwnersBackend.CODE_OWNER_CONFIG_FILE_NAME;
+ } else if (backend instanceof ProtoBackend) {
+ return ProtoBackend.CODE_OWNER_CONFIG_FILE_NAME;
+ }
+ throw new IllegalStateException("unknown code owner backend: " + backend.getClass().getName());
+ }
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
index a2e37ef..75bf757 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
@@ -668,16 +668,6 @@
return projectCodeOwnersApiFactory.project(projectName).checkCodeOwnerConfigFiles().check();
}
- private String getCodeOwnerConfigFileName() {
- CodeOwnerBackend backend = backendConfig.getDefaultBackend();
- if (backend instanceof FindOwnersBackend) {
- return FindOwnersBackend.CODE_OWNER_CONFIG_FILE_NAME;
- } else if (backend instanceof ProtoBackend) {
- return ProtoBackend.CODE_OWNER_CONFIG_FILE_NAME;
- }
- throw new IllegalStateException("unknown code owner backend: " + backend.getClass().getName());
- }
-
private String getParsingErrorMessage(
ImmutableMap<Class<? extends CodeOwnerBackend>, String> messagesByBackend) {
CodeOwnerBackend codeOwnerBackend = backendConfig.getDefaultBackend();
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
index 3be9ea8..238dc9f 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerIT.java
@@ -39,15 +39,11 @@
import com.google.gerrit.plugins.codeowners.acceptance.testsuite.TestCodeOwnerConfigCreation;
import com.google.gerrit.plugins.codeowners.acceptance.testsuite.TestPathExpressions;
import com.google.gerrit.plugins.codeowners.api.CodeOwnerCheckInfo;
-import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigImportMode;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfigReference;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerResolver;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSet;
-import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig;
-import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend;
-import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.restapi.CheckCodeOwnerCapability;
import com.google.gerrit.plugins.codeowners.util.JgitPath;
import com.google.gerrit.server.ServerInitiated;
@@ -75,12 +71,10 @@
@Inject @ServerInitiated private Provider<AccountsUpdate> accountsUpdate;
@Inject private ExternalIdNotes.Factory externalIdNotesFactory;
- private BackendConfig backendConfig;
private TestPathExpressions testPathExpressions;
@Before
public void setUpCodeOwnersPlugin() throws Exception {
- backendConfig = plugin.getSysInjector().getInstance(BackendConfig.class);
testPathExpressions = plugin.getSysInjector().getInstance(TestPathExpressions.class);
}
@@ -1339,16 +1333,6 @@
.create();
}
- private String getCodeOwnerConfigFileName() {
- CodeOwnerBackend backend = backendConfig.getDefaultBackend();
- if (backend instanceof FindOwnersBackend) {
- return FindOwnersBackend.CODE_OWNER_CONFIG_FILE_NAME;
- } else if (backend instanceof ProtoBackend) {
- return ProtoBackend.CODE_OWNER_CONFIG_FILE_NAME;
- }
- throw new IllegalStateException("unknown code owner backend: " + backend.getClass().getName());
- }
-
private void addEmail(Account.Id accountId, String email) throws Exception {
accountsUpdate
.get()
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java
index 555bfcc..6907c43 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CodeOwnerConfigValidatorIT.java
@@ -2476,16 +2476,6 @@
return ObjectIds.abbreviateName(id, testRepo.getRevWalk().getObjectReader());
}
- private String getCodeOwnerConfigFileName() {
- CodeOwnerBackend backend = backendConfig.getDefaultBackend();
- if (backend instanceof FindOwnersBackend) {
- return FindOwnersBackend.CODE_OWNER_CONFIG_FILE_NAME;
- } else if (backend instanceof ProtoBackend) {
- return ProtoBackend.CODE_OWNER_CONFIG_FILE_NAME;
- }
- throw new IllegalStateException("unknown code owner backend: " + backend.getClass().getName());
- }
-
private static void assertOkWithoutMessages(PushOneCommit.Result pushResult) {
pushResult.assertOkStatus();
pushResult.assertNotMessage("fatal");
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
index da9c694..f958012 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
@@ -21,14 +21,9 @@
import com.google.gerrit.entities.RefNames;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersIT;
-import com.google.gerrit.plugins.codeowners.backend.CodeOwnerBackend;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerSet;
-import com.google.gerrit.plugins.codeowners.backend.config.BackendConfig;
-import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend;
-import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.util.JgitPath;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -36,13 +31,6 @@
* com.google.gerrit.plugins.codeowners.restapi.GetCodeOwnerConfigFiles} REST endpoint.
*/
public class GetCodeOwnerConfigFilesIT extends AbstractCodeOwnersIT {
- private BackendConfig backendConfig;
-
- @Before
- public void setUpCodeOwnersPlugin() throws Exception {
- backendConfig = plugin.getSysInjector().getInstance(BackendConfig.class);
- }
-
@Test
public void noCodeOwnerConfigFiles() throws Exception {
assertThat(
@@ -434,14 +422,4 @@
codeOwnerConfigOperations.codeOwnerConfig(codeOwnerConfigKey3).getFilePath())
.inOrder();
}
-
- private String getCodeOwnerConfigFileName() {
- CodeOwnerBackend backend = backendConfig.getDefaultBackend();
- if (backend instanceof FindOwnersBackend) {
- return FindOwnersBackend.CODE_OWNER_CONFIG_FILE_NAME;
- } else if (backend instanceof ProtoBackend) {
- return ProtoBackend.CODE_OWNER_CONFIG_FILE_NAME;
- }
- throw new IllegalStateException("unknown code owner backend: " + backend.getClass().getName());
- }
}
