diff --git a/common/src/main/java/com/alibaba/otter/canal/common/utils/UriUtils.java b/common/src/main/java/com/alibaba/otter/canal/common/utils/UriUtils.java
index 9522247c..130666b6 100644
--- a/common/src/main/java/com/alibaba/otter/canal/common/utils/UriUtils.java
+++ b/common/src/main/java/com/alibaba/otter/canal/common/utils/UriUtils.java
@@ -54,6 +54,7 @@ public final class UriUtils {
         }
         String query = uri.getRawQuery();
         HashMap<String, String> params = new HashMap<String, String>();
+        @SuppressWarnings("resource")
         Scanner scan = new Scanner(query);
         scan.useDelimiter(SPLIT);
         while (scan.hasNext()) {
diff --git a/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/DirectLogFetcherTest.java b/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/DirectLogFetcherTest.java
index 03fe5265..b8f4e47d 100644
--- a/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/DirectLogFetcherTest.java
+++ b/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/DirectLogFetcherTest.java
@@ -5,7 +5,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/FileLogFetcherTest.java b/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/FileLogFetcherTest.java
index 51726db6..e7551932 100644
--- a/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/FileLogFetcherTest.java
+++ b/dbsync/src/test/java/com/taobao/tddl/dbsync/binlog/FileLogFetcherTest.java
@@ -4,7 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java b/driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java
index 6ebcca54..4c5be652 100644
--- a/driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java
+++ b/driver/src/test/java/com/alibaba/otter/canal/parse/driver/mysql/MysqlConnectorTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.parse.driver.mysql;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java b/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java
index 07533e4c..d7f27503 100644
--- a/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java
+++ b/filter/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java
@@ -20,6 +20,7 @@ import com.google.common.collect.MigrateMap;
  */
 public class PatternUtils {
 
+    @SuppressWarnings("deprecation")
     private static Map<String, Pattern> patterns = MigrateMap.makeComputingMap(new MapMaker().softValues(),
                                                      new Function<String, Pattern>() {
 
diff --git a/filter/src/test/java/com/alibaba/otter/canal/filter/AviaterFilterTest.java b/filter/src/test/java/com/alibaba/otter/canal/filter/AviaterFilterTest.java
index a306e086..d972d0e6 100644
--- a/filter/src/test/java/com/alibaba/otter/canal/filter/AviaterFilterTest.java
+++ b/filter/src/test/java/com/alibaba/otter/canal/filter/AviaterFilterTest.java
@@ -1,6 +1,6 @@
 package com.alibaba.otter.canal.filter;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/filter/src/test/java/com/alibaba/otter/canal/filter/MutliAviaterFilterTest.java b/filter/src/test/java/com/alibaba/otter/canal/filter/MutliAviaterFilterTest.java
index b9cbd172..480e19ed 100644
--- a/filter/src/test/java/com/alibaba/otter/canal/filter/MutliAviaterFilterTest.java
+++ b/filter/src/test/java/com/alibaba/otter/canal/filter/MutliAviaterFilterTest.java
@@ -5,7 +5,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Test;
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java
index 2e83921c..23f9b8da 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/AbstractMetaManagerTest.java
@@ -6,7 +6,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.alibaba.otter.canal.protocol.ClientIdentity;
 import com.alibaba.otter.canal.protocol.position.EntryPosition;
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
index eb97cf94..1bedc4ba 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/FileMixedMetaManagerTest.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/MemoryMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/MemoryMetaManagerTest.java
index fa8d7d7f..c5f91a87 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/MemoryMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/MemoryMetaManagerTest.java
@@ -2,7 +2,7 @@ package com.alibaba.otter.canal.meta;
 
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/MixedMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/MixedMetaManagerTest.java
index 947a31c8..78f98902 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/MixedMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/MixedMetaManagerTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.meta;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManagerTest.java
index b63f4787..610758c2 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/PeriodMixedMetaManagerTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.meta;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/meta/src/test/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManagerTest.java b/meta/src/test/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManagerTest.java
index 85cce8e7..46d410a7 100644
--- a/meta/src/test/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManagerTest.java
+++ b/meta/src/test/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManagerTest.java
@@ -2,7 +2,7 @@ package com.alibaba.otter.canal.meta;
 
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
index 234c1e58..71ac0789 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
@@ -4,8 +4,7 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.driver.mysql.MysqlConnector;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/EventTransactionBufferTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/EventTransactionBufferTest.java
index 24effdc7..6c433f6a 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/EventTransactionBufferTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/EventTransactionBufferTest.java
@@ -5,7 +5,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
index e37077ea..e46fdc68 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogDumpTest.java
@@ -4,7 +4,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
index af31caec..c2badf00 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/LocalBinlogEventParserTest.java
@@ -1,8 +1,5 @@
 package com.alibaba.otter.canal.parse.inbound.mysql;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.net.URL;
@@ -10,6 +7,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -93,10 +91,10 @@ public class LocalBinlogEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
-        assertEquals(entryPosition, defaultPosition);
+        Assert.assertEquals(entryPosition, defaultPosition);
     }
 
     @Test
@@ -155,12 +153,12 @@ public class LocalBinlogEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
-        assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
-        assertTrue(entryPosition.getPosition() <= 6163L);
-        assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
+        Assert.assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
+        Assert.assertTrue(entryPosition.getPosition() <= 6163L);
+        Assert.assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
     }
 
     @Test
@@ -221,11 +219,11 @@ public class LocalBinlogEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
         // assertEquals(entryPosition.getJournalName(), "mysql-bin.000002");
-        assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
+        Assert.assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
     }
 
     private EntryPosition buildPosition(String binlogFile, Long offest, Long timestamp) {
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
index 228dc851..18042539 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlDumpTest.java
@@ -4,7 +4,7 @@ import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
index 32aa2f94..6c31f447 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlEventParserTest.java
@@ -1,15 +1,11 @@
 package com.alibaba.otter.canal.parse.inbound.mysql;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
 import java.net.InetSocketAddress;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.helper.TimeoutChecker;
@@ -88,7 +84,7 @@ public class MysqlEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
         Assert.assertEquals(entryPosition, defaultPosition);
@@ -152,12 +148,12 @@ public class MysqlEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
-        assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
-        assertTrue(entryPosition.getPosition() <= 6163L);
-        assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
+        Assert.assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
+        Assert.assertTrue(entryPosition.getPosition() <= 6163L);
+        Assert.assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
     }
 
     @Test
@@ -219,12 +215,12 @@ public class MysqlEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
         Assert.assertEquals(entryPosition.getJournalName(), "mysql-bin.000001");
-        assertTrue(entryPosition.getPosition() <= 6163L);
-        assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
+        Assert.assertTrue(entryPosition.getPosition() <= 6163L);
+        Assert.assertTrue(entryPosition.getTimestamp() <= defaultPosition.getTimestamp());
     }
 
     @Test
