Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SPR-5963] Upgraded to JUnit 4.7

Browse Source
This commit is contained in:
Sam Brannen
2009-08-11 10:12:20 +00:00
parent 5d17515dc5
commit 42638585b5
10 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/.classpath
View File

@@ -20,7 +20,7 @@
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-2.5.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet/2.5.0/com.springsource.javax.servlet-sources-2.5.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-2.1.0.jar" sourcepath="/IVY_CACHE/javax.servlet/com.springsource.javax.servlet.jsp/2.1.0/com.springsource.javax.servlet.jsp-sources-2.1.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-3.8.2.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.junit/3.8.2/com.springsource.junit-sources-3.8.2.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>

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

@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.6</version>
<version>4.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
View File

@@ -32,7 +32,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
* <p>
* Abstract base test class which integrates the <em>Spring TestContext
* Framework</em> with explicit {@link ApplicationContext} testing support in a
* <strong>JUnit 4.6</strong> environment.
* <strong>JUnit 4.7</strong> environment.
* </p>
* <p>
* Concrete subclasses should typically declare a class-level

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

@@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.statements.SpringRepeat;
* <p>
* <code>SpringJUnit4ClassRunner</code> is a custom extension of
* {@link BlockJUnit4ClassRunner} which provides functionality of the
* <em>Spring TestContext Framework</em> to standard JUnit 4.6+ tests by means
* <em>Spring TestContext Framework</em> to standard JUnit 4.7+ tests by means
* of the {@link TestContextManager} and associated support classes and
* annotations.
* </p>
@@ -76,7 +76,7 @@ import org.springframework.test.context.junit4.statements.SpringRepeat;
* </ul>
* <p>
* <b>NOTE:</b> As of Spring 3.0, <code>SpringJUnit4ClassRunner</code> requires
* JUnit 4.6.
* JUnit 4.7.
* </p>
*
* @author Sam Brannen
@@ -249,6 +249,11 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
}
}
private EachTestNotifier makeNotifier(FrameworkMethod method, RunNotifier notifier) {
Description description = describeChild(method);
return new EachTestNotifier(notifier, description);
}
/**
* Augments the default JUnit behavior
* {@link #withPotentialRepeat(FrameworkMethod, Object, Statement) with

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java
View File

@@ -1,6 +1,6 @@
/**
* <p>Support classes for ApplicationContext-based and transactional
* tests run with JUnit 4.6 and the <em>Spring TestContext Framework</em>.</p>
* tests run with JUnit 4.7 and the <em>Spring TestContext Framework</em>.</p>
*/
package org.springframework.test.context.junit4;

2
org.springframework.test/src/main/java/org/springframework/test/context/package-info.java
View File

@@ -4,7 +4,7 @@
* that is agnostic of the actual testing framework in use. The same
* techniques and annotation-based configuration used in, for example, a
* JUnit 3.8 environment can also be applied to tests written with JUnit
* 4.6, TestNG, etc.</p>
* 4.7, TestNG, etc.</p>
*
* <p>In addition to providing generic and extensible testing
* infrastructure, the Spring TestContext Framework provides out-of-the-box

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

@@ -17,7 +17,7 @@ Import-Template:
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
org.apache.taglibs.standard.*;version="[1.1.0, 2.0.0)";resolution:=optional,
org.aspectj.weaver.*;version="[1.5.4, 2.0.0)";resolution:=optional,
org.junit.*;version="[4.6.0, 5.0.0)";resolution:=optional,
org.junit.*;version="[4.7.0, 5.0.0)";resolution:=optional,
org.springframework.*;version="[3.0.0, 3.0.1)";resolution:=optional,
org.testng.*;version="[5.9.0, 6.0.0)";resolution:=optional,
org.w3c.dom.*;version="0";resolution:=optional

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

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