diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml index 9b5ab8b4c7b..f9be02e082f 100644 --- a/spring-framework-reference/src/testing.xml +++ b/spring-framework-reference/src/testing.xml @@ -179,7 +179,7 @@ linkend="testcontext-framework">Spring TestContext Framework. The TestContext Framework is agnostic of the actual testing framework in use, thus allowing instrumentation of tests in various environments - including JUnit 3.8, JUnit 4.5, TestNG, etc. + including JUnit 3.8, JUnit 4.6, TestNG, etc. Legacy JUnit 3.8 class hierarchy is deprecated @@ -393,7 +393,7 @@ simplify standard database testing scenarios. Note that AbstractTransactionalJUnit38SpringContextTests, AbstractTransactionalJUnit4SpringContextTests, + linkend="testcontext-support-classes-junit4">AbstractTransactionalJUnit4SpringContextTests, and AbstractTransactionalTestNGSpringContextTests provide convenience methods which delegate to @@ -571,7 +571,7 @@ public void testProcessWithoutTransaction() { when used in conjunction with JUnit (i.e., with the SpringJUnit4ClassRunner or the JUnit 3.8 - and JUnit 4.5 + and JUnit 4.6 support classes. @@ -761,15 +761,15 @@ public void testProcessRepeatedly() { 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.5, TestNG 5.8, etc. The TestContext framework also places a great deal + 4.6, TestNG 5.8, 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.5, and TestNG + framework provides explicit support for JUnit 3.8, JUnit 4.6, and TestNG 5.8 in the form of abstract support classes. For - JUnit 4.5, the framework also provides a custom + JUnit 4.6, the framework also provides a custom Runner which allows one to write test classes that are not required to extend a particular class hierarchy. @@ -1060,11 +1060,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.5 based implementation of the test class itself which + at a JUnit 4.6 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.5. + the following code listings is not in any way specific to JUnit 4.6. The same DI techniques can be used in conjunction with any testing framework. @@ -1264,7 +1264,7 @@ public final class HibernateTitleDaoTests { Note that AbstractTransactionalJUnit38SpringContextTests, AbstractTransactionalJUnit4SpringContextTests, + linkend="testcontext-support-classes-junit4">AbstractTransactionalJUnit4SpringContextTests, and AbstractTransactionalTestNGSpringContextTests are pre-configured for transactional support at the class level. @@ -1418,11 +1418,11 @@ public class FictitiousTransactionalTest { -
- JUnit 4.5 support classes +
+ JUnit 4.6 support classes The org.springframework.test.context.junit4 - package provides support classes for JUnit 4.5 based test + package provides support classes for JUnit 4.6 based test cases. @@ -1432,7 +1432,7 @@ public class FictitiousTransactionalTest { Abstract base test class which integrates the Spring TestContext Framework with explicit ApplicationContext testing support in a - JUnit 4.5 environment. + JUnit 4.6 environment. When you extend AbstractJUnit4SpringContextTests you will @@ -1502,13 +1502,13 @@ public class FictitiousTransactionalTest {
- Custom JUnit 4.5 Runner + Custom JUnit 4.6 Runner The Spring TestContext Framework offers - full integration with JUnit 4.5 via a custom runner. By annotating + full integration with JUnit 4.6 via a custom runner. By annotating test classes with @Runwith(SpringJUnit4ClassRunner.class), - developers can implement standard JUnit 4.5 unit and integration + developers can implement standard JUnit 4.6 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 @@ -1627,7 +1627,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.5 environment. Most test + TestContext Framework in a JUnit 4.6 environment. Most test functionality is included in the AbstractClinicTests, for which a partial listing is shown below: @@ -1767,7 +1767,7 @@ public class HibernateClinicTests extends AbstractClinicTests { } JUnit: the Spring Framework's unit and integration test suite is written using JUnit 3.8 - and JUnit 4.5 as the testing framework. + and JUnit 4.6 as the testing framework.