test

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

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

@@ -18,6 +18,8 @@ public class DruidDataSourceFilterTest extends TestCase {
         dataSource.setFilters("stat");
 
         Assert.assertEquals(1, dataSource.getProxyFilters().size());
+        
+        dataSource.close();
     }
 
     public void test_filter_2() throws Exception {
@@ -28,6 +30,8 @@ public class DruidDataSourceFilterTest extends TestCase {
         dataSource.setFilters("stat,trace");
 
         Assert.assertEquals(2, dataSource.getProxyFilters().size());
+        
+        dataSource.close();
     }
 
     public void test_filter_3() throws Exception {

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

@@ -24,6 +24,8 @@ public class PasswordCallbackTest extends TestCase {
 
         Assert.assertEquals(dataSource.getUrl(), passwordCallback.getUrl());
         Assert.assertEquals(dataSource.getConnectProperties(), passwordCallback.getProperties());
+        
+        dataSource.close();
     }
 
     public static class TestPasswordCallback extends PasswordCallback {

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

@@ -10,7 +10,6 @@ import javax.sql.DataSource;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 import com.alibaba.druid.filter.FilterAdapter;
@@ -20,7 +19,7 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
 public class SpringFilterTest extends TestCase {
 
     public void test_spring() throws Exception {
-        ApplicationContext context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/spring-config-1.xml");
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/spring-config-1.xml");
 
         DataSource dataSource = (DataSource) context.getBean("dataSource");
         Connection conn = dataSource.getConnection();
@@ -28,6 +27,8 @@ public class SpringFilterTest extends TestCase {
 
         TestFilter filter = (TestFilter) context.getBean("test-filter");
         Assert.assertEquals(1, filter.getConnectCount());
+        
+        context.close();
     }
 
     public static class TestFilter extends FilterAdapter {

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

@@ -1,13 +1,14 @@
 package com.alibaba.druid.bvt.pool;
 
 import java.sql.Connection;
-import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 import com.alibaba.druid.mock.MockDriver;
 import com.alibaba.druid.pool.DruidDataSource;
-
-import junit.framework.TestCase;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
 
 
 public class TestDisable extends TestCase {
@@ -32,6 +33,11 @@ public class TestDisable extends TestCase {
         dataSource.setFilters("stat");
     }
     
+    protected void tearDown() throws Exception {
+        dataSource.close();
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+
     public void test_close() throws Exception {
         final int threadCount = 100;
         Thread[] threads = new Thread[threadCount];

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

@@ -35,12 +35,10 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase {
         dataSource.setValidationQuery("SELECT 1");
         dataSource.setFilters("stat");
 
-        ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource,
-                                                                 new ObjectName("com.alibaba:type=DataSource"));
     }
 
     protected void tearDown() throws Exception {
-        ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName("com.alibaba:type=DataSource"));
+        dataSource.close();
     }
 
     public void test_idle2() throws Exception {
@@ -80,7 +78,6 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase {
         }
         // Assert.assertEquals(2, dataSource.getPoolingCount());
 
-        dataSource.close();
     }
 
     private void concurrent(final int threadCount) throws Exception {

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

@@ -36,12 +36,10 @@ public class TestIdle3_Concurrent_Starvation extends TestCase {
         dataSource.setValidationQuery("SELECT 1");
         dataSource.setFilters("stat");
         
-        ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource,
-                                                                 new ObjectName("com.alibaba:type=DataSource"));
     }
     
     protected void tearDown() throws Exception {
-        ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName("com.alibaba:type=DataSource"));
+        dataSource.close();
     }
 
     public void test_idle2() throws Exception {
@@ -79,7 +77,6 @@ public class TestIdle3_Concurrent_Starvation extends TestCase {
         }
         // Assert.assertEquals(2, dataSource.getPoolingCount());
 
-        dataSource.close();
     }
 
     private void concurrent(final int threadCount) throws Exception {

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

@@ -1,12 +1,9 @@
 package com.alibaba.druid.bvt.pool;
 
-import java.lang.management.ManagementFactory;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
-import javax.management.ObjectName;
-
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
@@ -21,6 +18,7 @@ public class TestStat extends TestCase {
     protected void setUp() throws Exception {
         dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setName("com.alibaba.dragoon.monitor");
 
     }
 
@@ -49,7 +47,6 @@ public class TestStat extends TestCase {
         JdbcStatManager.getInstance().getDataSourceList();
         Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
 
-        ManagementFactory.getPlatformMBeanServer().registerMBean(DruidDataSourceStatManager.getInstance(), new ObjectName("com.alibaba.druid:type=DruidDataSourceStat"));
         
     }
 }