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

[SPR-5964] Upgraded to TestNG 5.10

This commit is contained in:
Sam Brannen 2009-08-11 10:31:06 +00:00
parent 42638585b5
commit 601120979b
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-spring-framework/resources/changelog.txt
View File

@ -3,6 +3,12 @@ SPRING FRAMEWORK CHANGELOG
http://www.springsource.org
Changes in version 3.0.0.RC1 (2009 Q3)
--------------------------------------
* upgraded to JUnit 4.7 and TestNG 5.10
Changes in version 3.0.0.M4 (2009-08-10)
-----------------------------------------

2
build.versions
View File

@ -1,2 +1,2 @@
org.testng.version=5.9.0
org.testng.version=5.10.0
org.junit.version=4.7.0

2
org.springframework.test/.classpath
View File

@ -21,7 +21,7 @@
<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.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.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-5.10.0.jar" sourcepath="/IVY_CACHE/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-sources-5.10.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"/>
<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE/com.springsource.org.aspectj.weaver-1.6.3.RELEASE.jar"/>

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

@ -81,7 +81,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.9</version>
<version>5.10</version>
<classifier>jdk15</classifier>
<optional>true</optional>
</dependency>

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

@ -19,7 +19,7 @@ Import-Template:
org.aspectj.weaver.*;version="[1.5.4, 2.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.testng.*;version="[5.10.0, 6.0.0)";resolution:=optional,
org.w3c.dom.*;version="0";resolution:=optional
Ignored-Existing-Headers:
Bnd-LastModified,

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

@ -89,11 +89,11 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-5.9.0.jar!/" />
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-5.10.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.9.0/com.springsource.org.testng-sources-5.9.0.jar!/" />
<root url="jar://$IVY_CACHE$/org.testng/com.springsource.org.testng/5.10.0/com.springsource.org.testng-sources-5.10.0.jar!/" />
</SOURCES>
</library>
</orderEntry>

4
spring-framework-reference/src/testing.xml
View File

@ -813,14 +813,14 @@ public void testProcessRepeatedly() {
<literal>org.springframework.test.context</literal> package) provides
generic, annotation-driven unit and integration testing support that
is agnostic of the testing framework in use, for example JUnit 3.8,
JUnit 4.7, TestNG 5.9, etc. The TestContext framework also places a
JUnit 4.7, TestNG 5.10, etc. The TestContext framework also places a
great deal of importance on <emphasis>convention over
configuration</emphasis> with reasonable defaults that can be
overridden via annotation-based configuration.</para>
<para>In addition to generic testing infrastructure, the TestContext
framework provides explicit support for JUnit 3.8, JUnit 4.7, and
TestNG 5.9 in the form of <literal>abstract</literal> support
TestNG 5.10 in the form of <literal>abstract</literal> support
classes. For JUnit 4.7, the framework also provides a custom
<interfacename>Runner</interfacename> which allows one to write test
classes that are not required to extend a particular class