static import

Author: wenshao

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java

@@ -15,12 +15,13 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
 
 import com.alibaba.druid.PoolTestCase;
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.mock.MockDriver;
@@ -48,7 +49,7 @@ protected void setUp() throws Exception {
 
     protected void tearDown() throws Exception {
         dataSource.close();
-        Assert.assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
 
         super.tearDown();
     }
@@ -60,8 +61,8 @@ public void test_for_happyday517_0() throws Exception {
 
         MockStatement mockStmt = stmt.unwrap(MockStatement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
 
         stmt.close();
 
@@ -76,9 +77,9 @@ public void test_for_happyday517_1() throws Exception {
 
         MockStatement mockStmt = stmt.unwrap(MockStatement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
-        Assert.assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
 
         stmt.close();
 
@@ -93,8 +94,8 @@ public void test_for_happyday517_2() throws Exception {
 
         MockPreparedStatement mockStmt = stmt.unwrap(MockPreparedStatement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
 
         stmt.close();
 
@@ -110,9 +111,9 @@ public void test_for_happyday517_3() throws Exception {
 
         MockPreparedStatement mockStmt = stmt.unwrap(MockPreparedStatement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
-        Assert.assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
 
         stmt.close();
 
@@ -127,8 +128,8 @@ public void test_for_happyday517_4() throws Exception {
 
         Statement mockStmt = stmt.unwrap(Statement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
 
         stmt.close();
 
@@ -144,9 +145,9 @@ public void test_for_happyday517_5() throws Exception {
 
         Statement mockStmt = stmt.unwrap(Statement.class);
 
-        Assert.assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
-        Assert.assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
-        Assert.assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
+        assertEquals(ResultSet.TYPE_SCROLL_SENSITIVE, mockStmt.getResultSetType());
+        assertEquals(ResultSet.CONCUR_UPDATABLE, mockStmt.getResultSetConcurrency());
+        assertEquals(ResultSet.CLOSE_CURSORS_AT_COMMIT, mockStmt.getResultSetHoldability());
 
         stmt.close();
 

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_2.java

@@ -15,13 +15,15 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.sql.Connection;
 import java.sql.DataTruncation;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.mock.MockConnection;
@@ -66,7 +68,7 @@ public PreparedStatement prepareStatement(String sql) throws SQLException {
 
     protected void tearDown() throws Exception {
         dataSource.close();
-        Assert.assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
 
     public void test_bug() throws Exception {
@@ -81,7 +83,7 @@ public void test_bug() throws Exception {
             error = ex;
         }
 
-        Assert.assertTrue(exception == error);
+        assertTrue(exception == error);
 
         stmt.close();
 

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java

@@ -15,9 +15,10 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.sql.Connection;
 
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.mock.MockDriver;
@@ -43,12 +44,12 @@ protected void setUp() throws Exception {
 
     protected void tearDown() throws Exception {
         dataSource.close();
-        Assert.assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+        assertEquals(originalDataSourceCount, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
     }
 
     public void test_bug() throws Exception {
         Connection conn = dataSource.getConnection();
-        Assert.assertEquals(false, conn.getAutoCommit());
+        assertEquals(false, conn.getAutoCommit());
         conn.close();
     }
 }

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_order.java

@@ -15,15 +15,16 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import com.alibaba.druid.sql.SQLUtils;
 import junit.framework.TestCase;
-import org.junit.Assert;
 
 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);
+        assertEquals(expected, format);
     }
 }

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_qianbi.java

@@ -1,10 +1,11 @@
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.junit.Assert;
 
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser;
@@ -32,6 +33,6 @@ public void test_for_issue() throws Exception {
 
         // System.out.println(out.toString());
 
-        Assert.assertEquals(expected, out.toString());
+        assertEquals(expected, out.toString());
     }
 }

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_ruiyi.java

@@ -1,8 +1,9 @@
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.sql.ast.SQLStatement;
@@ -47,6 +48,6 @@ public void test_for_issue() throws Exception {
 
         //System.out.println(out.toString());
 
-        Assert.assertEquals(expected, out.toString());
+        assertEquals(expected, out.toString());
     }
 }

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_weizhi.java

@@ -15,12 +15,13 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
 import com.alibaba.druid.sql.SQLUtils;
 import junit.framework.TestCase;
 
-import org.junit.Assert;
 
 import com.alibaba.druid.sql.ast.SQLStatement;
 import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
@@ -32,6 +33,6 @@ public void test_for_issue() throws Exception {
 
         String expected = "INSERT INTO aaa\nVALUES (1, 2, '这是个反斜杠\\\\');";
 
-        Assert.assertEquals(expected, SQLUtils.formatMySql(sql));
+        assertEquals(expected, SQLUtils.formatMySql(sql));
     }
 }

core/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java

@@ -15,11 +15,12 @@
  */
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertNull;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.mock.MockDriver;
@@ -52,7 +53,7 @@ public void test_bug_for_xuershan() throws Exception {
         Connection conn = dataSource.getConnection();
         PreparedStatement stmt = conn.prepareStatement(sql);
         stmt.execute();
-        Assert.assertNull(stmt.getResultSet());
+        assertNull(stmt.getResultSet());
         stmt.close();
         conn.close();
     }

core/src/test/java/com/alibaba/druid/bvt/bug/Issue_4094.java

@@ -21,7 +21,6 @@
 import com.alibaba.druid.wall.WallUtils;
 
 import junit.framework.TestCase;
-import org.junit.Assert;
 
 /**
  * https://github.com/alibaba/druid/issues/4094

core/src/test/java/com/alibaba/druid/bvt/bug/Issue_697.java

@@ -1,9 +1,10 @@
 package com.alibaba.druid.bvt.bug;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.List;
 
 import com.alibaba.druid.sql.SQLUtils;
-import org.junit.Assert;
 import junit.framework.TestCase;
 
 import com.alibaba.druid.sql.ast.SQLStatement;
@@ -25,6 +26,6 @@ public void test_for_issue() throws Exception {
                 "VALUES (1010103, now(), now(), 10101, 0\n" +
                 "\t, 'flow=''Ctr''', 'be:login,dev:pc, env:web, type:ctr, from:$loginfrom, result:true');";
 
-        Assert.assertEquals(expected, SQLUtils.formatMySql(sql));
+        assertEquals(expected, SQLUtils.formatMySql(sql));
     }
 }