Merge pull request #323 from wenshao/master

fixed testcase

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);
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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 {

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);
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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);
     }
 

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);
     }