Browse Source

[SPR-5887] Upgraded to JUnit 4.6.

conversation
Sam Brannen 16 years ago
parent
commit
ba746a8e51
  1. 2
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/AbstractJUnit4SpringContextTests.java
  2. 4
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
  3. 6
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java
  4. 2
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextAfters.java
  5. 2
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java
  6. 2
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java
  7. 2
      org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java
  8. 6
      org.springframework.test/src/main/java/org/springframework/test/context/package-info.java

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

@ -32,7 +32,7 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe @@ -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.5</strong> environment.
* <strong>JUnit 4.6</strong> environment.
* </p>
* <p>
* Concrete subclasses should typically declare a class-level

4
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; @@ -48,7 +48,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.5+ tests by means
* <em>Spring TestContext Framework</em> to standard JUnit 4.6+ tests by means
* of the {@link TestContextManager} and associated support classes and
* annotations.
* </p>
@ -74,7 +74,7 @@ import org.springframework.test.context.junit4.statements.SpringRepeat; @@ -74,7 +74,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.5.
* JUnit 4.6.
* </p>
*
* @author Sam Brannen

6
org.springframework.test/src/main/java/org/springframework/test/context/junit4/package-info.java

@ -1,9 +1,7 @@ @@ -1,9 +1,7 @@
/**
*
* <p>Support classes for ApplicationContext-based and transactional
* tests run with JUnit 4.5 and the <em>Spring TestContext Framework</em>.</p>
*
* tests run with JUnit 4.6 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/junit4/statements/RunSpringTestContextAfters.java

@ -1,5 +1,5 @@ @@ -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.

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/RunSpringTestContextBefores.java

@ -1,5 +1,5 @@ @@ -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.

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringFailOnTimeout.java

@ -1,5 +1,5 @@ @@ -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.

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/statements/SpringRepeat.java

@ -1,5 +1,5 @@ @@ -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.

6
org.springframework.test/src/main/java/org/springframework/test/context/package-info.java

@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
/**
*
* <p>This package contains the <em>Spring TestContext Framework</em>
* 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.</p>
* 4.6, TestNG, etc.</p>
*
* <p>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.</p>
*
*/
package org.springframework.test.context;

Loading…
Cancel
Save