root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

added JUnit 4.5 compatibility note

This commit is contained in:
Juergen Hoeller 2008-11-20 22:28:00 +00:00
parent 582c564fa3
commit e9649b3a34
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,11 @@ import org.springframework.test.context.TestContextManager;
* <li>{@link org.springframework.test.annotation.IfProfileValue @IfProfileValue}</li> * <li>{@link org.springframework.test.annotation.IfProfileValue @IfProfileValue}</li>
* </ul> * </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 Sam Brannen
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 2.5 * @since 2.5

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

@ -29,10 +29,10 @@ import java.util.concurrent.TimeoutException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.junit.internal.AssumptionViolatedException;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runner.notification.Failure; import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunNotifier; import org.junit.runner.notification.RunNotifier;
import org.junit.internal.AssumptionViolatedException;
import org.springframework.test.annotation.Repeat; import org.springframework.test.annotation.Repeat;
import org.springframework.test.annotation.Timed; import org.springframework.test.annotation.Timed;
@ -98,6 +98,7 @@ class SpringMethodRoadie {
this.description = description; this.description = description;
} }
/** /**
* Runs the <em>test</em>, including notification of events to the * Runs the <em>test</em>, including notification of events to the
* {@link RunNotifier} and {@link TestContextManager} as well as proper * {@link RunNotifier} and {@link TestContextManager} as well as proper
@ -333,6 +334,7 @@ class SpringMethodRoadie {
runTestMethod(); runTestMethod();
} }
catch (FailedBefore ex) { catch (FailedBefore ex) {
// ignore
} }
finally { finally {
runAfters(); runAfters();