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 #108 from wenshao/master

Browse Source 
add testcase & remove Filter not used code
This commit is contained in:
温高铁
2012-08-28 08:22:34 -07:00
parent 172d9211c0 96949d176c
commit c196129f80
4 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/Filter.java
-2
View File
@@ -1277,8 +1277,6 @@ public interface Filter {
void clob_truncate(FilterChain chain, ClobProxy wrapper, long len) throws SQLException;
void loadConfig(AbstractDruidFilterConfig druidFilterConfig);
void dataSource_releaseConnection(FilterChain chain, DruidPooledConnection connection) throws SQLException;
DruidPooledConnection dataSource_getConnection(FilterChain chain, DruidDataSource dataSource, long maxWaitMillis) throws SQLException;
src/main/java/com/alibaba/druid/filter/FilterAdapter.java
-5
View File
@@ -44,7 +44,6 @@ import javax.management.NotificationBroadcasterSupport;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
import com.alibaba.druid.proxy.jdbc.ClobProxy;
import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
@@ -60,10 +59,6 @@ import com.alibaba.druid.proxy.jdbc.StatementProxy;
*/
public abstract class FilterAdapter extends NotificationBroadcasterSupport implements Filter {
@Override
public void loadConfig(AbstractDruidFilterConfig DruidFilterConfig) {
}
@Override
public void init(DataSourceProxy dataSource) {
}
src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java
+103 -95
View File
@@ -29,7 +29,8 @@ public class FilterChainImplTest extends TestCase {
dataSource.setUrl("jdbc:mock:xxx");
dataSource.setFilters("stat,log4j,wall");
dataSource.getProxyFilters().add(new FilterAdapter() {} );
dataSource.getProxyFilters().add(new FilterAdapter() {
});
dataSource.setDbType("mysql");
dataSource.init();
@@ -46,43 +47,50 @@ public class FilterChainImplTest extends TestCase {
public void test_unwrap() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).unwrap(null, null));
}
public void test_unwrap_1() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((Connection) null, null));
}
public void test_unwrap_2() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (Statement) null));
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(Statement) null));
}
public void test_unwrap_3() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (PreparedStatement) null, ""));
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(PreparedStatement) null, ""));
}
public void test_unwrap_4() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (CallableStatement) null, ""));
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(CallableStatement) null, ""));
}
public void test_unwrap_5() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (Clob) null));
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(Clob) null));
}
public void test_unwrap_6() throws Exception {
Connection conn = dataSource.getConnection();
Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, new MockNClob()) instanceof NClob);
Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
new MockNClob()) instanceof NClob);
conn.close();
}
public void test_unwrap_8() throws Exception {
Connection conn = dataSource.getConnection();
Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (Clob) new MockNClob()) instanceof NClob);
Assert.assertTrue(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(Clob) new MockNClob()) instanceof NClob);
conn.close();
}
public void test_unwrap_7() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) null, (NClob) null));
Assert.assertNull(new FilterChainImpl(dataSource).wrap((ConnectionProxy) dataSource.getConnection().getConnection(),
(NClob) null));
}
public void test_unwrap_9() throws Exception {
Assert.assertNull(new FilterChainImpl(dataSource).wrap((StatementProxy) null, (NClob) null));
}
@@ -93,297 +101,297 @@ public class FilterChainImplTest extends TestCase {
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getUnicodeStream(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getUnicodeStream_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getUnicodeStream("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getRef() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getRef(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getRef_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getRef("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getArray() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getArray(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getArray_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getArray("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getURL() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getURL(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getURL_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getURL("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getRowId() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getRowId(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getRowId_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getRowId("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getNClob() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNClob(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getNClob_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNClob("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getSQLXML() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getSQLXML(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getSQLXML_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getSQLXML("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getNString() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNString(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getNString_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNString("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getNCharacterStream() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNCharacterStream(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getNCharacterStream_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getNCharacterStream("1"));
rs.close();
stmt.close();
conn.close();
}
public void test_getObject() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getObject(1));
rs.close();
stmt.close();
conn.close();
}
public void test_getObject_1() throws Exception {
Connection conn = dataSource.getConnection();
PreparedStatement stmt = conn.prepareStatement("select ?");
stmt.setNull(1, Types.VARCHAR);
ResultSet rs = stmt.executeQuery();
rs.next();
Assert.assertNull(rs.getObject("1"));
rs.close();
stmt.close();
conn.close();
}
}
src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java
-12
View File
@@ -35,10 +35,6 @@ public class DruidDriverTest extends TestCase {
}
@Override
public void loadConfig(AbstractDruidFilterConfig druidFilterConfig) {
}
}
static class PrivateJdbcFilterAdapter extends FilterAdapter {
@@ -46,11 +42,6 @@ public class DruidDriverTest extends TestCase {
private PrivateJdbcFilterAdapter(){
}
@Override
public void loadConfig(AbstractDruidFilterConfig druidFilterConfig) {
}
}
public static class InitErrorJdbcFilterAdapter extends FilterAdapter {
@@ -59,9 +50,6 @@ public class DruidDriverTest extends TestCase {
throw new InstantiationException("init error");
}
@Override
public void loadConfig(AbstractDruidFilterConfig druidFilterConfig) {
}
}
static class PrivateDriver extends MockDriver {