Extract isAnyExceptionExpected().

Improve readability and avoid duplicate code.
junit-team · Oct 16, 2013 · 8b35f0c · 8b35f0c
1 parent bb13b31
commit 8b35f0c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/junit/rules/ExpectedException.java b/src/main/java/org/junit/rules/ExpectedException.java
@@ -232,20 +232,24 @@ public void evaluate() throws Throwable {
                 handleException(e);
                 return;
             }
-            if (fMatcherBuilder.expectsThrowable()) {
+            if (isAnyExceptionExpected()) {
                 failDueToMissingException();
             }
         }
     }
 
     private void handleException(Throwable e) throws Throwable {
-        if (fMatcherBuilder.expectsThrowable()) {
+        if (isAnyExceptionExpected()) {
             assertThat(e, fMatcherBuilder.build());
         } else {
             throw e;
         }
     }
 
+    private boolean isAnyExceptionExpected() {
+        return fMatcherBuilder.expectsThrowable();
+    }
+
     private void failDueToMissingException() throws AssertionError {
         fail(missingExceptionMessage());
     }