From ba746a8e51924fca522d445ad508a393e45b9784 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 3 Jul 2009 11:21:39 +0000 Subject: [PATCH] [SPR-5887] Upgraded to JUnit 4.6. --- .../context/junit4/AbstractJUnit4SpringContextTests.java | 2 +- .../test/context/junit4/SpringJUnit4ClassRunner.java | 4 ++-- .../springframework/test/context/junit4/package-info.java | 6 ++---- .../junit4/statements/RunSpringTestContextAfters.java | 2 +- .../junit4/statements/RunSpringTestContextBefores.java | 2 +- .../test/context/junit4/statements/SpringFailOnTimeout.java | 2 +- .../test/context/junit4/statements/SpringRepeat.java | 2 +- .../java/org/springframework/test/context/package-info.java | 6 ++---- 8 files changed, 11 insertions(+), 15 deletions(-) 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 864e846bd54..04bdef9ab0b 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.5 environment. + * JUnit 4.6 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 0bad691e396..732122edb1c 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 @@ -48,7 +48,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.5+ tests by means + * Spring TestContext Framework to standard JUnit 4.6+ tests by means * of the {@link TestContextManager} and associated support classes and * annotations. *

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

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

* * @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 8a11e3a4cad..5351e4f80e2 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,9 +1,7 @@ - /** - * *

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

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

*/ + package org.springframework.test.context.junit4; diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextAfters.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextAfters.java index 2912003dc8c..08bbec01740 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextAfters.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextAfters.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java index 49d91f1ac46..1f9e76e8660 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java index 82b7e929eea..62aee02728f 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java index e18a3682b35..f2c79a9f3b7 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java @@ -1,5 +1,5 @@ /* - * Copyright 2009 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. 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 e15f93f8f81..ff16d5e6a04 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 @@ -1,19 +1,17 @@ - /** - * *

This package contains the Spring TestContext Framework * which provides annotation-driven unit and integration testing support * 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.5, TestNG, etc.

+ * 4.6, TestNG, etc.

* *

In addition to providing generic and extensible testing * infrastructure, the Spring TestContext Framework provides out-of-the-box * support for Spring-specific integration testing functionality such as * context management and caching, dependency injection of test fixtures, * and transactional test management with default rollback semantics.

- * */ + package org.springframework.test.context;