Throw AssertionError outside of the catch block
Change-Id: I1c11a987bdd3e612e87e413abfe2ddc87c791d7d
diff --git a/javatests/com/google/gitiles/MoreAssert.java b/javatests/com/google/gitiles/MoreAssert.java
index 3f79874..3814be5 100644
--- a/javatests/com/google/gitiles/MoreAssert.java
+++ b/javatests/com/google/gitiles/MoreAssert.java
@@ -15,13 +15,10 @@
/** Assertion methods for Gitiles. */
public class MoreAssert {
- private MoreAssert() {}
-
/** Simple version of assertThrows that will be introduced in JUnit 4.13. */
public static <T extends Throwable> T assertThrows(Class<T> expected, ThrowingRunnable r) {
try {
r.run();
- throw new AssertionError("Expected " + expected.getSimpleName() + " to be thrown");
} catch (Throwable actual) {
if (expected.isAssignableFrom(actual.getClass())) {
@SuppressWarnings("unchecked")
@@ -32,9 +29,12 @@
"Expected " + expected.getSimpleName() + ", but got " + actual.getClass().getSimpleName(),
actual);
}
+ throw new AssertionError("Expected " + expected.getSimpleName() + " to be thrown");
}
public interface ThrowingRunnable {
void run() throws Throwable;
}
+
+ private MoreAssert() {}
}
