From 1e33fad5b022e67fcce9b4e0eeb53c8ced777b08 Mon Sep 17 00:00:00 2001 From: Zhanming Qi Date: Sat, 1 Sep 2012 16:10:23 +0800 Subject: [PATCH] change resetAll to setUp, before every method, need resetAll. --- .../druid/bvt/stat/DruidStatServiceTest.java | 47 ++++--------------- 1 file changed, 9 insertions(+), 38 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 49e1368049..8a255c86e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java @@ -51,6 +51,9 @@ public class DruidStatServiceTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { + // DruidStatService is singleton, reset all for other testcase. + DruidStatService.getInstance().service("/reset-all.json"); + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); @@ -89,8 +92,6 @@ public class DruidStatServiceTest extends TestCase { Assert.assertEquals(1, sqlStat.get("ExecuteCount")); Assert.assertEquals(1, sqlStat.get("FetchRowCount")); Assert.assertEquals(0, sqlStat.get("EffectedRowCount")); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getSqlById() throws Exception { @@ -120,8 +121,6 @@ public class DruidStatServiceTest extends TestCase { String result2 = DruidStatService.getInstance().service("/sql-" + Integer.MAX_VALUE + ".json"); resultMap = (Map) JSONUtils.parse(result2); Assert.assertNull(resultMap.get("Content")); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getDataSourceList() throws Exception { @@ -147,8 +146,6 @@ public class DruidStatServiceTest extends TestCase { Assert.assertEquals(1, dataSourceStat.get("PoolingCount")); Assert.assertEquals(0, dataSourceStat.get("ActiveCount")); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getDataSourceIdList() throws Exception { @@ -173,8 +170,6 @@ public class DruidStatServiceTest extends TestCase { Map resultIdMap = (Map) JSONUtils.parse(resultId); Map dataSourceIdStat = (Map) resultIdMap.get("Content"); assertThat((Integer) dataSourceIdStat.get("PoolingCount"), equalTo(1)); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } /** @@ -190,8 +185,6 @@ public class DruidStatServiceTest extends TestCase { assertThat(contentMap.get("Version"), is(not(nullValue()))); assertThat(contentMap.get("Drivers"), is(not(nullValue()))); assertThat((Boolean) contentMap.get("ResetEnable"), is(true)); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getActiveConnectionStackTrace() throws Exception { @@ -213,8 +206,6 @@ public class DruidStatServiceTest extends TestCase { // close connection at last. stmt.close(); conn.close(); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getActiveConnectionStackTraceId() throws Exception { @@ -243,20 +234,14 @@ public class DruidStatServiceTest extends TestCase { assertThat(contentList.get(0), is(not(nullValue()))); stmt.close(); conn.close(); - - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } - public void test_statService_returnJSONActiveConnectionStackTrace() throws Exception{ + public void test_statService_returnJSONActiveConnectionStackTrace() throws Exception { String result = DruidStatService.getInstance().service("/activeConnectionStackTrace-1.json"); Map resultMap = (Map) JSONUtils.parse(result); - assertThat((Integer)resultMap.get("ResultCode"), equalTo(-1)); - - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); + assertThat((Integer) resultMap.get("ResultCode"), equalTo(-1)); } - + public void test_statService_getWebURIList() throws Exception { String uri = "/"; MockServletContext servletContext = new MockServletContext(); @@ -291,8 +276,6 @@ public class DruidStatServiceTest extends TestCase { assertThat((String) webURI.get("URI"), equalTo(uri)); assertThat((Integer) webURI.get("RequestCount"), equalTo(2)); filter.destroy(); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getWebURIById() throws Exception { @@ -322,8 +305,6 @@ public class DruidStatServiceTest extends TestCase { contentMap = (Map) resultMap.get("Content"); assertThat((Integer) contentMap.get("RequestCount"), equalTo(2)); filter.destroy(); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getWebApp() throws Exception { @@ -357,8 +338,6 @@ public class DruidStatServiceTest extends TestCase { contentMap = contentList.get(0); assertThat((Integer) contentMap.get("RequestCount"), equalTo(2)); filter.destroy(); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getWebSession() throws Exception { @@ -399,8 +378,6 @@ public class DruidStatServiceTest extends TestCase { contentMap = contentList.get(1); assertThat((String) contentMap.get("SESSIONID"), equalTo(sessionId2)); filter.destroy(); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getSpring() throws Exception { @@ -424,8 +401,6 @@ public class DruidStatServiceTest extends TestCase { contentMap = contentList.get(0); assertThat((String) contentMap.get("Class"), is(not(nullValue()))); assertThat((Integer) contentMap.get("ExecuteCount"), equalTo(2)); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getSpringDetail() throws Exception { @@ -443,8 +418,6 @@ public class DruidStatServiceTest extends TestCase { resultMap = (Map) JSONUtils.parse(result); contentMap = (Map) resultMap.get("Content"); assertThat((Integer) contentMap.get("ExecuteCount"), equalTo(2)); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } public void test_statService_getResetAll() throws Exception { @@ -520,16 +493,14 @@ public class DruidStatServiceTest extends TestCase { resultSpringMap = (Map) JSONUtils.parse(resultSpring); contentSpringList = (List>) resultSpringMap.get("Content"); assertThat(contentSpringList, is(nullValue())); - // DruidStatService is singleton, reset all for other testcase. - DruidStatService.getInstance().service("/reset-all.json"); } - + public void test_statService() throws Exception { String result = DruidStatService.getInstance().service("/bad.json"); Map resultMap = (Map) JSONUtils.parse(result); - assertThat((Integer)resultMap.get("ResultCode"), equalTo(-1)); + assertThat((Integer) resultMap.get("ResultCode"), equalTo(-1)); } - + public void test_statService_getParameters() throws Exception { String url = "?x=a&y=b"; Map parameters = DruidStatService.getParameters(url);