test fixed

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@728 b9813039-fb51-4c41-a8b9-e21c2acb5095

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

@@ -13,9 +13,15 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class Case0 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
 
     public void test_0() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
         
         final DruidDataSource dataSource = new DruidDataSource();
 
@@ -60,6 +66,5 @@ public class Case0 extends TestCase {
         Assert.assertTrue(completeLatch.await(1, TimeUnit.SECONDS));
 
         dataSource.close();
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
 }

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

@@ -12,8 +12,12 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 public class Case1 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_f() throws Exception {

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

@@ -31,8 +31,12 @@ import com.alibaba.druid.util.JMXUtils;
  * @author admin 2011-5-4 下午02:45:21
  */
 public class Case2 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_singleThread() throws Exception {

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

@@ -40,9 +40,12 @@ public class Case3 extends TestCase {
     //
     // dataSource.close();
     // }
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
     
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
 
     public void test_2() throws Exception {

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

@@ -10,8 +10,12 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcStatManager;
 
 public class DruidDataSourceFilterTest extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
-        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
     }
     
     public void test_filter() throws Exception {

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

@@ -16,6 +16,8 @@ public class ManagedDataSourceTest extends TestCase {
     private DruidDataSource dataSource;
 
     public void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:xxx");
     }

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

@@ -10,6 +10,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcStatManager;
 
 public class ParamTest extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }

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

@@ -9,9 +9,17 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class PasswordCallbackTest extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     public void test_0() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:");

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

@@ -18,7 +18,14 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class SpringFilterTest extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());        
+    }
+    
     public void test_spring() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
         

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

@@ -13,6 +13,8 @@ public class TestAbondon extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         dataSource = new DruidDataSource();
         dataSource.setRemoveAbandoned(true);
         dataSource.setRemoveAbandonedTimeoutMillis(10);

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

@@ -11,6 +11,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestClose_0 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }

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

@@ -8,9 +8,17 @@ import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestClose_1 extends TestCase {
-
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
+    protected void tearDown() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     public void test_close() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
         dataSource.setPoolPreparedStatements(true);

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

@@ -17,6 +17,8 @@ public class TestDisable extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();

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

@@ -29,6 +29,10 @@ public class TestDruidDataSource extends TestCase {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
     
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     public void test_0() throws Exception {
         DruidDataSource dataSource = new DruidDataSource();
 

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

@@ -17,6 +17,8 @@ public class TestGraceShutdown extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();

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

@@ -14,6 +14,10 @@ public class TestIdle extends TestCase {
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
+    
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
 
     public void test_idle() throws Exception {
         MockDriver driver = new MockDriver();

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

@@ -11,6 +11,10 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle2 extends TestCase {
 
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }

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

@@ -13,6 +13,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle3 extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }

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

@@ -13,6 +13,10 @@ import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 public class TestIdle3_Concurrent extends TestCase {
+    protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+    
     protected void tearDown() throws Exception {
         Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }

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

@@ -20,6 +20,8 @@ public class TestIdle3_Concurrent_Starvation extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();

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

@@ -17,6 +17,8 @@ public class TestPoolPreparedStatement extends TestCase {
     private DruidDataSource dataSource;
 
     protected void setUp() throws Exception {
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        
         driver = new MockDriver();
 
         dataSource = new DruidDataSource();