Delete deprecated code in the TestContext framework

This commit deletes the deprecated SimpleJdbcTestUtils class as well as
remaining usage of SimpleJdbcTemplate within the TestContext framework
and its test suite.

Issue: SPR-10499

spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -24,7 +24,6 @@
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
@@ -66,7 +65,6 @@
  * @see org.springframework.test.context.transaction.TransactionalTestExecutionListener
  * @see org.springframework.test.context.transaction.TransactionConfiguration
  * @see org.springframework.transaction.annotation.Transactional
- * @see org.springframework.test.annotation.NotTransactional
  * @see org.springframework.test.annotation.Rollback
  * @see org.springframework.test.context.transaction.BeforeTransaction
  * @see org.springframework.test.context.transaction.AfterTransaction
@@ -78,13 +76,6 @@
 @SuppressWarnings("deprecation")
 public abstract class AbstractTransactionalJUnit4SpringContextTests extends AbstractJUnit4SpringContextTests {
 
-	/**
-	 * The {@code SimpleJdbcTemplate} that this base class manages, available to subclasses.
-	 * @deprecated As of Spring 3.2, use {@link #jdbcTemplate} instead.
-	 */
-	@Deprecated
-	protected SimpleJdbcTemplate simpleJdbcTemplate;
-
 	/**
 	 * The {@code JdbcTemplate} that this base class manages, available to subclasses.
 	 * @since 3.2
@@ -96,12 +87,11 @@ public abstract class AbstractTransactionalJUnit4SpringContextTests extends Abst
 
 	/**
 	 * Set the {@code DataSource}, typically provided via Dependency Injection.
-	 * <p>This method also instantiates the {@link #simpleJdbcTemplate} and
-	 * {@link #jdbcTemplate} instance variables.
+	 * <p>This method also instantiates the {@link #jdbcTemplate} instance
+     * variable.
 	 */
 	@Autowired
 	public void setDataSource(DataSource dataSource) {
-		this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource);
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
 	}
 

spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -24,7 +24,6 @@
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
 import org.springframework.test.jdbc.JdbcTestUtils;
@@ -57,7 +56,6 @@
  * @see org.springframework.test.context.transaction.TransactionalTestExecutionListener
  * @see org.springframework.test.context.transaction.TransactionConfiguration
  * @see org.springframework.transaction.annotation.Transactional
- * @see org.springframework.test.annotation.NotTransactional
  * @see org.springframework.test.annotation.Rollback
  * @see org.springframework.test.context.transaction.BeforeTransaction
  * @see org.springframework.test.context.transaction.AfterTransaction
@@ -69,13 +67,6 @@
 @SuppressWarnings("deprecation")
 public abstract class AbstractTransactionalTestNGSpringContextTests extends AbstractTestNGSpringContextTests {
 
-	/**
-	 * The {@code SimpleJdbcTemplate} that this base class manages, available to subclasses.
-	 * @deprecated As of Spring 3.2, use {@link #jdbcTemplate} instead.
-	 */
-	@Deprecated
-	protected SimpleJdbcTemplate simpleJdbcTemplate;
-
 	/**
 	 * The {@code JdbcTemplate} that this base class manages, available to subclasses.
 	 * @since 3.2
@@ -87,12 +78,11 @@ public abstract class AbstractTransactionalTestNGSpringContextTests extends Abst
 
 	/**
 	 * Set the {@code DataSource}, typically provided via Dependency Injection.
-	 * <p>This method also instantiates the {@link #simpleJdbcTemplate} and
-	 * {@link #jdbcTemplate} instance variables.
+	 * <p>This method also instantiates the {@link #jdbcTemplate} instance
+     * variable.
 	 */
 	@Autowired
 	public void setDataSource(DataSource dataSource) {
-		this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource);
 		this.jdbcTemplate = new JdbcTemplate(dataSource);
 	}
 

spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java

@@ -37,8 +37,6 @@
  * {@code JdbcTestUtils} is a collection of JDBC related utility functions
  * intended to simplify standard database testing scenarios.
  *
- * <p>As of Spring 3.1.3, {@code JdbcTestUtils} supersedes {@link SimpleJdbcTestUtils}.
- *
  * @author Thomas Risberg
  * @author Sam Brannen
  * @author Juergen Hoeller