diff --git a/src/test/java/com/alibaba/druid/TestIdel3.java b/src/test/java/com/alibaba/druid/TestIdel3.java index bdba9a5755..f9c83f928b 100644 --- a/src/test/java/com/alibaba/druid/TestIdel3.java +++ b/src/test/java/com/alibaba/druid/TestIdel3.java @@ -21,7 +21,7 @@ import java.util.concurrent.CountDownLatch; import javax.management.ObjectName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/TestLockCount.java b/src/test/java/com/alibaba/druid/TestLockCount.java index f9e7abd0f4..6a72a3396c 100644 --- a/src/test/java/com/alibaba/druid/TestLockCount.java +++ b/src/test/java/com/alibaba/druid/TestLockCount.java @@ -19,7 +19,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class TestLockCount extends TestCase { diff --git a/src/test/java/com/alibaba/druid/TestOracle.java b/src/test/java/com/alibaba/druid/TestOracle.java index 84b54b6eec..18600fe1a4 100644 --- a/src/test/java/com/alibaba/druid/TestOracle.java +++ b/src/test/java/com/alibaba/druid/TestOracle.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/TestRollBack.java b/src/test/java/com/alibaba/druid/TestRollBack.java index 2587e94475..9a07206a86 100644 --- a/src/test/java/com/alibaba/druid/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/TestRollBack.java @@ -3,7 +3,7 @@ package com.alibaba.druid; import java.beans.PropertyVetoException; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.AfterClass; import org.junit.Before; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java index e86e64afd8..e6dff1411e 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.sql.DataSource; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.commons.dbcp.BasicDataSource; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java index 0855416c9e..620e7e9b97 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/Select1.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.benckmark.proxy.BenchmarkCase; import com.alibaba.druid.benckmark.proxy.SQLExecutor; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java index 81fe100b80..df32e9ff42 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectEmptyTable.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.benckmark.proxy.BenchmarkCase; import com.alibaba.druid.benckmark.proxy.SQLExecutor; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java index a4ebdbe836..d8caf9f17f 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectNow.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.benckmark.proxy.BenchmarkCase; import com.alibaba.druid.benckmark.proxy.SQLExecutor; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java index 1d4a7565f2..a9a651c681 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/sqlcase/SelectSysUser.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.benckmark.proxy.BenchmarkCase; import com.alibaba.druid.benckmark.proxy.SQLExecutor; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_JeffYin.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_JeffYin.java index 60c6e27161..b4087cf83e 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_JeffYin.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_JeffYin.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.bug; import java.sql.Driver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.util.IOUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java index e4cfc6664a..9fa8e43097 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 6ce50273bd..af91369e88 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 @@ -21,7 +21,7 @@ import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java index 71c797039c..eea56b1af3 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_happyday517_3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.bug; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java index 6028cbd3e2..3b8b404b8a 100644 --- a/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java +++ b/src/test/java/com/alibaba/druid/bvt/bug/Bug_for_xuershan.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java b/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java index bf6c89811e..d22e0ad15e 100644 --- a/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/console/OptionTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.console; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.junit.runner.JUnitCore; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java index b708ee8c27..371fc4be6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/EncodingConvertFilterTest.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.encoding.EncodingConvertFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java index 0c8595c5a1..a2f201c72d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest.java @@ -9,7 +9,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.sql.Types; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java index b1b1c689bb..fe95f61035 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest2.java @@ -5,7 +5,7 @@ import java.sql.Connection; import java.sql.Types; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; @@ -191,7 +191,7 @@ public class FilterChainImplTest2 extends TestCase { CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - Assert.assertEquals(0F, stmt.getFloat(1)); + Assert.assertTrue(0F == stmt.getFloat(1)); stmt.close(); conn.close(); @@ -202,7 +202,7 @@ public class FilterChainImplTest2 extends TestCase { CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - Assert.assertEquals(0F, stmt.getFloat("1")); + Assert.assertTrue(0F == stmt.getFloat("1")); stmt.close(); conn.close(); @@ -213,7 +213,7 @@ public class FilterChainImplTest2 extends TestCase { CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - Assert.assertEquals(0D, stmt.getDouble(1)); + Assert.assertTrue(0D == stmt.getDouble(1)); stmt.close(); conn.close(); @@ -224,7 +224,7 @@ public class FilterChainImplTest2 extends TestCase { CallableStatement stmt = conn.prepareCall("select ?"); stmt.registerOutParameter(1, Types.VARCHAR); - Assert.assertEquals(0D, stmt.getDouble("1")); + Assert.assertTrue(0D == stmt.getDouble("1")); stmt.close(); conn.close(); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java index f28aa873db..9cc8a14d02 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterChainImplTest3.java @@ -7,7 +7,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.sql.Types; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java b/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java index 835c9576ba..8620a6d49e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/FilterDatasourceConnectAndRecycleFilterTest.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.Filter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java index d8dd977083..04bcd71a54 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterAfterResetTest.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java index 28342f336f..0b54b31676 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterClobTest.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockClob; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java index 5b96fc6b7a..e70c1ac2f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteFirstResultSetTest.java @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java index 50a7ce5a25..c5c77d86fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterExecuteTest.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java index 35f74cc75d..46dc1e7152 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest.java @@ -6,7 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java index 78902a896f..9e49420ae1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenBlobCountTest2.java @@ -6,7 +6,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java index c156e61b83..7e4804623b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest.java @@ -6,7 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java index 231a92ae52..5c99687fca 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenClobCountTest2.java @@ -6,7 +6,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java index 0dfd9a9b38..ed94ad5291 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest.java @@ -6,7 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java index 238a961867..9a995d3268 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenInputStreamCountTest2.java @@ -6,7 +6,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java index 652870501d..3ad2ee76aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterOpenReaderCountTest.java @@ -5,7 +5,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.nutz.lang.stream.StringReader; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java index d6da8f2b88..f4ac5e3d6e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadBytesLengthTest.java @@ -5,7 +5,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java index 5ff79aab1c..054d00808f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterReadStringLengthTest.java @@ -5,7 +5,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java index ff764191ad..ab0d70e8c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/StatFilterResultSetMultiCloseTest.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java index 0a9d898fe2..9ae0eb1602 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest1.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.filter.config; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java index 083e785eaf..670b3d888b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest2.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.filter.config; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java index ec7d3f18ae..8e23785e0e 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest3.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.FileOutputStream; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java index 4e64ab74d8..b7afa13acf 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest4.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.FileOutputStream; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java index 97d55c52ac..673777597d 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigFilterTest5.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.filter.config; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java index d981689e1a..cb6b3fa1f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/config/ConfigToolsTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.filter.config; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.config.ConfigTools; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java index affb76963c..50d1d1d06f 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsLargeOrTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.filter.wall; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java index 59c26c7777..a63b8dc7cc 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallVisitorUtilsTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.filter.wall; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java b/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java index 140cfa5c92..252877c87e 100644 --- a/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/jmx/JMXExporterTest.java @@ -19,7 +19,7 @@ import java.lang.management.ManagementFactory; import javax.management.ObjectName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java index 1525ba7303..3930a9148f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/CallableStatmentTest.java @@ -20,7 +20,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockCallableStatement; 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 52becf1dcd..5428606433 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -20,7 +20,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 d92dda49d8..ccde07dd20 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 f535a86781..43546b4cb0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -21,7 +21,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java index acbfd24753..d7517bd216 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ClosedTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DataSourceClosedException; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java index fca98ea8be..981e24606a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java index 176cf6f853..db74d947a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTest2.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java index 82a3768684..18cdcb6cf2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ConfigErrorTestMysql.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java index 93d3253bd6..38307637e9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DataSourceDisableExceptionTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DataSourceDisableException; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DiscardTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DiscardTest.java index 0f700c3f84..776e6b7c53 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DiscardTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DiscardTest.java @@ -7,7 +7,7 @@ import java.sql.Statement; import java.util.Properties; import java.util.concurrent.CountDownLatch; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java index a490bd1ae6..8fd9189bb3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest2.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java index c3c1d28082..cf85fd5d42 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidConnectionHolderTest3.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java index 41508b1d54..82e4f56239 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFactoryTest1.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 04d0052c14..bb4d5dc795 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java index e10b98c047..55fdf39011 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java index 4efca3947a..b65223facb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest2.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java index edac9d24a7..140f5dd326 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_clearCache.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java index 7d4000ee9a..e0437df4c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_enable.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DataSourceDisableException; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java index 0782940db8..4dcbdf87f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getPoolingPeakTime.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java index 2318c7c63a..72d8ca5a36 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_getProperties.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java index 622ca0fe76..5da08102fb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_interrupt.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java index 02ba108b49..4f211c703a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive1.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java index 8b3936fd32..735fe4034a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive2.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java index 40d05365cf..b12739bcd2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive3.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java index 455d6bc141..79d09300fe 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxActive4.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java index 8f4631557b..ed23252ec9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_maxWait.java @@ -4,7 +4,7 @@ import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java index bc6510bb66..92b503e8c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_notEmptyWait.java @@ -4,7 +4,7 @@ import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java index 3038fb05ad..4af1aed546 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java index dd3424f76c..999b961a33 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle2.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java index c4ec2c4c24..563142b704 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle3.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java index 21d474f8cb..ac3c91c6cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceTest_oracle_error.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java index 39dd1cfa3a..70443076a8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledConnectionTest.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.Savepoint; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java index c852d376d0..afe5097e7d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest.java @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLFeatureNotSupportedException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockResultSet; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java index 3aa84c709a..1fba8c615c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidPooledResultSetTest2.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockResultSet; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java index 90f94db0fa..2728a3f689 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DumpTest.java @@ -6,7 +6,7 @@ import java.sql.ResultSet; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java b/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java index 449c86f5d2..9c3fb4462c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/JdbcDataSourceStatTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.Constants; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java b/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java index 16547efc1f..bbc917646c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/LockFairTest.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.concurrent.locks.ReentrantLock; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java index e335dbf3eb..c085bdc2f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java index fa7eb7317b..3b1b8c0d85 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest1.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java index 9a4f617379..c77ca31bab 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest2.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java index e447d0e54d..5dcdfbc02a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest3.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidConnectionHolder; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java index c8bc335644..964a6b88df 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PSCacheTest4.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidConnectionHolder; 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 5048f6ef78..f7ac1d0448 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 20e9a575f7..fb54c5530f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java index 62d79ffffc..27d961205c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PreparedStatementKeyTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java index abdb6cf754..6008d2de21 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SavepointTest.java @@ -4,7 +4,7 @@ import java.sql.Connection; import java.sql.Savepoint; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java index 40094fe484..87c21382a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.stat.StatFilter; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java index 2241104ddb..7894bbd4f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SlowSqlMillisTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.stat.StatFilter; 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 74e6c0fb4c..496fcbb0a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java index 55e32f91cf..7f01f5e966 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClone.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; 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 eaed792254..373a489968 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 @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 b5cae48e97..42ad5144a3 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 @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockStatement; 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 b48ec54ccc..4110d8ebc6 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 @@ -19,7 +19,7 @@ import java.sql.CallableStatement; import java.sql.Connection; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockStatement; 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 d3459e8a8c..ef80abcf94 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.concurrent.CountDownLatch; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 654c0c4ce7..42aa20be6c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectError.java @@ -20,7 +20,7 @@ import java.sql.SQLException; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java index fcc63e276e..6e473c596c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConnectTimeout.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 ec4ae0dc73..bffe0bc92c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 c26a1c3cbf..418d4cfedd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.util.concurrent.CountDownLatch; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 2371f2aa3b..52eb1eaf66 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java index 250a3597b8..dd1088358e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGetUpdateCount.java @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; 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 6e30b08e9a..04375e9ec1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java index 3d80f0d834..d92b011675 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestH2.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 c745971bb2..26190ecb13 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 0052ceffe2..036acb174f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -20,7 +20,7 @@ import java.sql.Connection; import javax.management.ObjectName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 5862dcaf3f..8190a940da 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 @@ -20,7 +20,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 e525077616..0cc2bc90c6 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 @@ -19,7 +19,7 @@ import java.sql.Connection; import java.util.Random; import java.util.concurrent.CountDownLatch; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 cb10438aa7..36cf8e85ed 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 @@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java b/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java index 507aff90f9..3ce68ca304 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestLogLongTimeTransaction.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java index c7b406c7af..598b9acdff 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOraclePrefetch.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import oracle.jdbc.OracleConnection; import oracle.jdbc.internal.OraclePreparedStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java index 9173cd7c6c..16ceb35d78 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java index 68c89288fd..90cedcdb13 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall2.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java index ffe3b2961e..20492982ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWall3.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java index debb55bcdd..9d951feb89 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWallJdbc3.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java index 56fa984a26..e3b17de5c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java index f77ed3acbe..36bba3928c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOracleWrap2.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.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 d062de3ba3..7134d1820a 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 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 f93159fab5..39d79f3e13 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; import java.sql.PreparedStatement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 7b82a2d6da..497c1cbc2b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java index 8a74e07b9e..46d30caf54 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java index 798d41744d..30c67b37a2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockPreparedStatement; 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 aba503f7bc..b9e956abd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java index ef425fc53c..5d11dded26 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java index f54c89bc69..77513929d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.pool; import java.lang.reflect.Field; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 50823947e9..ba3964503e 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool.adapter; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 bda1379faf..dd97e46ba8 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool.adapter; import javax.sql.DataSource; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; 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 9b756f7b41..70ecedb9bc 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 @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 927db5114f..23da8506e5 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 @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 ed3bf705b8..daacaf0390 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 @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 55fcae9fda..d8a2bc8a7e 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 @@ -21,7 +21,7 @@ import java.util.Properties; import javax.sql.ConnectionEvent; import javax.sql.ConnectionEventListener; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 7d521eac8b..89e9b7a197 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,7 @@ import java.sql.Time; import java.sql.Timestamp; import java.sql.Types; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockCallableStatement; 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 fb83db81ec..17606670ac 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.pool.basic; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockConnection; 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 d315caff09..2f7eccb4b2 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 @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.pool.basic; import java.sql.Connection; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 4b287cbaa4..39d265724f 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 @@ -21,7 +21,7 @@ import java.sql.Statement; import javax.sql.DataSource; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java index e0c94689be..6ee8635fa3 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/MaxActiveChangeTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.pool.dynamic; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java index 9a2c3fdc0c..d6086e27c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/dynamic/PoolPreparedStatementsChangeTest.java @@ -20,7 +20,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java index fc0d7836e4..b943edcdda 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/BasicTypeTest.java @@ -29,7 +29,7 @@ import java.sql.Types; import java.util.Calendar; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.proxy.DruidDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java index 40d48bf09e..d9ebae7252 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/ClobTest.java @@ -24,7 +24,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.proxy.DruidDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java index 285e91893b..2b5b29aa34 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java @@ -19,7 +19,7 @@ import java.sql.DriverManager; import java.sql.Statement; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.FilterChain; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java index c2bafe7db6..c77b4a176c 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/fake/FakeDriverTest.java @@ -20,7 +20,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java index 38117dbbac..2db87e0c6a 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetConvertTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.proxy.filter.encoding; import java.io.UnsupportedEncodingException; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.encoding.CharsetConvert; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java index dbce634cfb..aac603b56d 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/encoding/CharsetParameterTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.proxy.filter.encoding; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.filter.encoding.CharsetParameter; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java index eece1db374..821ec4c4ea 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/utils/DruidLoaderUtilsTest.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.bvt.proxy.DruidDriverTest.PublicJdbcFilterAdapter; diff --git a/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java b/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java index 264fc6ad40..762dd7ac53 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/DruidJdbcExtractorTest.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockCallableStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java b/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java index 499de4f522..e9897a6068 100644 --- a/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/spring/SpringMethodInfoTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.spring; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.spring.stat.SpringMethodInfo; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java index 441f69d6fc..302197053d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/CreateDatabaseTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java index 23616b4cfc..31c7013a40 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java index c96e1501ac..756fdc73ef 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java b/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java index 3bdc7137a1..2f574f04a5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/OverTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.sql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java index 58969da3c6..7b2c5dcd5d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLSelectParserTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java index 146fb18fe8..9f28a8bdc7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/DMLUpdateParserTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java index 4d1cf8a4b4..35634f330b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/LiteralHexadecimalTest.java @@ -18,7 +18,7 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.expr.SQLHexExpr; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java index 26cc9f4ec7..e1ba25127e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/cobar/MTSParserTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.cobar; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java index f1c1b06456..6d80171534 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalCaseThen.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java index f95738eb72..0d00c1b145 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalInTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java index e0316797ce..894bcf2e23 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalIsNullTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java index 53402b40c3..fbeb1add9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodAsciiTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java index 66640fd710..6d3c5f5d8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodBitLengthTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java index d9168d860d..326b137890 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodInstrTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java index e38fca24a8..19d96f2e8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLeftTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java index 74f44e2712..51b3a5342e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodLengthTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java index 41dbeeeb91..612a0cd91b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodModTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java index e9bf7db2e7..dd617b396d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodNowTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.sql.eval; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java index b1a58c65a9..7e06a1cefa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodPITest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java index becb82adf1..ff3961df91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodReverseTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java index fe3df33dcb..34038bb968 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodRightTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java index 90827af256..6a0fd3031d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalMethodTrimTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java index e271f389b4..1153665ec4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalRlikeTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.sql.eval; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java index 39dea061ef..bcf6298fd0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalSelectTest.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.sql.eval; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java index 7078418a3f..ed35835e7f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/EvalTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.eval; import java.math.BigDecimal; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java index e0dc1bb92b..9c5e1c59e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/eval/SQLEvalVisitorUtilsTest.java @@ -4,7 +4,7 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java index 2f31809278..c56740611c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ArithmeticOperatorsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java index f38786cbd9..9824950dad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/AssignmentOperatorsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java index 7929c6e252..0bc9d2739c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BitFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java index dc436c6294..0ad32f10c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/BooleanValuesTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java index 0a413c6c90..465e4529c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CALL_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java index e35620f9e9..2703ce1505 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CastFunctionsAndOperatorsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java index 34f0139efb..7b7789ef70 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CommitTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java index cd2a6829c2..1d157e926b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ComparisonFunctionsAndOperatorsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java index 09699b7b4f..5dcc3e65cf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/ControlFlowFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java index 7f11296c7c..bede1557d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/CreateUserTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java index 486456f6a5..3311c2123a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java index 36bd8b3217..072766218f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DateAndTimeValuesTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 d991d015d2..7a9b713554 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java index 9f5207bb42..ab9290ebe6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java index 87092fe1a3..f2a06c3efa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/DropUserTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java index b75897b115..caf7444cda 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/EncryptionAndCompressionFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java index 572b69a993..0dca333155 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/FullTextSearchesWithQueryExpansionTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java index 9ea604cc34..f8d86594d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/HexadecimalValuesTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java index ae049c0198..5c149b33b9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InformationFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java index abc3250308..a2b033c10b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/InsertSyntaxTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java index d83b0a1db8..69956e9ca2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Kill_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java index aac7bc2a74..ae828b14ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LOAD_XML_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java index cb1782bdc9..6f964f21d4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LoadDataInFileSyntaxTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java index 3b17fd3fff..e4c41e679a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/LogicalOperatorsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java index 267461843a..90b5443eee 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MathematicalFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java index c2a56b9bc6..9da6780382 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MiscellaneousFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_1.java index 3436df8b58..a92db8983f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddIndex_1.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddPrimaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddPrimaryKey.java index fd36b7b84e..6cae3afafe 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddPrimaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableAddPrimaryKey.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_0.java index 2c23aa0450..609e98a3b8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropIndex_0.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropPrimaryKey.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropPrimaryKey.java index f8f28d69be..c78d4025f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropPrimaryKey.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableDropPrimaryKey.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableEnableKeys.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableEnableKeys.java index 3e924613dd..f4ce349d76 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableEnableKeys.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableEnableKeys.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest.java index 8eba621a9c..bad21e1d0c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest10.java index a055489588..df29f035d2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest10.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest11.java index 2abad52a91..dd7ead89c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest11.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest12.java index 34be4192ff..959c9f438d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest12.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest13.java index 15985e6541..edbd92197d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest13.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest14.java index 36250bacd8..f007baf28d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest14.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest2.java index 9611d59faf..a434f6fdcc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest3.java index 4f782358c8..2992fc24d9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest3.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest4.java index 8b1b6f1cf5..8f98479f1a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest4.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java index c1cd845126..63900d35d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest5.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest6.java index 85d6a14059..3c12ecd78f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest6.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest7.java index 6e94bbd3bd..42ab3c9f56 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest7.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest9.java index 54d3cb8671..300ec253d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest9.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java index c5ff4c50c1..b772a773f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest1.java index 94f2131e9f..34cf834603 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java index 74d2efccaf..cf09bd51c9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest2.java index 20bacef69a..6e60f2a15f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest3.java index 0029db36cb..012750bbc8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest4.java index 8e2aec1aa3..8ab80ba757 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest5.java index 833693c7b1..a3ac13a5f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest6.java index ee7dcdee1c..1cf0647cb4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest7.java index dbd5c0a565..fd927d558a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest8.java index b60984ab3b..d3725d334d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest9.java index a78baa0ee3..142e5a6550 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateViewTest.java index 39913dd643..c09fe380ad 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateViewTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java index d717ed1483..abacac4686 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_0.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java index 3c92a3ee67..3291c5cde0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java index 821ee4ce44..88ea58aef3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDeleteTest_2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java index 4036dd9420..0adc36c293 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDescribteTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropTableTest.java index e686f4ed0a..2c5f1a0c39 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropViewTest.java index 06f2a96e49..dd9baf42ce 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlDropViewTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java index 768dbaea24..2c71a5771a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlFormatTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.mysql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_0.java index ad2b7f4789..fd2c023f8c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_0.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_1.java index bce1b69c27..4d9d655418 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_2.java index d7bc0b8e57..f5c7654dc4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_3.java index 50bb3fce44..b373e09ccc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_4.java index e2d4492726..1b2b59902e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_5.java index f03aeda6c4..7b6ffec0a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_6.java index 8292d6c58e..e3d00bfa53 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlInsertTest_6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.SQLUtils; 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 e3f289ef75..b9761994a4 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java index 2f662ed2d2..2aa3861203 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java index d16c88d165..d657a7db55 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_3.java index c0fabc61fb..ae3e9a793e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_4.java index b113828f2c..4ad0164156 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_5.java index 93cad14aee..0ff7eb8895 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_6.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_6.java index c3d0f4b104..d827299ac9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_8.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_8.java index 4f0f7fd120..f7f9d42207 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_BinaryConcat.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_BinaryConcat.java index e4684478de..d63bab9140 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_BinaryConcat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_BinaryConcat.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_crossjoin.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_crossjoin.java index 7ee998ae7d..62f1156b9c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_crossjoin.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_crossjoin.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.MysqlTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java index 60aafe9511..3430ac92d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/REPLACE_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java index faf50a625d..ffb1f79014 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/RegularExpressionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java index 83261cebc9..8a34989192 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/Reset_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java index 904a317dce..3803a38bcb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SELECT_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java index e59e16ecc6..1e3bf9933d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java index c61061aae4..33d5d171a6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_DATABASES_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java index e50c294696..d3a5be6ab8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_TABLES_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java index 647593f6c0..34e4fcc050 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_WARNINGS_Syntax_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java index d56cc80e3f..64c0917921 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/START_TRANSACTION_Test.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java index bf2cb60f05..471a846714 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringComparisonFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java index d475d6c51e..b0aa595788 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java index a287bfb716..d8ef41c1b3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/StringTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java index 13a291dc57..81c0e540f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/XMLFunctionsTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java index 1d30939fc0..be6bfcfbb6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/parser/MySqlParserResourceTest.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java index f38603670a..63a70a5d44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlResourceTest.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java index fc75ec9cb9..ea393d2152 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java index 3b8fda3ef7..0f72e6a04d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java index bbbc18d5df..05e9c5e912 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java index 7a0294c19d..d747638325 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Delete.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java index 9f8ca7f210..e3dae856c3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java index d08e9da3ea..3dd0abc7b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Subquery2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java index 1d7de2d58e..d6e38e2df5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/visitor/MySqlSchemaStatVisitorTest_Update.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 22f926633e..516aefa79e 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 f24a2a35dc..782e4ddd2e 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java index 267fa80602..64e2ef123d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java index ca2fa10287..244b3a06a2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest3.java index aab09dd170..1d248a3073 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest4.java index 1a7220be24..24fdf9043b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterIndexTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java index 5b5b0a1825..88447d011c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java index a61c9c5f25..4652f2e898 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterProcedureTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java index c6bec6d6dd..9fc31bcbf0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSessionTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSynonymTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSynonymTest.java index 9ba7e82e3c..5ccfe6be00 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSynonymTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterSynonymTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java index e1a632d9ed..b34c2351bf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest10.java index 460f53746d..6f38644ea9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest10.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest11.java index cccfa3c4e0..487d82c96d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest11.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest12.java index dae23f7e33..4d38093a7a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest12.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest13.java index e46653307d..29976e7576 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest13.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java index 95690e2b01..c7d34ea2df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java index 482ee8fd01..fdbea75f33 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java index 2613952f9b..f00eeeb3f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java index 04d6fd04a0..96ad2b000b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java index c6e21bc46e..7eff176254 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java index a3f673d7da..12bf778e49 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest9.java index 9da39d8ab0..eaf05e105b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java index a4e7572b8e..b9c1a53c67 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTableTestRename.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTablespaceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTablespaceTest.java index 1a82a68dc0..aa8d811ef7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTablespaceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTablespaceTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest.java index e036a99981..23c22ac7f8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest2.java index 67962e09f7..9bec98617c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterTriggerTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterViewTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterViewTest.java index c00f897c70..bf001f9148 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterViewTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleAlterViewTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; 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 d0363a078d..64438b3ff0 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 b3f820ba64..b97f5971a5 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java index 61f488a60e..b50723a99d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java index ae1a6378bd..69b1014575 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest10.java index 05d28f108d..7d2eda4113 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest10.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest11.java index 64f64cbdb0..4a5c2a79eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest11.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest12.java index 229e390b4a..d8c62f39bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest12.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest13.java index 53ba3c8033..657236e8df 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest13.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest14.java index 10e1bba521..91b08e5062 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest14.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java index ac7225cd20..4c7b6a9928 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java index ec30769642..f79a287195 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java index 0b83d12953..7fdaa2acd9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest5.java index 9af82d7d58..731dd2bc87 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest6.java index 85e2f164b0..2d5ffe33e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest7.java index 9d95ad11e6..6f428ab538 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest8.java index 8f918850e2..a630a7e5e2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest9.java index 7f7ec72fbe..7f55c412ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleBlockTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java index 9caa6a0dfc..4f9627762d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCallTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java index 1375f39366..f61d913880 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest2.java index b509fd1935..6e8cfa8934 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateIndexTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest1.java index 1df705f58e..e4ca8b9d15 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest2.java index 25c217bd8b..9944c232b6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateProcedureTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java index d198d33ba7..6fa5c69ffd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest10.java index 1f759cd384..68b10b7df5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest10.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest11.java index 57a1d3534a..830a023c1e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest11.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest12.java index 179185bada..24df8860a4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest12.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest13.java index e44616c110..73acfa5604 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest13.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest14.java index 5cefb5daeb..b988181a18 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest14.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest15.java index 65b21b964d..70597958f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest15.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest16.java index 2ffd095467..cf320be9d5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest16.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java index 6620d62fc8..a758b862af 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java index 5007ce7d5a..390c116073 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java index c45f5a1cee..b078953914 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java index 844172176d..e74645b9f9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java index 4bbe494ffc..439dbbc00d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest7.java index b95715e504..da0a1c15e3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest8.java index 18e7fb83c3..01dcf34a0b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest9.java index 1252a20b1e..fc10a22b21 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleCreateTableTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java index 90899f7c16..3a6a8a10d0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDeleteTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java index 31f581c4ed..b4b650866c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleDropSequenceTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.SQLUtils; 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 47ed9a346e..7c886c37dc 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java index 1a849f372b..e77e108dff 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java index 0186d9629a..73259b9200 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java index 1a078956a1..6c38b5f540 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleExplainTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; 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 201865ec0f..eb98776dd9 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 0b4f7ed8db..6a128a208f 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 040e62cdc5..c149ebdeba 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java index 7db6540b4e..08c76b9ba4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGrantTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java index 4dc13a3b9e..2d84c7f566 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleGroupingSetTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java index 684204c344..9007a30bb5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleHintTest.java @@ -8,7 +8,7 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor; import com.alibaba.druid.util.JdbcUtils; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class OracleHintTest extends TestCase { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java index 0017a09db2..49da09b6e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java index babc018258..3e56e1f759 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIbatisSelectTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java index 601e59ffe5..6633aac888 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java index d343d601c0..958fe217bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java index 1d6882ed7a..33fe39771a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java index 2c18bff3c8..c0e9b99938 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java index 9786bc128a..d0bc09450d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java index a6475f5314..7c705080bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java index bc9c0d3a30..e63f7d5415 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java index 3fa9e4aa17..e1feb20069 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest8.java index 3eb3e9674a..d2fb4ed88e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest9.java index 06b52c3c84..002479a7a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleInsertTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java index 2bdcaf6bc1..ada8671951 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsASetTest.java @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java index 1125d06d42..2f514cbe17 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleIsEmptyTest.java @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; 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 66e6e02c63..2886ea69dc 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 @@ -15,9 +15,10 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; import junit.framework.TestCase; +import org.junit.Assert; + import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.test.TestUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java index f545ea3c5d..532c3125fa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java index 12aaf8ccd4..67483ae2bc 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleLockTableTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java index f8913e504e..e0241453f5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java index 1c93706c93..f4d0cb0aa7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java index a970f6c32c..5c9c3dc54f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java index 3b853512ed..a6a63eb2d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java index 16c22e4623..b69801376b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java index ac4d9549d2..0772b28ee7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMergeTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java index 31023bdfaa..8ab0b4f370 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java index 1869b06ed1..6495faca3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleMultiInsertTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; 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 4f47cb501b..02d6cbc043 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 cdf78edc11..75e2f69d8a 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 25fd2dc5ab..469090b5d9 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java index f457f594ac..69f183e122 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserResourceTest.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java index 068a8d4e3f..1ed95bdc9a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSQLParserTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 63f13133e3..cdc163619b 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java index 87ef0f1025..6ce235c94d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSchemaStatVisitorTest.java @@ -18,7 +18,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLOrderingSpecification; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java index edf3d862f4..db4201d3f6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java index 505005afbb..ef40af57c1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest10.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java index 374570614c..9a79a5a673 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest11.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java index fb5a844968..e07c10ec71 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest12.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java index 01074894a5..aaede5be91 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest13.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java index 68ed73bcd9..99ea35937c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest14.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java index 3864182302..8f91ba23cb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest15.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java index f7ea396f1f..658a044790 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest16.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java index 3ab2a91aba..6f35504d2a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest17.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java index 58e96b5f32..7c973105e7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest19.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java index 089009c758..f3e79518c2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java index 7ec810cb56..e835ece159 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest20.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java index 5771774117..3c3a544c4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest21.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java index 8754d34fe0..b275b99c4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest22.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java index 3dc9ef3cf0..2b50073d72 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest23.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java index 706534ebc2..fab5e54e44 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest24.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java index 85a182a81b..72d4c208ca 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest25.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java index 046865a494..3aa807ce24 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest26.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java index 8b6abe83a3..2f9104c267 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest27.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java index 2ca00f9d88..7fb885d20e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest28.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java index 82dcfab0fe..5a516c8ed4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest29.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java index d0996e8e00..d429c34273 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java index 8471c6bb48..4a50ceecaa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest30.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest31.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest31.java index 5077505104..18177f2267 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest31.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest31.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest32.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest32.java index 27f3a7dd48..8f1002d336 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest32.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest32.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest33.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest33.java index 02b6891509..12f4bce8d1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest33.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest33.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest34.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest34.java index 30f0836f10..f1a0267cac 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest34.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest34.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest35.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest35.java index 53a3f03645..dad29b636d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest35.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest35.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest36.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest36.java index dcf81f59c6..4acff618b7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest36.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest36.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest37.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest37.java index df9c27112f..9a26a5c96a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest37.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest37.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest38.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest38.java index e134554bf3..29fcc0967e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest38.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest38.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest39.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest39.java index 739d297eb4..919ba26424 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest39.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest39.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java index 210c6751bf..3a83c8a03e 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest40.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest40.java index a4ed5a6376..1d7e238882 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest40.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest40.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest41.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest41.java index 6d79c7c53c..984eefa7b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest41.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest41.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java index 8cdac391e7..3ca0893c8d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java index d165563a9b..14bf1bda10 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java index 33d90ae49d..5097b2c2cd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java index cf1ae74a24..739defbf7b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java index 4b5b701b7d..b42995cfa5 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSelectTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java index fb18907f3e..ccfd39696b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java index 9b8f712024..63684ecb5b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleSetTransactionTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; 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 7332cb185b..99e0f70cae 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; 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 41cce5b0b2..03e4d684b2 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 @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java index 9bb48e7828..6d04168ddf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.oracle; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java index 413562fb36..8b1d84df08 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleTruncateTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java index 7f1fde0cee..5189f949c7 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java index 7943ccc26b..aa8cd01ac9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java index 2c5fed7406..1fd64a1acf 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleUpdateTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; 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 e4a893b456..d048896709 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java index 917165b6a8..5d7e874f43 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleOutputVisitorTest_PrettyFormat.java @@ -2,7 +2,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 cb635bd90f..474e41f262 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 586a328202..5db0627436 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 e63f6df05e..a759d3f4f3 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 ec787e14a7..27f313254d 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; 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 41f79a8e02..5d188a179f 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 @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java index 5f17258702..4dd1303b2d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleResourceTest.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.OracleTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java index 3cecc12e5d..aaf13be0d3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java index c00dfa20b5..2163cf7490 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java index 83aa45bafc..c40b65c141 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java index ed29677602..5733e8ee6f 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java index f63f058e08..b1e387e645 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Delete.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java index 0cb03c4e98..8ef2b34a84 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java index 031e35f09a..9b31d49aa8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Subquery2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java index 390adf1553..c66ec2e10c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/visitor/OracleSchemaStatVisitorTest_Update.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.oracle.visitor; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java index 7fb47ea2f7..668b187e6d 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/DropTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java index 3404c06d1b..5e13e8c7b4 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java index 302f29e6ad..0f2f6f4062 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java index 692c916aa6..b0c754f9e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java index 4bac6dbab4..52cbe89954 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java index c623ec1912..93a2d0064a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGDeleteTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java index a129c2d58c..3119c464fd 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGFormatTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.postgresql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.SQLUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java index d1c66c4ea0..b01fd61117 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest0.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java index b2005c0053..a69457d46b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java index c8854ff1a7..a00dd06403 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java index 2b19801e41..1de8f0025c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java index bc7faccbc8..8374b8a6c0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java index 1db580c8b3..f07316a018 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGInsertTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectForUpdateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectForUpdateTest.java index 7253eb9817..0edb1f54e1 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectForUpdateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectForUpdateTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java index 89ed03f4fd..4959a4a85c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectIntoTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest.java index 3d74d5520d..14be02b511 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest1.java index de18c757dd..54deb993e6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest1.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest10.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest10.java index 6dbc0f60d5..97f776d5ba 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest10.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest10.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest2.java index 475225a2ca..4a1b42fbbb 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest2.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest3.java index f121325b02..7702c02247 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest3.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest4.java index c329b2db8c..913e8d3208 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest4.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest5.java index c2da99f069..f2824ae1b0 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest5.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest6.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest6.java index 81a96dc31e..f60e0a418b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest6.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest6.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest7.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest7.java index 38706f8ca4..9ba1c7c287 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest7.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest7.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest8.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest8.java index 87860c2da4..ee8be7c498 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest8.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest8.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest9.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest9.java index 1362abeefe..1582811959 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest9.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest9.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java index 1ff3948b0d..e68b5adbd3 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PostgresqlResourceTest.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java index 34a03d54ef..cb8898f991 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/TruncateTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.postgresql; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import com.alibaba.druid.sql.PGTest; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest.java index 31f00e9005..2bae52f4da 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerCreateTableTest.java @@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.sqlserver; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java index cbebe25c5f..2f2759c4ed 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java index 9d66ffc8fd..6fff16d8aa 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest1.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java index 06b22bbbab..b946c2c10b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerInsertTest3.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java index f968392e31..c3e5f29290 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java index 2f32dbfead..1c459f387b 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerRowNumberTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java index 46498cc73f..6cd87a7f02 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest2.java index 19f4946a02..50df0302ae 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java index e069e9b9bf..3feada0bf9 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest3.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java index 907103e743..21eddfa249 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest4.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest5.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest5.java index 33fece3a38..94b81a8601 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerSelectTest5.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java index d3088128aa..0b7b8c10c6 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java index 05c9c05a14..8ddea76371 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/sqlserver/SQLServerTopTest2.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.sql.sqlserver; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; diff --git a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java index c248e2d314..ebf989b610 100644 --- a/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/stat/DruidStatServiceTest.java @@ -27,7 +27,7 @@ import java.sql.ResultSet; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.springframework.context.ApplicationContext; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java index ca0752d00a..a65c0d7f06 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewSerlvetTest_allow.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java index e5bc948bf6..d9aeac9569 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/StatViewServletTest_resetEnable.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.springframework.mock.web.MockServletConfig; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java index 5a59547b1f..9a2a0bd956 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentBotStat.java @@ -16,7 +16,7 @@ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.http.stat.WebAppStat; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java index ea2d2922b6..9f335b9f4f 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentMacTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.http.stat.WebAppStat; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java index 1eb9566220..68d5f563f4 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.http.stat.WebAppStat; diff --git a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java index b8217dd277..309f21c911 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java +++ b/src/test/java/com/alibaba/druid/bvt/support/http/UserAgentWindows.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.bvt.support.http; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.http.stat.WebAppStat; diff --git a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java index 5a12d32172..490834f7f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/support/json/JSONParserTest2.java @@ -3,7 +3,7 @@ package com.alibaba.druid.bvt.support.json; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.json.JSONUtils; diff --git a/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java b/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java index 8af2c8c619..2833586c79 100644 --- a/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java +++ b/src/test/java/com/alibaba/druid/bvt/support/profile/ProfilerTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.support.profile; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.support.profile.ProfileEntryKey; diff --git a/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java index 032842f761..bf11d18cf4 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/HistogramTest.java @@ -1,6 +1,6 @@ package com.alibaba.druid.bvt.utils; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.util.Histogram; diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java index eb8661b71c..2fc89acc64 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java index 53e7923524..e12b6cc933 100644 --- a/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java +++ b/src/test/java/com/alibaba/druid/filter/config/ConfigFileGenerator.java @@ -5,7 +5,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Before; diff --git a/src/test/java/com/alibaba/druid/pool/Case0.java b/src/test/java/com/alibaba/druid/pool/Case0.java index 9d1662a3be..d4cef214f2 100644 --- a/src/test/java/com/alibaba/druid/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/pool/Case0.java @@ -17,7 +17,7 @@ package com.alibaba.druid.pool; import java.sql.Connection; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.util.JMXUtils; diff --git a/src/test/java/com/alibaba/druid/pool/Case3.java b/src/test/java/com/alibaba/druid/pool/Case3.java index 3494a3c7c5..03357ba4b4 100644 --- a/src/test/java/com/alibaba/druid/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/Case3.java @@ -19,7 +19,7 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class Case3 extends TestCase { 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 30e84032e1..21fd132c4d 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 @@ -18,7 +18,7 @@ package com.alibaba.druid.pool; import java.sql.Connection; import java.util.concurrent.CountDownLatch; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; 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 eee45a309d..48847f0dee 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 @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.management.ObjectName; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.mock.MockDriver; diff --git a/src/test/java/com/alibaba/druid/pool/TestRollBack.java b/src/test/java/com/alibaba/druid/pool/TestRollBack.java index d8e5eb4b03..e957939ad1 100644 --- a/src/test/java/com/alibaba/druid/pool/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/pool/TestRollBack.java @@ -20,7 +20,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Statement; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.util.JdbcUtils; diff --git a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java index 2886c50893..921952eb68 100644 --- a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java @@ -18,7 +18,7 @@ package com.alibaba.druid.proxy.demo; import java.sql.Connection; import java.sql.DriverManager; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.stat.JdbcStatManager; diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 76cfa40a64..93ed92a664 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -23,7 +23,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index 1ddf4dfe96..c78206696e 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -21,7 +21,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.SQLStatement; diff --git a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java index 961f170046..cf92202df0 100644 --- a/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java +++ b/src/test/java/com/alibaba/druid/sql/SQLExprParserTest.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; diff --git a/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/src/test/java/com/alibaba/druid/sql/TestMigrate.java index e3d2d91967..38c9e96612 100644 --- a/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -23,7 +23,7 @@ import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import oracle.jdbc.OracleStatement; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index e892a9fbee..72b1666d30 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import junit.framework.Assert; +import org.junit.Assert; import oracle.jdbc.OracleStatement; import com.alibaba.druid.pool.DruidDataSource; diff --git a/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java b/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java index d399b6ccda..d3d215f443 100644 --- a/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java +++ b/src/test/java/com/alibaba/druid/test/NutzTransactionTest.java @@ -2,7 +2,7 @@ package com.alibaba.druid.test; import javax.sql.DataSource; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.nutz.dao.Chain; diff --git a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java index f69fe13938..e1c2b6d0a8 100644 --- a/src/test/java/com/alibaba/druid/util/MapComparatorTest.java +++ b/src/test/java/com/alibaba/druid/util/MapComparatorTest.java @@ -19,7 +19,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; public class MapComparatorTest extends TestCase {