Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
温少
2012-03-20 06:14:06 +08:00
parent a26954e672
commit aaa2e474a5
8 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java
+3 -2
View File
@@ -43,8 +43,9 @@ public class DruidDataSourceFilterTest extends TestCase {
JdbcStatManager.getInstance().reset();
dataSource.init();
Assert.assertEquals(1, JdbcStatManager.getInstance().getDataSources().size());
JdbcDataSourceStat dataSourceStat = JdbcStatManager.getInstance().getDataSources().values().iterator().next();
JdbcDataSourceStat dataSourceStat =dataSource.getDataSourceStat();
// Assert.assertEquals(1, JdbcStatManager.getInstance().getDataSources().size());
// JdbcDataSourceStat dataSourceStat = JdbcStatManager.getInstance().getDataSources().values().iterator().next();
Assert.assertEquals(0, dataSourceStat.getConnectionStat().getConnectCount());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java
+6 -12
View File
@@ -31,10 +31,7 @@ public class ParamTest extends TestCase {
JdbcStatManager.getInstance().reset();
dataSource.init();
Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
Assert.assertEquals(1, JdbcStatManager.getInstance().getDataSources().size());
JdbcDataSourceStat stat = JdbcStatManager.getInstance().getDataSources().values().iterator().next();
JdbcDataSourceStat stat =dataSource.getDataSourceStat();
Assert.assertEquals(0, stat.getConnectionStat().getConnectCount());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
@@ -54,7 +51,7 @@ public class ParamTest extends TestCase {
dataSource.close();
Assert.assertEquals(0, JdbcStatManager.getInstance().getDataSources().size());
// Assert.assertEquals(0, JdbcStatManager.getInstance().getDataSources().size());
Assert.assertEquals(1, stat.getConnectionStat().getConnectCount());
Assert.assertEquals(1, stat.getConnectionStat().getCloseCount());
@@ -79,8 +76,8 @@ public class ParamTest extends TestCase {
JdbcStatManager.getInstance().reset();
Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
Assert.assertEquals(0, JdbcStatManager.getInstance().getDataSources().size());
// Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
// Assert.assertEquals(0, JdbcStatManager.getInstance().getDataSources().size());
Assert.assertEquals(1, dataSource.getProxyFilters().size());
@@ -109,11 +106,8 @@ public class ParamTest extends TestCase {
JdbcStatManager.getInstance().reset();
dataSource.init();
Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
Assert.assertEquals(1, JdbcStatManager.getInstance().getDataSources().size());
JdbcDataSourceStat stat = JdbcStatManager.getInstance().getDataSources().values().iterator().next();
JdbcDataSourceStat stat =dataSource.getDataSourceStat();
Assert.assertEquals(10, stat.getConnectionStat().getConnectCount());
for (int i = 0; i < 10; ++i) {