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

Merge pull request #138 from zhanming/master

Browse Source 
change resetAll to setUp, before every method, need resetAll.
This commit is contained in:
温高铁
2012-09-01 02:54:38 -07:00
parent f3c0f3d749 ec3bdaccff
commit 8a7d21b008
2 changed files with 178 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java
+9 -38
View File
@@ -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<String, Object>) 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<String, Object> resultIdMap = (Map<String, Object>) JSONUtils.parse(resultId);
Map<String, Object> dataSourceIdStat = (Map<String, Object>) 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<String, Object> resultMap = (Map<String, Object>) 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<String, Object>) 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<String, Object>) JSONUtils.parse(result);
contentMap = (Map<String, Object>) 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<String, Object>) JSONUtils.parse(resultSpring);
contentSpringList = (List<Map<String, Object>>) 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<String, Object> resultMap = (Map<String, Object>) 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<String, String> parameters = DruidStatService.getParameters(url);
src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java
+169
View File
@@ -0,0 +1,169 @@
/*
* Copyright 1999-2011 Alibaba Group Holding Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.druid.bvt.stat;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.List;
import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.stat.DruidStatService;
import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.druid.util.JdbcUtils;
/**
* Multiple data source test case.
*/
public class DruidStatServiceTest2 {
private DruidDataSource dataSource;
private DruidDataSource dataSource2;
// every test, two data source initialized.
@Before
public void setUp() throws Exception {
// DruidStatService is singleton, reset all for other testcase.
DruidStatService.getInstance().service("/reset-all.json");
// mock datasource1
dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:xxx");
dataSource.setFilters("stat");
dataSource.setTestOnBorrow(false);
dataSource.init();
// mock datasource2
dataSource2 = new DruidDataSource();
dataSource2.setUrl("jdbc:mock:xxx2");
dataSource2.setFilters("stat");
dataSource2.setTestOnBorrow(false);
dataSource2.init();
}
@After
public void tearDown() throws Exception {
JdbcUtils.close(dataSource);
JdbcUtils.close(dataSource2);
}
@Test
public void test_statService_getSqlList() throws Exception {
String sql = "select 1";
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement(sql);
ResultSet rs = stmt.executeQuery();
rs.next();
rs.close();
stmt.close();
conn.close();
// second data source
String sql2 = "select 2";
conn = dataSource2.getConnection();
stmt = conn.prepareStatement(sql2);
rs = stmt.executeQuery();
rs.next();
rs.close();
stmt.close();
conn.close();
String result = DruidStatService.getInstance().service("/sql.json");
Map<String, Object> resultMap = (Map<String, Object>) JSONUtils.parse(result);
List<Map<String, Object>> sqlList = (List<Map<String, Object>>) resultMap.get("Content");
assertThat(sqlList.size(), equalTo(2));
for (Map<String, Object> sqlStat : sqlList) {
assertThat((Integer) sqlStat.get("RunningCount"), equalTo(0));
assertThat((Integer) sqlStat.get("ExecuteCount"), equalTo(1));
assertThat((Integer) sqlStat.get("FetchRowCount"), equalTo(1));
assertThat((Integer) sqlStat.get("EffectedRowCount"), equalTo(0));
}
}
@Test
public void test_statService_getSqlById() throws Exception {
String sql = "select 1";
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement(sql);
ResultSet rs = stmt.executeQuery();
rs.next();
rs.close();
stmt.close();
conn.close();
// second data source
String sql2 = "select 2";
conn = dataSource2.getConnection();
stmt = conn.prepareStatement(sql2);
rs = stmt.executeQuery();
rs.next();
rs.close();
stmt.close();
conn.close();
long id = dataSource.getSqlStatMap().values().iterator().next().getId();
String result = DruidStatService.getInstance().service("/sql-" + id + ".json");
Map<String, Object> resultMap = (Map<String, Object>) JSONUtils.parse(result);
Map<String, Object> sqlStat = (Map<String, Object>) resultMap.get("Content");
assertThat((Integer) sqlStat.get("RunningCount"), equalTo(0));
assertThat((Integer) sqlStat.get("ExecuteCount"), equalTo(1));
assertThat((Integer) sqlStat.get("FetchRowCount"), equalTo(1));
assertThat((Integer) sqlStat.get("EffectedRowCount"), equalTo(0));
assertThat((String) sqlStat.get("SQL"), equalTo(sql));
id = dataSource2.getSqlStatMap().values().iterator().next().getId();
result = DruidStatService.getInstance().service("/sql-" + id + ".json");
resultMap = (Map<String, Object>) JSONUtils.parse(result);
sqlStat = (Map<String, Object>) resultMap.get("Content");
assertThat((Integer) sqlStat.get("RunningCount"), equalTo(0));
assertThat((Integer) sqlStat.get("ExecuteCount"), equalTo(1));
assertThat((Integer) sqlStat.get("FetchRowCount"), equalTo(1));
assertThat((Integer) sqlStat.get("EffectedRowCount"), equalTo(0));
assertThat((String) sqlStat.get("SQL"), equalTo(sql2));
String result2 = DruidStatService.getInstance().service("/sql-" + Integer.MAX_VALUE + ".json");
resultMap = (Map<String, Object>) JSONUtils.parse(result2);
assertThat(resultMap.get("Content"), is(nullValue()));
}
@Test
public void test_statService_getDataSourceList() throws Exception {
String result = DruidStatService.getInstance().service("/datasource.json");
Map<String, Object> resultMap = (Map<String, Object>) JSONUtils.parse(result);
List<Map<String, Object>> dataSourceList = (List<Map<String, Object>>) resultMap.get("Content");
assertThat(dataSourceList.size(), equalTo(2));
Map<String, Object> dataSourceStat = dataSourceList.get(0);
assertThat((Integer) dataSourceStat.get("PoolingCount"), equalTo(0));
assertThat((Integer) dataSourceStat.get("ActiveCount"), equalTo(0));
}
}