From 7f3f4a6dd6bcab353b94ad2f1917996f98b11dbb Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 20 Nov 2017 15:00:26 +0800 Subject: [PATCH] testcase refactor. --- .../java/com/alibaba/druid/PoolTestCase.java | 26 +++++++++++++++++++ .../alibaba/druid/bvt/pool/AsyncInitTest.java | 7 ++++- .../bvt/pool/Bug_for_dupCloseStmtError.java | 10 +++++-- .../druid/bvt/pool/CallableStatmentTest.java | 7 ++++- .../com/alibaba/druid/bvt/pool/Case0.java | 11 ++------ .../com/alibaba/druid/bvt/pool/Case1.java | 11 ++------ .../com/alibaba/druid/bvt/pool/Case2.java | 11 ++------ .../com/alibaba/druid/bvt/pool/Case3.java | 10 ++----- .../alibaba/druid/bvt/pool/ClosedTest.java | 3 ++- .../druid/bvt/pool/ConfigErrorTest.java | 7 ++++- .../druid/bvt/pool/ConfigErrorTest2.java | 7 ++++- .../druid/bvt/pool/ConfigErrorTest3.java | 7 ++++- .../druid/bvt/pool/ConfigErrorTestMysql.java | 5 +++- .../druid/bvt/pool/CreateSchedulerTest.java | 7 ++++- .../pool/DataSourceDisableExceptionTest.java | 3 ++- .../druid/bvt/pool/DestorySchedulerTest.java | 7 ++++- .../bvt/pool/DruidConnectionHolderTest.java | 7 ++++- .../bvt/pool/DruidConnectionHolderTest2.java | 7 ++++- .../bvt/pool/DruidConnectionHolderTest3.java | 7 ++++- .../bvt/pool/DruidConnectionHolderTest4.java | 7 ++++- .../com/alibaba/druid/bvt/pool/TestClone.java | 6 ++++- .../alibaba/druid/bvt/pool/TestClose_0.java | 11 ++------ .../alibaba/druid/bvt/pool/TestClose_1.java | 11 ++------ .../alibaba/druid/bvt/pool/TestClose_2.java | 12 ++------- .../druid/bvt/pool/UnwrapTest_filter.java | 6 ++++- .../bvt/pool/ValidationQueryLogDB2Test.java | 7 ++++- .../bvt/pool/ValidationQueryLogTest.java | 7 ++++- .../DruidDataSourceC3P0AdapterTest.java | 8 ++++-- .../DruidDataSourceC3P0AdapterTest2.java | 5 +++- .../druid/bvt/pool/basic/ConnectionTest.java | 7 ++--- .../druid/bvt/pool/basic/ConnectionTest2.java | 5 +++- .../druid/bvt/pool/basic/ConnectionTest3.java | 5 +++- .../druid/bvt/pool/basic/ConnectionTest4.java | 4 ++- .../druid/bvt/pool/basic/ConnectionTest5.java | 5 +++- .../druid/bvt/pool/basic/DataSourceTest3.java | 5 +++- .../bvt/pool/basic/TestDataSourceBasic.java | 7 +++-- .../bvt/pool/basic/TestDataSourceBasic2.java | 5 +++- .../dynamic/ConnectPropertiesChangeTest.java | 7 ++++- .../dynamic/ConnectPropertiesChangeTest1.java | 7 ++++- .../DruidDataSourceStatLoggerImplTest.java | 7 ++++- .../bvt/pool/dynamic/MaxActiveChangeTest.java | 7 ++++- .../PoolPreparedStatementsChangeTest.java | 7 ++++- .../bvt/pool/dynamic/SqlSkipCountTest.java | 7 ++++- ...eptionSorterTest_stmt_setQueryTimeout.java | 8 ++++-- .../OracleExceptionSorter_userDefined.java | 7 ++++- .../OracleExceptionSorter_userDefined_1.java | 5 +++- .../druid/bvt/pool/profile/FailFastTest.java | 7 ++++- .../pool/property/PropertyTest_filters.java | 5 +++- .../PropertyTest_validationQuery.java | 5 +++- .../vendor/InformixExceptionSorterTest.java | 3 ++- .../MSSQLValidConnectionCheckerTest.java | 3 ++- .../MySQLValidConnectionCheckerTest.java | 3 ++- .../pool/vendor/MySqlExceptionSorterTest.java | 3 ++- .../vendor/MySqlExceptionSorterTest_1.java | 3 ++- .../vendor/MySqlExceptionSorterTest_2.java | 3 ++- .../MySqlExceptionSorterTest_oceanbase.java | 3 ++- .../pool/vendor/PGExceptionSorterTest.java | 3 ++- .../vendor/SybaseExceptionSorterTest.java | 3 ++- .../ValidConnectionCheckerAdapterTest.java | 3 ++- .../alibaba/druid/bvt/pool/xa/H2XATest.java | 7 ++++- .../bvt/pool/xa/JtdsXAConnectionTest.java | 3 ++- 61 files changed, 280 insertions(+), 122 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/PoolTestCase.java diff --git a/src/test/java/com/alibaba/druid/PoolTestCase.java b/src/test/java/com/alibaba/druid/PoolTestCase.java new file mode 100644 index 0000000000..fd3c748cec --- /dev/null +++ b/src/test/java/com/alibaba/druid/PoolTestCase.java @@ -0,0 +1,26 @@ +package com.alibaba.druid; + +import com.alibaba.druid.stat.DruidDataSourceStatManager; +import junit.framework.TestCase; +import org.junit.Assert; + +import javax.management.openmbean.CompositeData; + +public class PoolTestCase extends TestCase { + protected void setUp() throws Exception { + DruidDataSourceStatManager.clear(); + } + + protected void tearDown() throws Exception { + int size = DruidDataSourceStatManager.getInstance().getDataSourceList().size(); + String errorInfo = null; + if (size > 0) { + CompositeData compositeData = (CompositeData) DruidDataSourceStatManager.getInstance().getDataSourceList().values().iterator().next(); + String name = (String) compositeData.get("Name"); + String url = (String) compositeData.get("URL"); + + errorInfo = "Name " + name + ", URL " + url; + } + Assert.assertEquals(errorInfo, 0, size); + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java b/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java index 5a6e78ce28..c69f403148 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/AsyncInitTest.java @@ -1,12 +1,15 @@ package com.alibaba.druid.bvt.pool; +import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; -public class AsyncInitTest extends TestCase { +public class AsyncInitTest extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setAsyncInit(true); dataSource.setUrl("jdbc:mock:xxx"); @@ -16,6 +19,8 @@ public class AsyncInitTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_async_init() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java b/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java index fd65f0973a..a60c698bc3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Bug_for_dupCloseStmtError.java @@ -18,6 +18,8 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; +import com.alibaba.druid.PoolTestCase; +import com.alibaba.druid.util.JdbcUtils; import junit.framework.TestCase; import org.junit.Assert; @@ -27,11 +29,13 @@ import com.alibaba.druid.mock.MockConnectionClosedException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class Bug_for_dupCloseStmtError extends TestCase { +public class Bug_for_dupCloseStmtError extends PoolTestCase { protected DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); dataSource.setPoolPreparedStatements(false); @@ -41,8 +45,10 @@ public class Bug_for_dupCloseStmtError extends TestCase { protected void tearDown() throws Exception { dataSource.close(); for (DruidDataSource dataSource : DruidDataSourceStatManager.getDruidDataSourceInstances()) { - dataSource.close(); + JdbcUtils.close(dataSource); } + + super.tearDown(); } public void test_2() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java index 0342f78cd4..61a6ad2079 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java @@ -20,6 +20,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -29,11 +30,13 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidDataSource; -public class CallableStatmentTest extends TestCase { +public class CallableStatmentTest extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -51,6 +54,8 @@ public class CallableStatmentTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index 3f69a1d11c..a53f2516e4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -20,6 +20,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -27,15 +28,7 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class Case0 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } +public class Case0 extends PoolTestCase { public void test_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index ca1946f4b2..3e7449f112 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -19,6 +19,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -27,15 +28,7 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class Case1 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } +public class Case1 extends PoolTestCase { public void test_f() throws Exception { final DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index 1cf1dee6d0..6e3eecd70d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -18,6 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.Properties; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -31,15 +32,7 @@ import com.alibaba.druid.util.JMXUtils; * * @author admin 2011-5-4 下午02:45:21 */ -public class Case2 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } +public class Case2 extends PoolTestCase { public void test_singleThread() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index ba102ec440..fb12f28ee5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -21,13 +21,14 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class Case3 extends TestCase { +public class Case3 extends PoolTestCase { // public void test_0() throws Exception { // DruidDataSource dataSource = new DruidDataSource(); @@ -55,13 +56,6 @@ public class Case3 extends TestCase { // // dataSource.close(); // } - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } public void test_2() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java index 74bc028828..7b3b3fbcb1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java @@ -17,13 +17,14 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DataSourceClosedException; import com.alibaba.druid.pool.DruidDataSource; -public class ClosedTest extends TestCase { +public class ClosedTest extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java index fe17403c2b..6391276295 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java @@ -18,17 +18,20 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConfigErrorTest extends TestCase { +public class ConfigErrorTest extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(true); @@ -36,6 +39,8 @@ public class ConfigErrorTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java index 877575964b..d13c84a018 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java @@ -18,17 +18,20 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConfigErrorTest2 extends TestCase { +public class ConfigErrorTest2 extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:wrap-jdbc:jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -38,6 +41,8 @@ public class ConfigErrorTest2 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java index dadf742b08..f96328eec2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest3.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -24,11 +25,13 @@ import org.junit.Assert; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConfigErrorTest3 extends TestCase { +public class ConfigErrorTest3 extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mysql:xxx"); dataSource.setTestOnBorrow(false); @@ -40,6 +43,8 @@ public class ConfigErrorTest3 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java index 806bb6d42f..0cf276cffd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java @@ -17,17 +17,19 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConfigErrorTestMysql extends TestCase { +public class ConfigErrorTestMysql extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mysql:xxx"); dataSource.setTestOnBorrow(false); @@ -36,6 +38,7 @@ public class ConfigErrorTestMysql extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + super.tearDown(); } public void test_success() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java index 987cadcff2..905c1b7ccd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CreateSchedulerTest.java @@ -4,18 +4,21 @@ import java.sql.Connection; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.druid.pool.DruidDataSource; -public class CreateSchedulerTest extends TestCase { +public class CreateSchedulerTest extends PoolTestCase { private DruidDataSource dataSource; private ScheduledExecutorService createScheduler; protected void setUp() throws Exception { + super.setUp(); + createScheduler = Executors.newScheduledThreadPool(1); dataSource = new DruidDataSource(); @@ -28,6 +31,8 @@ public class CreateSchedulerTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); createScheduler.shutdown(); + + super.tearDown(); } public void test_connectAndClose() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java index 38307637e9..da2ca77026 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java @@ -1,11 +1,12 @@ package com.alibaba.druid.bvt.pool; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DataSourceDisableException; -public class DataSourceDisableExceptionTest extends TestCase { +public class DataSourceDisableExceptionTest extends PoolTestCase { public void test_0() throws Exception { DataSourceDisableException ex = new DataSourceDisableException(); Assert.assertEquals(null, ex.getMessage()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java index 695e1a3e98..a0319158c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DestorySchedulerTest.java @@ -4,18 +4,21 @@ import java.sql.Connection; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.druid.pool.DruidDataSource; -public class DestorySchedulerTest extends TestCase { +public class DestorySchedulerTest extends PoolTestCase { private DruidDataSource dataSource; private ScheduledExecutorService destroyScheduler; protected void setUp() throws Exception { + super.setUp(); + destroyScheduler = Executors.newScheduledThreadPool(1); dataSource = new DruidDataSource(); @@ -28,6 +31,8 @@ public class DestorySchedulerTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); destroyScheduler.shutdown(); + + super.tearDown(); } public void test_connectAndClose() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java index e707ed11f4..5a1efedf76 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool; +import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; import com.alibaba.druid.pool.DruidDataSource; @@ -9,7 +10,7 @@ import junit.framework.TestCase; import java.sql.SQLException; -public class DruidConnectionHolderTest extends TestCase { +public class DruidConnectionHolderTest extends PoolTestCase { Driver driver; private DruidDataSource dataSource; @@ -17,6 +18,8 @@ public class DruidConnectionHolderTest extends TestCase { private Class exceptionClass; protected void setUp() throws Exception { + super.setUp(); + driver = new Driver(); if (driver.getMajorVersion() == 5) { @@ -48,6 +51,8 @@ public class DruidConnectionHolderTest extends TestCase { if (dataSource != null) { dataSource.close(); } + + super.tearDown(); } public void test_mysqlSyntaxError() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java index 8fd9189bb3..d4e12c942a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -11,11 +12,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -public class DruidConnectionHolderTest2 extends TestCase { +public class DruidConnectionHolderTest2 extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -32,6 +35,8 @@ public class DruidConnectionHolderTest2 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_mysqlSyntaxError() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java index cf85fd5d42..d51c85cb15 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -11,11 +12,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -public class DruidConnectionHolderTest3 extends TestCase { +public class DruidConnectionHolderTest3 extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -32,6 +35,8 @@ public class DruidConnectionHolderTest3 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_mysqlSyntaxError() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java index fefe89d08b..4b761f3cd5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest4.java @@ -3,6 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.PreparedStatement; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -11,11 +12,13 @@ import com.alibaba.druid.pool.DruidConnectionHolder; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; -public class DruidConnectionHolderTest4 extends TestCase { +public class DruidConnectionHolderTest4 extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -25,6 +28,8 @@ public class DruidConnectionHolderTest4 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_toString() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java index 1eb306705c..6601875d46 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java @@ -19,6 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -27,10 +28,12 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; -public class TestClone extends TestCase { +public class TestClone extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUsername("xxx1"); @@ -107,5 +110,6 @@ public class TestClone extends TestCase { protected void tearDown() throws Exception { JdbcUtils.close(dataSource); + super.tearDown(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index 320fadcd74..fae43a0e6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -19,21 +19,14 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class TestClose_0 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } +public class TestClose_0 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 9d9b2cf1d9..44c0e7ddab 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -19,6 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -26,15 +27,7 @@ import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class TestClose_1 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } +public class TestClose_1 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java index af1bc2e72b..468cec788b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java @@ -19,6 +19,7 @@ import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -26,16 +27,7 @@ import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class TestClose_2 extends TestCase { - - protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); - } - - protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } - +public class TestClose_2 extends PoolTestCase { public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setPoolPreparedStatements(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java index ed632dbb84..1511f7d693 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/UnwrapTest_filter.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -12,11 +13,12 @@ import com.alibaba.druid.filter.stat.MergeStatFilter; import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; -public class UnwrapTest_filter extends TestCase { +public class UnwrapTest_filter extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); @@ -31,6 +33,8 @@ public class UnwrapTest_filter extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_unwrap() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java index 5d11dded26..48ba2cd245 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java @@ -3,6 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -11,11 +12,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.util.JdbcConstants; -public class ValidationQueryLogDB2Test extends TestCase { +public class ValidationQueryLogDB2Test extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setDbType(JdbcConstants.DB2); @@ -29,6 +32,8 @@ public class ValidationQueryLogDB2Test extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_oracle() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java index 77513929d3..42c82a9889 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java @@ -3,6 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -11,11 +12,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.util.JdbcConstants; -public class ValidationQueryLogTest extends TestCase { +public class ValidationQueryLogTest extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setDbType(JdbcConstants.ORACLE); @@ -29,6 +32,8 @@ public class ValidationQueryLogTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_oracle() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java index 31a645a91c..5ddd6335cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.pool.adapter; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -24,12 +25,14 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class DruidDataSourceC3P0AdapterTest extends TestCase { +public class DruidDataSourceC3P0AdapterTest extends PoolTestCase { private MockDriver driver; private DruidDataSourceC3P0Adapter dataSource; protected void setUp() throws Exception { + super.setUp(); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); driver = new MockDriver(); @@ -49,7 +52,8 @@ public class DruidDataSourceC3P0AdapterTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + + super.tearDown(); } public void test_basic() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java index a4740e5741..af76c0c97c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.pool.adapter; import javax.sql.DataSource; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -24,7 +25,7 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class DruidDataSourceC3P0AdapterTest2 extends TestCase { +public class DruidDataSourceC3P0AdapterTest2 extends PoolTestCase { public void test_0() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); @@ -86,5 +87,7 @@ public class DruidDataSourceC3P0AdapterTest2 extends TestCase { for (DruidDataSource dataSource : DruidDataSourceStatManager.getDruidDataSourceInstances()) { dataSource.close(); } + + super.tearDown(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index dfc56a837b..cf662b7d2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -20,6 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -27,13 +28,13 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class ConnectionTest extends TestCase { +public class ConnectionTest extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); + super.setUp(); driver = new MockDriver(); @@ -54,7 +55,7 @@ public class ConnectionTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + super.tearDown(); } public void test_prepare() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index 387ef8c4c9..91e8f60698 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -20,6 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -27,7 +28,7 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class ConnectionTest2 extends TestCase { +public class ConnectionTest2 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -58,6 +59,8 @@ public class ConnectionTest2 extends TestCase { Assert.assertEquals(0, dataSource.getCreateCount()); dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + + super.tearDown(); } public void test_prepare() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index 9ea7a87cc4..eab0c3ab33 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -20,6 +20,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -30,7 +31,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; -public class ConnectionTest3 extends TestCase { +public class ConnectionTest3 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -64,6 +65,8 @@ public class ConnectionTest3 extends TestCase { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); JdbcStatManager.getInstance().setStatContext(null); + + super.tearDown(); } public void test_basic() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index ca8e5db321..566850b71f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -22,6 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -35,7 +36,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; -public class ConnectionTest4 extends TestCase { +public class ConnectionTest4 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -70,6 +71,7 @@ public class ConnectionTest4 extends TestCase { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); JdbcStatManager.getInstance().setStatContext(null); + super.tearDown(); } public void test_basic() throws Exception { 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 5aa2e6de44..35deda5d61 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 @@ -21,6 +21,7 @@ import java.util.Properties; import javax.sql.ConnectionEvent; import javax.sql.ConnectionEventListener; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -31,7 +32,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; -public class ConnectionTest5 extends TestCase { +public class ConnectionTest5 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -66,6 +67,8 @@ public class ConnectionTest5 extends TestCase { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); JdbcStatManager.getInstance().setStatContext(null); + + super.tearDown(); } public void test_basic() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index b43052d6b3..a226ecbeee 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -21,6 +21,7 @@ import java.util.Properties; import javax.security.auth.callback.PasswordCallback; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -34,7 +35,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatContext; import com.alibaba.druid.stat.JdbcStatManager; -public class DataSourceTest3 extends TestCase { +public class DataSourceTest3 extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; @@ -68,6 +69,8 @@ public class DataSourceTest3 extends TestCase { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); JdbcStatManager.getInstance().setStatContext(null); + + super.tearDown(); } public void test_prepareStatement_error() 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 4749a74fb2..3a7ebfcc52 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 @@ -21,6 +21,7 @@ import java.sql.Statement; import javax.sql.DataSource; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -30,13 +31,13 @@ import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.vendor.NullExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class TestDataSourceBasic extends TestCase { +public class TestDataSourceBasic extends PoolTestCase { private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.clear(); + super.setUp(); driver = new MockDriver(); @@ -67,6 +68,8 @@ public class TestDataSourceBasic extends TestCase { } dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + + super.tearDown(); } public void test_toCompositeData() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index 43bffb38cf..c698b78a3c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -18,6 +18,7 @@ package com.alibaba.druid.bvt.pool.basic; import java.util.Arrays; import java.util.Properties; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -26,7 +27,7 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ExceptionSorter; import com.alibaba.druid.stat.DruidDataSourceStatManager; -public class TestDataSourceBasic2 extends TestCase { +public class TestDataSourceBasic2 extends PoolTestCase { public void test_0() throws Exception { DruidDataSourceStatManager.clear(); @@ -126,6 +127,8 @@ public class TestDataSourceBasic2 extends TestCase { for (DruidDataSource dataSource : DruidDataSourceStatManager.getDruidDataSourceInstances()) { dataSource.close(); } + + super.tearDown(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java index 7529471791..4ab4e17d2c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java @@ -18,6 +18,7 @@ package com.alibaba.druid.bvt.pool.dynamic; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -26,13 +27,15 @@ import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConnectPropertiesChangeTest extends TestCase { +public class ConnectPropertiesChangeTest extends PoolTestCase { private DruidDataSource dataSource; private Log dataSourceLog; protected void setUp() throws Exception { + super.setUp(); + Field logField = DruidDataSource.class.getDeclaredField("LOG"); logField.setAccessible(true); dataSourceLog = (Log) logField.get(null); @@ -51,6 +54,8 @@ public class ConnectPropertiesChangeTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connectPropertiesChange() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java index 2eed1516a9..1102fd7cdb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java @@ -18,6 +18,7 @@ package com.alibaba.druid.bvt.pool.dynamic; import java.lang.reflect.Field; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -26,13 +27,15 @@ import com.alibaba.druid.filter.stat.StatFilter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class ConnectPropertiesChangeTest1 extends TestCase { +public class ConnectPropertiesChangeTest1 extends PoolTestCase { private DruidDataSource dataSource; private Log dataSourceLog; protected void setUp() throws Exception { + super.setUp(); + Field logField = DruidDataSource.class.getDeclaredField("LOG"); logField.setAccessible(true); dataSourceLog = (Log) logField.get(null); @@ -50,6 +53,8 @@ public class ConnectPropertiesChangeTest1 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connectPropertiesChange() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java index 3252eb234f..d8e05fb2ee 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/DruidDataSourceStatLoggerImplTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.dynamic; import java.lang.reflect.Field; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -11,13 +12,15 @@ import com.alibaba.druid.pool.DruidDataSourceStatLogger; import com.alibaba.druid.pool.DruidDataSourceStatLoggerImpl; import com.alibaba.druid.support.logging.Log; -public class DruidDataSourceStatLoggerImplTest extends TestCase { +public class DruidDataSourceStatLoggerImplTest extends PoolTestCase { private DruidDataSource dataSource; private Log statLog; protected void setUp() throws Exception { + super.setUp(); + Field logField = DruidDataSourceStatLoggerImpl.class.getDeclaredField("LOG"); logField.setAccessible(true); statLog = (Log) logField.get(null); @@ -35,6 +38,8 @@ public class DruidDataSourceStatLoggerImplTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connectPropertiesChange() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java index bfe4af8be7..9599e3d589 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java @@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.pool.dynamic; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; @@ -24,11 +25,13 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.GetConnectionTimeoutException; import com.alibaba.druid.util.JdbcUtils; -public class MaxActiveChangeTest extends TestCase { +public class MaxActiveChangeTest extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setTestOnBorrow(false); @@ -41,6 +44,8 @@ public class MaxActiveChangeTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_maxActive() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java index f6699b32e5..e20c4e6b7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java @@ -20,19 +20,22 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; -public class PoolPreparedStatementsChangeTest extends TestCase { +public class PoolPreparedStatementsChangeTest extends PoolTestCase { private DruidDataSource dataSource; private Log dataSourceLog; protected void setUp() throws Exception { + super.setUp(); + Field logField = DruidDataSource.class.getDeclaredField("LOG"); logField.setAccessible(true); dataSourceLog = (Log) logField.get(null); @@ -49,6 +52,8 @@ public class PoolPreparedStatementsChangeTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connectPropertiesChange() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java index de22e0c82c..674f0683fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/SqlSkipCountTest.java @@ -4,6 +4,7 @@ import java.lang.reflect.Field; import java.sql.Connection; import java.sql.PreparedStatement; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -12,13 +13,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceStatValue; import com.alibaba.druid.support.logging.Log; -public class SqlSkipCountTest extends TestCase { +public class SqlSkipCountTest extends PoolTestCase { private DruidDataSource dataSource; private Log dataSourceLog; protected void setUp() throws Exception { + super.setUp(); + Field logField = DruidDataSource.class.getDeclaredField("LOG"); logField.setAccessible(true); dataSourceLog = (Log) logField.get(null); @@ -36,6 +39,8 @@ public class SqlSkipCountTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void test_connectPropertiesChange() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java index 81a5734016..c746389e50 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorterTest_stmt_setQueryTimeout.java @@ -4,6 +4,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Statement; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -17,11 +18,13 @@ import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; -public class OracleExceptionSorterTest_stmt_setQueryTimeout extends TestCase { +public class OracleExceptionSorterTest_stmt_setQueryTimeout extends PoolTestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + Assert.assertEquals(0, JdbcStatManager.getInstance().getSqlList().size()); dataSource = new DruidDataSource(); @@ -37,7 +40,8 @@ public class OracleExceptionSorterTest_stmt_setQueryTimeout extends TestCase { @Override protected void tearDown() throws Exception { JdbcUtils.close(dataSource); - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + + super.tearDown(); } public void test_connect() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java index 3ec9212e32..b786a9fdc9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined.java @@ -2,20 +2,25 @@ package com.alibaba.druid.bvt.pool.exception; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.druid.pool.vendor.OracleExceptionSorter; -public class OracleExceptionSorter_userDefined extends TestCase { +public class OracleExceptionSorter_userDefined extends PoolTestCase { protected void setUp() throws Exception { + super.setUp(); + System.setProperty("druid.oracle.fatalErrorCodes", "1,2,3,a,"); } protected void tearDown() throws Exception { System.clearProperty("druid.oracle.fatalErrorCodes"); + + super.tearDown(); } public void test_userDefinedErrorCodes() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java index 4c4c30aa2e..f75304c18b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/exception/OracleExceptionSorter_userDefined_1.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.exception; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -12,7 +13,7 @@ import com.alibaba.druid.stat.JdbcStatManager; import com.alibaba.druid.test.util.OracleMockDriver; import com.alibaba.druid.util.JdbcUtils; -public class OracleExceptionSorter_userDefined_1 extends TestCase { +public class OracleExceptionSorter_userDefined_1 extends PoolTestCase { private DruidDataSource dataSource; @@ -32,6 +33,8 @@ public class OracleExceptionSorter_userDefined_1 extends TestCase { @Override protected void tearDown() throws Exception { JdbcUtils.close(dataSource); + + super.tearDown(); } public void test_userDefinedErrorCodes() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java index d2537d7aa6..4297488a5e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/profile/FailFastTest.java @@ -6,6 +6,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import com.alibaba.druid.pool.DataSourceNotAvailableException; @@ -13,7 +14,7 @@ import com.alibaba.druid.pool.DruidDataSource; import junit.framework.TestCase; -public class FailFastTest extends TestCase { +public class FailFastTest extends PoolTestCase { private DruidDataSource dataSource; @@ -21,6 +22,8 @@ public class FailFastTest extends TestCase { @SuppressWarnings("serial") protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidDataSource() { public PhysicalConnectionInfo createPhysicalConnection() throws SQLException { try { @@ -45,6 +48,8 @@ public class FailFastTest extends TestCase { protected void tearDown() throws Exception { dataSource.close(); + + super.tearDown(); } public void testDefault() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java index 848d2a42a4..2d29896f1b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_filters.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.property; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -8,7 +9,7 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; -public class PropertyTest_filters extends TestCase { +public class PropertyTest_filters extends PoolTestCase { private DruidDataSource dataSource; public void test_stat() { @@ -29,5 +30,7 @@ public class PropertyTest_filters extends TestCase { protected void tearDown() throws Exception { System.clearProperty("druid.filters"); JdbcUtils.close(dataSource); + + super.tearDown(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java index 67cfabcc83..a6a7d9576f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/property/PropertyTest_validationQuery.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.property; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -8,7 +9,7 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.util.JdbcUtils; -public class PropertyTest_validationQuery extends TestCase { +public class PropertyTest_validationQuery extends PoolTestCase { private DruidDataSource dataSource; public void test_validationQuery() { @@ -20,5 +21,7 @@ public class PropertyTest_validationQuery extends TestCase { protected void tearDown() throws Exception { System.clearProperty("druid.validationQuery"); JdbcUtils.close(dataSource); + + super.tearDown(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java index abe3b0528e..1dcee7e410 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/InformixExceptionSorterTest.java @@ -2,13 +2,14 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.druid.pool.vendor.InformixExceptionSorter; -public class InformixExceptionSorterTest extends TestCase { +public class InformixExceptionSorterTest extends PoolTestCase { public void test_informix() throws Exception { InformixExceptionSorter sorter = new InformixExceptionSorter(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java index e5a887d832..3a723262ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MSSQLValidConnectionCheckerTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -9,7 +10,7 @@ import org.junit.Assert; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker; -public class MSSQLValidConnectionCheckerTest extends TestCase { +public class MSSQLValidConnectionCheckerTest extends PoolTestCase { public void test_0() throws Exception { MSSQLValidConnectionChecker checker = new MSSQLValidConnectionChecker(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java index dd9b21d280..ad624495e5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySQLValidConnectionCheckerTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.Connection; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -9,7 +10,7 @@ import org.junit.Assert; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker; -public class MySQLValidConnectionCheckerTest extends TestCase { +public class MySQLValidConnectionCheckerTest extends PoolTestCase { private DruidDataSource dataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java index 76a32a09a3..2ff65b3ff0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -9,7 +10,7 @@ import org.junit.Assert; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; -public class MySqlExceptionSorterTest extends TestCase { +public class MySqlExceptionSorterTest extends PoolTestCase { public void test_true() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); Assert.assertTrue(sorter.isExceptionFatal(new SQLException("", "", 1040))); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_1.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_1.java index 7148054c11..649530df02 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_1.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.vendor; +import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; import com.mysql.jdbc.CommunicationsException; import junit.framework.TestCase; @@ -9,7 +10,7 @@ import java.sql.SQLException; /** * Created by wenshao on 18/07/2017. */ -public class MySqlExceptionSorterTest_1 extends TestCase { +public class MySqlExceptionSorterTest_1 extends PoolTestCase { public void test_0() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java index 6894fd44c0..1a830202fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_2.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.vendor; +import com.alibaba.druid.PoolTestCase; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; import com.mysql.jdbc.CommunicationsException; import junit.framework.TestCase; @@ -10,7 +11,7 @@ import java.sql.SQLException; /** * Created by wenshao on 18/07/2017. */ -public class MySqlExceptionSorterTest_2 extends TestCase { +public class MySqlExceptionSorterTest_2 extends PoolTestCase { public void test_0() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java index d162c663a6..319565a9b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/MySqlExceptionSorterTest_oceanbase.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -9,7 +10,7 @@ import org.junit.Assert; import com.alibaba.druid.pool.vendor.MySqlExceptionSorter; -public class MySqlExceptionSorterTest_oceanbase extends TestCase { +public class MySqlExceptionSorterTest_oceanbase extends PoolTestCase { public void test_true() throws Exception { MySqlExceptionSorter sorter = new MySqlExceptionSorter(); SQLException exception = new SQLException("", "", -9000); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java index fd5031d2c1..eb4f27b9eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/PGExceptionSorterTest.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.vendor; +import com.alibaba.druid.PoolTestCase; import org.junit.Assert; import org.postgresql.util.GT; import org.postgresql.util.PSQLException; @@ -9,7 +10,7 @@ import junit.framework.TestCase; import com.alibaba.druid.pool.vendor.PGExceptionSorter; -public class PGExceptionSorterTest extends TestCase { +public class PGExceptionSorterTest extends PoolTestCase { public void test_pg() throws Exception { PGExceptionSorter exSorter = new PGExceptionSorter(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java index 49241f0cbf..6b938cb0e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/SybaseExceptionSorterTest.java @@ -2,13 +2,14 @@ package com.alibaba.druid.bvt.pool.vendor; import java.sql.SQLException; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; import com.alibaba.druid.pool.vendor.SybaseExceptionSorter; -public class SybaseExceptionSorterTest extends TestCase { +public class SybaseExceptionSorterTest extends PoolTestCase { public void test_false() throws Exception { SybaseExceptionSorter sorter = new SybaseExceptionSorter(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java index 037a7afadb..f0f487d16a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/vendor/ValidConnectionCheckerAdapterTest.java @@ -1,5 +1,6 @@ package com.alibaba.druid.bvt.pool.vendor; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import org.junit.Assert; @@ -7,7 +8,7 @@ import org.junit.Assert; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; -public class ValidConnectionCheckerAdapterTest extends TestCase { +public class ValidConnectionCheckerAdapterTest extends PoolTestCase { public void test_adapter() throws Exception { ValidConnectionCheckerAdapter adapter = new ValidConnectionCheckerAdapter(); adapter.configFromProperties(System.getProperties()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java b/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java index ebc5ad9f1c..79d9f80233 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/xa/H2XATest.java @@ -17,16 +17,19 @@ package com.alibaba.druid.bvt.pool.xa; import javax.sql.XAConnection; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import com.alibaba.druid.pool.xa.DruidXADataSource; import com.alibaba.druid.util.JdbcUtils; -public class H2XATest extends TestCase { +public class H2XATest extends PoolTestCase { private DruidXADataSource dataSource; protected void setUp() throws Exception { + super.setUp(); + dataSource = new DruidXADataSource(); dataSource.setMinIdle(1); dataSource.setUrl("jdbc:h2:mem:test;"); @@ -39,6 +42,8 @@ public class H2XATest extends TestCase { protected void tearDown() throws Exception { JdbcUtils.execute(dataSource, "DROP TABLE user"); JdbcUtils.close(dataSource); + + super.tearDown(); } public void test_0() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java index 491ea58334..2b8f74ac0d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/xa/JtdsXAConnectionTest.java @@ -2,6 +2,7 @@ package com.alibaba.druid.bvt.pool.xa; import java.lang.reflect.Constructor; +import com.alibaba.druid.PoolTestCase; import junit.framework.TestCase; import net.sourceforge.jtds.jdbc.JtdsConnection; @@ -10,7 +11,7 @@ import org.junit.Assert; import com.alibaba.druid.pool.xa.JtdsXAConnection; import com.alibaba.druid.pool.xa.JtdsXAResource; -public class JtdsXAConnectionTest extends TestCase { +public class JtdsXAConnectionTest extends PoolTestCase { public void test_jtds() throws Exception { Constructor constrcutor = JtdsConnection.class.getDeclaredConstructor();