@@ -288,12 +284,12 @@ public class MysqlEventParserTest {
         }
 
         // check
-        assertTrue(entryCount.get() > 0);
+        Assert.assertTrue(entryCount.get() > 0);
 
         // 对比第一条数据和起始的position相同
         // Assert.assertEquals(logfilename, "mysql-bin.000001");
         // Assert.assertEquals(106L, logfileoffset);
-        assertTrue(entryPosition.getTimestamp() < defaultPosition.getTimestamp());
+        Assert.assertTrue(entryPosition.getTimestamp() < defaultPosition.getTimestamp());
     }
 
     // ======================== helper method =======================
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
index 129e191b..32f636a4 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/SimpleDdlParserTest.java
@@ -1,7 +1,6 @@
 package com.alibaba.otter.canal.parse.inbound.mysql;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.alibaba.otter.canal.parse.inbound.mysql.dbsync.SimpleDdlParser;
@@ -82,6 +81,12 @@ public class SimpleDdlParserTest {
         Assert.assertNotNull(result);
         Assert.assertEquals("temp_bond_keys", result.getSchemaName());
         Assert.assertEquals("temp_bond_key_id", result.getTableName());
+
+        queryString = "CREATE TABLE performance_schema.cond_instances(NAME ";
+        result = SimpleDdlParser.parse(queryString, "retl");
+        Assert.assertNotNull(result);
+        Assert.assertEquals("performance_schema", result.getSchemaName());
+        Assert.assertEquals("cond_instances", result.getTableName());
     }
 
     @Test
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/AbstractLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/AbstractLogPositionManagerTest.java
index 202ca241..8f979c3c 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/AbstractLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/AbstractLogPositionManagerTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.parse.index;
 import java.net.InetSocketAddress;
 import java.util.Date;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.alibaba.otter.canal.protocol.position.EntryPosition;
 import com.alibaba.otter.canal.protocol.position.LogIdentity;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManagerTest.java
index 15e01a34..5b05df71 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/FileMixedLogPositionManagerTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.parse.index;
 import java.io.File;
 import java.io.IOException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.io.FileUtils;
 import org.junit.Before;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java
index 255d23f9..1b76da52 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java
@@ -3,7 +3,7 @@ package com.alibaba.otter.canal.parse.index;
 import java.net.InetSocketAddress;
 import java.util.Date;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java
index 99e78081..36faa6e0 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java
@@ -1,6 +1,6 @@
 package com.alibaba.otter.canal.parse.index;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
index 49db15e1..02c03dca 100644
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
@@ -1,6 +1,6 @@
 package com.alibaba.otter.canal.parse.index;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;
diff --git a/store/src/test/java/com/alibaba/otter/cancel/store/memory/buffer/MemoryEventStoreMultiThreadTest.java b/store/src/test/java/com/alibaba/otter/cancel/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
index a0999385..23355194 100644
--- a/store/src/test/java/com/alibaba/otter/cancel/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
+++ b/store/src/test/java/com/alibaba/otter/cancel/store/memory/buffer/MemoryEventStoreMultiThreadTest.java
@@ -7,7 +7,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.lang.math.RandomUtils;
 import org.junit.After;