Browse Source

added JUnit 4.5 compatibility note

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@320 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Juergen Hoeller 17 years ago
parent
commit
705c1c6b03
  1. 5
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
  2. 4
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java

5
org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java

@ -54,6 +54,11 @@ import org.springframework.test.context.TestContextManager; @@ -54,6 +54,11 @@ import org.springframework.test.context.TestContextManager;
* <li>{@link org.springframework.test.annotation.IfProfileValue @IfProfileValue}</li>
* </ul>
*
* <p><b>NOTE:</b> 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

4
org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringMethodRoadie.java

@ -29,10 +29,10 @@ import java.util.concurrent.TimeoutException; @@ -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 { @@ -98,6 +98,7 @@ class SpringMethodRoadie {
this.description = description;
}
/**
* Runs the <em>test</em>, including notification of events to the
* {@link RunNotifier} and {@link TestContextManager} as well as proper
@ -333,6 +334,7 @@ class SpringMethodRoadie { @@ -333,6 +334,7 @@ class SpringMethodRoadie {
runTestMethod();
}
catch (FailedBefore ex) {
// ignore
}
finally {
runAfters();

Loading…
Cancel
Save