From a8ff378048cfa20263f12439a9ed756b6df108eb Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 24 Aug 2012 20:04:57 +0800
Subject: [PATCH 1/2] improve test

---
 .../druid/bvt/stat/DruidStatServiceTest.java   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
index d8dafc0fa6..ae9f3b716c 100644
--- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
@@ -47,23 +47,31 @@ public class DruidStatServiceTest extends TestCase {
         JdbcUtils.close(dataSource);
     }
 
+    @SuppressWarnings("unchecked")
     public void test_statService() throws Exception {
         String sql = "select 1";
         Connection conn = dataSource.getConnection();
-        
+
         PreparedStatement stmt = conn.prepareStatement(sql);
         ResultSet rs = stmt.executeQuery();
         rs.next();
         rs.close();
         stmt.close();
-        
+
         conn.close();
-        
+
         String result = DruidStatService.getInstance().service("/sql.json");
         Map<String, Object> resultMap = (Map<String, Object>) JSONUtils.parse(result);
-        
+
         List<Map<String, Object>> sqlList = (List<Map<String, Object>>) resultMap.get("Content");
-        
+
         Assert.assertEquals(1, sqlList.size());
+
+        Map<String, Object> sqlStat = sqlList.get(0);
+
+        Assert.assertEquals(0, sqlStat.get("RunningCount"));
+        Assert.assertEquals(1, sqlStat.get("ExecuteCount"));
+        Assert.assertEquals(1, sqlStat.get("FetchRowCount"));
+        Assert.assertEquals(0, sqlStat.get("EffectedRowCount"));
     }
 }

From a00768d64684917a537bc47b5d75e79b6fab9ce1 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 24 Aug 2012 20:07:54 +0800
Subject: [PATCH 2/2] improve test

---
 .../druid/bvt/stat/DruidStatServiceTest.java  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
index ae9f3b716c..fe06a10661 100644
--- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
@@ -48,7 +48,7 @@ public class DruidStatServiceTest extends TestCase {
     }
 
     @SuppressWarnings("unchecked")
-    public void test_statService() throws Exception {
+    public void test_statService_getSqlList() throws Exception {
         String sql = "select 1";
         Connection conn = dataSource.getConnection();
 
@@ -74,4 +74,29 @@ public class DruidStatServiceTest extends TestCase {
         Assert.assertEquals(1, sqlStat.get("FetchRowCount"));
         Assert.assertEquals(0, sqlStat.get("EffectedRowCount"));
     }
+    
+    public void test_statService_getDataSourceList() throws Exception {
+        String sql = "select 1";
+        Connection conn = dataSource.getConnection();
+
+        PreparedStatement stmt = conn.prepareStatement(sql);
+        ResultSet rs = stmt.executeQuery();
+        rs.next();
+        rs.close();
+        stmt.close();
+
+        conn.close();
+
+        String result = DruidStatService.getInstance().service("/datasource.json");
+        Map<String, Object> resultMap = (Map<String, Object>) JSONUtils.parse(result);
+
+        List<Map<String, Object>> dataSourceList = (List<Map<String, Object>>) resultMap.get("Content");
+
+        Assert.assertEquals(1, dataSourceList.size());
+
+        Map<String, Object> dataSourceStat = dataSourceList.get(0);
+
+        Assert.assertEquals(1, dataSourceStat.get("PoolingCount"));
+        Assert.assertEquals(0, dataSourceStat.get("ActiveCount"));
+    }
 }