fixed testcase

src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait2.java

@@ -5,9 +5,10 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.pool.DruidDataSource;
 
 public class DruidDataSourceTest_notEmptyWait2 extends TestCase {

src/test/java/com/alibaba/druid/bvt/pool/ExceptionSorterTest.java

@@ -10,6 +10,7 @@ import org.junit.Assert;
 import com.alibaba.druid.mock.MockConnection;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.vendor.MockExceptionSorter;
+import com.alibaba.druid.util.JdbcUtils;
 
 public class ExceptionSorterTest extends TestCase {
 
@@ -27,7 +28,7 @@ public class ExceptionSorterTest extends TestCase {
     }
 
     protected void tearDown() throws Exception {
-        dataSource.close();
+        JdbcUtils.close(dataSource);
     }
 
     public void test_exceptionSorter() throws Exception {

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest.java

@@ -10,6 +10,7 @@ import junit.framework.TestCase;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidPooledConnection;
 import com.alibaba.druid.pool.vendor.OracleExceptionSorter;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -18,6 +19,8 @@ public class OracleExceptionSorterTest extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_closeConn extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_1.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_closeConn_1 extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_2.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_closeConn_2 extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_closeConn_3.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_closeConn_3 extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -19,6 +20,8 @@ public class OracleExceptionSorterTest_closeStmt extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_commit.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_commit extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_rollback.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_rollback extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setCatalog.java

@@ -13,6 +13,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -21,6 +22,8 @@ public class OracleExceptionSorterTest_setCatalog extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setIsolationLevel.java

@@ -12,6 +12,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -20,6 +21,8 @@ public class OracleExceptionSorterTest_setIsolationLevel extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setReadOnly.java

@@ -13,6 +13,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -21,6 +22,8 @@ public class OracleExceptionSorterTest_setReadOnly extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepoint.java

@@ -13,6 +13,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -21,6 +22,8 @@ public class OracleExceptionSorterTest_setSavepoint extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_setSavepointWithName.java

@@ -13,6 +13,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.JdbcStatManager;
 import com.alibaba.druid.test.util.OracleMockDriver;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -21,6 +22,8 @@ public class OracleExceptionSorterTest_setSavepointWithName extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSource = new DruidDataSource();
 
         dataSource.setExceptionSorter(new OracleExceptionSorter());

src/test/java/com/alibaba/druid/bvt/proxy/AllStatisticTest.java

@@ -26,9 +26,11 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.management.openmbean.TabularData;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -64,6 +66,8 @@ public class AllStatisticTest extends TestCase {
 
     protected void tearDown() throws Exception {
         JdbcUtils.close(globalConnection);
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_stmt() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java

@@ -32,6 +32,8 @@ import java.util.HashMap;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class BasicTypeTest extends TestCase {
@@ -71,6 +73,9 @@ public class BasicTypeTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     @SuppressWarnings("deprecation")

src/test/java/com/alibaba/druid/bvt/proxy/BatchReadTest.java

@@ -26,6 +26,7 @@ import junit.framework.TestCase;
 
 import org.junit.Assert;
 
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
@@ -63,6 +64,9 @@ public class BatchReadTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_stmt_batch() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/BlobTest.java

@@ -24,9 +24,12 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class BlobTest extends TestCase {
@@ -61,6 +64,9 @@ public class BlobTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_blob() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/CallStatementTest.java

@@ -23,9 +23,13 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
+
 public class CallStatementTest extends TestCase {
 
     /**
@@ -90,6 +94,8 @@ public class CallStatementTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_precall() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/CallableStatementProxyImplTest.java

@@ -33,18 +33,26 @@ import java.sql.Types;
 import java.util.Calendar;
 import java.util.Properties;
 
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
 import com.alibaba.druid.filter.FilterEventAdapter;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.CallableStatementProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class CallableStatementProxyImplTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_call() throws Exception {
         DataSourceProxyConfig config = new DataSourceProxyConfig();
         DataSourceProxy dataSource = new DataSourceProxyImpl(null, config);

src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java

@@ -27,7 +27,9 @@ import java.sql.Statement;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ClobProxy;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class ClobTest extends TestCase {
@@ -44,6 +46,13 @@ public class ClobTest extends TestCase {
         conn.close();
     }
 
+    protected void tearDown() throws Exception {
+        dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+
     private void createTable() throws SQLException {
         Connection conn = DriverManager.getConnection(create_url);
         Statement stmt = conn.createStatement();
@@ -60,10 +69,6 @@ public class ClobTest extends TestCase {
         conn.close();
     }
 
-    protected void tearDown() throws Exception {
-        dropTable();
-    }
-
     public void test_clob() throws Exception {
 
         Connection conn = null;

src/test/java/com/alibaba/druid/bvt/proxy/CommonsLogFilterTest.java

@@ -15,17 +15,23 @@
  */
 package com.alibaba.druid.bvt.proxy;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.commons.logging.impl.Log4JLogger;
 import org.apache.log4j.Priority;
+import org.junit.Assert;
 
 import com.alibaba.druid.filter.logging.CommonsLogFilter;
 import com.alibaba.druid.filter.logging.LogFilter;
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class CommonsLogFilterTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_logger() throws Exception {
         CommonsLogFilter filter = new CommonsLogFilter();
 

src/test/java/com/alibaba/druid/bvt/proxy/ConnectionProxyImplTest.java

@@ -18,16 +18,25 @@ package com.alibaba.druid.bvt.proxy;
 import java.sql.SQLClientInfoException;
 import java.util.Properties;
 
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
 import com.alibaba.druid.filter.FilterEventAdapter;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class ConnectionProxyImplTest extends TestCase {
 
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_connection() throws Exception {
         DataSourceProxyConfig config = new DataSourceProxyConfig();
         DataSourceProxy dataSource = new DataSourceProxyImpl(null, config);

src/test/java/com/alibaba/druid/bvt/proxy/ConnectionStatisticTest.java

@@ -15,9 +15,10 @@
  */
 package com.alibaba.druid.bvt.proxy;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.stat.JdbcConnectionStat;
 
 public class ConnectionStatisticTest extends TestCase {

src/test/java/com/alibaba/druid/bvt/proxy/ConnectionTest.java

@@ -26,9 +26,12 @@ import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Savepoint;
 import java.sql.Statement;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class ConnectionTest extends TestCase {
@@ -63,6 +66,8 @@ public class ConnectionTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     @SuppressWarnings("deprecation")

src/test/java/com/alibaba/druid/bvt/proxy/CounterFilterTest.java

@@ -28,16 +28,23 @@ import com.alibaba.druid.filter.FilterChain;
 import com.alibaba.druid.filter.FilterChainImpl;
 import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
 import com.alibaba.druid.stat.JdbcDataSourceStat;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class CounterFilterTest extends TestCase {
 
     String sql = "SELECT 1";
 
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_countFilter() throws Exception {
         DataSourceProxyConfig config = new DataSourceProxyConfig();
         config.setUrl("");

src/test/java/com/alibaba/druid/bvt/proxy/DriverTest.java

@@ -20,15 +20,21 @@ import java.sql.Driver;
 import java.sql.DriverManager;
 import java.util.Properties;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class DriverTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_driver() throws Exception {
         String url_0 = "jdbc:wrap-jdbc:filters=default:name=driverTest:jdbc:derby:memory:driverTestDB;create=true";
         String url_1 = "jdbc:wrap-jdbc:filters=counter:name=driverTest:jdbc:derby:memory:driverTestDB;create=true";

src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java

@@ -17,17 +17,23 @@ package com.alibaba.druid.bvt.proxy;
 
 import java.util.Properties;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.filter.FilterAdapter;
 import com.alibaba.druid.mock.MockDriver;
 import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class DruidDriverTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public static class PublicJdbcFilterAdapter extends FilterAdapter {
 
         public PublicJdbcFilterAdapter(){

src/test/java/com/alibaba/druid/bvt/proxy/JdbcFilterEventAdapterTest.java

@@ -19,7 +19,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
 import com.alibaba.druid.filter.FilterChain;
@@ -27,6 +28,7 @@ import com.alibaba.druid.filter.FilterChainImpl;
 import com.alibaba.druid.filter.FilterEventAdapter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.pool.DruidPooledConnection;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
@@ -37,9 +39,14 @@ import com.alibaba.druid.proxy.jdbc.PreparedStatementProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl;
 import com.alibaba.druid.proxy.jdbc.StatementProxy;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class JdbcFilterEventAdapterTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_filterEventAdapter() throws Exception {
         DataSourceProxyConfig config = new DataSourceProxyConfig();
         DataSourceProxy dataSource = new DataSourceProxyImpl(null, config);

src/test/java/com/alibaba/druid/bvt/proxy/JdbcUtilsTest.java

@@ -26,18 +26,25 @@ import java.sql.Statement;
 import java.sql.Types;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.mock.MockConnection;
 import com.alibaba.druid.mock.MockResultSet;
 import com.alibaba.druid.mock.MockResultSetMetaData;
 import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.IOUtils;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class JdbcUtilsTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_print() throws Exception {
         final AtomicInteger nextCount = new AtomicInteger(2);
 

src/test/java/com/alibaba/druid/bvt/proxy/Log4jFilterTest.java

@@ -15,17 +15,23 @@
  */
 package com.alibaba.druid.bvt.proxy;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
+import org.junit.Assert;
 
 import com.alibaba.druid.filter.logging.Log4jFilter;
 import com.alibaba.druid.filter.logging.LogFilter;
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class Log4jFilterTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_logger() throws Exception {
         Log4jFilter filter = new Log4jFilter();
 

src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java

@@ -24,9 +24,10 @@ import java.sql.Statement;
 import java.sql.Types;
 import java.util.Properties;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.filter.FilterChainImpl;
 import com.alibaba.druid.filter.logging.CommonsLogFilter;
 import com.alibaba.druid.filter.logging.Log4jFilter;
@@ -37,15 +38,21 @@ import com.alibaba.druid.mock.MockResultSet;
 import com.alibaba.druid.mock.MockResultSetMetaData;
 import com.alibaba.druid.mock.MockRowId;
 import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl;
 import com.alibaba.druid.proxy.jdbc.StatementProxy;
 import com.alibaba.druid.proxy.jdbc.StatementProxyImpl;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class LogFilterTest extends TestCase {
-
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_logFilter_0() throws Exception {
         DataSourceProxyConfig config = new DataSourceProxyConfig();
         config.setRawUrl("jdbc:mock:");

src/test/java/com/alibaba/druid/bvt/proxy/PrecallTest.java

@@ -32,6 +32,10 @@ import java.sql.Types;
 
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class PrecallTest extends TestCase {
@@ -66,6 +70,9 @@ public class PrecallTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_precall() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/PreparedStatementTest.java

@@ -28,8 +28,12 @@ import java.sql.Statement;
 import java.sql.Types;
 import java.util.Calendar;
 
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class PreparedStatementTest extends TestCase {
@@ -64,6 +68,9 @@ public class PreparedStatementTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     @SuppressWarnings("deprecation")

src/test/java/com/alibaba/druid/bvt/proxy/ProxyDriverTest.java

@@ -18,6 +18,11 @@ package com.alibaba.druid.bvt.proxy;
 import java.sql.Connection;
 import java.sql.DriverManager;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
+
 import junit.framework.TestCase;
 
 public class ProxyDriverTest extends TestCase {
@@ -27,4 +32,9 @@ public class ProxyDriverTest extends TestCase {
         Connection conn = DriverManager.getConnection(url);
         conn.close();
     }
+    
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
 }

src/test/java/com/alibaba/druid/bvt/proxy/ResultSetProxyImplTest.java

@@ -20,18 +20,27 @@ import java.sql.Connection;
 import java.sql.NClob;
 import java.sql.Statement;
 
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
 import com.alibaba.druid.filter.logging.Log4jFilter;
 import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
 import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class ResultSetProxyImplTest extends TestCase {
 
     String sql = "SELECT 1";
+    
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
 
     public void test_resultset() throws Exception {
 

src/test/java/com/alibaba/druid/bvt/proxy/SchemaReadTest.java

@@ -26,15 +26,23 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class SchemaReadTest extends TestCase {
 
     private static String url = "jdbc:wrap-jdbc:filters=default,commonLogging,log4j:name=demo:jdbc:derby:classpath:petstore-db";
 
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+    
     public void test_schema() throws Exception {
         Class.forName("com.alibaba.druid.proxy.DruidDriver");
 

src/test/java/com/alibaba/druid/bvt/proxy/SqlStatisticTest.java

@@ -15,9 +15,10 @@
  */
 package com.alibaba.druid.bvt.proxy;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.stat.JdbcSqlStat;
 
 public class SqlStatisticTest extends TestCase {

src/test/java/com/alibaba/druid/bvt/proxy/StatementTest.java

@@ -22,9 +22,12 @@ import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Statement;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
+import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.util.JdbcUtils;
 
 public class StatementTest extends TestCase {
@@ -59,6 +62,8 @@ public class StatementTest extends TestCase {
 
     protected void tearDown() throws Exception {
         dropTable();
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_stmt() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/StatisticTest.java

@@ -15,10 +15,13 @@
  */
 package com.alibaba.druid.bvt.proxy;
 
-import junit.framework.Assert;
+import org.junit.Assert;
+
 import junit.framework.TestCase;
 
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.stat.JdbcConnectionStat;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class StatisticTest extends TestCase {
 
@@ -30,4 +33,9 @@ public class StatisticTest extends TestCase {
         stat.setActiveCount(2);
         Assert.assertEquals(2, stat.getActiveMax());
     }
+    
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
 }

src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java

@@ -26,6 +26,7 @@ import com.alibaba.druid.filter.FilterChain;
 import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
+import com.alibaba.druid.stat.JdbcStatManager;
 
 public class WrapImplTest extends TestCase {
 
@@ -75,4 +76,8 @@ public class WrapImplTest extends TestCase {
         statement.close();
     }
 
+    protected void tearDown() throws Exception {
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
 }

src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java

@@ -19,6 +19,8 @@ public class GlobalStatTest0 extends TestCase {
     private DruidDataSource dataSourceB;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+        
         dataSourceA = new DruidDataSource();
         dataSourceA.setUrl("jdbc:mock:xx_A");
         dataSourceA.setFilters("stat");
@@ -30,13 +32,22 @@ public class GlobalStatTest0 extends TestCase {
         dataSourceB.setUseGloalDataSourceStat(true);
     }
 
+    protected void tearDown() throws Exception {
+        JdbcUtils.close(dataSourceA);
+        JdbcUtils.close(dataSourceB);
+        
+        JdbcDataSourceStat.setGlobal(null);
+        
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+    }
+
     public void test_execute() throws Exception {
         {
             Connection conn = dataSourceA.getConnection();
             PreparedStatement stmt = conn.prepareStatement("SELECT 1");
             ResultSet rs = stmt.executeQuery();
             while (rs.next()) {
-                
+
             }
             rs.close();
             stmt.close();
@@ -47,22 +58,17 @@ public class GlobalStatTest0 extends TestCase {
             PreparedStatement stmt = conn.prepareStatement("SELECT 1");
             ResultSet rs = stmt.executeQuery();
             while (rs.next()) {
-                
+
             }
             rs.close();
             stmt.close();
             conn.close();
         }
-        
+
         Assert.assertSame(JdbcDataSourceStat.getGlobal(), dataSourceA.getDataSourceStat());
         Assert.assertSame(JdbcDataSourceStat.getGlobal(), dataSourceB.getDataSourceStat());
-        
+
         Assert.assertEquals(1, JdbcStatManager.getInstance().getSqlList().size());
     }
 
-    protected void tearDown() throws Exception {
-        JdbcUtils.close(dataSourceA);
-        JdbcUtils.close(dataSourceB);
-    }
-
 }

src/test/java/com/alibaba/druid/bvt/proxy/filter/MergeStatFilterTest_tddl.java

@@ -17,17 +17,35 @@ package com.alibaba.druid.bvt.proxy.filter;
 
 import java.sql.Connection;
 import java.sql.Statement;
+import java.util.Set;
+
+import javax.management.openmbean.TabularData;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
+import com.alibaba.druid.stat.JdbcStatManager;
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.druid.util.JdbcUtils;
 
 public class MergeStatFilterTest_tddl extends TestCase {
 
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        TabularData sqlList = JdbcStatManager.getInstance().getSqlList();
+        if (sqlList.size() > 0) {
+            for (Object item : JdbcStatManager.getInstance().getSqlList().values()) {
+                String text = JSONUtils.toJSONString(item);
+                System.out.println(text);
+            }
+        }
+        
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
+
         dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:xx");
         dataSource.setFilters("mergeStat");
@@ -35,7 +53,9 @@ public class MergeStatFilterTest_tddl extends TestCase {
     }
 
     protected void tearDown() throws Exception {
-        dataSource.close();
+        JdbcUtils.close(dataSource);
+
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_merge() throws Exception {

src/test/java/com/alibaba/druid/bvt/proxy/filter/StatFilterTest.java

@@ -23,9 +23,11 @@ import java.sql.Statement;
 import javax.management.openmbean.CompositeData;
 import javax.management.openmbean.TabularData;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.stat.JdbcStatManager;
 import com.alibaba.druid.support.json.JSONUtils;
 
@@ -37,6 +39,9 @@ public class StatFilterTest extends TestCase {
 
     public void tearDown() throws Exception {
         JdbcStatManager.getInstance().reset();
+        
+        DruidDriver.getProxyDataSources().clear();
+        Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size());
     }
 
     public void test_stat() throws Exception {