fixed testcase, use org.junit.Assert

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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();

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;