UpdateCheckerIT: Don't set checker fields which are unrelated to the test
Several tests were unnecessarily setting a name and a repository when
creating checkers. If the name and repository are not relevant for the
test it improves readability to not set them at all.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I66ec39d60aaceffb67a5dfc533725d3f174c8282
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
index 39cd9ad..17cdffd 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
@@ -193,7 +193,7 @@
@Test
public void addCheckerDescription() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.description = "A description.";
@@ -211,8 +211,7 @@
@Test
public void updateCheckerDescription() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").description("A description.").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().description("A description.").create();
CheckerInput input = new CheckerInput();
input.description = "A new description.";
@@ -230,8 +229,7 @@
@Test
public void unsetCheckerDescription() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").description("A description.").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().description("A description.").create();
CheckerInput checkerInput = new CheckerInput();
checkerInput.description = "";
@@ -249,7 +247,7 @@
@Test
public void checkerDescriptionIsTrimmed() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.description = " A description. ";
@@ -267,7 +265,7 @@
@Test
public void addCheckerUrl() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.url = "http://example.com/my-checker";
@@ -286,11 +284,7 @@
@Test
public void updateCheckerUrl() throws Exception {
CheckerUuid checkerUuid =
- checkerOperations
- .newChecker()
- .name("my-checker")
- .url("http://example.com/my-checker")
- .create();
+ checkerOperations.newChecker().url("http://example.com/my-checker").create();
CheckerInput input = new CheckerInput();
input.url = "http://example.com/my-checker-foo";
@@ -309,11 +303,7 @@
@Test
public void unsetCheckerUrl() throws Exception {
CheckerUuid checkerUuid =
- checkerOperations
- .newChecker()
- .name("my-checker")
- .url("http://example.com/my-checker")
- .create();
+ checkerOperations.newChecker().url("http://example.com/my-checker").create();
CheckerInput checkerInput = new CheckerInput();
checkerInput.url = "";
@@ -331,7 +321,7 @@
@Test
public void checkerUrlIsTrimmed() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.url = " http://example.com/my-checker ";
@@ -349,8 +339,7 @@
@Test
public void updateRepository() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().repository(allProjects).create();
Project.NameKey repositoryName = projectOperations.newProject().create();
@@ -410,7 +399,7 @@
@Test
public void cannotSetUrlToInvalidUrl() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.url = CheckerTestData.INVALID_URL;
@@ -421,8 +410,7 @@
@Test
public void disableAndReenable() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().repository(allProjects).create();
assertThat(checkerOperations.checkersOf(allProjects)).containsExactly(checkerUuid);
CheckerInput input = new CheckerInput();
@@ -441,8 +429,7 @@
@Test
public void updateRepositoryDuringDisable() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().repository(allProjects).create();
Project.NameKey repositoryName = projectOperations.newProject().create();
@@ -458,8 +445,7 @@
@Test
public void updateRepositoryDuringEnable() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().repository(allProjects).create();
Project.NameKey repositoryName = projectOperations.newProject().create();
assertThat(checkerOperations.checkersOf(allProjects)).containsExactly(checkerUuid);
@@ -484,22 +470,17 @@
@Test
public void updateCheckerWithBlockingConditions() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
- input.name = "my-checker";
- input.repository = allProjects.get();
input.blockingConditions = ImmutableSet.of(BlockingCondition.STATE_NOT_PASSING);
-
CheckerInfo info = checkersApi.id(checkerUuid).update(input);
assertThat(info.blocking).containsExactly(BlockingCondition.STATE_NOT_PASSING);
}
@Test
public void updateQuery() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.query = "f:foo";
@@ -516,8 +497,7 @@
@Test
public void updateWithEmptyQueryAfterTrimClearsQuery() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
CheckerInput input = new CheckerInput();
input.query = "f:foo";
@@ -534,8 +514,7 @@
@Test
public void updateWithUnsupportedOperatorInQuery() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
Optional<String> oldQuery = checkerOperations.checker(checkerUuid).get().getQuery();
CheckerInput input = new CheckerInput();
@@ -554,8 +533,7 @@
@Test
public void updateWithInvalidQuery() throws Exception {
- CheckerUuid checkerUuid =
- checkerOperations.newChecker().name("my-checker").repository(allProjects).create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
Optional<String> oldQuery = checkerOperations.checker(checkerUuid).get().getQuery();
CheckerInput input = new CheckerInput();
@@ -572,7 +550,7 @@
@Test
public void updateCheckerWithoutAdministrateCheckersCapabilityFails() throws Exception {
- CheckerUuid checkerUuid = checkerOperations.newChecker().name("my-checker").create();
+ CheckerUuid checkerUuid = checkerOperations.newChecker().create();
requestScopeOperations.setApiUser(user.getId());