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

basic JUnit 4.5 compatibility (accepting use of deprecated SPI)

This commit is contained in:
Juergen Hoeller 2008-11-20 21:33:08 +00:00
parent 22d3272117
commit ae34a8cb1b
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/ivy.xml
View File

@ -25,7 +25,7 @@
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/> <dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.4.0" conf="provided->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.0.0" conf="provided->compile"/> <dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.0.0" conf="provided->compile"/>
<dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/> <dependency org="org.junit" name="com.springsource.junit" rev="3.8.2" conf="optional->compile"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="optional->compile"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="optional->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/> <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
<dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional->compile"/> <dependency org="org.apache.taglibs" name="com.springsource.org.apache.taglibs.standard" rev="1.1.2" conf="optional->compile"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional->compile"/> <dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="optional->compile"/>

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

@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.junit.internal.runners.InitializationError; import org.junit.internal.runners.InitializationError;
import org.junit.internal.runners.JUnit4ClassRunner; import org.junit.internal.runners.JUnit4ClassRunner;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunNotifier; import org.junit.runner.notification.RunNotifier;
import org.springframework.test.annotation.ProfileValueUtils; import org.springframework.test.annotation.ProfileValueUtils;
@ -148,11 +149,11 @@ public class SpringJUnit4ClassRunner extends JUnit4ClassRunner {
testInstance = createTest(); testInstance = createTest();
} }
catch (InvocationTargetException ex) { catch (InvocationTargetException ex) {
notifier.testAborted(description, ex.getCause()); notifier.fireTestFailure(new Failure(description, ex.getCause()));
return; return;
} }
catch (Exception ex) { catch (Exception ex) {
notifier.testAborted(description, ex); notifier.fireTestFailure(new Failure(description, ex));
return; return;
} }

2
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.Assume.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;

2
org.springframework.test/template.mf
View File

@ -13,7 +13,7 @@ Import-Template:
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional, org.apache.taglibs.standard.*;version="[1.1.2, 2.0.0)";resolution:=optional,
org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional, org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
org.junit.*;version="[4.4.0, 5.0.0)";resolution:=optional, org.junit.*;version="[4.5.0, 5.0.0)";resolution:=optional,
org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional, org.springframework.*;version="[2.5.5.A, 2.5.5.A]";resolution:=optional,
org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional org.testng.*;version="[5.8.0, 6.0.0)";resolution:=optional
Unversioned-Imports: Unversioned-Imports:

4
org.springframework.test/test.iml
View File

@ -76,11 +76,11 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar!/" /> <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar!/" /> <root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>