From c736e6b873c7757d8f614dd8633b3c67292b287f Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 9 Mar 2011 11:45:43 +0000
Subject: [PATCH] [SPR-8030] AbstractJUnit38SpringContextTests and
 AbstractTransactionalJUnit38SpringContextTests are now officially deprecated.

---
 .../test/AbstractDependencyInjectionSpringContextTests.java  | 2 +-
 .../test/AbstractSingleSpringContextTests.java               | 2 +-
 .../org/springframework/test/AbstractSpringContextTests.java | 2 +-
 .../AbstractTransactionalDataSourceSpringContextTests.java   | 2 +-
 .../test/AbstractTransactionalSpringContextTests.java        | 2 +-
 .../java/org/springframework/test/ConditionalTestCase.java   | 2 +-
 .../AbstractAnnotationAwareTransactionalTests.java           | 2 +-
 .../context/junit38/AbstractJUnit38SpringContextTests.java   | 3 +++
 .../AbstractTransactionalJUnit38SpringContextTests.java      | 5 ++++-
 .../AbstractTransactionalTestNGSpringContextTests.java       | 2 +-
 10 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
index f57179e6a7..812141cf6a 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/AbstractDependencyInjectionSpringContextTests.java
@@ -60,7 +60,7 @@ import org.springframework.util.Assert;
  * @see #getContext
  * @see #getConfigLocations
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests})
  */
 @Deprecated
 @SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
index b05f927d4a..1fa2b4d9cb 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/AbstractSingleSpringContextTests.java
@@ -66,7 +66,7 @@ import org.springframework.util.StringUtils;
  * @see #loadContext(Object)
  * @see #getApplicationContext()
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests})
  */
 @Deprecated
 public abstract class AbstractSingleSpringContextTests extends AbstractSpringContextTests {
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
index 0b4ae975ee..ba6f6a6631 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/AbstractSpringContextTests.java
@@ -57,7 +57,7 @@ import org.springframework.util.StringUtils;
  * @see AbstractTransactionalSpringContextTests
  * @see AbstractTransactionalDataSourceSpringContextTests
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests})
  */
 @Deprecated
 public abstract class AbstractSpringContextTests extends ConditionalTestCase {
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
index c1d388301e..43d0fb2907 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalDataSourceSpringContextTests.java
@@ -45,7 +45,7 @@ import org.springframework.test.jdbc.JdbcTestUtils;
  * @see #setDataSource(javax.sql.DataSource)
  * @see #getJdbcTemplate()
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests})
  */
 @Deprecated
 @SuppressWarnings({ "unchecked", "rawtypes" })
diff --git a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
index 7e32eabd33..9fb4fae530 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/AbstractTransactionalSpringContextTests.java
@@ -78,7 +78,7 @@ import org.springframework.transaction.support.DefaultTransactionDefinition;
  * @author Sam Brannen
  * @since 1.1.1
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests})
  */
 @Deprecated
 public abstract class AbstractTransactionalSpringContextTests extends AbstractDependencyInjectionSpringContextTests {
diff --git a/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java b/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java
index e44c9ac796..769d42945e 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
  * @since 2.0
  * @see #isDisabledInThisEnvironment
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests})
  */
 @Deprecated
 public abstract class ConditionalTestCase extends TestCase {
diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
index 656251dedc..158acde852 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java
@@ -68,7 +68,7 @@ import org.springframework.util.Assert;
  * @author Juergen Hoeller
  * @since 2.0
  * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework
- * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests})
+ * ({@link org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests})
  */
 @Deprecated
 public abstract class AbstractAnnotationAwareTransactionalTests extends
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
index 16f6261dfc..f476635416 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractJUnit38SpringContextTests.java
@@ -109,7 +109,10 @@ import org.springframework.test.context.support.DirtiesContextTestExecutionListe
  * @see AbstractTransactionalJUnit38SpringContextTests
  * @see org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests
  * @see org.springframework.test.context.testng.AbstractTestNGSpringContextTests
+ * @deprecated as of Spring 3.1, in favor of using
+ * {@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests AbstractJUnit4SpringContextTests}
  */
+@Deprecated
 @TestExecutionListeners( { DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
 public abstract class AbstractJUnit38SpringContextTests extends TestCase implements ApplicationContextAware {
 
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
index 0378579152..8185eab0b0 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/junit38/AbstractTransactionalJUnit38SpringContextTests.java
@@ -66,8 +66,11 @@ import org.springframework.transaction.annotation.Transactional;
  * @see org.springframework.test.jdbc.SimpleJdbcTestUtils
  * @see org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests
  * @see org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests
+ * @deprecated as of Spring 3.1, in favor of using
+ * {@link org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests AbstractTransactionalJUnit4SpringContextTests}
  */
-@TestExecutionListeners({TransactionalTestExecutionListener.class})
+@Deprecated
+@TestExecutionListeners(TransactionalTestExecutionListener.class)
 @Transactional
 public abstract class AbstractTransactionalJUnit38SpringContextTests extends AbstractJUnit38SpringContextTests {
 
diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java b/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
index 14320b8cd5..9b29991627 100644
--- a/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
+++ b/org.springframework.test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java
@@ -65,7 +65,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @see org.springframework.test.context.junit38.AbstractTransactionalJUnit38SpringContextTests
  * @see org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests
  */
-@TestExecutionListeners({TransactionalTestExecutionListener.class})
+@TestExecutionListeners(TransactionalTestExecutionListener.class)
 @Transactional
 public abstract class AbstractTransactionalTestNGSpringContextTests extends AbstractTestNGSpringContextTests {