From 75eef991a8336419732ea51d0f4e370f02e26be6 Mon Sep 17 00:00:00 2001 From: haocao Date: Mon, 12 Sep 2016 20:50:12 +0800 Subject: [PATCH] Add test cases and removed useless import. --- .../alibaba/druid/bvt/bug/Bug_for_order.java | 21 ++++------------- .../bvt/filter/FilterChainTest_Clob.java | 17 ++++++-------- .../MaxEvictableIdleTimeMillisTest2.java | 8 +------ .../druid/bvt/sql/db2/DB2MergeTest.java | 8 +++---- .../druid/bvt/sql/mysql/DeleteSyntaxTest.java | 10 ++++---- .../bvt/sql/mysql/MySqlError_test_2.java | 5 +--- ...MySqlParameterizedOutputVisitorTest_8.java | 2 -- ...MySqlParameterizedOutputVisitorTest_9.java | 2 -- .../mysql/alter/MySqlAlterTableTest10.java | 6 ++--- .../mysql/alter/MySqlAlterTableTest11.java | 6 ++--- .../mysql/alter/MySqlAlterTableTest12.java | 6 ++--- .../mysql/alter/MySqlAlterTableTest13.java | 6 ++--- .../mysql/alter/MySqlAlterTableTest14.java | 6 ++--- .../sql/mysql/alter/MySqlAlterTableTest6.java | 6 ++--- .../sql/mysql/alter/MySqlAlterTableTest7.java | 6 ++--- .../sql/mysql/alter/MySqlAlterTableTest9.java | 6 ++--- .../create/MySqlCreateProcedureTest7.java | 9 +++----- .../create/MySqlCreateProcedureTest8.java | 9 +++----- .../create/MySqlCreateProcedureTest9.java | 9 +++----- .../sql/mysql/drop/MySqlDropTriggerTest.java | 8 +++---- .../mysql/select/MySqlSelectTest_update.java | 13 +++-------- .../sql/mysql/update/MySqlUpdateTest_9.java | 1 - .../sql/postgresql/expr/LineSegmentsTest.java | 6 +---- .../bvt/sql/postgresql/expr/MacAddrTest.java | 5 +--- .../druid/bvt/stat/DruidStatServiceTest2.java | 23 ++++++++----------- .../bvt/support/json/JSONParserTest4.java | 11 +++------ .../com/alibaba/druid/pool/MaxWaitTest.java | 5 ++-- .../druid/sql/parser/MySQLCharSetTest.java | 1 - 28 files changed, 68 insertions(+), 153 deletions(-) diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java index e6709f8f5d..ac82c2b75c 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java @@ -15,27 +15,16 @@ */ package com.alibaba.druid.bvt.bug; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - +import com.alibaba.druid.sql.SQLUtils; +import junit.framework.TestCase; import org.junit.Assert; -import junit.framework.TestCase; - -import com.alibaba.druid.mock.MockDriver; -import com.alibaba.druid.mock.MockPreparedStatement; -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.sql.SQLUtils; -import com.alibaba.druid.util.JdbcUtils; - public class Bug_for_order extends TestCase { - - - + public void test_bug_for_xuershan() throws Exception { String sql = "select * from order"; String format = SQLUtils.formatMySql(sql); - + String expected = "SELECT *\nFROM order"; + Assert.assertEquals(expected, format); } } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java index a235fde4b3..c7c8598117 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainTest_Clob.java @@ -15,26 +15,23 @@ */ package com.alibaba.druid.bvt.filter; -import java.sql.Clob; -import java.sql.SQLException; -import java.util.Collections; -import java.util.Properties; - -import junit.framework.TestCase; - -import org.junit.Assert; - import com.alibaba.druid.filter.FilterChainImpl; import com.alibaba.druid.mock.MockClob; import com.alibaba.druid.mock.MockResultSet; import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.proxy.jdbc.ClobProxy; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.proxy.jdbc.ResultSetProxyImpl; import com.alibaba.druid.proxy.jdbc.StatementProxy; import com.alibaba.druid.proxy.jdbc.StatementProxyImpl; import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.sql.Clob; +import java.sql.SQLException; +import java.util.Collections; +import java.util.Properties; public class FilterChainTest_Clob extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java index 5db8e2b2c8..c1ec2680dc 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/MaxEvictableIdleTimeMillisTest2.java @@ -1,14 +1,8 @@ package com.alibaba.druid.bvt.pool.basic; -import java.sql.Connection; - -import org.junit.Assert; - import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.pool.GetConnectionTimeoutException; -import com.alibaba.druid.util.JdbcUtils; - import junit.framework.TestCase; +import org.junit.Assert; public class MaxEvictableIdleTimeMillisTest2 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java index 32e34c8931..d7396752c8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2MergeTest.java @@ -15,18 +15,16 @@ */ package com.alibaba.druid.bvt.sql.db2; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.DB2Test; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; import com.alibaba.druid.util.JdbcConstants; +import org.junit.Assert; + +import java.util.List; public class DB2MergeTest extends DB2Test { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java index 5708204583..36b913682b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DeleteSyntaxTest.java @@ -15,16 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import java.util.List; - -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; -import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor; import com.alibaba.druid.sql.parser.SQLStatementParser; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.util.List; public class DeleteSyntaxTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java index e6783ef859..bf392e666b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlError_test_2.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; public class MySqlError_test_2 extends MysqlTest { - public void test_0() throws Exception { + public void test_0() { String sql = "Describe sdb_goods free_postage"; - Exception error = null; MySqlStatementParser parser = new MySqlStatementParser(sql); parser.parseStatementList(); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_8.java index 23dd605a20..a9b5672c40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_8.java @@ -1,13 +1,11 @@ package com.alibaba.druid.bvt.sql.mysql; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; -import com.alibaba.druid.sql.visitor.ParameterizedVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_9.java index 0ced15ce9b..ce8aaf171c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlParameterizedOutputVisitorTest_9.java @@ -1,13 +1,11 @@ package com.alibaba.druid.bvt.sql.mysql; -import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor; import com.alibaba.druid.sql.parser.SQLParserUtils; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.alibaba.druid.sql.visitor.ExportParameterVisitor; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; -import com.alibaba.druid.sql.visitor.ParameterizedVisitor; import com.alibaba.druid.util.JdbcConstants; import junit.framework.TestCase; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java index 632c578eff..efcc51253f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest10.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest10 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java index da2d034396..acdd1cdd7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest11.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest11 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java index 6e74bf2514..b0f71a6426 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest12.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest12 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java index c508e401e1..8e9a6cb200 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest13.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest13 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java index 3ae6b9cf84..587ae0da11 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest14.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest14 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest6.java index d5ef7a9914..383a2ae0fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest6.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest6 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java index b9a3240780..ade005edb1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest7.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest7 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java index ca81153703..1efb9a57f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/alter/MySqlAlterTableTest9.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.alter; -import org.junit.Assert; -import junit.framework.TestCase; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; import com.alibaba.druid.sql.parser.Token; -import com.alibaba.druid.stat.TableStat.Column; +import junit.framework.TestCase; +import org.junit.Assert; public class MySqlAlterTableTest9 extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java index 9253349fdc..45c90ac22c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest7.java @@ -15,17 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; +import org.junit.Assert; + +import java.util.List; /** * diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java index 5dd933671c..54f3d1275c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest8.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; +import org.junit.Assert; + +import java.util.List; /** * diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java index c0a16eb892..5307cb403a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest9.java @@ -15,16 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.create; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; -import com.alibaba.druid.stat.TableStat.Column; +import org.junit.Assert; + +import java.util.List; /** * diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java index a7c3c693c9..6e9ecb648e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/drop/MySqlDropTriggerTest.java @@ -15,15 +15,13 @@ */ package com.alibaba.druid.bvt.sql.mysql.drop; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; +import org.junit.Assert; + +import java.util.List; public class MySqlDropTriggerTest extends MysqlTest { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java index c0304e5cc8..d630447bd1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/select/MySqlSelectTest_update.java @@ -15,19 +15,14 @@ */ package com.alibaba.druid.bvt.sql.mysql.select; -import java.util.List; - -import org.junit.Assert; - import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; -import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import org.junit.Assert; + +import java.util.List; public class MySqlSelectTest_update extends MysqlTest { @@ -42,8 +37,6 @@ public class MySqlSelectTest_update extends MysqlTest { List statementList = parser.parseStatementList(); SQLStatement stmt = statementList.get(0); - MySqlUpdateStatement updateStmt = (MySqlUpdateStatement) stmt; - print(statementList); Assert.assertEquals(1, statementList.size()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java index 73972b2a0d..adb31b756a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/update/MySqlUpdateTest_9.java @@ -20,7 +20,6 @@ import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; -import com.alibaba.druid.stat.TableStat; import com.alibaba.druid.stat.TableStat.Column; import org.junit.Assert; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java index f206547df5..69ebcb6e7c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/LineSegmentsTest.java @@ -1,14 +1,10 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; -import org.junit.Assert; - import com.alibaba.druid.sql.PGTest; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGBoxExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGLineSegmentsExpr; -import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGPointExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; +import org.junit.Assert; public class LineSegmentsTest extends PGTest { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java index 35ec0ada23..ac4b47410f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/expr/MacAddrTest.java @@ -2,13 +2,10 @@ package com.alibaba.druid.bvt.sql.postgresql.expr; -import org.junit.Assert; - import com.alibaba.druid.sql.PGTest; -import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; -import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGMacAddrExpr; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; +import org.junit.Assert; public class MacAddrTest extends PGTest { diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java index 69a3b22e0a..05d7b4680a 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest2.java @@ -15,10 +15,11 @@ */ package com.alibaba.druid.bvt.stat; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.assertThat; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.stat.DruidStatService; +import com.alibaba.druid.support.json.JSONUtils; +import com.alibaba.druid.util.JdbcUtils; +import junit.framework.TestCase; import java.sql.Connection; import java.sql.PreparedStatement; @@ -27,16 +28,10 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.stat.DruidStatService; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.util.JdbcUtils; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertThat; /** * Multiple data source test case. diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java index 6424edf6de..20a4108a5f 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest4.java @@ -1,17 +1,12 @@ package com.alibaba.druid.bvt.support.json; -import java.util.LinkedHashMap; -import java.util.Map; - +import com.alibaba.druid.support.json.JSONUtils; import junit.framework.TestCase; -import com.alibaba.druid.support.json.JSONUtils; -import com.alibaba.druid.util.Utils; - public class JSONParserTest4 extends TestCase { + public void test_parse() throws Exception { String text ="{\"\\u0006\":\"123\"}"; - JSONUtils.parse(text); - + System.out.println(JSONUtils.parse(text)); } } diff --git a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java index 00a742374f..06befbfe32 100644 --- a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java +++ b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java @@ -15,13 +15,12 @@ */ package com.alibaba.druid.pool; +import junit.framework.TestCase; + import java.sql.Connection; import java.sql.Statement; import java.util.concurrent.CountDownLatch; -import EDU.oswego.cs.dl.util.concurrent.CountDown; -import junit.framework.TestCase; - public class MaxWaitTest extends TestCase { private DruidDataSource dataSource; diff --git a/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java b/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java index f44462fe9a..47550a78c1 100644 --- a/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java +++ b/src/test/java/com/alibaba/druid/sql/parser/MySQLCharSetTest.java @@ -1,7 +1,6 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.sql.ast.SQLStatement; -import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import junit.framework.TestCase; import org.junit.Assert;