From 6dd3f66c3b764b1fd8b4e5b35d222ec6a6b1d80c Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 26 Jul 2012 15:18:08 +0800 Subject: [PATCH] testcase fixed --- .../druid/pool/DruidPooledConnection.java | 24 +++++++++++-------- .../stat/DruidDataSourceStatManager.java | 16 +++++++++++++ .../com/alibaba/druid/bvt/pool/Case0.java | 2 +- .../com/alibaba/druid/bvt/pool/Case1.java | 2 +- .../com/alibaba/druid/bvt/pool/Case2.java | 2 +- .../com/alibaba/druid/bvt/pool/Case3.java | 2 +- .../bvt/pool/DruidDataSourceFilterTest.java | 2 +- .../druid/bvt/pool/ManagedDataSourceTest.java | 2 +- .../com/alibaba/druid/bvt/pool/ParamTest.java | 2 +- .../druid/bvt/pool/PasswordCallbackTest.java | 2 +- .../bvt/pool/SpringIbatisFilterTest.java | 2 +- .../bvt/pool/SpringMybatisFilterTest.java | 2 +- .../alibaba/druid/bvt/pool/TestAbondon.java | 2 +- .../druid/bvt/pool/TestActiveTrace.java | 6 +---- .../alibaba/druid/bvt/pool/TestClose_0.java | 2 +- .../alibaba/druid/bvt/pool/TestClose_1.java | 2 +- .../alibaba/druid/bvt/pool/TestClose_2.java | 2 +- .../druid/bvt/pool/TestConcurrent.java | 2 +- .../alibaba/druid/bvt/pool/TestDefault.java | 2 +- .../alibaba/druid/bvt/pool/TestDisable.java | 2 +- .../druid/bvt/pool/TestDruidDataSource.java | 2 +- .../druid/bvt/pool/TestGraceShutdown.java | 2 +- .../com/alibaba/druid/bvt/pool/TestIdle.java | 2 +- .../com/alibaba/druid/bvt/pool/TestIdle2.java | 2 +- .../com/alibaba/druid/bvt/pool/TestIdle3.java | 2 +- .../druid/bvt/pool/TestIdle3_Concurrent.java | 2 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 2 +- .../pool/TestIdle3_Concurrent_Starvation.java | 2 +- .../bvt/pool/TestPoolPreparedStatement.java | 2 +- .../bvt/pool/TestPoolPreparedStatement2.java | 2 +- .../bvt/pool/TestSharePreparedStatements.java | 2 +- .../com/alibaba/druid/bvt/pool/TestStat.java | 2 +- .../druid/bvt/pool/basic/ConnectionTest.java | 2 +- .../druid/bvt/pool/basic/ConnectionTest2.java | 2 +- .../druid/bvt/pool/basic/ConnectionTest3.java | 2 +- .../druid/bvt/pool/basic/ConnectionTest4.java | 2 +- .../druid/bvt/pool/basic/ConnectionTest5.java | 2 +- .../druid/bvt/pool/basic/DataSourceTest3.java | 2 +- .../pool/basic/PoolableStatementTest2.java | 2 +- .../druid/bvt/pool/basic/TestCommit.java | 2 +- .../bvt/pool/basic/TestDataSourceBasic.java | 2 +- .../bvt/pool/basic/TestDataSourceBasic2.java | 2 +- 42 files changed, 70 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java index 4be7913bc3..8a1544fdf1 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java @@ -15,6 +15,7 @@ */ package com.alibaba.druid.pool; +import java.lang.ref.WeakReference; import java.sql.Array; import java.sql.Blob; import java.sql.CallableStatement; @@ -54,18 +55,19 @@ import com.alibaba.druid.support.logging.LogFactory; */ public class DruidPooledConnection implements javax.sql.PooledConnection, Connection { - private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class); + private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class); - protected Connection conn; - protected ConnectionHolder holder; - protected TransactionInfo transactionInfo; - private final boolean dupCloseLogEnable; - private boolean traceEnable = false; - private boolean diable = false; - private boolean closed = false; - private final Thread ownerThread; + protected Connection conn; + protected ConnectionHolder holder; + protected TransactionInfo transactionInfo; + private final boolean dupCloseLogEnable; + private boolean traceEnable = false; + private boolean diable = false; + private boolean closed = false; + private final Thread ownerThread; + private WeakReference closedThreadRef = null; - private long connectedTimeNano; + private long connectedTimeNano; public DruidPooledConnection(ConnectionHolder holder){ this.conn = holder.getConnection(); @@ -178,6 +180,8 @@ public class DruidPooledConnection implements javax.sql.PooledConnection, Connec LOG.error("dup close"); return; } + + closedThreadRef = new WeakReference(Thread.currentThread()); for (ConnectionEventListener listener : holder.getConnectionEventListeners()) { listener.connectionClosed(new ConnectionEvent(this)); diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index a15f97d958..8e6cc4e321 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -54,6 +54,22 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe public static DruidDataSourceStatManager getInstance() { return instance; } + + public static void cear() { + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + for (Map.Entry entry : dataSources.entrySet()) { + ObjectName objectName = entry.getValue(); + if (objectName == null) { + continue; + } + try { + mbeanServer.unregisterMBean(objectName); + } catch (JMException e) { + LOG.error(e.getMessage(), e); + } + } + dataSources.clear(); + } public synchronized static ObjectName add(DruidDataSource dataSource, String name) { MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index 21960172cc..bd07add846 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -15,7 +15,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case0 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index e8b7b62333..99f81e8720 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -14,7 +14,7 @@ import junit.framework.TestCase; public class Case1 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index 3c05c545d1..d92dda49d8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -34,7 +34,7 @@ import com.alibaba.druid.util.JMXUtils; public class Case2 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index 7036a7061e..5ed3bf4a2e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -41,7 +41,7 @@ public class Case3 extends TestCase { // dataSource.close(); // } protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index e70ddbd420..ebe506af44 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class DruidDataSourceFilterTest extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java index 3119223d75..56a3583083 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -16,7 +16,7 @@ public class ManagedDataSourceTest extends TestCase { private DruidDataSource dataSource; public void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java index b56b79da2d..a2e059f875 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ParamTest extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index ff9e692717..45485c4d48 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -14,7 +14,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class PasswordCallbackTest extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java index 745f72c785..5cf6da6db1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java @@ -23,7 +23,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class SpringIbatisFilterTest extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java index 3b18be631c..58118ab485 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java @@ -18,7 +18,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class SpringMybatisFilterTest extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java index 3d8a7180ca..25d6d6ecac 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java @@ -13,7 +13,7 @@ public class TestAbondon extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); dataSource = new DruidDataSource(); dataSource.setRemoveAbandoned(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java index 7ac09e20fe..de8a15f5ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java @@ -14,7 +14,7 @@ public class TestActiveTrace extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); dataSource = new DruidDataSource(); dataSource.setRemoveAbandoned(true); @@ -41,10 +41,6 @@ public class TestActiveTrace extends TestCase { dataSource.shrink(); Assert.assertEquals(0, dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveConnections().size()); - - if (i % 5000 == 0) { - System.out.println(ManagementFactory.getClassLoadingMXBean().getLoadedClassCount()); - } } } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index 93a13c18e3..a801010ac0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_0 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 2f6fcb5741..18b79db55f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -14,7 +14,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_1 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java index bc9217b949..b8045fc3cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java @@ -14,7 +14,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_2 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java index 5ebd3458d3..9d671bb55d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java @@ -18,7 +18,7 @@ public class TestConcurrent extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); driver.setLogExecuteQueryEnable(false); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java index adf14ab7e8..c767628b84 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDefault extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java index d3b7577e9f..9f99c88da6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -17,7 +17,7 @@ public class TestDisable extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java index 94a20a0c31..2371f2aa3b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -27,7 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDruidDataSource extends TestCase { protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java index eff058d4de..294c378639 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -17,7 +17,7 @@ public class TestGraceShutdown extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java index d8d30965fa..cdd00b6002 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle extends TestCase { protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java index 86dd980f54..082e983600 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -12,7 +12,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle2 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java index 14a4fb85a1..7a6dd3a0c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -15,7 +15,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3 extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java index fe814dfe85..10b3271204 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java @@ -15,7 +15,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java index 5c9dbf192a..909d32cb89 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -17,7 +17,7 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java index 22bdbc0a80..ddb4edc0f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java @@ -20,7 +20,7 @@ public class TestIdle3_Concurrent_Starvation extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java index f92cc88523..62ac42cb12 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java @@ -18,7 +18,7 @@ public class TestPoolPreparedStatement extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java index bbbc220ad0..25511a637c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -18,7 +18,7 @@ public class TestPoolPreparedStatement2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java index d8de4f9391..c79336dc34 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java @@ -14,7 +14,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestSharePreparedStatements extends TestCase { protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java index b0f7f5e986..141c2400f1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -16,7 +16,7 @@ public class TestStat extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index e5a4bc38a0..c7c20ce428 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -18,7 +18,7 @@ public class ConnectionTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index c02f089e2c..61ba11acd4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -18,7 +18,7 @@ public class ConnectionTest2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index 6308e114e4..405ca149fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -20,7 +20,7 @@ public class ConnectionTest3 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index 638ad768d2..209b4653c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -25,7 +25,7 @@ public class ConnectionTest4 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index 45739d0540..19f6c385bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -22,7 +22,7 @@ public class ConnectionTest5 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index 54301e947d..58b8651614 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -24,7 +24,7 @@ public class DataSourceTest3 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 0504815570..6797ebe303 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -24,7 +24,7 @@ public class PoolableStatementTest2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java index 0a1eec7761..a798afb8f0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java @@ -18,7 +18,7 @@ public class TestCommit extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index 89637d7645..5f525dd5aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -21,7 +21,7 @@ public class TestDataSourceBasic extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index 4bca453da5..2cf7a70b3e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -13,7 +13,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDataSourceBasic2 extends TestCase { public void test_0() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + DruidDataSourceStatManager.cear(); DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx");