diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java index 5473827f5c2..50967dedf79 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java @@ -32,7 +32,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe *

* Abstract base test class which integrates the Spring TestContext * Framework with explicit {@link ApplicationContext} testing support in a - * JUnit 4.7 environment. + * JUnit 4.5+ environment. *

*

* Concrete subclasses should typically declare a class-level diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java index f6a1a7815ca..09adb2acb90 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java @@ -50,7 +50,7 @@ import org.springframework.test.context.junit4.statements.SpringRepeat; *

* SpringJUnit4ClassRunner is a custom extension of * {@link BlockJUnit4ClassRunner} which provides functionality of the - * Spring TestContext Framework to standard JUnit 4.7+ tests by means + * Spring TestContext Framework to standard JUnit 4.5+ tests by means * of the {@link TestContextManager} and associated support classes and * annotations. *

@@ -76,7 +76,7 @@ import org.springframework.test.context.junit4.statements.SpringRepeat; * *

* NOTE: As of Spring 3.0, SpringJUnit4ClassRunner requires - * JUnit 4.7. + * JUnit 4.5+. *

* * @author Sam Brannen diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java index c53746ed666..64f30c8f8ac 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java @@ -1,6 +1,6 @@ /** *

Support classes for ApplicationContext-based and transactional - * tests run with JUnit 4.7 and the Spring TestContext Framework.

+ * tests run with JUnit 4.5+ and the Spring TestContext Framework.

*/ package org.springframework.test.context.junit4; diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/package-info.java b/org.springframework.test/src/main/java/org/springframework/test/context/package-info.java index 3cd7eb26add..c9cd821a2ae 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/package-info.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/package-info.java @@ -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.7, TestNG, etc.

+ * 4.5+, TestNG, etc.

* *

In addition to providing generic and extensible testing * infrastructure, the Spring TestContext Framework provides out-of-the-box diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml index 3c677cb6ffd..9eba3228a57 100644 --- a/spring-framework-reference/src/testing.xml +++ b/spring-framework-reference/src/testing.xml @@ -621,8 +621,8 @@ public void testProcessWithoutTransaction() { The following annotations are only supported when used in conjunction with JUnit (i.e., with the SpringJUnit4ClassRunner or - the JUnit 3.8 - and JUnit 4.7 + the JUnit 3.8.2 + and JUnit 4.5+ support classes. @@ -812,16 +812,16 @@ public void testProcessRepeatedly() { Framework (located in the org.springframework.test.context 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.10, etc. The TestContext framework also places a + is agnostic of the testing framework in use, for example JUnit 3.8.2, + JUnit 4.5+, TestNG 5.10, etc. The TestContext framework also places a great deal of importance on convention over configuration with reasonable defaults that can be overridden via annotation-based configuration. In addition to generic testing infrastructure, the TestContext - framework provides explicit support for JUnit 3.8, JUnit 4.7, and + framework provides explicit support for JUnit 3.8.2, JUnit 4.5+, and TestNG 5.10 in the form of abstract support - classes. For JUnit 4.7, the framework also provides a custom + classes. For JUnit 4.5+, the framework also provides a custom Runner which allows one to write test classes that are not required to extend a particular class hierarchy. @@ -1112,11 +1112,11 @@ public class ExtendedTest extends BaseTest { Consider the scenario where we have a class, HibernateTitleDao (as outlined in the Goals section). First, let's look - at a JUnit 4.7 based implementation of the test class itself which + at a JUnit 4 based implementation of the test class itself which uses @Autowired for field injection (we will look at the application context configuration after all sample code listings). Note: The dependency injection behavior in - the following code listings is not in any way specific to JUnit 4.7. + the following code listings is not in any way specific to JUnit 4. The same DI techniques can be used in conjunction with any testing framework. @@ -1525,10 +1525,10 @@ public void updateWithSessionFlush() {

- JUnit 4.7 support classes + JUnit 4.5+ support classes The org.springframework.test.context.junit4 - package provides support classes for JUnit 4.7 based test + package provides support classes for JUnit 4.5+ based test cases. @@ -1538,7 +1538,7 @@ public void updateWithSessionFlush() { Abstract base test class which integrates the Spring TestContext Framework with explicit ApplicationContext testing support in a - JUnit 4.7 environment. + JUnit 4.5+ environment. When you extend AbstractJUnit4SpringContextTests you will @@ -1608,13 +1608,13 @@ public void updateWithSessionFlush() {
- Custom JUnit 4.7 Runner + Custom JUnit 4.5+ Runner The Spring TestContext Framework offers - full integration with JUnit 4.7 via a custom runner. By annotating - test classes with + full integration with JUnit 4.5+ via a custom runner (tested on + JUnit 4.5, 4.6, and 4.7). By annotating test classes with @Runwith(SpringJUnit4ClassRunner.class), - developers can implement standard JUnit 4.7 unit and integration + developers can implement standard JUnit 4.5+ unit and integration tests and simultaneously reap the benefits of the TestContext framework such as support for loading application contexts, dependency injection of test instances, transactional test method @@ -1733,7 +1733,7 @@ public class SimpleTest { The PetClinic sample application included with the full Spring distribution illustrates several features of the Spring - TestContext Framework in a JUnit 4.7 environment. Most test + TestContext Framework in a JUnit 4.5+ environment. Most test functionality is included in the AbstractClinicTests, for which a partial listing is shown below: @@ -1875,7 +1875,7 @@ public class HibernateClinicTests extends AbstractClinicTests { } JUnit: the Spring - Framework's unit and integration test suite is written using JUnit 3.8 + Framework's unit and integration test suite is written using JUnit 3.8.2 and JUnit 4.7 as the testing framework.