Checker Test API: Allow easy creation of enabled/disabled checkers
TestCheckerUpdate already provided more expressive methods for
switching a checker to enabled/disabled. There's no reason to use a
different approach for TestCheckerCreation. Since the enable()/disable()
methods are the recommended way, reduce the visibility of the underlying
method.
Change-Id: Ia6b5f5e2abdc25915246182db874cdb5383d3d2f
diff --git a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java
index d258eee..298d0c9 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java
@@ -72,7 +72,15 @@
public abstract Builder repository(Project.NameKey repository);
- public abstract Builder status(CheckerStatus status);
+ public Builder enable() {
+ return status(CheckerStatus.ENABLED);
+ }
+
+ public Builder disable() {
+ return status(CheckerStatus.DISABLED);
+ }
+
+ abstract Builder status(CheckerStatus status);
public abstract Builder blockingConditions(
ImmutableSortedSet<BlockingCondition> blockingConditions);
diff --git a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerUpdate.java b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerUpdate.java
index 1fd5409..063911b 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerUpdate.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerUpdate.java
@@ -68,8 +68,6 @@
public abstract Builder repository(Project.NameKey repository);
- public abstract Builder status(CheckerStatus status);
-
public Builder enable() {
return status(CheckerStatus.ENABLED);
}
@@ -78,6 +76,8 @@
return status(CheckerStatus.DISABLED);
}
+ abstract Builder status(CheckerStatus status);
+
public abstract Builder blockingConditions(
ImmutableSortedSet<BlockingCondition> blockingConditions);
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
index 34e92d7..538c062 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckerRefsIT.java
@@ -27,7 +27,6 @@
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.plugins.checks.CheckerRef;
import com.google.gerrit.plugins.checks.CheckerUuid;
-import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.reviewdb.client.BranchNameKey;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.Project;
@@ -158,8 +157,7 @@
@Test
public void submitToCheckerRefsIsDisabled() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().status(CheckerStatus.DISABLED).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().disable().create();
String checkerRef = checkerUuid.toRefName();
String changeId = createChangeWithoutCommitValidation(allProjects, checkerRef);
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckersIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckersIT.java
index 51c2ca4..a319b5f 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/CheckersIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/CheckersIT.java
@@ -19,7 +19,6 @@
import com.google.gerrit.plugins.checks.Checker;
import com.google.gerrit.plugins.checks.CheckerUuid;
import com.google.gerrit.plugins.checks.Checkers;
-import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.reviewdb.client.Project;
import java.util.stream.Stream;
import org.junit.Test;
@@ -47,7 +46,7 @@
@Test
public void checkersOfOmitsDisabledCheckers() throws Exception {
// Creates a disabled checker.
- checkerOperations.newChecker().repository(project).status(CheckerStatus.DISABLED).create();
+ checkerOperations.newChecker().repository(project).disable().create();
// Creates an enabled checker and then disabled it by an update.
CheckerUuid checkerUuid1 = checkerOperations.newChecker().repository(project).create();
checkerOperations.checker(checkerUuid1).forUpdate().disable().update();
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
index bcbee51..00c876a 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckIT.java
@@ -32,7 +32,6 @@
import com.google.gerrit.plugins.checks.api.CheckInfo;
import com.google.gerrit.plugins.checks.api.CheckInput;
import com.google.gerrit.plugins.checks.api.CheckState;
-import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.util.time.TimeUtil;
@@ -235,8 +234,7 @@
@Test
public void canCreateCheckForDisabledChecker() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().repository(project).status(CheckerStatus.DISABLED).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).disable().create();
CheckInput input = new CheckInput();
input.checkerUuid = checkerUuid.get();
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
index 1fbb9dd..4a1b052 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
@@ -112,14 +112,13 @@
@Test
public void getCheckerReturnsStatus() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().status(CheckerStatus.ENABLED).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().enable().create();
assertThat(getCheckerInfo(checkerUuid).status).isEqualTo(CheckerStatus.ENABLED);
}
@Test
public void getDisabledChecker() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().status(CheckerStatus.DISABLED).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().disable().create();
assertThat(getCheckerInfo(checkerUuid).status).isEqualTo(CheckerStatus.DISABLED);
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/db/GetCombinedCheckStateIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/db/GetCombinedCheckStateIT.java
index 6ebd10b..b0cb2a2 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/db/GetCombinedCheckStateIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/db/GetCombinedCheckStateIT.java
@@ -24,7 +24,6 @@
import com.google.gerrit.plugins.checks.acceptance.testsuite.TestCheckerCreation;
import com.google.gerrit.plugins.checks.api.BlockingCondition;
import com.google.gerrit.plugins.checks.api.CheckState;
-import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.plugins.checks.api.CombinedCheckState;
import com.google.gerrit.reviewdb.client.PatchSet;
import org.junit.Before;
@@ -51,7 +50,7 @@
@Test
public void returnsSuccessfulWhenForSuccessfulCheckWhoseCheckerIsDisabled() throws Exception {
- CheckerUuid checkerUuid = newRequiredChecker().status(CheckerStatus.DISABLED).create();
+ CheckerUuid checkerUuid = newRequiredChecker().disable().create();
setCheckSuccessful(checkerUuid);
CombinedCheckState combinedCheckState = checks.getCombinedCheckState(project, patchSetId);
@@ -117,7 +116,7 @@
return checkerOperations
.newChecker()
.repository(project)
- .status(CheckerStatus.ENABLED)
+ .enable()
.blockingConditions(BlockingCondition.STATE_NOT_PASSING);
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/rules/ChecksSubmitRuleIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/rules/ChecksSubmitRuleIT.java
index 9cd3059..fadd0f9 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/rules/ChecksSubmitRuleIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/rules/ChecksSubmitRuleIT.java
@@ -26,7 +26,6 @@
import com.google.gerrit.plugins.checks.acceptance.testsuite.TestCheckerCreation;
import com.google.gerrit.plugins.checks.api.BlockingCondition;
import com.google.gerrit.plugins.checks.api.CheckState;
-import com.google.gerrit.plugins.checks.api.CheckerStatus;
import com.google.gerrit.reviewdb.client.PatchSet;
import org.junit.Before;
import org.junit.Test;
@@ -148,7 +147,7 @@
return checkerOperations
.newChecker()
.repository(project)
- .status(CheckerStatus.ENABLED)
+ .enable()
.blockingConditions(BlockingCondition.STATE_NOT_PASSING);
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
index f81bbae..a9e237d 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -125,15 +125,22 @@
}
@Test
- public void specifiedStatusIsRespectedForCheckerCreation() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().status(CheckerStatus.DISABLED).create();
+ public void disabledStatusIsRespectedForCheckerCreation() throws Exception {
+ CheckerUuid checkerUuid = checkerOperations.newChecker().disable().create();
CheckerInfo checker = getCheckerFromServer(checkerUuid);
assertThat(checker.status).isEqualTo(CheckerStatus.DISABLED);
}
@Test
+ public void enabledStatusIsRespectedForCheckerCreation() throws Exception {
+ CheckerUuid checkerUuid = checkerOperations.newChecker().enable().create();
+
+ CheckerInfo checker = getCheckerFromServer(checkerUuid);
+ assertThat(checker.status).isEqualTo(CheckerStatus.ENABLED);
+ }
+
+ @Test
public void specifiedRepositoryIsRespectedForCheckerCreation() throws Exception {
Project.NameKey otherProject = createProjectOverAPI("other", null, true, null);
CheckerUuid checkerUuid = checkerOperations.newChecker().repository(otherProject).create();
