opendev/gerrit
Code Issues Proposed changes

StalenessCheckerTest: Migrate from try-catch-fail to assertThrows

Browse Source 
Change-Id: I0a3936c72f4417c23b403ebe41d935d6803abdf2
This commit is contained in:
David Pursehouse
2019-05-22 20:32:00 +09:00
parent c3d93880cc
commit 98f1fbb5c6
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java
View File

@@ -15,8 +15,8 @@
package com.google.gerrit.server.index.change;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assert_;
import static com.google.gerrit.server.index.change.StalenessChecker.refsAreStale;
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.toList;
@@ -82,12 +82,7 @@ public class StalenessCheckerTest {
}
private static void assertInvalidState(String state) {
try {
RefState.parseStates(byteArrays(state));
assert_().fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// Expected.
}
assertThrows(IllegalArgumentException.class, () -> RefState.parseStates(byteArrays(state)));
}
@Test
@@ -154,12 +149,8 @@ public class StalenessCheckerTest {
}
private static void assertInvalidPattern(String state) {
try {
StalenessChecker.parsePatterns(byteArrays(state));
assert_().fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
// Expected.
}
assertThrows(
IllegalArgumentException.class, () -> StalenessChecker.parsePatterns(byteArrays(state)));
}
@Test