commit fdfa80d509a96ff3eee2dfaa616916ee84003f3b
author Edwin Kempin <ekempin@google.com> Mon Mar 25 13:05:51 2019 +0100
committer Edwin Kempin <ekempin@google.com> Mon Mar 25 13:28:30 2019 +0100
tree d564d1be0e541df90d94ab1a0c4c58822670f04a
parent 9f7df89ab4ae8b08efb0dbc886f3bbfa2edb5ed7

TestCheckerCreation: Add clearQuery() method to create checker without query

That's more readable than calling query("") and is consistent with how
we clear other fields (e.g. see clearUrl()).

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ia736b841b0e5a2def35c29ba0763f47d52cdf89f

java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java

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 504705e..d258eee 100644
--- a/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java
+++ b/java/com/google/gerrit/plugins/checks/acceptance/testsuite/TestCheckerCreation.java
@@ -89,6 +89,10 @@
 
     public abstract Builder query(String query);
 
+    public Builder clearQuery() {
+      return query("");
+    }
+
     abstract Builder checkerCreator(
         ThrowingFunction<TestCheckerCreation, CheckerUuid> checkerCreator);
 

javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java

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 a450e41..9759b17 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckerIT.java
@@ -135,7 +135,7 @@
 
   @Test
   public void getCheckerWithoutQuery() throws Exception {
-    CheckerUuid checkerUuid = checkerOperations.newChecker().query("").create();
+    CheckerUuid checkerUuid = checkerOperations.newChecker().clearQuery().create();
     assertThat(getCheckerInfo(checkerUuid).query).isNull();
   }
 

javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java

diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
index 18b7fe3..6d02d74 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListPendingChecksIT.java
@@ -255,7 +255,8 @@
   @Test
   public void listPendingChecksFiltersOutChecksForClosedChangesIfQueryDoesntSpecifyStatus()
       throws Exception {
-    CheckerUuid checkerUuid = checkerOperations.newChecker().repository(project).query("").create();
+    CheckerUuid checkerUuid =
+        checkerOperations.newChecker().repository(project).clearQuery().create();
 
     checkOperations
         .newCheck(CheckKey.create(project, patchSetId, checkerUuid))

javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java

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 e929d06..ed63108 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -168,7 +168,7 @@
 
   @Test
   public void requestingNoQueryIsPossibleForCheckerCreation() throws Exception {
-    CheckerUuid checkerUuid = checkerOperations.newChecker().query("").create();
+    CheckerUuid checkerUuid = checkerOperations.newChecker().clearQuery().create();
 
     CheckerInfo checker = getCheckerFromServer(checkerUuid);
     assertThat(checker.query).isNull();
@@ -344,7 +344,7 @@
 
   @Test
   public void emptyQueryOfExistingCheckerCanBeRetrieved() throws Exception {
-    CheckerUuid checkerUuid = checkerOperations.newChecker().query("").create();
+    CheckerUuid checkerUuid = checkerOperations.newChecker().clearQuery().create();
 
     Optional<String> query = checkerOperations.checker(checkerUuid).get().getQuery();