diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java index 7b63e9bee1..3a66936aeb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java @@ -32,7 +32,8 @@ public class OracleExceptionSorterTest extends TestCase { dataSource.setFilters("log4j"); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java index 0dc952e2f5..eda5aa3b1c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_closeConn extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java index 3b7df781d7..f3f8638e83 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_closeConn_1 extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java index 2ca1148c40..8e6ace6ad7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_closeConn_2 extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java index 833d4373c4..8d1084f526 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_closeConn_3 extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java index 6d5b30deca..7e707d3bc3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeStmt.java @@ -11,6 +11,7 @@ import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; +import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; @@ -32,8 +33,10 @@ public class OracleExceptionSorterTest_closeStmt extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java index 45bea53653..56447bd9e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_commit extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java index 5295f3b733..9f8229254a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_rollback extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java index 86626e8aec..a4a49d39b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java @@ -34,7 +34,8 @@ public class OracleExceptionSorterTest_setCatalog extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java index 83d43d5824..ef221a19b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java @@ -33,7 +33,8 @@ public class OracleExceptionSorterTest_setIsolationLevel extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java index e251e0fef1..d2a41ca017 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java @@ -34,7 +34,8 @@ public class OracleExceptionSorterTest_setReadOnly extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java index 89fb1ff83e..fd6f4e424d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java @@ -34,7 +34,8 @@ public class OracleExceptionSorterTest_setSavepoint extends TestCase { dataSource.setMaxOpenPreparedStatements(100); } - protected void tearDowN() throws Exception { + @Override + protected void tearDown() throws Exception { JdbcUtils.close(dataSource); }