From 8f8b09275ee008fd1fa8903af2cedeb8aca7940e Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 18 Sep 2011 03:46:16 +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@832 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java | 3 ++- .../alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index d12a341a43..bb8106f11e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -36,7 +36,8 @@ public class ConnectionTest5 extends TestCase { dataSource.setMinEvictableIdleTimeMillis(300 * 1000); // 300 / 10 dataSource.setTimeBetweenEvictionRunsMillis(180 * 1000); // 180 / 10 dataSource.setTestWhileIdle(true); - dataSource.setTestOnBorrow(false); + dataSource.setTestOnBorrow(true); + dataSource.setTestOnReturn(true); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat,trace"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java index dc24e92db4..ea0d3c5f8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java @@ -15,4 +15,12 @@ public class PoolableWrapperTest extends TestCase { Assert.assertEquals(true, wrapper.isWrapperFor(PoolableWrapper.class)); Assert.assertEquals(true, wrapper.isWrapperFor(MockConnection.class)); } + + public void test_unwrap() throws Exception { + PoolableWrapper wrapper = new PoolableWrapper(new MockConnection()); + + Assert.assertEquals(null, wrapper.unwrap(null)); + Assert.assertEquals(true, wrapper.unwrap(PoolableWrapper.class) != null); + Assert.assertEquals(true, wrapper.unwrap(MockConnection.class) != null); + } }