Use enableCodeOwnersForProject in all tests
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I9e0e1760f94ea4908c501d422773dc95565fff57
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 299a4c4..16432bd 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesIT.java
@@ -44,7 +44,6 @@
import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend;
import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.config.BackendConfig;
-import com.google.gerrit.plugins.codeowners.config.StatusConfig;
import com.google.inject.Inject;
import java.util.HashMap;
import java.util.List;
@@ -588,7 +587,7 @@
.getChangeId();
approve(changeId);
gApi.changes().id(changeId).current().submit();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
}
private String getParsingErrorMessage(
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java
index 095c4af..98a071c 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/CheckCodeOwnerConfigFilesInRevisionIT.java
@@ -33,7 +33,6 @@
import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.backend.proto.ProtoCodeOwnerConfigParser;
import com.google.gerrit.plugins.codeowners.config.BackendConfig;
-import com.google.gerrit.plugins.codeowners.config.StatusConfig;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -122,7 +121,7 @@
String changeId =
createChange("Add code owners", JgitPath.of(codeOwnerConfigPath).get(), "INVALID")
.getChangeId();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
assertThat(checkCodeOwnerConfigFilesIn(changeId))
.containsExactly(
@@ -170,7 +169,7 @@
unknownEmail1, admin.email(), unknownEmail2))
.build()))
.getChangeId();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
Map<String, List<ConsistencyProblemInfo>> problemsByPath =
checkCodeOwnerConfigFilesIn(changeId);
@@ -211,7 +210,7 @@
CodeOwnerSet.createWithoutPathExpressions(admin.email(), user.email()))
.build()))
.getChangeId();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
// The validation request is done by 'admin' which can see 'admin' and 'user', however the
// validation is performed from the perspective of the uploader which is 'user2' and 'user2'
@@ -253,7 +252,7 @@
.getChangeId();
approve(changeId);
gApi.changes().id(changeId).current().submit();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
// Create a change that adds another code owner config file without issues.
CodeOwnerConfig.Key codeOwnerConfigKey2 = createCodeOwnerConfigKey("/foo/");
@@ -279,7 +278,7 @@
codeOwnerConfigOperations.codeOwnerConfig(codeOwnerConfigKey).getFilePath();
disableCodeOwnersForProject(project);
String changeId = createChangeWithFileDeletion(codeOwnerConfigPath);
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
assertThat(checkCodeOwnerConfigFilesIn(changeId)).isEmpty();
}
@@ -314,7 +313,7 @@
unknownEmail2, admin.email()))
.build())))
.getChangeId();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
Map<String, List<ConsistencyProblemInfo>> problemsByPath =
changeCodeOwnersApiFactory
@@ -375,7 +374,7 @@
unknownEmail3, admin.email()))
.build())))
.getChangeId();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
Map<String, List<ConsistencyProblemInfo>> problemsByPath =
changeCodeOwnersApiFactory
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 0489c38..804fcbf 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/api/GetCodeOwnerConfigFilesIT.java
@@ -25,7 +25,6 @@
import com.google.gerrit.plugins.codeowners.backend.findowners.FindOwnersBackend;
import com.google.gerrit.plugins.codeowners.backend.proto.ProtoBackend;
import com.google.gerrit.plugins.codeowners.config.BackendConfig;
-import com.google.gerrit.plugins.codeowners.config.StatusConfig;
import org.junit.Before;
import org.junit.Test;
@@ -325,6 +324,6 @@
.getChangeId();
approve(changeId);
gApi.changes().id(changeId).current().submit();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
}
}
diff --git a/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/GetCodeOwnerStatusRestIT.java b/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/GetCodeOwnerStatusRestIT.java
index 8788ddb..bcbb0cf 100644
--- a/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/GetCodeOwnerStatusRestIT.java
+++ b/javatests/com/google/gerrit/plugins/codeowners/acceptance/restapi/GetCodeOwnerStatusRestIT.java
@@ -24,7 +24,6 @@
import com.google.gerrit.plugins.codeowners.acceptance.AbstractCodeOwnersTest;
import com.google.gerrit.plugins.codeowners.acceptance.testsuite.CodeOwnerConfigOperations;
import com.google.gerrit.plugins.codeowners.backend.CodeOwnerConfig;
-import com.google.gerrit.plugins.codeowners.config.StatusConfig;
import org.junit.Before;
import org.junit.Test;
@@ -74,7 +73,7 @@
createChange("Add code owners", JgitPath.of(filePath).get(), "INVALID").getChangeId();
approve(changeId);
gApi.changes().id(changeId).current().submit();
- setCodeOwnersConfig(project, null, StatusConfig.KEY_DISABLED, "false");
+ enableCodeOwnersForProject(project);
String changeId2 = createChange().getChangeId();
RestResponse r =
