TagsIT,ListBranchesIT,ListProjectsIT: Migrate from try-catch-fail to assertThrows
Change-Id: I7572ee73d49cca8b814f79740760f0be778685ea
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
index d1364f0..8fca32f 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/ListBranchesIT.java
@@ -173,11 +173,6 @@
}
private void assertBadRequest(ListRefsRequest<BranchInfo> req) throws Exception {
- try {
- req.get();
- fail("Expected BadRequestException");
- } catch (BadRequestException e) {
- // Expected
- }
+ assertThrows(BadRequestException.class, () -> req.get());
}
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
index f29069c..9de59fb 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java
@@ -17,6 +17,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.rest.project.ProjectAssert.assertThatNameList;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
+import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.util.stream.Collectors.toList;
import com.google.common.base.Splitter;
@@ -334,11 +335,6 @@
}
private void assertBadRequest(ListRequest req) throws Exception {
- try {
- req.get();
- fail("Expected BadRequestException");
- } catch (BadRequestException expected) {
- // Expected.
- }
+ assertThrows(BadRequestException.class, () -> req.get());
}
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java b/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java
index 2bd9460..97cac4d 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/TagsIT.java
@@ -370,12 +370,7 @@
}
private void assertBadRequest(ListRefsRequest<TagInfo> req) throws Exception {
- try {
- req.get();
- fail("Expected BadRequestException");
- } catch (BadRequestException e) {
- // Expected
- }
+ assertThrows(BadRequestException.class, () -> req.get());
}
private void grantTagPermissions() throws Exception {
