From 5419f2af74479eea5ddf692d21ecff3806c4b7e4 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sat, 10 Sep 2011 18:12:45 +0000 Subject: [PATCH] test fixed 2 git-svn-id: http://code.alibabatech.com/svn/druid/trunk@723 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../java/com/alibaba/druid/bvt/pool/TestClose_0.java | 6 +++++- .../com/alibaba/druid/bvt/pool/TestDruidDataSource.java | 6 +++++- .../com/alibaba/druid/bvt/pool/TestGraceShutdown.java | 6 ++++++ src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java | 6 +++++- .../com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java | 9 +++++---- .../druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java | 3 --- 6 files changed, 26 insertions(+), 10 deletions(-) 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 7deab231f0..6e007dd29b 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 @@ -8,9 +8,13 @@ import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_0 extends TestCase { - + protected void tearDown() throws Exception { + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + } + public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); 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 d2295889e9..8040c260f7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -22,9 +22,13 @@ import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.PoolableConnection; +import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDruidDataSource extends TestCase { - + protected void tearDown() throws Exception { + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + } + public void test_0() throws Exception { DruidDataSource dataSource = new DruidDataSource(); 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 df6de4fb3e..f1cfc4bdd6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -3,11 +3,13 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.concurrent.CountDownLatch; +import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestGraceShutdown extends TestCase { @@ -32,6 +34,10 @@ public class TestGraceShutdown extends TestCase { dataSource.setFilters("stat"); } + protected void tearDown() throws Exception { + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + } + public void test_close() throws Exception { final int threadCount = 100; Thread[] threads = new Thread[threadCount]; 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 48345a2eee..c2bb22d255 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -10,9 +10,13 @@ import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3 extends TestCase { - + protected void tearDown() throws Exception { + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + } + public void test_idle2() throws Exception { MockDriver driver = new MockDriver(); 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 f318797640..d9d4d97cb9 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 @@ -1,21 +1,22 @@ package com.alibaba.druid.bvt.pool; -import java.lang.management.ManagementFactory; import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import javax.management.ObjectName; - import junit.framework.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent extends TestCase { - + protected void tearDown() throws Exception { + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + } + public void test_idle2() throws Exception { MockDriver driver = new MockDriver(); 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 68de4b8aed..0037391079 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 @@ -1,12 +1,9 @@ package com.alibaba.druid.bvt.pool; -import java.lang.management.ManagementFactory; import java.sql.Connection; import java.util.Random; import java.util.concurrent.CountDownLatch; -import javax.management.ObjectName; - import junit.framework.Assert; import junit.framework.TestCase;