From b530efe42ad4ffe46554f555e1ba49aaff473426 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 16 Sep 2011 07:21:21 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84mock=E5=92=8C=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@807 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../druid/bvt/pool/basic/PoolableStatementTest2.java | 9 ++++++++- .../druid/bvt/pool/basic/TestDataSourceBasic.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) 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 e3e60c0a34..da5062ff7e 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 @@ -14,6 +14,8 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.PoolableStatement; import com.alibaba.druid.pool.vendor.NullExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; +import com.alibaba.druid.stat.JdbcStatContext; +import com.alibaba.druid.stat.JdbcStatManager; public class PoolableStatementTest2 extends TestCase { @@ -37,19 +39,24 @@ public class PoolableStatementTest2 extends TestCase { dataSource.setTestWhileIdle(true); dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); - dataSource.setFilters("stat"); + dataSource.setFilters("stat,trace"); dataSource.setRemoveAbandoned(true); dataSource.setExceptionSorterClassName(null); Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter); dataSource.setExceptionSorterClassName(""); Assert.assertTrue(dataSource.getExceptionSoter() instanceof NullExceptionSorter); + + JdbcStatContext context = new JdbcStatContext(); + context.setTraceEnable(true); + JdbcStatManager.getInstance().setStatContext(context); } protected void tearDown() throws Exception { Assert.assertEquals(true, dataSource.getCreateTimespanNano() > 0); dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + JdbcStatManager.getInstance().setStatContext(null); } public void test_dupClose() throws Exception { 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 8d4d1e065c..0380f32d6a 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 @@ -34,7 +34,7 @@ public class TestDataSourceBasic extends TestCase { dataSource.setTestWhileIdle(true); dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); - dataSource.setFilters("stat"); + dataSource.setFilters("stat,trace"); dataSource.setRemoveAbandoned(true); dataSource.setExceptionSorterClassName(null);