diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java index 6f8cfb8a5e..1b240b0c62 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java @@ -54,6 +54,11 @@ import org.springframework.test.context.TestContextManager; *
NOTE: As of Spring 3.0 M1, SpringJUnit4ClassRunner requires + * JUnit 4.5, while internally still being based on JUnit 4.4 SPI. + * This will be rewritten based on JUnit 4.5's BlockJUnit4ClassRunner + * in a later Spring 3.0 release. + * * @author Sam Brannen * @author Juergen Hoeller * @since 2.5 diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java index cca9685277..8e171b6e0d 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java @@ -29,10 +29,10 @@ import java.util.concurrent.TimeoutException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.internal.AssumptionViolatedException; import org.junit.runner.Description; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; -import org.junit.internal.AssumptionViolatedException; import org.springframework.test.annotation.Repeat; import org.springframework.test.annotation.Timed; @@ -98,6 +98,7 @@ class SpringMethodRoadie { this.description = description; } + /** * Runs the test, including notification of events to the * {@link RunNotifier} and {@link TestContextManager} as well as proper @@ -333,6 +334,7 @@ class SpringMethodRoadie { runTestMethod(); } catch (FailedBefore ex) { + // ignore } finally { runAfters();