From 96949d176c203defb3d8bc1c6fbe0e6f12a83135 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 28 Aug 2012 23:21:50 +0800 Subject: [PATCH] add testcase & remove Filter not used code --- .../java/com/alibaba/druid/filter/Filter.java | 2 - .../alibaba/druid/filter/FilterAdapter.java | 5 - .../druid/bvt/filter/FilterChainImplTest.java | 198 +++++++++--------- .../druid/bvt/proxy/DruidDriverTest.java | 12 -- 4 files changed, 103 insertions(+), 114 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/Filter.java b/src/main/java/com/alibaba/druid/filter/Filter.java index 6a0c2a5ce5..a7f4845231 100644 --- a/src/main/java/com/alibaba/druid/filter/Filter.java +++ b/src/main/java/com/alibaba/druid/filter/Filter.java @@ -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; diff --git a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java index 32804f030a..4d280bbea6 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java @@ -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) { } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java index 7598766d72..29bfa43d10 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java @@ -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(); - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java index 599155ad36..35cc17c2ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java @@ -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 {