From bb57f86db1e42fba935184ac7ab8a22d62faa2e2 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 16 Nov 2011 14:07:08 +0800 Subject: [PATCH] code format --- .../druid/TransactionTimeoutException.java | 1 - .../druid/filter/FilterEventAdapter.java | 7 +- .../alibaba/druid/filter/stat/StatFilter.java | 2 +- .../druid/filter/stat/StatFilterMBean.java | 2 +- .../druid/mock/MockCallableStatement.java | 4 +- .../alibaba/druid/mock/MockConnection.java | 2 +- .../mock/MockConnectionClosedException.java | 2 +- .../druid/mock/MockPreparedStatement.java | 10 +- .../com/alibaba/druid/mock/MockResultSet.java | 8 +- .../druid/mock/MockResultSetMetaData.java | 4 +- .../alibaba/druid/pool/DataSourceAdapter.java | 4 +- .../druid/pool/DruidAbstractDataSource.java | 6 +- .../pool/DruidAbstractDataSourceMBean.java | 39 ++-- .../alibaba/druid/pool/DruidDataSource.java | 4 +- .../pool/DruidDataSourceC3P0Adapter.java | 8 +- .../druid/pool/DruidDataSourceMBean.java | 15 +- .../pool/GetConnectionTimeoutException.java | 3 +- .../druid/pool/PoolableConnection.java | 2 +- .../druid/pool/PoolablePreparedStatement.java | 4 +- .../alibaba/druid/pool/PoolableResultSet.java | 2 +- .../alibaba/druid/pool/PoolableStatement.java | 26 +-- .../druid/pool/PreparedStatementPool.java | 6 +- .../alibaba/druid/pool/ha/HADataSource.java | 2 +- .../pool/ha/MultiDataSourceStatement.java | 2 +- .../druid/proxy/jdbc/ConnectionProxyImpl.java | 2 +- .../druid/proxy/jdbc/DataSourceProxy.java | 2 +- .../druid/proxy/jdbc/DataSourceProxyImpl.java | 2 +- .../druid/proxy/jdbc/StatementProxyImpl.java | 2 +- .../alibaba/druid/sql/ast/SQLExprImpl.java | 2 +- .../druid/sql/ast/expr/SQLAllColumnExpr.java | 6 +- .../druid/sql/ast/expr/SQLAllExpr.java | 2 +- .../druid/sql/ast/expr/SQLBinaryOpExpr.java | 3 +- .../druid/sql/ast/expr/SQLCaseExpr.java | 3 +- .../druid/sql/ast/expr/SQLCastExpr.java | 2 +- .../druid/sql/ast/expr/SQLIdentifierExpr.java | 3 +- .../druid/sql/ast/expr/SQLListExpr.java | 2 +- .../druid/sql/ast/expr/SQLNullExpr.java | 4 +- .../druid/sql/ast/expr/SQLPropertyExpr.java | 3 +- .../druid/sql/ast/expr/SQLVariantRefExpr.java | 3 +- .../mysql/ast/expr/MySqlBinaryExpr.java | 3 +- .../mysql/ast/expr/MySqlBooleanExpr.java | 3 +- .../mysql/ast/expr/MySqlMatchAgainstExpr.java | 2 +- .../MySqlParameterizedOutputVisitor.java | 2 +- .../dialect/oracle/ast/OracleSQLObject.java | 2 +- .../oracle/ast/clause/GroupingSetExpr.java | 1 - .../dialect/oracle/ast/expr/OracleExpr.java | 1 - .../oracle/ast/expr/OracleExtractExpr.java | 2 +- .../oracle/ast/expr/OracleIntervalExpr.java | 2 +- .../oracle/ast/expr/OracleTimestampExpr.java | 2 +- .../ast/stmt/OracleDeleteStatement.java | 2 +- .../oracle/parser/OracleExprParser.java | 1 + .../dialect/oracle/parser/OracleLexer.java | 4 +- .../oracle/parser/OracleSelectParser.java | 44 ++--- .../OracleParameterizedOutputVisitor.java | 4 +- .../sqlserver/ast/SQLServerSelect.java | 1 - .../ast/SQLServerSelectQueryBlock.java | 2 +- .../druid/sql/dialect/sqlserver/ast/Top.java | 10 +- .../sqlserver/parser/SQLServerLexer.java | 1 - .../parser/SQLServerSelectParser.java | 4 +- .../visitor/SQLServerASTVisitor.java | 5 +- .../transact/ast/TransactSQLObject.java | 1 - .../transact/ast/TransactSQLSelect.java | 1 - .../com/alibaba/druid/sql/parser/Lexer.java | 2 +- .../sql/visitor/SQLASTVisitorAdapter.java | 1 - .../stat/DruidDataSourceStatManager.java | 22 ++- .../com/alibaba/druid/stat/JdbcSqlStat.java | 44 +---- .../druid/util/ConcurrentIdentityHashMap.java | 4 +- .../com/alibaba/druid/util/Histogram.java | 2 +- .../java/com/alibaba/druid/TestHistogram.java | 1 + .../java/com/alibaba/druid/TestIdel3.java | 12 +- src/test/java/com/alibaba/druid/TestLRU.java | 12 +- .../java/com/alibaba/druid/TestLockCount.java | 2 +- .../benckmark/TestAtomicPerformance.java | 2 +- .../druid/bvt/bug/Bug_for_happyday517_2.java | 8 +- .../druid/bvt/filter/TraceFilterTest.java | 28 +-- .../filter/TraceFilterTest_close_error.java | 14 +- .../filter/TraceFilterTest_commit_error.java | 8 +- .../bvt/mock/MockResultSetMetaDataTest.java | 4 +- .../com/alibaba/druid/bvt/pool/Case0.java | 9 +- .../com/alibaba/druid/bvt/pool/Case1.java | 11 +- .../com/alibaba/druid/bvt/pool/Case2.java | 9 +- .../com/alibaba/druid/bvt/pool/Case3.java | 6 +- .../bvt/pool/DruidDataSourceFilterTest.java | 17 +- .../druid/bvt/pool/ManagedDataSourceTest.java | 2 +- .../com/alibaba/druid/bvt/pool/ParamTest.java | 11 +- .../druid/bvt/pool/PasswordCallbackTest.java | 11 +- .../druid/bvt/pool/SpringFilterTest.java | 18 +- .../alibaba/druid/bvt/pool/TestAbondon.java | 2 +- .../alibaba/druid/bvt/pool/TestClose_0.java | 5 +- .../alibaba/druid/bvt/pool/TestClose_1.java | 5 +- .../alibaba/druid/bvt/pool/TestClose_2.java | 2 + .../druid/bvt/pool/TestConcurrent.java | 2 +- .../druid/bvt/pool/TestConnectError.java | 4 +- .../alibaba/druid/bvt/pool/TestDefault.java | 2 +- .../alibaba/druid/bvt/pool/TestDisable.java | 9 +- .../druid/bvt/pool/TestDruidDataSource.java | 5 +- .../druid/bvt/pool/TestGraceShutdown.java | 11 +- .../com/alibaba/druid/bvt/pool/TestIdle.java | 10 +- .../com/alibaba/druid/bvt/pool/TestIdle2.java | 2 +- .../com/alibaba/druid/bvt/pool/TestIdle3.java | 15 +- .../druid/bvt/pool/TestIdle3_Concurrent.java | 24 ++- .../pool/TestIdle3_Concurrent_MaxActive.java | 2 +- .../pool/TestIdle3_Concurrent_Starvation.java | 2 +- .../bvt/pool/TestPoolPreparedStatement.java | 2 +- .../bvt/pool/TestPoolPreparedStatement2.java | 6 +- .../druid/bvt/pool/TestRemoveAbandoned.java | 9 +- .../com/alibaba/druid/bvt/pool/TestStat.java | 7 +- .../DruidDataSourceC3P0AdapterTest.java | 6 +- .../DruidDataSourceC3P0AdapterTest2.java | 8 +- .../druid/bvt/pool/basic/ConnectionTest.java | 73 +++---- .../druid/bvt/pool/basic/ConnectionTest2.java | 73 +++---- .../druid/bvt/pool/basic/ConnectionTest3.java | 25 ++- .../druid/bvt/pool/basic/ConnectionTest4.java | 64 +++---- .../druid/bvt/pool/basic/ConnectionTest5.java | 26 ++- .../druid/bvt/pool/basic/DataSourceTest3.java | 10 +- .../basic/DruidDataSourceFactoryTest.java | 18 +- .../basic/PoolableCallableStatementTest.java | 11 +- .../basic/PoolablePreparedStatementTest.java | 12 +- .../bvt/pool/basic/PoolableStatementTest.java | 14 +- .../pool/basic/PoolableStatementTest2.java | 178 +++++++++--------- .../pool/basic/PoolableStatementTest3.java | 6 +- .../bvt/pool/basic/PoolableWrapperTest.java | 8 +- .../pool/basic/PreparedStatementKeyTest.java | 34 ++-- .../druid/bvt/pool/basic/TestCommit.java | 2 +- .../bvt/pool/basic/TestDataSourceBasic.java | 12 +- .../bvt/pool/basic/TestDataSourceBasic2.java | 52 +++-- .../druid/bvt/proxy/LogFilterTest.java | 2 - .../druid/bvt/proxy/filter/ClobTest.java | 6 +- .../MySqlParameterizedOutputVisitorTest2.java | 10 +- .../druid/bvt/sql/oracle/CursorTest.java | 5 +- .../druid/bvt/sql/oracle/LargeOrTest.java | 2 +- .../bvt/sql/oracle/OracleAnalyticTest.java | 60 +++--- .../druid/bvt/sql/oracle/OracleAnyTest.java | 4 +- .../bvt/sql/oracle/OracleEXTRACTTest.java | 20 +- .../sql/oracle/OracleFlashbackQueryTest.java | 22 +-- .../sql/oracle/OracleFlashbackQueryTest2.java | 2 +- .../sql/oracle/OracleFlashbackQueryTest3.java | 7 +- .../bvt/sql/oracle/OracleIntervalTest.java | 52 ++--- .../bvt/sql/oracle/OracleLiteralTest.java | 12 +- .../sql/oracle/OracleNumberLiteralTest.java | 2 +- .../druid/bvt/sql/oracle/OracleOuterTest.java | 2 +- .../bvt/sql/oracle/OraclePivotClauseTest.java | 63 ++++--- .../druid/bvt/sql/oracle/OraclePriorTest.java | 4 +- .../sql/oracle/OracleSampleClauseTest.java | 12 +- .../oracle/OracleSubqueryFactoringTest.java | 43 ++--- .../oracle/OracleSubqueryFactoringTest2.java | 62 +++--- .../OracleOutputVisitorTest_Aggregate.java | 4 +- .../OracleOutputVisitorTest_dblink.java | 4 +- .../OracleOutputVisitorTest_delete.java | 4 +- .../OracleOutputVisitorTest_forupdate.java | 4 +- .../OracleOutputVisitorTest_orderBy.java | 4 +- .../OracleOutputVisitorTest_selectJoin.java | 7 +- .../pool/TestIdle3_Concurrent_MaxActive.java | 4 +- ...tIdle3_Concurrent_Starvation_Longtime.java | 12 +- .../alibaba/druid/pool/TestPoolStatement.java | 4 +- .../pool/ui/DruidDataSourceUIManager.java | 16 +- .../com/alibaba/druid/sql/test/TestUtils.java | 21 +-- 157 files changed, 888 insertions(+), 912 deletions(-) diff --git a/src/main/java/com/alibaba/druid/TransactionTimeoutException.java b/src/main/java/com/alibaba/druid/TransactionTimeoutException.java index 50146cba40..55e028f0f3 100644 --- a/src/main/java/com/alibaba/druid/TransactionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/TransactionTimeoutException.java @@ -17,7 +17,6 @@ package com.alibaba.druid; import java.sql.SQLException; - public class TransactionTimeoutException extends SQLException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java index 624b11159a..7060cbcdf4 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java @@ -79,7 +79,8 @@ public abstract class FilterEventAdapter extends FilterAdapter { @Override public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency) throws SQLException { - StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, resultSetConcurrency); + StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, + resultSetConcurrency); statementCreateAfter(statement); @@ -90,8 +91,8 @@ public abstract class FilterEventAdapter extends FilterAdapter { public StatementProxy connection_createStatement(FilterChain chain, ConnectionProxy connection, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { - StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, resultSetConcurrency, - resultSetHoldability); + StatementProxy statement = super.connection_createStatement(chain, connection, resultSetType, + resultSetConcurrency, resultSetHoldability); statementCreateAfter(statement); diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java index dc03871522..5d7f58c092 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java @@ -325,7 +325,7 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean { if (sqlStat != null) { sqlStat.addExecuteBatchCount(batchSize); } - + internalBeforeStatementExecute(statement, sql); // super.statementExecuteBatchBefore(statement); diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java index e47b78f82f..bc89a08c66 100644 --- a/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java +++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilterMBean.java @@ -85,6 +85,6 @@ public interface StatFilterMBean { TabularData getSqlList() throws JMException; TabularData getConnectionList() throws JMException; - + long getResetCount(); } diff --git a/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java b/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java index d605e84154..37bd7b307e 100644 --- a/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockCallableStatement.java @@ -56,7 +56,7 @@ public class MockCallableStatement extends MockPreparedStatement implements Call if (parameterIndex < 1) { throw new SQLException(); } - + if (parameters.size() >= parameterIndex - 1) { parameters.add(null); } else { @@ -74,7 +74,7 @@ public class MockCallableStatement extends MockPreparedStatement implements Call if (closed) { throw new SQLException(); } - + return wasNull; } diff --git a/src/main/java/com/alibaba/druid/mock/MockConnection.java b/src/main/java/com/alibaba/druid/mock/MockConnection.java index a21275e571..f32b622253 100644 --- a/src/main/java/com/alibaba/druid/mock/MockConnection.java +++ b/src/main/java/com/alibaba/druid/mock/MockConnection.java @@ -281,7 +281,7 @@ public class MockConnection implements Connection { stmt.setResultSetType(resultSetType); stmt.setResultSetConcurrency(resultSetConcurrency); - + return stmt; } diff --git a/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java b/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java index c738c604dc..fbe7a1fdc0 100644 --- a/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java +++ b/src/main/java/com/alibaba/druid/mock/MockConnectionClosedException.java @@ -6,7 +6,7 @@ public class MockConnectionClosedException extends SQLException { private static final long serialVersionUID = 1L; - public MockConnectionClosedException() { + public MockConnectionClosedException(){ super(); } } diff --git a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java index c8b4141470..81659dc429 100644 --- a/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/mock/MockPreparedStatement.java @@ -63,7 +63,7 @@ public class MockPreparedStatement extends MockStatement implements PreparedStat if (closed) { throw new SQLException(); } - + if (mockConnection != null && mockConnection.getDriver() != null) { return mockConnection.getDriver().createResultSet(this); } @@ -80,7 +80,7 @@ public class MockPreparedStatement extends MockStatement implements PreparedStat if (closed) { throw new SQLException(); } - + return 0; } @@ -174,7 +174,7 @@ public class MockPreparedStatement extends MockStatement implements PreparedStat if (closed) { throw new SQLException(); } - + parameters.clear(); } @@ -233,7 +233,7 @@ public class MockPreparedStatement extends MockStatement implements PreparedStat if (closed) { throw new SQLException(); } - + return resultSetMetaData; } @@ -267,7 +267,7 @@ public class MockPreparedStatement extends MockStatement implements PreparedStat if (closed) { throw new SQLException(); } - + return metadata; } diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSet.java b/src/main/java/com/alibaba/druid/mock/MockResultSet.java index 984fc0e3d9..f076e56d54 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSet.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSet.java @@ -315,7 +315,7 @@ public class MockResultSet implements ResultSet { if (closed) { throw new SQLException(); } - + return warning; } @@ -324,7 +324,7 @@ public class MockResultSet implements ResultSet { if (closed) { throw new SQLException(); } - + warning = null; } @@ -337,7 +337,7 @@ public class MockResultSet implements ResultSet { if (closed) { throw new SQLException(); } - + return cursorName; } @@ -350,7 +350,7 @@ public class MockResultSet implements ResultSet { if (closed) { throw new SQLException("resultSet closed"); } - + return metaData; } diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java index 09ec776901..f457d4b219 100644 --- a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java +++ b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java @@ -38,7 +38,7 @@ public class MockResultSetMetaData implements ResultSetMetaData { if (iface == null) { return null; } - + if (iface.isAssignableFrom(MockResultSetMetaData.class)) { return (T) this; } @@ -50,7 +50,7 @@ public class MockResultSetMetaData implements ResultSetMetaData { if (iface == null) { return false; } - + return MockResultSetMetaData.class.isAssignableFrom(iface); } diff --git a/src/main/java/com/alibaba/druid/pool/DataSourceAdapter.java b/src/main/java/com/alibaba/druid/pool/DataSourceAdapter.java index eaddfe64d4..47b518c329 100644 --- a/src/main/java/com/alibaba/druid/pool/DataSourceAdapter.java +++ b/src/main/java/com/alibaba/druid/pool/DataSourceAdapter.java @@ -45,9 +45,9 @@ public class DataSourceAdapter extends WrapperAdapter implements DataSource { public Connection getConnection(String username, String password) throws SQLException { throw new UnsupportedOperationException(); } - + public Logger getParentLogger() throws SQLFeatureNotSupportedException { throw new SQLFeatureNotSupportedException(); } - + } diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 1260de47d3..549593b68f 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -195,15 +195,15 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements public Histogram getTransactionHistogram() { return transactionHistogram; } - + public void incrementCachedPreparedStatementCount() { cachedPreparedStatementCount.incrementAndGet(); } - + public void decrementCachedPreparedStatementCount() { cachedPreparedStatementCount.decrementAndGet(); } - + public long getCachedPreparedStatementCount() { return cachedPreparedStatementCount.get(); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java index 488bd4bf3f..0c9ecad310 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSourceMBean.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; public interface DruidAbstractDataSourceMBean { + int getLoginTimeout(); String getDbType(); @@ -35,11 +36,11 @@ public interface DruidAbstractDataSourceMBean { long getDestroyCount(); long getCreateTimespanMillis(); - + long getCommitCount(); - + long getRollbackCount(); - + long getStartTransactionCount(); int getQueryTimeout(); @@ -55,7 +56,7 @@ public interface DruidAbstractDataSourceMBean { long getMinEvictableIdleTimeMillis(); boolean isRemoveAbandoned(); - + long getRemoveAbandonedTimeoutMillis(); List getActiveConnectionStackTrace(); @@ -91,19 +92,19 @@ public interface DruidAbstractDataSourceMBean { int getMaxOpenPreparedStatements(); long getRemoveAbandonedCount(); - + boolean isLogAbandoned(); - + long getDupCloseCount(); - + boolean isBreakAfterAcquireFailure(); - + int getConnectionErrorRetryAttempts(); - + int getMaxPoolPreparedStatementPerConnectionSize(); - + void setMaxPoolPreparedStatementPerConnectionSize(int maxPoolPreparedStatementPerConnectionSize); - + String getProperties(); int getRawDriverMinorVersion(); @@ -111,20 +112,20 @@ public interface DruidAbstractDataSourceMBean { int getRawDriverMajorVersion(); Date getCreatedTime(); - + String getValidConnectionCheckerClassName(); - + long[] getTransactionHistogramValues(); - + void setTransactionThresholdMillis(long transactionThresholdMillis); - + long getTransactionThresholdMillis(); - + long getReusePreparedStatementCount(); - + long getPreparedStatementCount(); - + long getClosedPreparedStatementCount(); - + long getCachedPreparedStatementCount(); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 1eeab2b387..d01f4e2beb 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -180,7 +180,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat closePreapredStatement(holder); decrementCachedPreparedStatementCount(); } - + connection.getStatementPool().getMap().clear(); } } @@ -392,7 +392,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat new ActiveConnectionTraceInfo(poolalbeConnection, System.currentTimeMillis(), stackTrace)); } - + if (!this.isDefaultAutoCommit()) { poolalbeConnection.setAutoCommit(false); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java index 9292fa9a1a..ab37811304 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceC3P0Adapter.java @@ -98,11 +98,11 @@ public class DruidDataSourceC3P0Adapter implements DataSource, DruidDataSourceC3 public String getJdbcUrl() { return dataSource.getUrl(); } - + public Driver getDriver() { return dataSource.getDriver(); } - + public void setDriver(Driver driver) { dataSource.setDriver(driver); } @@ -214,11 +214,11 @@ public class DruidDataSourceC3P0Adapter implements DataSource, DruidDataSourceC3 public void setPreferredTestQuery(String preferredTestQuery) { dataSource.setValidationQuery(preferredTestQuery); } - + public void setFilters(String filters) throws SQLException { dataSource.setFilters(filters); } - + public List getProxyFilters() { return dataSource.getProxyFilters(); } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index de664a91df..bf78433e1a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -17,7 +17,6 @@ package com.alibaba.druid.pool; import java.util.Date; - /** * @author wenshao */ @@ -36,7 +35,7 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { int getLockQueueLength(); long getNotEmptyWaitCount(); - + int getNotEmptyWaitThreadCount(); long getNotEmptySignalCount(); @@ -52,24 +51,26 @@ public interface DruidDataSourceMBean extends DruidAbstractDataSourceMBean { void setResetStatEnable(boolean resetStatEnable); String getVersion(); - + void setPoolPreparedStatements(boolean poolPreparedStatements); /** * ActiveCount峰值 + * * @return */ int getActivePeak(); - + /** * PoolingCount峰值 + * * @return */ int getPoolingPeak(); - + Date getActivePeakTime(); - + Date getPoolingPeakTime(); - + long getErrorCount(); } diff --git a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java index c517bbeafa..144cee7c05 100644 --- a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java @@ -2,7 +2,6 @@ package com.alibaba.druid.pool; import java.sql.SQLException; - public class GetConnectionTimeoutException extends SQLException { private static final long serialVersionUID = 1L; @@ -19,4 +18,4 @@ public class GetConnectionTimeoutException extends SQLException { super(cause); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java index e5df0762dd..c70d64c1c9 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableConnection.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableConnection.java @@ -57,7 +57,7 @@ public class PoolableConnection implements PooledConnection, Connection { protected ConnectionHolder holder; protected TransactionInfo transactionInfo; - public PoolableConnection(ConnectionHolder holder) { + public PoolableConnection(ConnectionHolder holder){ this.conn = holder.getConnection(); this.holder = holder; } diff --git a/src/main/java/com/alibaba/druid/pool/PoolablePreparedStatement.java b/src/main/java/com/alibaba/druid/pool/PoolablePreparedStatement.java index 9a46413e25..306d1fc03c 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolablePreparedStatement.java +++ b/src/main/java/com/alibaba/druid/pool/PoolablePreparedStatement.java @@ -786,8 +786,8 @@ public class PoolablePreparedStatement extends PoolableStatement implements Prep public static class PreparedStatementKey { - private final String sql; - private final String catalog; + private final String sql; + private final String catalog; protected final MethodType methodType; diff --git a/src/main/java/com/alibaba/druid/pool/PoolableResultSet.java b/src/main/java/com/alibaba/druid/pool/PoolableResultSet.java index 00c21d8d08..5373b272c6 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableResultSet.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableResultSet.java @@ -1743,7 +1743,7 @@ public final class PoolableResultSet extends PoolableWrapper implements ResultSe public T getObject(int columnIndex, Class type) throws SQLException { throw new SQLFeatureNotSupportedException(); } - + public T getObject(String columnLabel, Class type) throws SQLException { throw new SQLFeatureNotSupportedException(); } diff --git a/src/main/java/com/alibaba/druid/pool/PoolableStatement.java b/src/main/java/com/alibaba/druid/pool/PoolableStatement.java index 61998ecff9..0e474b0c44 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableStatement.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableStatement.java @@ -83,7 +83,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final ResultSet executeQuery(String sql) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -105,7 +105,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final int executeUpdate(String sql) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -249,7 +249,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final boolean execute(String sql) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -366,7 +366,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final void addBatch(String sql) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -436,7 +436,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -449,7 +449,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final int executeUpdate(String sql, int columnIndexes[]) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -462,7 +462,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final int executeUpdate(String sql, String columnNames[]) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -475,7 +475,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final boolean execute(String sql, int autoGeneratedKeys) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -488,7 +488,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final boolean execute(String sql, int columnIndexes[]) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -501,7 +501,7 @@ public class PoolableStatement extends PoolableWrapper implements Statement { @Override public final boolean execute(String sql, String columnNames[]) throws SQLException { checkOpen(); - + transactionRecord(sql); try { @@ -544,11 +544,11 @@ public class PoolableStatement extends PoolableWrapper implements Statement { public String toString() { return stmt.toString(); } - + public void closeOnCompletion() throws SQLException { - + } - + public boolean isCloseOnCompletion() throws SQLException { return false; } diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java index 99e7d2e579..25f3184d4b 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementPool.java @@ -55,12 +55,12 @@ public class PreparedStatementPool { } public void put(PreparedStatementHolder holder) throws SQLException { - PreparedStatement stmt = holder.getStatement(); - + PreparedStatement stmt = holder.getStatement(); + if (stmt.isClosed()) { return; } - + PreparedStatementKey key = holder.getKey(); PreparedStatementHolder oldHolder = map.put(key, holder); if (oldHolder != null) { diff --git a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java index aa4a9eaae6..18dcc9e5fc 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/HADataSource.java @@ -81,7 +81,7 @@ public class HADataSource extends MultiDataSource implements DataSource { if (LOG.isDebugEnabled()) { LOG.debug("HADataSource closed"); } - + JdbcUtils.close(master); } diff --git a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSourceStatement.java b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSourceStatement.java index 86b59c1d6b..f39f20f973 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/MultiDataSourceStatement.java +++ b/src/main/java/com/alibaba/druid/pool/ha/MultiDataSourceStatement.java @@ -452,7 +452,7 @@ public class MultiDataSourceStatement extends WrapperAdapter implements Statemen } public void closeOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + throw new SQLFeatureNotSupportedException(); } public boolean isCloseOnCompletion() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java index 21a16c002e..1b89dfbe84 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java @@ -322,7 +322,7 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP } public void setSchema(String schema) throws SQLException { - throw new SQLFeatureNotSupportedException(); + throw new SQLFeatureNotSupportedException(); } public String getSchema() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java index b6967aaca2..cffbab82a4 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxy.java @@ -42,6 +42,6 @@ public interface DataSourceProxy { long createStatementId(); long createResultSetId(); - + long createTransactionId(); } diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java index ae926a3c9f..ba3d441d26 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java @@ -58,7 +58,7 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl private final AtomicLong connectionIdSeed = new AtomicLong(10000); private final AtomicLong statementIdSeed = new AtomicLong(20000); private final AtomicLong resultSetIdSeed = new AtomicLong(50000); - private final AtomicLong transactionIdSeed = new AtomicLong(0); + private final AtomicLong transactionIdSeed = new AtomicLong(0); public DataSourceProxyImpl(Driver rawDriver, DataSourceProxyConfig config){ super(); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java index 970b1c4d3b..61f61f9da9 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/StatementProxyImpl.java @@ -308,7 +308,7 @@ public class StatementProxyImpl extends WrapperProxyImpl implements StatementPro } public void closeOnCompletion() throws SQLException { - throw new SQLFeatureNotSupportedException(); + throw new SQLFeatureNotSupportedException(); } public boolean isCloseOnCompletion() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java index ba6486b33f..7dd55b4086 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java @@ -22,7 +22,7 @@ public abstract class SQLExprImpl extends SQLObjectImpl implements SQLExpr { public SQLExprImpl(){ } - + public abstract boolean equals(Object o); public abstract int hashCode(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java index b9b92a7615..d1df2b7cf4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java @@ -21,7 +21,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAllColumnExpr extends SQLExprImpl { private static final long serialVersionUID = 1L; - + public SQLAllColumnExpr(){ } @@ -34,11 +34,11 @@ public class SQLAllColumnExpr extends SQLExprImpl { visitor.visit(this); visitor.endVisit(this); } - + public int hashCode() { return 0; } - + public boolean equals(Object o) { return o instanceof SQLAllColumnExpr; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java index b96f23797e..fefc8701b4 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java @@ -83,5 +83,5 @@ public class SQLAllExpr extends SQLExprImpl { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java index 42d3e31472..08f7678764 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java @@ -128,6 +128,5 @@ public class SQLBinaryOpExpr extends SQLExprImpl implements Serializable { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java index 2969405125..2fc39f563a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java @@ -180,6 +180,5 @@ public class SQLCaseExpr extends SQLExprImpl implements Serializable { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java index 790799925b..4b33a22ee6 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java @@ -100,5 +100,5 @@ public class SQLCastExpr extends SQLExprImpl { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java index fb8d29f0e9..7d48d1df17 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java @@ -81,6 +81,5 @@ public class SQLIdentifierExpr extends SQLExprImpl implements SQLName { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java index fa0c20b955..dfc28e8b34 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java @@ -54,5 +54,5 @@ public class SQLListExpr extends SQLExprImpl { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java index b7cf24a92b..f73a8fb2a3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java @@ -34,11 +34,11 @@ public class SQLNullExpr extends SQLLiteralExpr { visitor.endVisit(this); } - + public int hashCode() { return 0; } - + public boolean equals(Object o) { return o instanceof SQLNullExpr; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java index ae1776e4b9..cc70848a9f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java @@ -104,6 +104,5 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java index 030d2b1e65..ca3bb1bf8a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java @@ -81,6 +81,5 @@ public class SQLVariantRefExpr extends SQLExprImpl { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java index c9e9cdaa94..a4515d5b70 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBinaryExpr.java @@ -88,6 +88,5 @@ public class MySqlBinaryExpr extends SQLLiteralExpr implements MySqlExpr { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java index 393d279276..0908cdcf66 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlBooleanExpr.java @@ -82,6 +82,5 @@ public class MySqlBooleanExpr extends SQLLiteralExpr implements MySqlExpr { } return true; } - - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java index a19cfd0c6d..fd57455e40 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlMatchAgainstExpr.java @@ -124,5 +124,5 @@ public class MySqlMatchAgainstExpr extends SQLExprImpl implements MySqlExpr { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java index 953c2578ff..61daa0b29c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java @@ -76,7 +76,7 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor { } x = new SQLBinaryOpExpr(x.getLeft(), x.getOperator(), merge((SQLBinaryOpExpr) x.getRight())); } - + break; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java index 8b7799fc25..5fbb1d1fe7 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/OracleSQLObject.java @@ -3,7 +3,7 @@ package com.alibaba.druid.sql.dialect.oracle.ast; import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; - public interface OracleSQLObject extends SQLObject { + void accept0(OracleASTVisitor visitor); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java index 62c3ee7064..65d706d991 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/GroupingSetExpr.java @@ -59,5 +59,4 @@ public class GroupingSetExpr extends SQLExprImpl { return true; } - } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java index 761dc4a5dc..69a3022311 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExpr.java @@ -3,7 +3,6 @@ package com.alibaba.druid.sql.dialect.oracle.ast.expr; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; - public interface OracleExpr extends SQLExpr, OracleSQLObject { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java index 4a31d97565..2d73ea6802 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleExtractExpr.java @@ -100,5 +100,5 @@ public class OracleExtractExpr extends SQLExprImpl implements OracleExpr { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java index cfbcfb4ce7..9d6147444e 100755 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleIntervalExpr.java @@ -153,5 +153,5 @@ public class OracleIntervalExpr extends SQLLiteralExpr implements OracleExpr { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java index ea76b13888..43ce838045 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleTimestampExpr.java @@ -93,5 +93,5 @@ public class OracleTimestampExpr extends SQLLiteralExpr implements OracleExpr { } return true; } - + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java index 19d52907e2..45a1fc9cf0 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleDeleteStatement.java @@ -38,7 +38,7 @@ public class OracleDeleteStatement extends SQLDeleteStatement { public List getHints() { return this.hints; } - + protected void accept0(SQLASTVisitor visitor) { accept0((OracleASTVisitor) visitor); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index 95a84ed47a..75bf0d90c2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -54,6 +54,7 @@ import com.alibaba.druid.sql.parser.Token; public class OracleExprParser extends SQLExprParser { + public boolean allowStringAdditive = false; /** diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java index 8429ed0741..29136f2f5c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java @@ -93,9 +93,9 @@ public class OracleLexer extends Lexer { map.put("EXTRACT", Token.EXTRACT); map.put("DATE", Token.DATE); map.put("TIMESTAMP", Token.TIMESTAMP); - + map.put("CURSOR", Token.CURSOR); - + map.put("DAY", Token.DAY); map.put("YEAR", Token.YEAR); map.put("MONTH", Token.MONTH); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java index 77ae6f8368..26554922ec 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleSelectParser.java @@ -372,7 +372,7 @@ public class OracleSelectParser extends SQLSelectParser { ModelColumnClause modelColumnClause = new ModelColumnClause(); parseQueryPartitionClause(modelColumnClause); mainModel.setModelColumnClause(modelColumnClause); - + acceptIdentifier("DIMENSION"); accept(Token.BY); accept(Token.LPAREN); @@ -381,18 +381,18 @@ public class OracleSelectParser extends SQLSelectParser { lexer.nextToken(); break; } - + ModelColumn column = new ModelColumn(); column.setExpr(expr()); column.setAlias(as()); modelColumnClause.getDimensionByColumns().add(column); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } } - + acceptIdentifier("MEASURES"); accept(Token.LPAREN); for (;;) { @@ -400,28 +400,28 @@ public class OracleSelectParser extends SQLSelectParser { lexer.nextToken(); break; } - + ModelColumn column = new ModelColumn(); column.setExpr(expr()); column.setAlias(as()); modelColumnClause.getMeasuresColumns().add(column); - + if (lexer.token() == Token.COMMA) { lexer.nextToken(); continue; } } mainModel.setModelColumnClause(modelColumnClause); - + parseCellReferenceOptions(mainModel.getCellReferenceOptions()); - + parseModelRulesClause(mainModel); modelClause.setMainModel(mainModel); } - + private void parseModelRulesClause(MainModelClause mainModel) { - ModelRulesClause modelRulesClause = new ModelRulesClause(); + ModelRulesClause modelRulesClause = new ModelRulesClause(); if (identifierEquals("RULES")) { lexer.nextToken(); if (lexer.token() == Token.UPDATE) { @@ -431,7 +431,7 @@ public class OracleSelectParser extends SQLSelectParser { modelRulesClause.getOptions().add(ModelRuleOption.UPSERT); lexer.nextToken(); } - + if (identifierEquals("AUTOMATIC")) { lexer.nextToken(); accept(Token.ORDER); @@ -442,54 +442,54 @@ public class OracleSelectParser extends SQLSelectParser { modelRulesClause.getOptions().add(ModelRuleOption.SEQUENTIAL_ORDER); } } - + if (identifierEquals("ITERATE")) { lexer.nextToken(); accept(Token.LPAREN); modelRulesClause.setIterate(expr()); accept(Token.RPAREN); - + if (identifierEquals("UNTIL")) { lexer.nextToken(); accept(Token.LPAREN); modelRulesClause.setUntil(expr()); - accept(Token.RPAREN); + accept(Token.RPAREN); } } - + accept(Token.LPAREN); for (;;) { if (lexer.token() == Token.RPAREN) { lexer.nextToken(); break; } - + CellAssignmentItem item = new CellAssignmentItem(); if (lexer.token() == Token.UPDATE) { item.setOption(ModelRuleOption.UPDATE); } else if (identifierEquals("UPSERT")) { item.setOption(ModelRuleOption.UPSERT); } - + item.setCellAssignment(parseCellAssignment()); item.setOrderBy(this.parseOrderBy()); accept(Token.EQ); item.setExpr(expr()); - + modelRulesClause.getCellAssignmentItems().add(item); } - + mainModel.setModelRulesClause(modelRulesClause); } - + private CellAssignment parseCellAssignment() { CellAssignment cellAssignment = new CellAssignment(); - + cellAssignment.setMeasureColumn(expr()); accept(Token.LBRACKET); this.createExprParser().exprList(cellAssignment.getConditions()); accept(Token.RBRACKET); - + return cellAssignment; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java index 3e3273b9e7..4782877617 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleParameterizedOutputVisitor.java @@ -41,7 +41,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor { return super.visit(x); } - + public boolean visit(SQLNullExpr x) { print('?'); return false; @@ -75,7 +75,7 @@ public class OracleParameterizedOutputVisitor extends OracleOutputVisitor { } x = new SQLBinaryOpExpr(x.getLeft(), x.getOperator(), merge((SQLBinaryOpExpr) x.getRight())); } - + break; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java index 37fa2c8d21..ff0368aafa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelect.java @@ -2,7 +2,6 @@ package com.alibaba.druid.sql.dialect.sqlserver.ast; import com.alibaba.druid.sql.ast.statement.SQLSelect; - public class SQLServerSelect extends SQLSelect { /** diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java index 4a45be5f57..4955dab3f8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerSelectQueryBlock.java @@ -20,7 +20,7 @@ public class SQLServerSelectQueryBlock extends SQLSelectQueryBlock { public void setTop(Top top) { this.top = top; } - + @Override protected void accept0(SQLASTVisitor visitor) { accept0((SQLServerASTVisitor) visitor); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/Top.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/Top.java index 4780ecd71a..94a05110c8 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/Top.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/Top.java @@ -9,10 +9,10 @@ public class Top extends SQLServerObjectImpl { * */ private static final long serialVersionUID = 1L; - - private SQLExpr expr; - private boolean percent; - private boolean withTies; + + private SQLExpr expr; + private boolean percent; + private boolean withTies; public SQLExpr getExpr() { return expr; @@ -41,7 +41,7 @@ public class Top extends SQLServerObjectImpl { @Override public void accept0(SQLServerASTVisitor visitor) { if (visitor.visit(this)) { - + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java index edfa2da560..db9824da82 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java @@ -7,7 +7,6 @@ import com.alibaba.druid.sql.parser.Keywords; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.Token; - public class SQLServerLexer extends Lexer { public final static Keywords DEFAULT_SQL_SERVER_KEYWORDS; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java index 787bc2a035..6b6571b3c1 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerSelectParser.java @@ -34,7 +34,7 @@ public class SQLServerSelectParser extends SQLSelectParser { return select; } - + protected SQLSelectQuery query() throws ParserException { if (lexer.token() == Token.LPAREN) { lexer.nextToken(); @@ -56,7 +56,7 @@ public class SQLServerSelectParser extends SQLSelectParser { queryBlock.setDistionOption(SQLSetQuantifier.ALL); lexer.nextToken(); } - + if (lexer.token() == Token.TOP) { Top top = new Top(); lexer.nextToken(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java index 0d38b1ecad..30133fe68c 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerASTVisitor.java @@ -5,11 +5,12 @@ import com.alibaba.druid.sql.dialect.sqlserver.ast.Top; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public interface SQLServerASTVisitor extends SQLASTVisitor { + boolean visit(SQLServerSelectQueryBlock x); void endVisit(SQLServerSelectQueryBlock x); - + boolean visit(Top x); - + void endVisit(Top x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java index 3eefd6d43b..3c7f4cdd3d 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLObject.java @@ -2,7 +2,6 @@ package com.alibaba.druid.sql.dialect.transact.ast; import com.alibaba.druid.sql.ast.SQLObject; - public interface TransactSQLObject extends SQLObject { } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLSelect.java b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLSelect.java index cdcb790427..6d45e186a6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLSelect.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/transact/ast/TransactSQLSelect.java @@ -1,6 +1,5 @@ package com.alibaba.druid.sql.dialect.transact.ast; - public class TransactSQLSelect { } diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 969df58c9d..5643d69875 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -87,7 +87,7 @@ public class Lexer { int bp; int sp; int np; - char ch; + char ch; Token token; } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 336e78ab37..9bfa7a7b90 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -211,7 +211,6 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { public void endVisit(SQLCastExpr x) { } - public boolean visit(SQLSelectStatement astNode) { return true; } diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index 24e260c26d..24678e968f 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -92,7 +92,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe public synchronized static void remove(DruidDataSource dataSource) { ObjectName objectName = dataSources.remove(dataSource); - + if (objectName == null) { return; } @@ -188,7 +188,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe map.put("ErrorCount", dataSource.getErrorCount()); map.put("ReusePreparedStatementCount", dataSource.getReusePreparedStatementCount()); map.put("StartTransactionCount", dataSource.getStartTransactionCount()); - + map.put("CommitCount", dataSource.getCommitCount()); map.put("RollbackCount", dataSource.getRollbackCount()); @@ -217,12 +217,18 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe String[] indexNames = { // - "Name", "URL", "CreateCount", "DestroyCount", "ConnectCount", // - "CloseCount", "ActiveCount", "PoolingCount", "LockQueueLength", "WaitThreadCount", // - "InitialSize", "MaxActive", "MinIdle", "PoolPreparedStatements", "TestOnBorrow", // - "TestOnReturn", "MinEvictableIdleTimeMillis", "ConnectErrorCount", "CreateTimespanMillis", "DbType", // - "ValidationQuery", "ValidationQueryTimeout", "DriverClassName", "Username", "RemoveAbandonedCount", // - "NotEmptyWaitCount", "NotEmptyWaitNanos", "ErrorCount", "ReusePreparedStatementCount", "StartTransactionCount", // + "Name", "URL", "CreateCount", "DestroyCount", + "ConnectCount", // + "CloseCount", "ActiveCount", "PoolingCount", "LockQueueLength", + "WaitThreadCount", // + "InitialSize", "MaxActive", "MinIdle", "PoolPreparedStatements", + "TestOnBorrow", // + "TestOnReturn", "MinEvictableIdleTimeMillis", "ConnectErrorCount", "CreateTimespanMillis", + "DbType", // + "ValidationQuery", "ValidationQueryTimeout", "DriverClassName", "Username", + "RemoveAbandonedCount", // + "NotEmptyWaitCount", "NotEmptyWaitNanos", "ErrorCount", "ReusePreparedStatementCount", + "StartTransactionCount", // "CommitCount", "RollbackCount" // }; diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java index cbde4db563..c05b89c73c 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java @@ -64,9 +64,8 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { private final Histogram histogram = new Histogram(new long[] { // // - 4, 15, 60, 250, // - 1000, 4 * 1000, 15 * 1000, 60 * 1000, 250 * 1000 - }); + 4, 15, 60, 250, // + 1000, 4 * 1000, 15 * 1000, 60 * 1000, 250 * 1000 }); public JdbcSqlStat(String sql){ this.sql = sql; @@ -335,40 +334,15 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean { SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.DATE, SimpleType.STRING, SimpleType.STRING // - , new ArrayType(SimpleType.LONG, true) - }; + , new ArrayType(SimpleType.LONG, true) }; - String[] indexNames = { - "ID", - "DataSource", - "SQL", - "ExecuteCount", - "ErrorCount" // - , - "TotalTime", - "LastTime", - "MaxTimespan", - "LastError", - "EffectedRowCount" // - , - "FetchRowCount", - "MaxTimespanOccurTime", - "BatchSizeMax", - "BatchSizeTotal", - "ConcurrentMax" // - , - "RunningCount", - "Name", - "File", - "LastErrorMessage", - "LastErrorClass" // - , - "LastErrorStackTrace", - "LastErrorTime", - "DbType", - "URL" // + String[] indexNames = { "ID", "DataSource", "SQL", "ExecuteCount", "ErrorCount" // + , "TotalTime", "LastTime", "MaxTimespan", "LastError", "EffectedRowCount" // + , "FetchRowCount", "MaxTimespanOccurTime", "BatchSizeMax", "BatchSizeTotal", "ConcurrentMax" // + , "RunningCount", "Name", "File", "LastErrorMessage", "LastErrorClass" // + , "LastErrorStackTrace", "LastErrorTime", "DbType", "URL" // - , "Histogram"}; + , "Histogram" }; String[] indexDescriptions = indexNames; COMPOSITE_TYPE = new CompositeType("SqlStatistic", "Sql Statistic", indexNames, indexDescriptions, indexTypes); diff --git a/src/main/java/com/alibaba/druid/util/ConcurrentIdentityHashMap.java b/src/main/java/com/alibaba/druid/util/ConcurrentIdentityHashMap.java index e0db246b20..bb1a99834a 100644 --- a/src/main/java/com/alibaba/druid/util/ConcurrentIdentityHashMap.java +++ b/src/main/java/com/alibaba/druid/util/ConcurrentIdentityHashMap.java @@ -1100,9 +1100,9 @@ public final class ConcurrentIdentityHashMap extends AbstractMap imp */ static class SimpleEntry implements Entry { - private final K key; + private final K key; - private V value; + private V value; public SimpleEntry(K key, V value){ this.key = key; diff --git a/src/main/java/com/alibaba/druid/util/Histogram.java b/src/main/java/com/alibaba/druid/util/Histogram.java index 54a0f6409b..b4906fd4dc 100644 --- a/src/main/java/com/alibaba/druid/util/Histogram.java +++ b/src/main/java/com/alibaba/druid/util/Histogram.java @@ -81,7 +81,7 @@ public class Histogram { } return array; } - + public long[] getRanges() { return ranges; } diff --git a/src/test/java/com/alibaba/druid/TestHistogram.java b/src/test/java/com/alibaba/druid/TestHistogram.java index 838a46e9cc..db88727152 100644 --- a/src/test/java/com/alibaba/druid/TestHistogram.java +++ b/src/test/java/com/alibaba/druid/TestHistogram.java @@ -3,6 +3,7 @@ package com.alibaba.druid; import junit.framework.TestCase; public class TestHistogram extends TestCase { + public void test_histogram() throws Exception { int val = 4; for (int i = 0; i < 10; ++i) { diff --git a/src/test/java/com/alibaba/druid/TestIdel3.java b/src/test/java/com/alibaba/druid/TestIdel3.java index 58fc9bd5a8..cce97fbf4a 100644 --- a/src/test/java/com/alibaba/druid/TestIdel3.java +++ b/src/test/java/com/alibaba/druid/TestIdel3.java @@ -81,10 +81,10 @@ public class TestIdel3 extends TestCase { concurrent(dataSource, 1, 1000 * 1000); Thread.sleep(1000 * 10); concurrent(dataSource, 1000, 1000 * 1000); - + Assert.assertEquals(driver.getConnections().size(), dataSource.getPoolingCount()); Assert.assertEquals(0, dataSource.getActiveCount()); - + // 连续打开关闭单个连接 for (int i = 0; i < 1000; ++i) { Assert.assertEquals(0, dataSource.getActiveCount()); @@ -95,15 +95,15 @@ public class TestIdel3 extends TestCase { Thread.sleep(10); conn.close(); } - //Assert.assertEquals(2, dataSource.getPoolingCount()); + // Assert.assertEquals(2, dataSource.getPoolingCount()); Thread.sleep(1000 * 100); dataSource.close(); - - + } - private void concurrent(final DruidDataSource dataSource, int threadCount, final int loopCount) throws InterruptedException { + private void concurrent(final DruidDataSource dataSource, int threadCount, final int loopCount) + throws InterruptedException { final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); diff --git a/src/test/java/com/alibaba/druid/TestLRU.java b/src/test/java/com/alibaba/druid/TestLRU.java index c1773d8264..e2d16447c1 100644 --- a/src/test/java/com/alibaba/druid/TestLRU.java +++ b/src/test/java/com/alibaba/druid/TestLRU.java @@ -4,21 +4,21 @@ import java.util.LinkedHashMap; import junit.framework.TestCase; - public class TestLRU extends TestCase { + public void test_lru() throws Exception { LinkedHashMap cache = new LinkedHashMap(100, 0.75f, true); - + cache.put(2, "22"); cache.put(3, "33"); - + System.out.println(cache); - + cache.put(2, "22"); - + System.out.println(cache); cache.get(3); System.out.println(cache); - + } } diff --git a/src/test/java/com/alibaba/druid/TestLockCount.java b/src/test/java/com/alibaba/druid/TestLockCount.java index 9a26e7ac41..83a34acccb 100644 --- a/src/test/java/com/alibaba/druid/TestLockCount.java +++ b/src/test/java/com/alibaba/druid/TestLockCount.java @@ -28,7 +28,7 @@ public class TestLockCount extends TestCase { Assert.assertEquals(result, dataSource.getC7()); Assert.assertEquals(result, dataSource.getC8()); Assert.assertEquals(result, dataSource.getC9()); - + Assert.assertEquals(result, dataSource.getC10()); Assert.assertEquals(result, dataSource.getC11()); Assert.assertEquals(result, dataSource.getC12()); diff --git a/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java b/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java index d358e034a4..852af08ce4 100644 --- a/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java +++ b/src/test/java/com/alibaba/druid/benckmark/TestAtomicPerformance.java @@ -29,7 +29,7 @@ public class TestAtomicPerformance extends TestCase { long millis = System.currentTimeMillis() - startMillis; System.out.println("millis " + millis); } - + private void perf2(AtomicInteger count) { long startMillis = System.currentTimeMillis(); diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java index 7f9fb5725e..2d6bd7a196 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java @@ -59,16 +59,16 @@ public class Bug_for_happyday517_2 extends TestCase { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("insert into message.dbo.TempSMS(sms) values ('333')"); - + Exception error = null; try { - stmt.execute(); + stmt.execute(); } catch (SQLException ex) { error = ex; } - + Assert.assertTrue(exception == error); - + stmt.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest.java index ee3dd8475a..dd4e8efcf7 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest.java @@ -25,7 +25,7 @@ public class TraceFilterTest extends TestCase { private MockDriver driver; private DruidDataSource dataSource; - private TraceFilter filter; + private TraceFilter filter; protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); @@ -45,7 +45,7 @@ public class TraceFilterTest extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("trace"); - + filter = (TraceFilter) dataSource.getProxyFilters().get(0); JdbcStatContext statContext = new JdbcStatContext(); statContext.setTraceEnable(true); @@ -65,7 +65,7 @@ public class TraceFilterTest extends TestCase { stmt.close(); conn.close(); } - + public void test_exuecuteQuery() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); @@ -75,7 +75,7 @@ public class TraceFilterTest extends TestCase { stmt.close(); conn.close(); } - + public void test_preExuecuteQuery() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT ?"); @@ -86,7 +86,7 @@ public class TraceFilterTest extends TestCase { stmt.close(); conn.close(); } - + public void test_set() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT ?"); @@ -105,35 +105,35 @@ public class TraceFilterTest extends TestCase { stmt.setBoolean(1, true); stmt.setByte(1, (byte) 12); stmt.setBytes(1, null); - + stmt.setCharacterStream(1, null); stmt.setCharacterStream(1, null, 0); stmt.setCharacterStream(1, null, 0L); - + stmt.setClob(1, (Clob) null); stmt.setClob(1, (Reader) null); stmt.setClob(1, (Reader) null, 1); - + stmt.setDate(1, null); stmt.setDate(1, null, null); - + stmt.setDouble(1, 1D); stmt.setFloat(1, 1F); stmt.setLong(1, 1L); - + stmt.setNCharacterStream(1, null); stmt.setNCharacterStream(1, null, 0); - + stmt.setNClob(1, (NClob) null); stmt.setNClob(1, (Reader) null); stmt.setNClob(1, (Reader) null, 1); - + stmt.setNull(1, Types.INTEGER); stmt.setNull(1, Types.INTEGER, "int"); stmt.setObject(1, null); stmt.setObject(1, null, Types.INTEGER); stmt.setObject(1, null, Types.INTEGER, 2); - + stmt.setRef(1, null); stmt.setRowId(1, null); stmt.setShort(1, (short) 1); @@ -145,7 +145,7 @@ public class TraceFilterTest extends TestCase { stmt.setTimestamp(1, null, null); stmt.setUnicodeStream(1, null, 0); stmt.setURL(1, null); - + ResultSet rs = stmt.executeQuery(); rs.next(); rs.previous(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_close_error.java b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_close_error.java index 7c6c932e64..4a2f11ca37 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_close_error.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_close_error.java @@ -57,13 +57,14 @@ public class TraceFilterTest_close_error extends TestCase { public void test_close_error() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + MockConnection conn = new MockConnection() { + public void close() throws SQLException { throw new SQLException(); } }; - + { SQLException error = null; try { @@ -75,16 +76,17 @@ public class TraceFilterTest_close_error extends TestCase { } } - + public void test_close_error_2() throws Exception { FilterChainImpl chain = new FilterChainImpl(dataSource); - + MockConnection conn = new MockConnection() { + public void close() throws SQLException { throw new RuntimeException(); } }; - + { Exception error = null; try { @@ -94,6 +96,6 @@ public class TraceFilterTest_close_error extends TestCase { } Assert.assertNotNull(error); } - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_commit_error.java b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_commit_error.java index e6caba4eb4..0a48e24291 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_commit_error.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/TraceFilterTest_commit_error.java @@ -163,14 +163,15 @@ public class TraceFilterTest_commit_error extends TestCase { // TODO Auto-generated method stub return null; } - + }; filter.connection_rollback(chain, new ConnectionProxyImpl(dataSource, conn, new Properties(), 0), savepoint); { SQLException error = null; try { - filter.connection_rollback(chain, new ConnectionProxyImpl(dataSource, conn, new Properties(), 0), savepoint); + filter.connection_rollback(chain, new ConnectionProxyImpl(dataSource, conn, new Properties(), 0), + savepoint); } catch (SQLException ex) { error = ex; } @@ -179,7 +180,8 @@ public class TraceFilterTest_commit_error extends TestCase { { RuntimeException error = null; try { - filter.connection_rollback(chain, new ConnectionProxyImpl(dataSource, conn, new Properties(), 0), savepoint); + filter.connection_rollback(chain, new ConnectionProxyImpl(dataSource, conn, new Properties(), 0), + savepoint); } catch (RuntimeException ex) { error = ex; } diff --git a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java index a89524b657..8f53bafd2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java +++ b/src/test/java/com/alibaba/druid/bvt/mock/MockResultSetMetaDataTest.java @@ -21,10 +21,10 @@ public class MockResultSetMetaDataTest extends TestCase { Assert.assertTrue(meta.unwrap(java.sql.ResultSetMetaData.class) != null); Assert.assertTrue(meta.unwrap(Object.class) != null); Assert.assertTrue(meta.unwrap(Date.class) == null); - + ColumnMetaData column = new ColumnMetaData(); meta.getColumns().add(column); - + meta.isAutoIncrement(1); meta.isCaseSensitive(1); meta.isSearchable(1); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index 383b6b474c..afa1067cbf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -13,16 +13,17 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case0 extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } public void test_0() throws Exception { - + final DruidDataSource dataSource = new DruidDataSource(); dataSource.setDriver(new MockDriver() { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index 38625f049b..4a492c8604 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -12,14 +12,15 @@ import junit.framework.Assert; import junit.framework.TestCase; public class Case1 extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_f() throws Exception { final DruidDataSource dataSource = new DruidDataSource(); dataSource.setTimeBetweenConnectErrorMillis(100); @@ -46,7 +47,7 @@ public class Case1 extends TestCase { Connection conn = dataSource.getConnection(); conn.close(); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index e8caa54a07..141ad17969 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -31,14 +31,15 @@ import com.alibaba.druid.util.JMXUtils; * @author admin 2011-5-4 下午02:45:21 */ public class Case2 extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_singleThread() throws Exception { Class.forName("com.alibaba.druid.mock.MockDriver"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index 4b96a88b1a..57ddf1afaa 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -41,11 +41,11 @@ public class Case3 extends TestCase { // dataSource.close(); // } protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } public void test_2() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index d472e852e2..32288d2acf 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -10,14 +10,15 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; public class DruidDataSourceFilterTest extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_filter() throws Exception { DruidDataSource dataSource = new DruidDataSource(); @@ -26,7 +27,7 @@ public class DruidDataSourceFilterTest extends TestCase { dataSource.setFilters("stat"); Assert.assertEquals(1, dataSource.getProxyFilters().size()); - + dataSource.close(); } @@ -38,7 +39,7 @@ public class DruidDataSourceFilterTest extends TestCase { dataSource.setFilters("stat,trace"); Assert.assertEquals(2, dataSource.getProxyFilters().size()); - + dataSource.close(); } @@ -67,8 +68,8 @@ public class DruidDataSourceFilterTest extends TestCase { Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); // logic // close不会导致计数器＋1 } - - Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + + Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); dataSource.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java index c9597ca256..c56616a94a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -17,7 +17,7 @@ public class ManagedDataSourceTest extends TestCase { public void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java index d7ac66704b..dec7c18d72 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -10,14 +10,15 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; import com.alibaba.druid.stat.JdbcStatManager; public class ParamTest extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_default() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); @@ -79,7 +80,7 @@ public class ParamTest extends TestCase { error = ex; } Assert.assertNotNull(error); - + dataSource.close(); } @@ -104,7 +105,7 @@ public class ParamTest extends TestCase { } Assert.assertEquals(10, JdbcStatManager.getInstance().getConnectionstat().getConnectCount()); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index 96ceffb4bd..a3fd5a8c91 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -12,14 +12,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class PasswordCallbackTest extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_0() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:"); @@ -32,7 +33,7 @@ public class PasswordCallbackTest extends TestCase { Assert.assertEquals(dataSource.getUrl(), passwordCallback.getUrl()); Assert.assertEquals(dataSource.getConnectProperties(), passwordCallback.getProperties()); - + dataSource.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java index cfd4f1d691..c677e5b917 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringFilterTest.java @@ -18,18 +18,20 @@ import com.alibaba.druid.proxy.jdbc.ConnectionProxy; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class SpringFilterTest extends TestCase { + protected void setUp() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { - Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_spring() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("com/alibaba/druid/pool/spring-config-1.xml"); + + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( + "com/alibaba/druid/pool/spring-config-1.xml"); DataSource dataSource = (DataSource) context.getBean("dataSource"); Connection conn = dataSource.getConnection(); @@ -37,9 +39,9 @@ public class SpringFilterTest extends TestCase { TestFilter filter = (TestFilter) context.getBean("test-filter"); Assert.assertEquals(1, filter.getConnectCount()); - + context.close(); - + Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java index e4858ba9dd..90a01059e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java @@ -14,7 +14,7 @@ public class TestAbondon extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + dataSource = new DruidDataSource(); dataSource.setRemoveAbandoned(true); dataSource.setRemoveAbandonedTimeoutMillis(10); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index dec8a22aab..384ba867bd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -11,14 +11,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_0 extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 227895ac7a..697d8f4711 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -12,14 +12,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_1 extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_close() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setPoolPreparedStatements(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java index b0e8831389..63801331c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java @@ -12,9 +12,11 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_2 extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java index f7f61bbeb4..ee5c0b4ff0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java @@ -19,7 +19,7 @@ public class TestConcurrent extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); driver.setLogExecuteQueryEnable(false); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java index 700b01ffa8..0326c027ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java @@ -58,7 +58,7 @@ public class TestConnectError extends TestCase { public void test_connect_error() throws Exception { Assert.assertEquals(0, dataSource.getCreateErrorCount()); - + int count = 10; Connection[] connections = new Connection[count]; for (int i = 0; i < count; ++i) { @@ -68,7 +68,7 @@ public class TestConnectError extends TestCase { for (int i = 0; i < count; ++i) { connections[i].close(); } - + Assert.assertEquals(10, dataSource.getCreateErrorCount()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java index 3ae3e76e7f..e32292eb7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -49,7 +49,7 @@ public class TestDefault extends TestCase { } Connection conn = dataSource.getConnection(); - + Assert.assertEquals(0, conn.getHoldability()); Assert.assertEquals(false, conn.isReadOnly()); Assert.assertEquals(0, conn.getTransactionIsolation()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java index 1ac01a6b7c..fb54542028 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -11,14 +11,14 @@ import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestDisable extends TestCase { + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); dataSource = new DruidDataSource(); @@ -35,7 +35,7 @@ public class TestDisable extends TestCase { dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); } - + protected void tearDown() throws Exception { dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); @@ -70,8 +70,9 @@ public class TestDisable extends TestCase { threads[i].start(); } Thread.sleep(1000); - + new Thread("close thread") { + public void run() { dataSource.setEnable(false); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java index ecbc69bdc9..3eb1562b21 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -25,14 +25,15 @@ import com.alibaba.druid.pool.PoolableConnection; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDruidDataSource extends TestCase { + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_0() throws Exception { DruidDataSource dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java index 792e07f043..8093f7523d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -11,14 +11,14 @@ import com.alibaba.druid.pool.DataSourceDisableException; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestGraceShutdown extends TestCase { + private MockDriver driver; private DruidDataSource dataSource; protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); dataSource = new DruidDataSource(); @@ -35,11 +35,11 @@ public class TestGraceShutdown extends TestCase { dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_close() throws Exception { final int threadCount = 100; Thread[] threads = new Thread[threadCount]; @@ -68,8 +68,9 @@ public class TestGraceShutdown extends TestCase { threads[i].start(); } Thread.sleep(1000); - + new Thread("close thread") { + public void run() { dataSource.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java index a79a337521..b2f0dddd47 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java @@ -11,10 +11,11 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle extends TestCase { + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } @@ -38,7 +39,7 @@ public class TestIdle extends TestCase { { Assert.assertEquals(0, dataSource.getCreateCount()); Assert.assertEquals(0, dataSource.getActiveCount()); - + Connection conn = dataSource.getConnection(); Assert.assertEquals(dataSource.getInitialSize(), dataSource.getCreateCount()); @@ -88,7 +89,7 @@ public class TestIdle extends TestCase { Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size()); Assert.assertEquals(0, dataSource.getActiveCount()); } - + { int count = 4; Connection[] connections = new Connection[4]; @@ -103,13 +104,12 @@ public class TestIdle extends TestCase { } Assert.assertEquals(4, driver.getConnections().size()); Assert.assertEquals(0, dataSource.getActiveCount()); - + dataSource.shrink(); Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size()); } - dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java index f0befe68f5..f9614c01d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -14,7 +14,7 @@ public class TestIdle2 extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java index 01dd27afcb..3e74e20cc9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -13,14 +13,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3 extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_idle2() throws Exception { MockDriver driver = new MockDriver(); @@ -37,9 +38,13 @@ public class TestIdle3 extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - - ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new ObjectName("com.alibaba:type=DataSource,name=mysql")); - ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new ObjectName("com.alibaba:type=DataSource,name=oracle")); + + ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, + new ObjectName( + "com.alibaba:type=DataSource,name=mysql")); + ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, + new ObjectName( + "com.alibaba:type=DataSource,name=oracle")); // 第一次创建连接 { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java index bc8c2f6ebb..918463c785 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java @@ -13,14 +13,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_idle2() throws Exception { MockDriver driver = new MockDriver(); @@ -37,8 +38,9 @@ public class TestIdle3_Concurrent extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - - // ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new ObjectName("com.alibaba:type=DataSource")); + + // ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new + // ObjectName("com.alibaba:type=DataSource")); // 第一次创建连接 { @@ -77,18 +79,20 @@ public class TestIdle3_Concurrent extends TestCase { dataSource.close(); } - private void concurrent(final MockDriver driver, final DruidDataSource dataSource, final int count) throws Exception { + private void concurrent(final MockDriver driver, final DruidDataSource dataSource, final int count) + throws Exception { final int LOOP_COUNT = 1000; Thread[] threads = new Thread[count]; final CyclicBarrier barrier = new CyclicBarrier(count); final CountDownLatch endLatch = new CountDownLatch(count); for (int i = 0; i < count; ++i) { threads[i] = new Thread("thread-" + i) { + public void run() { try { for (int i = 0; i < LOOP_COUNT; ++i) { barrier.await(); - + Connection conn = dataSource.getConnection(); { AtomicInteger c = new AtomicInteger(); @@ -108,16 +112,16 @@ public class TestIdle3_Concurrent extends TestCase { } }; } - + for (int i = 0; i < count; ++i) { threads[i].start(); } - + endLatch.await(); System.out.println("concurrent end"); - + int max = count > dataSource.getMaxActive() ? dataSource.getMaxActive() : count; Assert.assertEquals(max, driver.getConnections().size()); - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java index 0037391079..aa149717e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -18,7 +18,7 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java index 975264a66c..17dcb8cf8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java @@ -21,7 +21,7 @@ public class TestIdle3_Concurrent_Starvation extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java index a09a468035..c2e208a498 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java @@ -18,7 +18,7 @@ public class TestPoolPreparedStatement extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + driver = new MockDriver(); dataSource = new DruidDataSource(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java index 8fa1d3a178..b57a6e6d9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -54,9 +54,9 @@ public class TestPoolPreparedStatement2 extends TestCase { conn.close(); } } - + dataSource.setPoolPreparedStatements(true); - + for (int j = 0; j < 10; ++j) { for (int i = 0; i < 10; ++i) { Connection conn = dataSource.getConnection(); @@ -67,7 +67,7 @@ public class TestPoolPreparedStatement2 extends TestCase { conn.close(); } } - + for (int i = 0; i < 1000 * 100 * 1; ++i) { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELECT " + i); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java index c8106dd597..3eb61585e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java @@ -9,8 +9,8 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class TestRemoveAbandoned extends TestCase { + private MockDriver driver; private DruidDataSource dataSource; @@ -35,22 +35,21 @@ public class TestRemoveAbandoned extends TestCase { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + protected void tearDown() throws Exception { dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - public void test_removeAbandoned() throws Exception { Connection conn = dataSource.getConnection(); Assert.assertEquals(1, dataSource.getActiveCount()); Assert.assertEquals(0, dataSource.getPoolingCount()); - + // 超时之后，连接自动关闭 Thread.sleep(100); Assert.assertTrue(conn.isClosed()); - + Assert.assertEquals(1, dataSource.getRemoveAbandonedCount()); Assert.assertEquals(0, dataSource.getActiveCount()); Assert.assertEquals(1, dataSource.getPoolingCount()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java index fe5e05ecb4..cd2a8be2ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -17,7 +17,7 @@ public class TestStat extends TestCase { protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); dataSource.setName("com.alibaba.dragoon.monitor"); @@ -47,12 +47,11 @@ public class TestStat extends TestCase { rs.close(); stmt.close(); - + dataSource.shrink(); - + JdbcStatManager.getInstance().getDataSourceList(); Assert.assertEquals(1, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java index 78cea68c09..3a69d57493 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest.java @@ -9,9 +9,9 @@ import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.pool.DruidDataSourceC3P0Adapter; import com.alibaba.druid.stat.DruidDataSourceStatManager; - public class DruidDataSourceC3P0AdapterTest extends TestCase { - private MockDriver driver; + + private MockDriver driver; private DruidDataSourceC3P0Adapter dataSource; protected void setUp() throws Exception { @@ -36,7 +36,7 @@ public class DruidDataSourceC3P0AdapterTest extends TestCase { dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_basic() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java index bfacd10600..f47c26d26d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/adapter/DruidDataSourceC3P0AdapterTest2.java @@ -16,20 +16,20 @@ public class DruidDataSourceC3P0AdapterTest2 extends TestCase { DruidDataSourceC3P0Adapter dataSource = new DruidDataSourceC3P0Adapter(); dataSource.setJdbcUrl("jdbc:mock:xxx"); - + dataSource.setLogWriter(dataSource.getLogWriter()); dataSource.setLoginTimeout(dataSource.getLoginTimeout()); - + Assert.assertTrue(dataSource.isWrapperFor(DruidDataSourceC3P0Adapter.class)); Assert.assertTrue(dataSource.isWrapperFor(DruidDataSource.class)); Assert.assertTrue(dataSource.isWrapperFor(DataSource.class)); Assert.assertFalse(dataSource.isWrapperFor(null)); - + Assert.assertNotNull(dataSource.unwrap(DruidDataSourceC3P0Adapter.class)); Assert.assertNotNull(dataSource.unwrap(DruidDataSource.class)); Assert.assertNotNull(dataSource.unwrap(DataSource.class)); Assert.assertNull(dataSource.unwrap(null)); - + dataSource.setProperties(dataSource.getProperties()); dataSource.setUser(dataSource.getUser()); dataSource.setPassword(dataSource.getPassword()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index cd12f65f14..8812fe3aa8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -44,100 +44,103 @@ public class ConnectionTest extends TestCase { public void test_prepare() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_prepare2() throws Exception { Connection conn = dataSource.getConnection(); - - PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } - + public void test_prepare3() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", new int[0]); stmt.close(); - + conn.close(); } - + public void test_prepare4() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", new String[0]); stmt.close(); - + conn.close(); } - + public void test_prepare5() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS); stmt.close(); - + conn.close(); } - + public void test_prepareCall() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareCall("SELECT 1"); stmt.close(); - + conn.close(); } - + public void test_prepareCall1() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_prepareCall2() throws Exception { Connection conn = dataSource.getConnection(); - - PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } - + public void test_create() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); stmt.close(); - + conn.close(); } - + public void test_create1() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_create2() throws Exception { Connection conn = dataSource.getConnection(); - - Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index 1b82ab30e6..f909290e41 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -47,100 +47,103 @@ public class ConnectionTest2 extends TestCase { public void test_prepare() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_prepare2() throws Exception { Connection conn = dataSource.getConnection(); - - PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + PreparedStatement stmt = conn.prepareStatement("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } - + public void test_prepare3() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", new int[0]); stmt.close(); - + conn.close(); } - + public void test_prepare4() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", new String[0]); stmt.close(); - + conn.close(); } - + public void test_prepare5() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareStatement("SELECT 1", Statement.RETURN_GENERATED_KEYS); stmt.close(); - + conn.close(); } - + public void test_prepareCall() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareCall("SELECT 1"); stmt.close(); - + conn.close(); } - + public void test_prepareCall1() throws Exception { Connection conn = dataSource.getConnection(); - + PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_prepareCall2() throws Exception { Connection conn = dataSource.getConnection(); - - PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + PreparedStatement stmt = conn.prepareCall("SELECT 1", ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } - + public void test_create() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(); stmt.close(); - + conn.close(); } - + public void test_create1() throws Exception { Connection conn = dataSource.getConnection(); - + Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY); stmt.close(); - + conn.close(); } - + public void test_create2() throws Exception { Connection conn = dataSource.getConnection(); - - Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT); + + Statement stmt = conn.createStatement(ResultSet.FETCH_FORWARD, ResultSet.CONCUR_READ_ONLY, + ResultSet.HOLD_CURSORS_OVER_COMMIT); stmt.close(); - + conn.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index ca032997a4..fff9c6cc67 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -37,7 +37,7 @@ public class ConnectionTest3 extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat,trace"); - + JdbcStatContext context = new JdbcStatContext(); context.setTraceEnable(true); JdbcStatManager.getInstance().setStatContext(context); @@ -46,32 +46,32 @@ public class ConnectionTest3 extends TestCase { protected void tearDown() throws Exception { dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); - + JdbcStatManager.getInstance().setStatContext(null); } public void test_basic() throws Exception { PoolableConnection conn = (PoolableConnection) dataSource.getConnection(); - + conn.getTransactionInfo(); conn.getMetaData(); conn.setReadOnly(true); Assert.assertEquals(true, conn.isReadOnly()); - + conn.setCatalog("xxx"); Assert.assertEquals("xxx", conn.getCatalog()); - + conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); Assert.assertEquals(Connection.TRANSACTION_READ_COMMITTED, conn.getTransactionIsolation()); - + conn.getWarnings(); conn.clearWarnings(); conn.getTypeMap(); conn.setTypeMap(null); - + conn.setHoldability(ResultSet.CLOSE_CURSORS_AT_COMMIT); Assert.assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, conn.getHoldability()); - + conn.setSavepoint(); conn.setSavepoint("savepoint"); conn.rollback(); @@ -86,17 +86,16 @@ public class ConnectionTest3 extends TestCase { conn.setClientInfo("xx", "11"); conn.getClientInfo("xx"); conn.getClientInfo(); - + conn.createArrayOf("int", new Object[0]); conn.createStruct("int", new Object[0]); - + conn.addConnectionEventListener(null); conn.removeConnectionEventListener(null); conn.addStatementEventListener(null); conn.removeStatementEventListener(null); - + conn.close(); } - - + } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index 4b3f28a227..2bf5a4009f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -65,11 +65,11 @@ public class ConnectionTest4 extends TestCase { Assert.assertEquals(false, conn.isWrapperFor(null)); Assert.assertEquals(true, conn.isWrapperFor(PoolableConnection.class)); Assert.assertEquals(true, conn.isWrapperFor(Connection.class)); - + Assert.assertEquals("SELECT 1", conn.nativeSQL("SELECT 1")); conn.toString(); - + conn.close(); conn.toString(); } @@ -403,7 +403,7 @@ public class ConnectionTest4 extends TestCase { conn.getConnectionHolder().toString(); conn.getConnectionHolder().getUseCount(); conn.getConnectionHolder().getTimeMillis(); - + conn.close(); } @@ -441,10 +441,10 @@ public class ConnectionTest4 extends TestCase { conn.close(); } - + public void test_create_2() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.getConnection().close(); { SQLException error = null; @@ -455,13 +455,13 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_setAutoCommit() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.getAutoCommit(); conn.setAutoCommit(true); conn.getConnection().close(); @@ -474,13 +474,13 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_commit() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.getConnection().close(); { SQLException error = null; @@ -491,17 +491,17 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_rollback() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.setAutoCommit(false); Statement stmt = conn.createStatement(); stmt.execute("SELECT 1"); - + conn.getConnection().close(); { SQLException error = null; @@ -512,13 +512,13 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_rollback_1() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.getConnection().close(); { SQLException error = null; @@ -529,13 +529,13 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_releaseSavepoint_1() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.getConnection().close(); { SQLException error = null; @@ -546,13 +546,13 @@ public class ConnectionTest4 extends TestCase { } Assert.assertNotNull(error); } - + conn.close(); } - + public void test_addListenerError() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.close(); { Exception error = null; @@ -564,10 +564,10 @@ public class ConnectionTest4 extends TestCase { Assert.assertNotNull(error); } } - + public void test_addListenerError2() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.close(); { Exception error = null; @@ -579,10 +579,10 @@ public class ConnectionTest4 extends TestCase { Assert.assertNotNull(error); } } - + public void test_removeConnectionEventListener() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.close(); { Exception error = null; @@ -594,10 +594,10 @@ public class ConnectionTest4 extends TestCase { Assert.assertNotNull(error); } } - + public void test_removeStatementEventListener() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.close(); { Exception error = null; @@ -609,10 +609,10 @@ public class ConnectionTest4 extends TestCase { Assert.assertNotNull(error); } } - + public void test_checkOpen_error() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); - + conn.close(); { Exception error = null; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index bb8106f11e..abc7d0fd32 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -98,7 +98,7 @@ public class ConnectionTest5 extends TestCase { conn.close(); } - + public void test_handleException_3() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); conn.getConnection().close(); @@ -115,7 +115,7 @@ public class ConnectionTest5 extends TestCase { conn.close(); } - + public void test_handleException_4() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); conn.getConnection().close(); @@ -132,24 +132,24 @@ public class ConnectionTest5 extends TestCase { Assert.assertEquals(true, conn.isClosed()); } - + public void test_handleException_5() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); conn.addConnectionEventListener(new ConnectionEventListener() { @Override public void connectionClosed(ConnectionEvent event) { - + } @Override public void connectionErrorOccurred(ConnectionEvent event) { - + } - + }); conn.close(); - + { SQLException error = null; try { @@ -159,11 +159,9 @@ public class ConnectionTest5 extends TestCase { } Assert.assertNotNull(error); } - - + } - - + public void test_setClientInfo() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); conn.close(); @@ -179,11 +177,11 @@ public class ConnectionTest5 extends TestCase { } } - + public void test_setClientInfo_1() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); conn.close(); - + { SQLException error = null; try { @@ -193,6 +191,6 @@ public class ConnectionTest5 extends TestCase { } Assert.assertNotNull(error); } - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index 0a2a64fdf4..bf5c007995 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -317,17 +317,17 @@ public class DataSourceTest3 extends TestCase { Assert.assertNotNull(error); } } - + public void test_setExceptionSorter() throws Exception { dataSource.setExceptionSorter(NullExceptionSorter.class.getName()); } - + public void test_setProxyFilters() throws Exception { dataSource.setProxyFilters(null); dataSource.setFilters(null); dataSource.setFilters(""); } - + public void test_error_validateConnection() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); @@ -343,7 +343,7 @@ public class DataSourceTest3 extends TestCase { Assert.assertNotNull(error); } } - + public void test_error_validateConnection_2() throws Exception { PoolableConnection conn = dataSource.getConnection().unwrap(PoolableConnection.class); @@ -359,7 +359,7 @@ public class DataSourceTest3 extends TestCase { Assert.assertNotNull(error); } } - + public void test_error_validateConnection_3() throws Exception { dataSource.setValidationQuery(null); dataSource.setValidConnectionChecker(new MySqlValidConnectionChecker()); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java index 5c43f4ff0f..95b0f4e668 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DruidDataSourceFactoryTest.java @@ -12,34 +12,36 @@ import org.junit.Assert; import com.alibaba.druid.pool.DruidDataSourceFactory; - public class DruidDataSourceFactoryTest extends TestCase { + @SuppressWarnings("serial") public void test_factory() throws Exception { DruidDataSourceFactory factory = new DruidDataSourceFactory(); - + Assert.assertNull(factory.getObjectInstance(null, null, null, null)); Assert.assertNull(factory.getObjectInstance(new Reference("javax.sql.Date"), null, null, null)); - + Reference ref = new Reference("javax.sql.DataSource"); ref.add(new RefAddr("user") { + @Override public Object getContent() { return null; } - + }); ref.add(new RefAddr("defaultReadOnly") { + @Override public Object getContent() { return Boolean.TRUE; } - + }); - + factory.getObjectInstance(ref, null, null, new Hashtable()); } - + public void test_createDataSource() throws Exception { Properties properties = new Properties(); properties.setProperty("defaultAutoCommit", "true"); @@ -74,7 +76,7 @@ public class DruidDataSourceFactoryTest extends TestCase { properties.setProperty("filters", "stat;trace"); properties.setProperty("exceptionSorter", "com.alibaba.druid.pool.vendor.NullExceptionSorter"); properties.setProperty("exception-sorter-class-name", "com.alibaba.druid.pool.vendor.NullExceptionSorter"); - + DruidDataSourceFactory.createDataSource(properties); } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java index a48d321bba..9a07f32f54 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableCallableStatementTest.java @@ -28,7 +28,8 @@ public class PoolableCallableStatementTest extends TestCase { protected void setUp() throws Exception { raw = new MockCallableStatement(null, null); - stmt = new PoolableCallableStatement(null, new PreparedStatementHolder(new PreparedStatementKey("", null, null), raw)) { + stmt = new PoolableCallableStatement(null, + new PreparedStatementHolder(new PreparedStatementKey("", null, null), raw)) { protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { @@ -2067,12 +2068,12 @@ public class PoolableCallableStatementTest extends TestCase { Assert.assertNotNull(error); } } - + public void test_registerOutParameter_2() throws Exception { - + stmt.registerOutParameter(1, Types.INTEGER); stmt.registerOutParameter("1", Types.INTEGER); - + { SQLException error = null; try { @@ -2082,7 +2083,7 @@ public class PoolableCallableStatementTest extends TestCase { } Assert.assertNotNull(error); } - + { SQLException error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java index 5183885fc0..492a36051a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolablePreparedStatementTest.java @@ -24,7 +24,8 @@ public class PoolablePreparedStatementTest extends TestCase { protected void setUp() throws Exception { raw = new MockPreparedStatement(null, null); - stmt = new PoolablePreparedStatement(null, new PreparedStatementHolder(new PreparedStatementKey("", null, null), raw)) { + stmt = new PoolablePreparedStatement(null, + new PreparedStatementHolder(new PreparedStatementKey("", null, null), raw)) { protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { @@ -309,7 +310,6 @@ public class PoolablePreparedStatementTest extends TestCase { } } - public void test_updateCharacterStream_2() throws Exception { stmt.setCharacterStream(1, (Reader) null, 1L); @@ -324,7 +324,7 @@ public class PoolablePreparedStatementTest extends TestCase { Assert.assertNotNull(error); } } - + public void test_setRef() throws Exception { stmt.setRef(1, null); @@ -339,11 +339,11 @@ public class PoolablePreparedStatementTest extends TestCase { Assert.assertNotNull(error); } } - + public void test_setArray() throws Exception { - + stmt.setArray(1, null); - + { SQLException error = null; try { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java index 9f6105c861..4e5657bb2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest.java @@ -11,14 +11,15 @@ import org.junit.Assert; import com.alibaba.druid.mock.MockStatement; import com.alibaba.druid.pool.PoolableStatement; - public class PoolableStatementTest extends TestCase { - protected Statement raw; + + protected Statement raw; protected PoolableStatement stmt; protected void setUp() throws Exception { raw = new MockStatement(null); stmt = new PoolableStatement(null, raw) { + protected SQLException checkException(Throwable error) throws SQLException { if (error instanceof SQLException) { return (SQLException) error; @@ -28,11 +29,11 @@ public class PoolableStatementTest extends TestCase { } }; } - + protected void tearDown() throws Exception { - + } - + public void test_basic() throws Exception { Assert.assertEquals(raw, stmt.getStatement()); Assert.assertEquals(null, stmt.getPoolableConnection()); @@ -40,6 +41,5 @@ public class PoolableStatementTest extends TestCase { Assert.assertEquals(false, stmt.isPoolable()); stmt.toString(); } - - + } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 7e57e0c9a7..ec2c366ace 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -47,7 +47,7 @@ public class PoolableStatementTest2 extends TestCase { Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter); dataSource.setExceptionSorterClassName(""); Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter); - + JdbcStatContext context = new JdbcStatContext(); context.setTraceEnable(true); JdbcStatManager.getInstance().setStatContext(context); @@ -552,14 +552,14 @@ public class PoolableStatementTest2 extends TestCase { stmt.close(); conn.close(); } - + public void test_executeBatch() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeBatch(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -569,18 +569,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_getMoreResults_1() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.getMoreResults(1); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -590,18 +590,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_getGeneratedKeys() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.getGeneratedKeys(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -611,7 +611,7 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } @@ -619,10 +619,10 @@ public class PoolableStatementTest2 extends TestCase { public void test_getResultSetHoldability() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.getResultSetHoldability(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -632,18 +632,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_execute() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.execute("SELECT 1", new String[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -653,18 +653,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_execute_1() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.execute("SELECT 1", new int[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -674,18 +674,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_execute_2() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.execute("SELECT 1", Statement.NO_GENERATED_KEYS); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -695,18 +695,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_1() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SELECT 1", new String[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -716,18 +716,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_2() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SELECT 1", new int[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -737,18 +737,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_3() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SELECT 1", Statement.NO_GENERATED_KEYS); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -758,18 +758,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_getMeta() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.getMetaData(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -779,18 +779,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_getParameterMetaData() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.getParameterMetaData(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -800,18 +800,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_wasNull() throws Exception { Connection conn = dataSource.getConnection(); CallableStatement stmt = conn.prepareCall("SELELCT 1"); - + stmt.wasNull(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -821,18 +821,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeQuery() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.executeQuery(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -842,18 +842,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_4() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.executeQuery(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -863,18 +863,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_execute_3() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.execute(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -884,19 +884,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - - + public void test_clearParameters() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.clearParameters(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -906,18 +905,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_addBatch_1() throws Exception { Connection conn = dataSource.getConnection(); PreparedStatement stmt = conn.prepareStatement("SELELCT 1"); - + stmt.addBatch(); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -927,18 +926,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_5() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SET 1", Statement.RETURN_GENERATED_KEYS); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -948,18 +947,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_6() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SET 1", new String[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -969,18 +968,18 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - + public void test_executeUpdate_7() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.executeUpdate("SET 1", new int[0]); ((PoolableStatement) stmt).getStatement().close(); - + { SQLException error = null; try { @@ -990,18 +989,17 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } - - + public void test_setPoolable() throws Exception { Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement(); - + stmt.setPoolable(true); - + { SQLException error = null; try { @@ -1011,7 +1009,7 @@ public class PoolableStatementTest2 extends TestCase { } Assert.assertNotNull(error); } - + stmt.close(); conn.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java index ed28754dff..7e803ad8b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest3.java @@ -11,18 +11,20 @@ public class PoolableStatementTest3 extends TestCase { public void test_clearResultSetError() throws Exception { final MockResultSet rs = new MockResultSet(null) { + public void close() throws SQLException { throw new SQLException(); } }; - + PoolableStatement stmt = new PoolableStatement(null, null) { + public void close() throws SQLException { resultSetTrace.add(rs); clearResultSet(); } }; stmt.close(); - + } } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java index ea0d3c5f8c..2144c7f2c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableWrapperTest.java @@ -6,19 +6,19 @@ import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; import com.alibaba.druid.pool.PoolableWrapper; - public class PoolableWrapperTest extends TestCase { + public void test_isWrapper() throws Exception { PoolableWrapper wrapper = new PoolableWrapper(new MockConnection()); - + Assert.assertEquals(false, wrapper.isWrapperFor(null)); Assert.assertEquals(true, wrapper.isWrapperFor(PoolableWrapper.class)); Assert.assertEquals(true, wrapper.isWrapperFor(MockConnection.class)); } - + public void test_unwrap() throws Exception { PoolableWrapper wrapper = new PoolableWrapper(new MockConnection()); - + Assert.assertEquals(null, wrapper.unwrap(null)); Assert.assertEquals(true, wrapper.unwrap(PoolableWrapper.class) != null); Assert.assertEquals(true, wrapper.unwrap(MockConnection.class) != null); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java index 8a253d6250..3ae7e6c583 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PreparedStatementKeyTest.java @@ -13,13 +13,13 @@ import com.alibaba.druid.pool.PreparedStatementHolder; import com.alibaba.druid.pool.PreparedStatementPool; import com.alibaba.druid.pool.PreparedStatementPool.MethodType; - public class PreparedStatementKeyTest extends TestCase { + public void test_equals_0() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x1", "c2", MethodType.M1); PreparedStatementKey k3 = new PreparedStatementKey("x1", "c3", MethodType.M1); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -27,12 +27,12 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_2() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x2", "c1", MethodType.M1); PreparedStatementKey k3 = new PreparedStatementKey("x3", "c1", MethodType.M1); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -40,12 +40,12 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_3() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x1", "c1", MethodType.M2); PreparedStatementKey k3 = new PreparedStatementKey("x1", "c1", MethodType.M3); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -53,12 +53,12 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_4() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x1", "c2", MethodType.M1); PreparedStatementKey k3 = new PreparedStatementKey("x1", null, MethodType.M1); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -66,14 +66,14 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_5() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", null, MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x1", null, MethodType.M2); PreparedStatementKey k3 = new PreparedStatementKey("x1", null, MethodType.M3); - + k1.hashCode(); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -81,14 +81,14 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_equals_6() throws Exception { PreparedStatementKey k1 = new PreparedStatementKey("x1", null, MethodType.M1); PreparedStatementKey k2 = new PreparedStatementKey("x2", null, MethodType.M1); PreparedStatementKey k3 = new PreparedStatementKey("x3", null, MethodType.M1); - + k1.hashCode(); - + Assert.assertFalse(k1.equals(k2)); Assert.assertFalse(k1.equals(k3)); Assert.assertFalse(k2.equals(k1)); @@ -96,16 +96,16 @@ public class PreparedStatementKeyTest extends TestCase { Assert.assertFalse(k3.equals(k2)); Assert.assertFalse(k3.equals(k1)); } - + public void test_contains() throws Exception { DruidDataSource dataSource = new DruidDataSource(); MockConnection conn = new MockConnection(); PreparedStatementKey k1 = new PreparedStatementKey("x1", "c1", MethodType.M1); - + PreparedStatementPool pool = new PreparedStatementPool(new ConnectionHolder(dataSource, conn)); MockPreparedStatement raw = new MockPreparedStatement(null, null); pool.put(new PreparedStatementHolder(k1, raw)); - + Assert.assertTrue(pool.get(k1) != null); Assert.assertTrue(pool.get(k1) != null); } diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java index 9fa22f8039..45f4a87acc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java @@ -52,7 +52,7 @@ public class TestCommit extends TestCase { Assert.assertTrue(conn.isWrapperFor(PoolableConnection.class)); Assert.assertNotNull(wrap); } - + { Statement wrap = conn.unwrap(Statement.class); Assert.assertTrue(!conn.isWrapperFor(Statement.class)); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index df7a61ae4f..be44058997 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -40,7 +40,7 @@ public class TestDataSourceBasic extends TestCase { dataSource.setFilters("stat,trace"); dataSource.setRemoveAbandoned(true); dataSource.setExceptionSorterClassName(null); - + Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter); dataSource.setExceptionSorterClassName(""); Assert.assertTrue(dataSource.getExceptionSorter() instanceof NullExceptionSorter); @@ -53,7 +53,7 @@ public class TestDataSourceBasic extends TestCase { dataSource.close(); Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_toCompositeData() throws Exception { Connection conn = dataSource.getConnection(); conn.close(); @@ -68,7 +68,7 @@ public class TestDataSourceBasic extends TestCase { Assert.assertTrue(conn.isWrapperFor(PoolableConnection.class)); Assert.assertNotNull(wrap); } - + { Statement wrap = conn.unwrap(Statement.class); Assert.assertTrue(!conn.isWrapperFor(Statement.class)); @@ -80,7 +80,7 @@ public class TestDataSourceBasic extends TestCase { Statement stmt = conn.createStatement(); stmt.execute("SELECT 1"); stmt.close(); - + Assert.assertEquals(1, dataSource.getActiveConnectionStackTrace().size()); Assert.assertEquals(1, dataSource.getActiveConnections().size()); conn.commit(); @@ -93,12 +93,12 @@ public class TestDataSourceBasic extends TestCase { Assert.assertEquals(0, dataSource.getActiveConnectionStackTrace().size()); Assert.assertEquals(0, dataSource.getActiveConnections().size()); } - + public void test_wrap() throws Exception { Assert.assertTrue(!dataSource.isWrapperFor(Date.class)); Assert.assertTrue(!dataSource.isWrapperFor(null)); Assert.assertTrue(dataSource.isWrapperFor(DataSource.class)); - + Assert.assertTrue(dataSource.unwrap(Date.class) == null); Assert.assertTrue(dataSource.unwrap(null) == null); Assert.assertTrue(dataSource.unwrap(DataSource.class) != null); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index 73e19a7c26..8e9d3c2a81 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -18,30 +18,29 @@ public class TestDataSourceBasic2 extends TestCase { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); - dataSource.setBreakAfterAcquireFailure(true); Assert.assertEquals(true, dataSource.isBreakAfterAcquireFailure()); - + dataSource.setConnectionErrorRetryAttempts(234); Assert.assertEquals(234, dataSource.getConnectionErrorRetryAttempts()); - + dataSource.setMaxPoolPreparedStatementPerConnectionSize(234); Assert.assertEquals(234, dataSource.getMaxPoolPreparedStatementPerConnectionSize()); - + dataSource.incrementDupCloseCount(); Assert.assertEquals(1, dataSource.getDupCloseCount()); - + dataSource.setValidConnectionChecker(null); dataSource.setValidConnectionCheckerClassName(null); Assert.assertEquals(null, dataSource.getValidConnectionChecker()); - + dataSource.addConnectionProperty("user", "ljw"); Assert.assertEquals(1, dataSource.getConnectProperties().size()); - + Assert.assertEquals(0, dataSource.getConnectionInitSqls().size()); - dataSource.setConnectionInitSqls(Arrays.asList("SELECT 1", null, "")); + dataSource.setConnectionInitSqls(Arrays. asList("SELECT 1", null, "")); Assert.assertEquals(1, dataSource.getConnectionInitSqls().size()); - + Assert.assertEquals(30 * 1000, dataSource.getTimeBetweenConnectErrorMillis()); Assert.assertEquals(-1, dataSource.getMaxOpenPreparedStatements()); Assert.assertEquals(300, dataSource.getRemoveAbandonedTimeout()); @@ -51,62 +50,59 @@ public class TestDataSourceBasic2 extends TestCase { Assert.assertEquals(3, dataSource.getNumTestsPerEvictionRun()); dataSource.setNumTestsPerEvictionRun(4); Assert.assertEquals(4, dataSource.getNumTestsPerEvictionRun()); - + dataSource.setMaxWaitThreadCount(4); Assert.assertEquals(4, dataSource.getMaxWaitThreadCount()); - + dataSource.setValidationQueryTimeout(4); Assert.assertEquals(4, dataSource.getValidationQueryTimeout()); - + dataSource.setAccessToUnderlyingConnectionAllowed(true); Assert.assertEquals(true, dataSource.isAccessToUnderlyingConnectionAllowed()); - + dataSource.setDefaultReadOnly(true); Assert.assertEquals(Boolean.TRUE, dataSource.getDefaultReadOnly()); - + dataSource.setDefaultTransactionIsolation(10); Assert.assertEquals(Integer.valueOf(10), dataSource.getDefaultTransactionIsolation()); - - + dataSource.setDefaultCatalog("xxx"); Assert.assertEquals("xxx", dataSource.getDefaultCatalog()); - + dataSource.setPasswordCallbackClassName(null); dataSource.setUserCallback(null); - + Assert.assertEquals(0, dataSource.getQueryTimeout()); dataSource.setQueryTimeout(10001); Assert.assertEquals(10001, dataSource.getQueryTimeout()); - + Assert.assertEquals(-1, dataSource.getMaxWait()); dataSource.setMaxWait(10001); Assert.assertEquals(10001, dataSource.getMaxWait()); - + Assert.assertEquals(8, dataSource.getMaxIdle()); dataSource.setMaxIdle(3); Assert.assertEquals(3, dataSource.getMaxIdle()); - + Assert.assertEquals(0, dataSource.getLoginTimeout()); dataSource.setLoginTimeout(30); Assert.assertEquals(30, dataSource.getLoginTimeout()); - - + Assert.assertEquals(null, dataSource.getUsername()); dataSource.setUsername("ljw"); Assert.assertEquals("ljw", dataSource.getUsername()); - - + Assert.assertEquals(null, dataSource.getPassword()); dataSource.setPassword("xxx"); Assert.assertEquals("xxx", dataSource.getPassword()); - + dataSource.setConnectProperties(new Properties()); Assert.assertEquals(0, dataSource.getConnectProperties().size()); dataSource.setConnectionProperties("a=1;b=2;c"); Assert.assertEquals(3, dataSource.getConnectProperties().size()); - + dataSource.setExceptionSorter((ExceptionSorter) null); - + dataSource.close(); } diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java index 7641b500eb..a0391f21f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/LogFilterTest.java @@ -277,7 +277,6 @@ public class LogFilterTest extends TestCase { stmt.executeQuery(sql); stmt.executeUpdate(sql); stmt.cancel(); - PreparedStatement pstmt = conn.prepareStatement(sql); pstmt.setArray(1, null); @@ -313,7 +312,6 @@ public class LogFilterTest extends TestCase { pstmt.executeBatch(); pstmt.executeQuery(); pstmt.executeUpdate(); - conn.prepareCall(sql); diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java index 5ea9ed15e5..fc722f1e2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/ClobTest.java @@ -16,13 +16,15 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.stat.DruidDataSourceStatManager; public class ClobTest extends TestCase { + protected void setUp() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } + protected void tearDown() throws Exception { Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size()); } - + public void test_clob() throws Exception { DruidDataSource dataSource = new DruidDataSource(); dataSource.setFilters("stat"); @@ -66,7 +68,7 @@ public class ClobTest extends TestCase { rs.close(); stmt.close(); conn.close(); - + dataSource.close(); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest2.java index 6454590ce9..e2a2723922 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest2.java @@ -14,11 +14,11 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVis public class MySqlParameterizedOutputVisitorTest2 extends TestCase { public void test_0() throws Exception { - String sql = "SELECT * FROM T WHERE ID = ?"; - for (int i = 0; i < 10000; ++i) { - sql += " OR ID = ?"; - } - + String sql = "SELECT * FROM T WHERE ID = ?"; + for (int i = 0; i < 10000; ++i) { + sql += " OR ID = ?"; + } + validate(sql, "SELECT * FROM T WHERE ID = ?"); validateOracle(sql, "SELECT * FROM T WHERE ID = ?; "); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java index f08e27b70a..8ab732f51c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/CursorTest.java @@ -18,9 +18,8 @@ public class CursorTest extends TestCase { String text = TestUtils.outputOracle(stmt); - Assert.assertEquals("SELECT department_name, CURSOR(SELECT salary, commission_pct\n" - + "\tFROM employees e\n" + "\tWHERE e.department_id = d.department_id)\n" - + "FROM departments d;\n", text); + Assert.assertEquals("SELECT department_name, CURSOR(SELECT salary, commission_pct\n" + "\tFROM employees e\n" + + "\tWHERE e.department_id = d.department_id)\n" + "FROM departments d;\n", text); System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java index 16564f55ac..f9ed9ca7a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/LargeOrTest.java @@ -25,7 +25,7 @@ public class LargeOrTest extends TestCase { SQLBinaryOpExpr last = (SQLBinaryOpExpr) where.getRight(); Assert.assertEquals(SQLBinaryOperator.Equality, last.getOperator()); } - + public void test_largeAnd() throws Exception { StringBuffer buf = new StringBuffer(); buf.append("SELECT 1 FROM T WHERE ID = ?"); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java index 31f5b5d0d7..74a1d9ddeb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnalyticTest.java @@ -9,41 +9,35 @@ import junit.framework.TestCase; public class OracleAnalyticTest extends TestCase { - public void test_0() throws Exception { - String sql = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) \"StdDev\" " + - "FROM employees " + - "WHERE department_id = 30;"; + public void test_0() throws Exception { + String sql = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) \"StdDev\" " + + "FROM employees " + "WHERE department_id = 30;"; - String expect = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) AS \"StdDev\"\n" + - "FROM employees\n" + - "WHERE department_id = 30;\n"; - OracleStatementParser parser = new OracleStatementParser(sql); - SQLSelectStatement stmt = (SQLSelectStatement) parser - .parseStatementList().get(0); + String expect = "SELECT last_name, salary, STDDEV(salary) OVER (ORDER BY hire_date) AS \"StdDev\"\n" + + "FROM employees\n" + "WHERE department_id = 30;\n"; + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - String text = TestUtils.outputOracle(stmt); + String text = TestUtils.outputOracle(stmt); - Assert.assertEquals(expect, text); + Assert.assertEquals(expect, text); - System.out.println(text); - } - - public void test_1() throws Exception { - String sql = "SELECT submit_date, num_votes, TRUNC(AVG(num_votes) OVER(PARTITION BY submit_date ORDER BY submit_date ROWS UNBOUNDED PRECEDING)) AVG_VOTE_PER_DAY\n" + - "FROM vote_count\n" + - "ORDER BY submit_date;\n"; - - String expect = "SELECT submit_date, num_votes, TRUNC(AVG(num_votes) OVER (PARTITION BY submit_date ORDER BY submit_date ROWS UNBOUNDED PRECEDING)) AS AVG_VOTE_PER_DAY\n" + - "FROM vote_count\n" + - "ORDER BY submit_date;\n"; - OracleStatementParser parser = new OracleStatementParser(sql); - SQLSelectStatement stmt = (SQLSelectStatement) parser - .parseStatementList().get(0); - - String text = TestUtils.outputOracle(stmt); - - Assert.assertEquals(expect, text); - - System.out.println(text); - } + System.out.println(text); + } + + public void test_1() throws Exception { + String sql = "SELECT submit_date, num_votes, TRUNC(AVG(num_votes) OVER(PARTITION BY submit_date ORDER BY submit_date ROWS UNBOUNDED PRECEDING)) AVG_VOTE_PER_DAY\n" + + "FROM vote_count\n" + "ORDER BY submit_date;\n"; + + String expect = "SELECT submit_date, num_votes, TRUNC(AVG(num_votes) OVER (PARTITION BY submit_date ORDER BY submit_date ROWS UNBOUNDED PRECEDING)) AS AVG_VOTE_PER_DAY\n" + + "FROM vote_count\n" + "ORDER BY submit_date;\n"; + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); + + String text = TestUtils.outputOracle(stmt); + + Assert.assertEquals(expect, text); + + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java index b03653a23b..62781831f3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAnyTest.java @@ -17,8 +17,8 @@ public class OracleAnyTest extends TestCase { String expect = "SELECT country, prod, YEAR, s\n" + "FROM sales_view\n" + "MODEL\n" + "\tPARTITION BY (country)\n" + "\tDIMENSION BY (prod, YEAR)\n" + "\tMEASURES (sale s)\n" - + "\tIGNORE NAV\n" + "\tUNIQUE DIMENSION\n" + "\tRULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0)\n" - + "ORDER BY country, prod, YEAR;\n"; + + "\tIGNORE NAV\n" + "\tUNIQUE DIMENSION\n" + + "\tRULES UPSERT SEQUENTIAL ORDER (s[ANY, 2000] = 0)\n" + "ORDER BY country, prod, YEAR;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java index d13d5f2efc..9521c5e887 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleEXTRACTTest.java @@ -9,20 +9,18 @@ import junit.framework.TestCase; public class OracleEXTRACTTest extends TestCase { - public void test_Extract() throws Exception { - String sql = "SELECT EXTRACT(YEAR FROM DATE '1998-03-07') FROM DUAL;"; + public void test_Extract() throws Exception { + String sql = "SELECT EXTRACT(YEAR FROM DATE '1998-03-07') FROM DUAL;"; - String expect = "SELECT EXTRACT(YEAR FROM DATE '1998-03-07')\n" - + "FROM DUAL;\n"; + String expect = "SELECT EXTRACT(YEAR FROM DATE '1998-03-07')\n" + "FROM DUAL;\n"; - OracleStatementParser parser = new OracleStatementParser(sql); - SQLSelectStatement stmt = (SQLSelectStatement) parser - .parseStatementList().get(0); + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - String text = TestUtils.outputOracle(stmt); + String text = TestUtils.outputOracle(stmt); - Assert.assertEquals(expect, text); + Assert.assertEquals(expect, text); - System.out.println(text); - } + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java index 541626f615..d7f673787b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest.java @@ -9,21 +9,19 @@ import junit.framework.TestCase; public class OracleFlashbackQueryTest extends TestCase { - public void test_isEmpty() throws Exception { - String sql = "SELECT salary FROM employees AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY) WHERE last_name = 'Chung';"; + public void test_isEmpty() throws Exception { + String sql = "SELECT salary FROM employees AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY) WHERE last_name = 'Chung';"; - String expect = "SELECT salary\n" + "FROM employees\n" - + "AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY)\n" - + "WHERE last_name = 'Chung';\n"; + String expect = "SELECT salary\n" + "FROM employees\n" + "AS OF TIMESTAMP (SYSTIMESTAMP - INTERVAL '1' DAY)\n" + + "WHERE last_name = 'Chung';\n"; - OracleStatementParser parser = new OracleStatementParser(sql); - SQLSelectStatement stmt = (SQLSelectStatement) parser - .parseStatementList().get(0); + OracleStatementParser parser = new OracleStatementParser(sql); + SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - String text = TestUtils.outputOracle(stmt); + String text = TestUtils.outputOracle(stmt); - Assert.assertEquals(expect, text); + Assert.assertEquals(expect, text); - System.out.println(text); - } + System.out.println(text); + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java index d2d6413a39..8cfbbbba08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest2.java @@ -18,7 +18,7 @@ public class OracleFlashbackQueryTest2 extends TestCase { + "FROM employees\n" + "VERSIONS BETWEEN TIMESTAMP SYSTIMESTAMP - INTERVAL '10' MINUTE AND SYSTIMESTAMP - INTERVAL '1' MINUTE\n" + "WHERE last_name = 'Chung';\n"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java index 5c8c8d2b56..9c6c0f9180 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFlashbackQueryTest3.java @@ -16,9 +16,10 @@ public class OracleFlashbackQueryTest3 extends TestCase { + "GROUP BY ROLLUP (department_name, job_id);\n"; String expect = "SELECT DECODE(GROUPING(department_name), 1, 'All Departments', department_name) AS department, " - + "DECODE(GROUPING(job_id), 1, 'All Jobs', job_id) AS job, COUNT(*) AS \"Total Empl\", AVG(salary) * 12 AS \"Average Sal\"\n" - + "FROM employees e, departments d\n" + "WHERE d.department_id = e.department_id\n" - + "GROUP BY ROLLUP(department_name, job_id);\n"; + + "DECODE(GROUPING(job_id), 1, 'All Jobs', job_id) AS job, COUNT(*) AS \"Total Empl\", AVG(salary) * 12 AS \"Average Sal\"\n" + + "FROM employees e, departments d\n" + + "WHERE d.department_id = e.department_id\n" + + "GROUP BY ROLLUP(department_name, job_id);\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java index 172e5a55d7..adf79b47f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIntervalTest.java @@ -21,72 +21,72 @@ public class OracleIntervalTest extends TestCase { System.out.println(text); } - + public void test_interval_literal_1() throws Exception { String sql = "SELECT INTERVAL '123' YEAR(3) FROM DUAL"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals("SELECT INTERVAL '123' YEAR(3)\nFROM DUAL;\n", text); - + System.out.println(text); } - + public void test_interval_literal_2() throws Exception { String sql = "SELECT INTERVAL '5-3' YEAR TO MONTH + INTERVAL'20' MONTH FROM DUAL"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals("SELECT INTERVAL '5-3' YEAR TO MONTH + INTERVAL '20' MONTH\nFROM DUAL;\n", text); - + System.out.println(text); } - + public void test_interval_literal_3() throws Exception { String sql = "SELECT INTERVAL '6-11' YEAR TO MONTH FROM DUAL"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals("SELECT INTERVAL '6-11' YEAR TO MONTH\nFROM DUAL;\n", text); - + System.out.println(text); } - + public void test_interval_literal_4() throws Exception { String sql = "SELECT INTERVAL '4 5:12:10.222' DAY TO SECOND(3) FROM DUAL"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals("SELECT INTERVAL '4 5:12:10.222' DAY TO SECOND(3)\nFROM DUAL;\n", text); - + System.out.println(text); } - + public void test_interval_literal_5() throws Exception { String sql = "SELECT INTERVAL '30.12345' SECOND(2,4) FROM DUAL"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals("SELECT INTERVAL '30.12345' SECOND(2, 4)\nFROM DUAL;\n", text); - + System.out.println(text); } - + public void test_interval() throws Exception { String sql = "SELECT (SYSTIMESTAMP - order_date) DAY(9) TO SECOND from orders WHERE order_id = 2458;"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java index 3bd16fbffb..8183b547c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLiteralTest.java @@ -23,19 +23,19 @@ public class OracleLiteralTest extends TestCase { System.out.println(text); } - + public void test_date() throws Exception { String sql = "SELECT DATE '1998-12-25' FROM DUAL;"; - + String expect = "SELECT DATE '1998-12-25'\n" + "FROM DUAL;\n"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals(expect, text); - + System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java index 399336a973..1e97870695 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleNumberLiteralTest.java @@ -21,7 +21,7 @@ public class OracleNumberLiteralTest extends TestCase { System.out.println(text); } - + public void test_number_literal_2() throws Exception { String sql = "SELECT BINARY_FLOAT_INFINITY FROM DUAL"; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java index 7805dc2b14..b0bda21aec 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleOuterTest.java @@ -14,7 +14,7 @@ public class OracleOuterTest extends TestCase { + "WHERE employees.manager_id(+) = employees.employee_id;"; String expect = "SELECT employee_id, manager_id\n" + "FROM employees\n" - + "WHERE employees.manager_id(+) = employees.employee_id;\n"; + + "WHERE employees.manager_id(+) = employees.employee_id;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java index 50d783bee7..100b22dc09 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePivotClauseTest.java @@ -15,8 +15,8 @@ public class OraclePivotClauseTest extends TestCase { + "ORDER BY year, order_mode;"; String expected = "SELECT *\n" + "FROM pivot_table\n" - + "\tUNPIVOT (yearly_total FOR order_mode IN (store AS 'direct', internet AS 'online'))\n" - + "ORDER BY YEAR, order_mode;\n"; + + "\tUNPIVOT (yearly_total FOR order_mode IN (store AS 'direct', internet AS 'online'))\n" + + "ORDER BY YEAR, order_mode;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -29,13 +29,14 @@ public class OraclePivotClauseTest extends TestCase { } public void test_pivot() throws Exception { - String sql = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) year, order_mode, order_total FROM orders)\n" + - "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String sql = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) year, order_mode, order_total FROM orders)\n" + + "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; - String expected = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS YEAR, order_mode, order_total\n" + - "\tFROM orders\n" + - "\t)\n" + - "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String expected = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS YEAR, order_mode, order_total\n" + + "\tFROM orders\n" + "\t)\n" + + "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -46,15 +47,16 @@ public class OraclePivotClauseTest extends TestCase { System.out.println(text); } - + public void test_pivot_1() throws Exception { - String sql = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) as year, order_mode, order_total FROM orders)\n" + - "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String sql = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) as year, order_mode, order_total FROM orders)\n" + + "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; - String expected = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS YEAR, order_mode, order_total\n" + - "\tFROM orders\n" + - "\t)\n" + - "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String expected = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS YEAR, order_mode, order_total\n" + + "\tFROM orders\n" + "\t)\n" + + "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -65,15 +67,15 @@ public class OraclePivotClauseTest extends TestCase { System.out.println(text); } - + public void test_pivot_2() throws Exception { - String sql = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) as day, order_mode, order_total FROM orders)\n" + - "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String sql = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) as day, order_mode, order_total FROM orders)\n" + + "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; - String expected = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS DAY, order_mode, order_total\n" + - "\tFROM orders\n" + - "\t)\n" + - "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + String expected = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS DAY, order_mode, order_total\n" + + "\tFROM orders\n" + "\t)\n" + + "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); @@ -84,15 +86,16 @@ public class OraclePivotClauseTest extends TestCase { System.out.println(text); } - - public void test_pivot_3() throws Exception { - String sql = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) day, order_mode YEAR, order_total FROM orders)\n" + - "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; - String expected = "SELECT *\n" + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS DAY, order_mode AS YEAR, order_total\n" + - "\tFROM orders\n" + - "\t)\n" + - "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + public void test_pivot_3() throws Exception { + String sql = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) day, order_mode YEAR, order_total FROM orders)\n" + + "PIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; + + String expected = "SELECT *\n" + + "FROM (SELECT EXTRACT(YEAR FROM order_date) AS DAY, order_mode AS YEAR, order_total\n" + + "\tFROM orders\n" + "\t)\n" + + "\tPIVOT (SUM(order_total) FOR order_mode IN ('direct' AS Store, 'online' AS Internet));\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java index e7121832a8..f626919ab1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OraclePriorTest.java @@ -31,8 +31,8 @@ public class OraclePriorTest extends TestCase { + "ORDER SIBLINGS BY last_name;"; String expect = "SELECT last_name, employee_id, manager_id, LEVEL\n" + "FROM employees\n" - + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" - + "ORDER SIBLINGS BY last_name;\n"; + + "START WITH employee_id = 100\n" + "CONNECT BY PRIOR employee_id = manager_id\n" + + "ORDER SIBLINGS BY last_name;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java index 534a829dac..a0452132fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSampleClauseTest.java @@ -23,19 +23,19 @@ public class OracleSampleClauseTest extends TestCase { System.out.println(text); } - + public void test_1() throws Exception { String sql = "SELECT COUNT(*) * 10 FROM orders SAMPLE (10) SEED (1);"; - + String expected = "SELECT COUNT(*) * 10\n" + "FROM orders\n" + "SAMPLE (10) SEED (1);\n"; - + OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); - + String text = TestUtils.outputOracle(stmt); - + Assert.assertEquals(expected, text); - + System.out.println(text); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java index 2e33e23151..b9a569c398 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest.java @@ -10,36 +10,21 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleSubqueryFactoringTest extends TestCase { public void test_interval() throws Exception { - String sql = "WITH dept_costs AS (\n" + - "SELECT department_name, SUM(salary) dept_total\n" + - "FROM employees e, departments d\n" + - "WHERE e.department_id = d.department_id\n" + - "GROUP BY department_name), " + - "avg_cost AS (SELECT SUM(dept_total)/COUNT(*) avg FROM dept_costs)\n" + - "SELECT * FROM dept_costs WHERE dept_total > (SELECT avg FROM avg_cost) ORDER BY department_name;"; + String sql = "WITH dept_costs AS (\n" + + "SELECT department_name, SUM(salary) dept_total\n" + + "FROM employees e, departments d\n" + + "WHERE e.department_id = d.department_id\n" + + "GROUP BY department_name), " + + "avg_cost AS (SELECT SUM(dept_total)/COUNT(*) avg FROM dept_costs)\n" + + "SELECT * FROM dept_costs WHERE dept_total > (SELECT avg FROM avg_cost) ORDER BY department_name;"; - String expected = "WITH\n" + - "\tdept_costs\n" + - "\tAS\n" + - "\t(\n" + - "\t\tSELECT department_name, SUM(salary) AS dept_total\n" + - "\t\tFROM employees e, departments d\n" + - "\t\tWHERE e.department_id = d.department_id\n" + - "\t\tGROUP BY department_name\n" + - "\t), \n" + - "\tavg_cost\n" + - "\tAS\n" + - "\t(\n" + - "\t\tSELECT SUM(dept_total) / COUNT(*) AS avg\n" + - "\t\tFROM dept_costs\n" + - "\t)\n" + - "SELECT *\n" + - "FROM dept_costs\n" + - "WHERE dept_total > (\n" + - "\tSELECT avg\n" + - "\tFROM avg_cost\n" + - "\t)\n" + - "ORDER BY department_name;\n"; + String expected = "WITH\n" + "\tdept_costs\n" + "\tAS\n" + "\t(\n" + + "\t\tSELECT department_name, SUM(salary) AS dept_total\n" + + "\t\tFROM employees e, departments d\n" + "\t\tWHERE e.department_id = d.department_id\n" + + "\t\tGROUP BY department_name\n" + "\t), \n" + "\tavg_cost\n" + "\tAS\n" + "\t(\n" + + "\t\tSELECT SUM(dept_total) / COUNT(*) AS avg\n" + "\t\tFROM dept_costs\n" + "\t)\n" + + "SELECT *\n" + "FROM dept_costs\n" + "WHERE dept_total > (\n" + "\tSELECT avg\n" + + "\tFROM avg_cost\n" + "\t)\n" + "ORDER BY department_name;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java index 2e4183eee2..aadab6613e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSubqueryFactoringTest2.java @@ -10,41 +10,35 @@ import com.alibaba.druid.sql.test.TestUtils; public class OracleSubqueryFactoringTest2 extends TestCase { public void test_interval() throws Exception { - String sql = "WITH org_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id) AS\n" + - "(\n" + - "SELECT employee_id, last_name, manager_id, 0 reportLevel, salary, job_id\n" + - "FROM employees\n" + - "WHERE manager_id is null\n" + - "UNION ALL\n" + - "SELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel+1 reportLevel, e.salary, e.job_id\n" + - "FROM org_chart r, employees e\n" + - "WHERE r.eid = e.manager_id\n" + - ")\n" + - "SEARCH DEPTH FIRST BY emp_last SET order1\n" + - "CYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'" + - "SELECT lpad(' ',2*reportLevel)||emp_last emp_name, eid, mgr_id, salary, job_id\n" + - "FROM org_chart\n" + - "ORDER BY order1;\n"; + String sql = "WITH org_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id) AS\n" + + "(\n" + + "SELECT employee_id, last_name, manager_id, 0 reportLevel, salary, job_id\n" + + "FROM employees\n" + + "WHERE manager_id is null\n" + + "UNION ALL\n" + + "SELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel+1 reportLevel, e.salary, e.job_id\n" + + "FROM org_chart r, employees e\n" + "WHERE r.eid = e.manager_id\n" + ")\n" + + "SEARCH DEPTH FIRST BY emp_last SET order1\n" + + "CYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'" + + "SELECT lpad(' ',2*reportLevel)||emp_last emp_name, eid, mgr_id, salary, job_id\n" + + "FROM org_chart\n" + "ORDER BY order1;\n"; - String expected = "WITH\n" + - "\torg_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id)\n" + - "\tAS\n" + - "\t(\n" + - "\t\tSELECT employee_id, last_name, manager_id, 0 AS reportLevel, salary\n" + - "\t\t\t, job_id\n" + - "\t\tFROM employees\n" + - "\t\tWHERE manager_id IS NULL\n" + - "\t\tUNION ALL\n" + - "\t\tSELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel + 1 AS reportLevel, e.salary\n" + - "\t\t\t, e.job_id\n" + - "\t\tFROM org_chart r, employees e\n" + - "\t\tWHERE r.eid = e.manager_id\n" + - "\t)\n" + - "\tSEARCH DEPTH FIRST BY emp_last SET order1\n" + - "\tCYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'\n" + - "SELECT lpad(' ', 2 * reportLevel) || emp_last AS emp_name, eid, mgr_id, salary, job_id\n" + - "FROM org_chart\n" + - "ORDER BY order1;\n"; + String expected = "WITH\n" + + "\torg_chart (eid, emp_last, mgr_id, reportLevel, salary, job_id)\n" + + "\tAS\n" + + "\t(\n" + + "\t\tSELECT employee_id, last_name, manager_id, 0 AS reportLevel, salary\n" + + "\t\t\t, job_id\n" + + "\t\tFROM employees\n" + + "\t\tWHERE manager_id IS NULL\n" + + "\t\tUNION ALL\n" + + "\t\tSELECT e.employee_id, e.last_name, e.manager_id, r.reportLevel + 1 AS reportLevel, e.salary\n" + + "\t\t\t, e.job_id\n" + "\t\tFROM org_chart r, employees e\n" + + "\t\tWHERE r.eid = e.manager_id\n" + "\t)\n" + + "\tSEARCH DEPTH FIRST BY emp_last SET order1\n" + + "\tCYCLE hire_date SET is_cycle TO 'Y' DEFAULT 'N'\n" + + "SELECT lpad(' ', 2 * reportLevel) || emp_last AS emp_name, eid, mgr_id, salary, job_id\n" + + "FROM org_chart\n" + "ORDER BY order1;\n"; OracleStatementParser parser = new OracleStatementParser(sql); SQLSelectStatement stmt = (SQLSelectStatement) parser.parseStatementList().get(0); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java index 013bb0a401..2dab6f101d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_Aggregate.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_Aggregate extends TestCase { + public void test_0() throws Exception { String sql = "SELECT MAX(salary) from emp where F1 = Date '2011-10-01'"; @@ -31,7 +31,7 @@ public class OracleOutputVisitorTest_Aggregate extends TestCase { Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("emp", "salary"))); Assert.assertEquals(true, visitor.getFields().contains(new Column("emp", "F1"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java index 9314b4843e..a0f48c7ab0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_dblink.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_dblink extends TestCase { + public void test_0() throws Exception { String sql = "SELECT salary from master@emp"; @@ -30,7 +30,7 @@ public class OracleOutputVisitorTest_dblink extends TestCase { Assert.assertEquals(1, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("master@emp", "salary"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java index bfae321706..47a180dec0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_delete.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_delete extends TestCase { + public void test_0() throws Exception { String sql = "DELETE FROM employee where id = 3"; @@ -30,7 +30,7 @@ public class OracleOutputVisitorTest_delete extends TestCase { Assert.assertEquals(1, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "id"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java index 4a82bb3f52..f1f348bb5c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_forupdate.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_forupdate extends TestCase { + public void test_0() throws Exception { String sql = "SELECT salary from employee for update"; @@ -30,7 +30,7 @@ public class OracleOutputVisitorTest_forupdate extends TestCase { Assert.assertEquals(1, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java index 058e17330d..ffc1ab8e65 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_orderBy.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_orderBy extends TestCase { + public void test_0() throws Exception { String sql = "SELECT salary from employee order by name"; @@ -31,7 +31,7 @@ public class OracleOutputVisitorTest_orderBy extends TestCase { Assert.assertEquals(2, visitor.getFields().size()); Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "name"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java index b4794460f2..45b4014897 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_selectJoin.java @@ -11,8 +11,8 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; import com.alibaba.druid.stat.TableStat.Column; - public class OracleOutputVisitorTest_selectJoin extends TestCase { + public void test_0() throws Exception { String sql = "SELECT e.salary from employee e join department d where e.depId = d.id"; @@ -33,11 +33,12 @@ public class OracleOutputVisitorTest_selectJoin extends TestCase { Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "salary"))); Assert.assertEquals(true, visitor.getFields().contains(new Column("employee", "depId"))); Assert.assertEquals(true, visitor.getFields().contains(new Column("department", "id"))); - + StringBuilder buf = new StringBuilder(); OracleOutputVisitor outputVisitor = new OracleOutputVisitor(buf); stmt.accept(outputVisitor); - Assert.assertEquals("SELECT e.salary\nFROM employee e JOIN department d\nWHERE e.depId = d.id;\n", buf.toString()); + Assert.assertEquals("SELECT e.salary\nFROM employee e JOIN department d\nWHERE e.depId = d.id;\n", + buf.toString()); } } diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java index bad16fb404..3e419ef1e4 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_MaxActive.java @@ -38,8 +38,8 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { public void test_idle2() throws Exception { -// ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, -// new ObjectName("com.alibaba:type=DataSource")); + // ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, + // new ObjectName("com.alibaba:type=DataSource")); // 第一次创建连接 { diff --git a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java index c15373af0a..44affb749b 100644 --- a/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java +++ b/src/test/java/com/alibaba/druid/pool/TestIdle3_Concurrent_Starvation_Longtime.java @@ -35,11 +35,11 @@ public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { dataSource.setTestOnBorrow(false); dataSource.setValidationQuery("SELECT 1"); dataSource.setFilters("stat"); - + ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new ObjectName("com.alibaba:type=DataSource")); } - + protected void tearDown() throws Exception { ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName("com.alibaba:type=DataSource")); } @@ -86,10 +86,11 @@ public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { Thread[] threads = new Thread[threadCount]; final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(threadCount); - + final AtomicInteger pass = new AtomicInteger(); final CyclicBarrier closedBarrier = new CyclicBarrier(threadCount, new Runnable() { + public void run() { Assert.assertEquals(threadCount, dataSource.getPoolingCount()); dataSource.shrink(false); @@ -101,6 +102,7 @@ public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { } }); final CyclicBarrier closeBarrier = new CyclicBarrier(threadCount, new Runnable() { + public void run() { Assert.assertEquals(threadCount, dataSource.getActiveCount()); } @@ -113,10 +115,10 @@ public class TestIdle3_Concurrent_Starvation_Longtime extends TestCase { try { startLatch.await(); for (int i = 0; i < 1000 * 1000 * 10; ++i) { - + Connection conn = dataSource.getConnection(); closeBarrier.await(); - + conn.close(); closedBarrier.await(); } diff --git a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java index 013ab14feb..549aac4582 100644 --- a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java @@ -45,7 +45,7 @@ public class TestPoolStatement extends TestCase { System.out.println(); System.out.println("millis : " + millis); } - + private void stat() throws SQLException { Connection conn = dataSource.getConnection(); @@ -68,7 +68,7 @@ public class TestPoolStatement extends TestCase { stmt.setLong(1, new Random().nextInt(1000 * 100)); ResultSet rs = stmt.executeQuery(); while (rs.next()) { - + } rs.close(); stmt.close(); diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java index ac7d42d982..3ad3dc633d 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java @@ -49,7 +49,8 @@ public class DruidDataSourceUIManager extends JFrame { private JScrollPane scrollPane = new JScrollPane(mainPanel); private JLabel lbUrl = new JLabel("URL : "); - private JTextField txtUrl = new JTextField("jdbc:oracle:thin:@10.20.36.18:1521:ocndb"); + private JTextField txtUrl = new JTextField( + "jdbc:oracle:thin:@10.20.36.18:1521:ocndb"); private JLabel lbDriverClass = new JLabel("DriverClassName : "); private JTextField txtDriverClass = new JTextField(); @@ -448,9 +449,10 @@ public class DruidDataSourceUIManager extends JFrame { public void closeDataSource_actionPerformed(ActionEvent e) { dataSource.close(); - + try { - ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName("com.alibaba.druid:type=DruidDataSource")); + ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName( + "com.alibaba.druid:type=DruidDataSource")); } catch (Exception e1) { e1.printStackTrace(); } @@ -492,11 +494,13 @@ public class DruidDataSourceUIManager extends JFrame { dataSource.setMinEvictableIdleTimeMillis(Integer.parseInt(txtMinEvictableIdleTimeMillis.getText().trim())); dataSource.setTestWhileIdle(Boolean.parseBoolean(txtTestWhileIdle.getText().trim())); dataSource.setTestOnBorrow(Boolean.parseBoolean(txtTestOnBorrow.getText().trim())); - + dataSource.setTimeBetweenEvictionRunsMillis(60000); dataSource.setNumTestsPerEvictionRun(20); - - ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, new ObjectName("com.alibaba.druid:type=DruidDataSource")); + + ManagementFactory.getPlatformMBeanServer().registerMBean(dataSource, + new ObjectName( + "com.alibaba.druid:type=DruidDataSource")); try { Connection conn = dataSource.getConnection(); diff --git a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java index 0a6e6f0d1d..d78c7d8371 100644 --- a/src/test/java/com/alibaba/druid/sql/test/TestUtils.java +++ b/src/test/java/com/alibaba/druid/sql/test/TestUtils.java @@ -8,51 +8,50 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.sql.dialect.sqlserver.visitor.SqlServerOutputVisitor; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; - public class TestUtils { public static String outputOracle(List stmtList) { StringBuilder out = new StringBuilder(); OracleOutputVisitor visitor = new OracleOutputVisitor(out); - + for (SQLStatement stmt : stmtList) { stmt.accept(visitor); } - + return out.toString(); } - + public static String outputSqlServer(List stmtList) { StringBuilder out = new StringBuilder(); SqlServerOutputVisitor visitor = new SqlServerOutputVisitor(out); - + for (SQLStatement stmt : stmtList) { stmt.accept(visitor); } - + return out.toString(); } public static String outputOracle(SQLStatement... stmtList) { return outputOracle(Arrays.asList(stmtList)); } - + public static String outputSqlServer(SQLStatement... stmtList) { return outputSqlServer(Arrays.asList(stmtList)); } - + public static String output(SQLStatement... stmtList) { return output(Arrays.asList(stmtList)); } - + public static String output(List stmtList) { StringBuilder out = new StringBuilder(); SQLASTOutputVisitor visitor = new SQLASTOutputVisitor(out); - + for (SQLStatement stmt : stmtList) { stmt.accept(visitor); } - + return out.toString(); } }