Handle expected AssertionError and AssumptionViolatedException.

Fixes junit-team#687.

Author: stefanbirkner

src/main/java/org/junit/rules/ExpectedException.java

@@ -199,11 +199,16 @@ private void optionallyHandleException(Throwable e, boolean handleException)
             throws Throwable {
         if (handleException) {
             handleException(e);
-        } else {
+        } else if (!isExpectedException(e)) {
             throw e;
         }
     }
 
+    private boolean isExpectedException(Throwable e) {
+        return fMatcherBuilder.expectsThrowable()
+                && fMatcherBuilder.build().matches(e);
+    }
+
     private void handleException(Throwable e) throws Throwable {
         if (fMatcherBuilder.expectsThrowable()) {
             assertThat(e, fMatcherBuilder.build());

src/test/java/org/junit/tests/experimental/rules/ExpectedExceptionTest.java

@@ -286,7 +286,6 @@ public static class ThrowExpectedAssertionError {
 
         @Test
         public void wrongException() {
-            thrown.handleAssertionErrors();
             thrown.expect(AssertionError.class);
             throw new AssertionError("the expected assertion error");
         }
@@ -298,7 +297,6 @@ public static class DontThrowAssertionErrorButExpectOne {
 
         @Test
         public void assertionErrorExpectedButNonIsThrown() {
-            thrown.handleAssertionErrors();
             thrown.expect(AssertionError.class);
         }
     }
@@ -333,7 +331,6 @@ public static class ThrowExpectedAssumptionViolatedException {
 
         @Test
         public void throwExpectAssumptionViolatedException() {
-            thrown.handleAssumptionViolatedExceptions();
             thrown.expect(AssumptionViolatedException.class);
             throw new AssumptionViolatedException("");
         }