Migrate from try-catch-fail to assertThrows
Change-Id: I89d008937ba8d7c62412be0d87a62c4c34d73d02
diff --git a/javatests/com/google/gerrit/plugins/checks/CheckerQueryTest.java b/javatests/com/google/gerrit/plugins/checks/CheckerQueryTest.java
index c3a93dd..750ef53 100644
--- a/javatests/com/google/gerrit/plugins/checks/CheckerQueryTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/CheckerQueryTest.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.server.query.change.ChangeQueryBuilder;
@@ -54,12 +54,7 @@
@Test
public void disallowedUnknownOperator() throws Exception {
String query = "fhqwhgads:bar";
- try {
- newChangeQueryBuilder().parse(query);
- assert_().fail("expected QueryParseException");
- } catch (QueryParseException e) {
- // Expected.
- }
+ assertThrows(QueryParseException.class, () -> newChangeQueryBuilder().parse(query));
assertInvalidQuery(query, "Unsupported operator: fhqwhgads");
}
@@ -104,12 +99,9 @@
}
private static void assertInvalidQuery(String query, String expectedMessage) {
- try {
- CheckerQuery.clean(query);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- assertThat(e).hasMessageThat().isEqualTo(expectedMessage);
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> CheckerQuery.clean(query));
+ assertThat(thrown).hasMessageThat().isEqualTo(expectedMessage);
}
private static void assertValidQuery(String query) {
diff --git a/javatests/com/google/gerrit/plugins/checks/UrlValidatorTest.java b/javatests/com/google/gerrit/plugins/checks/UrlValidatorTest.java
index 5ada85a..63f36c2 100644
--- a/javatests/com/google/gerrit/plugins/checks/UrlValidatorTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/UrlValidatorTest.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.gerrit.extensions.restapi.BadRequestException;
import org.junit.Test;
@@ -59,11 +59,8 @@
}
private static void assertInvalidUrl(String url, String expectedMessage) {
- try {
- UrlValidator.clean(url);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e).hasMessageThat().isEqualTo(expectedMessage);
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> UrlValidator.clean(url));
+ assertThat(thrown).hasMessageThat().isEqualTo(expectedMessage);
}
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
index 88859f1..7514878 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/CreateCheckerIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.git.testing.CommitSubject.assertCommit;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
@@ -385,14 +384,11 @@
input.repository = allProjects.get();
input.query = CheckerTestData.QUERY_WITH_UNSUPPORTED_OPERATOR;
- try {
- checkersApi.create(input).get();
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo("Unsupported operator: " + CheckerTestData.UNSUPPORTED_OPERATOR);
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.create(input).get());
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo("Unsupported operator: " + CheckerTestData.UNSUPPORTED_OPERATOR);
}
@Test
@@ -402,12 +398,9 @@
input.repository = allProjects.get();
input.query = CheckerTestData.INVALID_QUERY;
- try {
- checkersApi.create(input).get();
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e).hasMessageThat().contains("Invalid query: " + input.query);
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.create(input).get());
+ assertThat(thrown).hasMessageThat().contains("Invalid query: " + input.query);
}
@Test
@@ -417,19 +410,16 @@
input.repository = allProjects.get();
input.query = CheckerTestData.longQueryWithSupportedOperators(MAX_INDEX_TERMS * 2);
assertThat(CheckerQuery.clean(input.query)).isEqualTo(input.query);
- try {
- checkersApi.create(input).get();
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo(
- "change query of checker "
- + input.uuid
- + " is invalid: "
- + input.query
- + " (too many terms in query)");
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.create(input).get());
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo(
+ "change query of checker "
+ + input.uuid
+ + " is invalid: "
+ + input.query
+ + " (too many terms in query)");
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
index a8239bb..2fbeeeb 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
@@ -16,7 +16,6 @@
import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
@@ -510,15 +509,12 @@
gApi.changes().id(patchSetId.changeId().get()).delete();
- try {
- getCheckInfo(patchSetId, checkerUuid);
- assert_().fail("expected ResourceNotFoundException");
- } catch (ResourceNotFoundException e) {
- assertThat(e)
- .hasMessageThat()
- .ignoringCase()
- .contains(String.format("change %d", patchSetId.changeId().get()));
- }
+ ResourceNotFoundException thrown =
+ assertThrows(ResourceNotFoundException.class, () -> getCheckInfo(patchSetId, checkerUuid));
+ assertThat(thrown)
+ .hasMessageThat()
+ .ignoringCase()
+ .contains(String.format("change %d", patchSetId.changeId().get()));
}
private CheckInfo getCheckInfo(
@@ -535,17 +531,14 @@
private void assertCheckNotFound(PatchSet.Id patchSetId, CheckerUuid checkerUuid)
throws Exception {
- try {
- getCheckInfo(patchSetId, checkerUuid);
- assert_().fail("expected ResourceNotFoundException");
- } catch (ResourceNotFoundException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo(
- String.format(
- "Patch set %s in repository %s doesn't have check for checker %s.",
- patchSetId, project, checkerUuid));
- }
+ ResourceNotFoundException thrown =
+ assertThrows(ResourceNotFoundException.class, () -> getCheckInfo(patchSetId, checkerUuid));
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo(
+ String.format(
+ "Patch set %s in repository %s doesn't have check for checker %s.",
+ patchSetId, project, checkerUuid));
}
private PatchSet.Id createPatchSet() throws Exception {
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListCheckersIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListCheckersIT.java
index 1fcdb91..590f82f 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListCheckersIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/ListCheckersIT.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.util.stream.Collectors.toList;
import com.google.common.collect.ImmutableList;
@@ -63,12 +63,10 @@
requestScopeOperations.setApiUser(user.id());
- try {
- checkersApi.all();
- assert_().fail("expected AuthException");
- } catch (AuthException e) {
- assertThat(e.getMessage()).isEqualTo("administrateCheckers for plugin checks not permitted");
- }
+ AuthException thrown = assertThrows(AuthException.class, () -> checkersApi.all());
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo("administrateCheckers for plugin checks not permitted");
}
@Test
@@ -77,12 +75,8 @@
requestScopeOperations.setApiUserAnonymous();
- try {
- checkersApi.all();
- assert_().fail("expected AuthException");
- } catch (AuthException e) {
- assertThat(e.getMessage()).isEqualTo("Authentication required");
- }
+ AuthException thrown = assertThrows(AuthException.class, () -> checkersApi.all());
+ assertThat(thrown).hasMessageThat().isEqualTo("Authentication required");
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
index 697d183..3586930 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/QueryPendingChecksIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.plugins.checks.testing.PendingChecksInfoSubject.assertThat;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
@@ -643,13 +642,10 @@
assertThat(pendingChecksList).isNotEmpty();
}
- private void assertInvalidQuery(String query, String expectedMessage) throws RestApiException {
- try {
- pendingChecksApi.query(query).get();
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e).hasMessageThat().isEqualTo(expectedMessage);
- }
+ private void assertInvalidQuery(String query, String expectedMessage) {
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> pendingChecksApi.query(query).get());
+ assertThat(thrown).hasMessageThat().isEqualTo(expectedMessage);
}
private List<PendingChecksInfo> queryPendingChecks(String queryString) throws RestApiException {
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 8b9be46..4089d63 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/UpdateCheckerIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.plugins.checks.acceptance.api;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
import static com.google.common.truth.Truth8.assertThat;
import static com.google.gerrit.git.testing.CommitSubject.assertCommit;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
@@ -498,14 +497,11 @@
CheckerInput input = new CheckerInput();
input.query = CheckerTestData.QUERY_WITH_UNSUPPORTED_OPERATOR;
- try {
- checkersApi.id(checkerUuid).update(input);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo("Unsupported operator: " + CheckerTestData.UNSUPPORTED_OPERATOR);
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.id(checkerUuid).update(input));
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo("Unsupported operator: " + CheckerTestData.UNSUPPORTED_OPERATOR);
assertThat(checkerOperations.checker(checkerUuid).get().getQuery()).isEqualTo(oldQuery);
}
@@ -517,12 +513,9 @@
CheckerInput input = new CheckerInput();
input.query = CheckerTestData.INVALID_QUERY;
- try {
- checkersApi.id(checkerUuid).update(input);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e).hasMessageThat().contains("Invalid query: " + input.query);
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.id(checkerUuid).update(input));
+ assertThat(thrown).hasMessageThat().contains("Invalid query: " + input.query);
assertThat(checkerOperations.checker(checkerUuid).get().getQuery()).isEqualTo(oldQuery);
}
@@ -535,19 +528,16 @@
CheckerInput input = new CheckerInput();
input.query = CheckerTestData.longQueryWithSupportedOperators(MAX_INDEX_TERMS * 2);
assertThat(CheckerQuery.clean(input.query)).isEqualTo(input.query);
- try {
- checkersApi.id(checkerUuid).update(input);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertThat(e)
- .hasMessageThat()
- .isEqualTo(
- "change query of checker "
- + checkerUuid
- + " is invalid: "
- + input.query
- + " (too many terms in query)");
- }
+ BadRequestException thrown =
+ assertThrows(BadRequestException.class, () -> checkersApi.id(checkerUuid).update(input));
+ assertThat(thrown)
+ .hasMessageThat()
+ .isEqualTo(
+ "change query of checker "
+ + checkerUuid
+ + " is invalid: "
+ + input.query
+ + " (too many terms in query)");
assertThat(checkerOperations.checker(checkerUuid).get().getQuery()).isEqualTo(oldQuery);
}
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckTestDataTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckTestDataTest.java
index e81c171..4c61a0c 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckTestDataTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckTestDataTest.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks.acceptance.testsuite;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.plugins.checks.UrlValidator;
@@ -25,12 +25,10 @@
public class CheckTestDataTest extends AbstractCheckersTest {
@Test
public void verifyTestUrls() throws Exception {
- try {
- UrlValidator.clean(CheckTestData.INVALID_URL);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertMessage(e, "only http/https URLs supported", CheckTestData.INVALID_URL);
- }
+ BadRequestException thrown =
+ assertThrows(
+ BadRequestException.class, () -> UrlValidator.clean(CheckTestData.INVALID_URL));
+ assertMessage(thrown, "only http/https URLs supported", CheckTestData.INVALID_URL);
}
private static void assertMessage(Exception e, String... expectedMessageParts) {
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 ade6bad..403a3a7 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerOperationsImplTest.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.common.truth.Truth.assert_;
import static com.google.common.truth.Truth8.assertThat;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -539,12 +538,7 @@
checkerOperations.checker(checkerUuid).forInvalidation().nonParseableConfig().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- }
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
}
@Test
@@ -553,14 +547,10 @@
checkerOperations.checker(checkerUuid).forInvalidation().invalidUuid().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("value of checker.uuid");
- assertThat(e.getMessage()).contains("does not match expected checker UUID");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("value of checker.uuid");
+ assertThat(thrown).hasMessageThat().contains("does not match expected checker UUID");
}
@Test
@@ -573,13 +563,9 @@
.invalidBlockingCondition()
.invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("Invalid value: checker.blocking");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("Invalid value: checker.blocking");
}
@Test
@@ -588,13 +574,9 @@
checkerOperations.checker(checkerUuid).forInvalidation().invalidStatus().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("Invalid value: checker.status");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("Invalid value: checker.status");
}
@Test
@@ -603,13 +585,9 @@
checkerOperations.checker(checkerUuid).forInvalidation().unsetUuid().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("checker.uuid is not set in config file");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("checker.uuid is not set in config file");
}
@Test
@@ -618,13 +596,9 @@
checkerOperations.checker(checkerUuid).forInvalidation().unsetRepository().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("checker.repository is not set in config file");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("checker.repository is not set in config file");
}
@Test
@@ -633,13 +607,9 @@
checkerOperations.checker(checkerUuid).forInvalidation().unsetStatus().invalidate();
- try {
- checkers.getChecker(checkerUuid);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // expected
- assertThat(e.getMessage()).contains("checker.status is not set in config file");
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> checkers.getChecker(checkerUuid));
+ assertThat(thrown).hasMessageThat().contains("checker.status is not set in config file");
}
@Test
diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerTestDataTest.java b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerTestDataTest.java
index 37b22e0..cde0900 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerTestDataTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/testsuite/CheckerTestDataTest.java
@@ -15,7 +15,7 @@
package com.google.gerrit.plugins.checks.acceptance.testsuite;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assert_;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.plugins.checks.CheckerQuery;
@@ -33,12 +33,10 @@
@Test
public void verifyTestUrls() throws Exception {
- try {
- UrlValidator.clean(CheckerTestData.INVALID_URL);
- assert_().fail("expected BadRequestException");
- } catch (BadRequestException e) {
- assertMessage(e, "only http/https URLs supported", CheckerTestData.INVALID_URL);
- }
+ BadRequestException thrown =
+ assertThrows(
+ BadRequestException.class, () -> UrlValidator.clean(CheckerTestData.INVALID_URL));
+ assertMessage(thrown, "only http/https URLs supported", CheckerTestData.INVALID_URL);
}
@Test
@@ -58,12 +56,9 @@
}
private static void assertInvalidQuery(String query, String... expectedMessageParts) {
- try {
- CheckerQuery.clean(query);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- assertMessage(e, expectedMessageParts);
- }
+ ConfigInvalidException thrown =
+ assertThrows(ConfigInvalidException.class, () -> CheckerQuery.clean(query));
+ assertMessage(thrown, expectedMessageParts);
}
private static void assertMessage(Exception e, String... expectedMessageParts) {
diff --git a/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java b/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
index 706d4a0..15b85fe 100644
--- a/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
+++ b/javatests/com/google/gerrit/plugins/checks/db/CheckerConfigTest.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.plugins.checks.testing.CheckerConfigSubject.assertThat;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
@@ -462,12 +461,7 @@
@Test
public void setQueryDoesNotValidateQuery() throws Exception {
String query = "foo:bar";
- try {
- CheckerQuery.clean(query);
- assert_().fail("expected ConfigInvalidException");
- } catch (ConfigInvalidException e) {
- // Expected.
- }
+ assertThrows(ConfigInvalidException.class, () -> CheckerQuery.clean(query));
createArbitraryChecker(checkerUuid);
