Merge pull request junit-team#521 from mmichaelis/adjust-testwatcher-…

…skipped Adjust testwatcher skipped to handle failures correctly
wanghuida · Nov 6, 2012 · 94aa692 · 94aa692
2 parents 35505c4 + be61237
commit 94aa692
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 2 deletions.
diff --git a/src/main/java/org/junit/rules/TestWatcher.java b/src/main/java/org/junit/rules/TestWatcher.java
@@ -55,8 +55,8 @@ public void evaluate() throws Throwable {
                     base.evaluate();
                     succeededQuietly(description, errors);
                 } catch (AssumptionViolatedException e) {
-                    skipped(e, description);
-                    throw e;
+                    errors.add(e);
+                    skippedQuietly(e, description, errors);
                 } catch (Throwable t) {
                     errors.add(t);
                     failedQuietly(t, description, errors);
@@ -87,6 +87,15 @@ private void failedQuietly(Throwable t, Description description,
         }
     }
 
+    private void skippedQuietly(AssumptionViolatedException e, Description description,
+            List<Throwable> errors) {
+        try {
+            skipped(e, description);
+        } catch (Throwable t) {
+            errors.add(t);
+        }
+    }
+
     private void startingQuietly(Description description,
             List<Throwable> errors) {
         try {

diff --git a/src/test/java/org/junit/tests/experimental/rules/TestWatcherTest.java b/src/test/java/org/junit/tests/experimental/rules/TestWatcherTest.java
@@ -12,6 +12,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.results.PrintableResult;
+import org.junit.internal.AssumptionViolatedException;
 import org.junit.rules.TestRule;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
@@ -37,6 +38,29 @@ public void neitherLogSuccessNorFailedForViolatedAssumption() {
                 is("starting finished "));
     }
 
+    public static class TestWatcherSkippedThrowsExceptionTest {
+        @Rule
+        public TestRule watcher = new TestWatcher() {
+            @Override
+            protected void skipped(AssumptionViolatedException e, Description description) {
+                throw new RuntimeException("watcher failure");
+            }
+        };
+
+        @Test
+        public void fails() {
+            throw new AssumptionViolatedException("test failure");
+        }
+    }
+
+    @Test
+    public void testWatcherSkippedThrowsException() {
+        PrintableResult result = testResult(TestWatcherSkippedThrowsExceptionTest.class);
+        assertThat(result, failureCountIs(2));
+        assertThat(result, hasFailureContaining("test failure"));
+        assertThat(result, hasFailureContaining("watcher failure"));
+    }
+
     public static class FailingTest {
         private static StringBuilder watchedLog = new StringBuilder();