diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d9864598..b7bcc7d89 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 * 【mail   】      增加文字颜色与背景颜色色差设置（pr#1252@gitee）
 * 【mail   】      XmlUtil增加xmlToBean重载，支持CopyOptions参数（issue#IAISBB@gitee）
 * 【core   】      增加默认色差方法（pr#1257@gitee）
+* 【all    】      单元测试由Junit4变更为Junit5
 
 ### 🐞Bug修复
 * 【core   】      修复因RFC3986理解有误导致的UrlPath处理冒号转义问题（issue#IAAE88@Gitee）
diff --git a/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java b/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java
index 079858775..a22ebd424 100755
--- a/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java
+++ b/hutool-aop/src/test/java/cn/hutool/aop/test/AopTest.java
@@ -4,8 +4,8 @@ import cn.hutool.aop.ProxyUtil;
 import cn.hutool.aop.aspects.TimeIntervalAspect;
 import cn.hutool.core.lang.Console;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * AOP模块单元测试
@@ -18,7 +18,7 @@ public class AopTest {
 	public void aopTest() {
 		Animal cat = ProxyUtil.proxy(new Cat(), TimeIntervalAspect.class);
 		String result = cat.eat();
-		Assert.assertEquals("猫吃鱼", result);
+		assertEquals("猫吃鱼", result);
 		cat.seize();
 	}
 
@@ -26,7 +26,7 @@ public class AopTest {
 	public void aopByAutoCglibTest() {
 		Dog dog = ProxyUtil.proxy(new Dog(), TimeIntervalAspect.class);
 		String result = dog.eat();
-		Assert.assertEquals("狗吃肉", result);
+		assertEquals("狗吃肉", result);
 
 		dog.seize();
 	}
@@ -78,7 +78,7 @@ public class AopTest {
 
 		TagObj proxy = ProxyUtil.proxy(target, TimeIntervalAspect.class);
 		//代理类获取标记tag (断言错误)
-		Assert.assertEquals("tag", proxy.getTag());
+		assertEquals("tag", proxy.getTag());
 	}
 
 	@Data
diff --git a/hutool-aop/src/test/java/cn/hutool/aop/test/IssueI74EX7Test.java b/hutool-aop/src/test/java/cn/hutool/aop/test/IssueI74EX7Test.java
index 82e90a326..5f6d1a3e5 100644
--- a/hutool-aop/src/test/java/cn/hutool/aop/test/IssueI74EX7Test.java
+++ b/hutool-aop/src/test/java/cn/hutool/aop/test/IssueI74EX7Test.java
@@ -19,7 +19,7 @@ import cn.hutool.aop.proxy.ProxyFactory;
 import cn.hutool.aop.proxy.SpringCglibProxyFactory;
 import cn.hutool.core.lang.Console;
 import lombok.Setter;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IssueI74EX7Test {
 	@Test
diff --git a/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java b/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java
index ad104d632..93bd54e9e 100755
--- a/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java
+++ b/hutool-bloomFilter/src/test/java/cn/hutool/bloomfilter/BitMapBloomFilterTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.bloomfilter;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.bloomfilter.bitMap.IntMap;
 import cn.hutool.bloomfilter.bitMap.LongMap;
@@ -16,13 +16,13 @@ public class BitMapBloomFilterTest {
 		filter.add("abc");
 		filter.add("ddd");
 
-		Assert.assertTrue(filter.contains("abc"));
-		Assert.assertTrue(filter.contains("ddd"));
-		Assert.assertTrue(filter.contains("123"));
+		assertTrue(filter.contains("abc"));
+		assertTrue(filter.contains("ddd"));
+		assertTrue(filter.contains("123"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testIntMap(){
 		IntMap intMap = new IntMap();
 
@@ -38,7 +38,7 @@ public class BitMapBloomFilterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testLongMap(){
 		LongMap longMap = new LongMap();
 
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java b/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java
index 22445b28b..bf98269ff 100755
--- a/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/CacheConcurrentTest.java
@@ -6,9 +6,9 @@ import cn.hutool.cache.impl.WeakCache;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ConcurrencyTester;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class CacheConcurrentTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void fifoCacheTest() {
 		int threadCount = 4000;
 		final Cache<String, String> cache = new FIFOCache<>(3);
@@ -52,7 +52,7 @@ public class CacheConcurrentTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lruCacheTest() {
 		int threadCount = 40000;
 		final Cache<String, String> cache = new LRUCache<>(1000);
@@ -102,6 +102,6 @@ public class CacheConcurrentTest {
 		});
 		long interval = concurrencyTester.getInterval();
 		// 总耗时应与单次操作耗时在同一个数量级
-		Assert.assertTrue(interval < delay * 2);
+		assertTrue(interval < delay * 2);
 	}
 }
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java
index 5bfc91c40..62766f779 100755
--- a/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/CacheTest.java
@@ -4,8 +4,8 @@ import cn.hutool.cache.impl.TimedCache;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 缓存测试用例
@@ -19,8 +19,8 @@ public class CacheTest {
 		Cache<String,String> fifoCache = CacheUtil.newFIFOCache(3);
 		fifoCache.setListener((key, value)->{
 			// 监听测试，此测试中只有key1被移除，测试是否监听成功
-			Assert.assertEquals("key1", key);
-			Assert.assertEquals("value1", value);
+			assertEquals("key1", key);
+			assertEquals("value1", value);
 		});
 
 		fifoCache.put("key1", "value1", DateUnit.SECOND.getMillis() * 3);
@@ -30,7 +30,7 @@ public class CacheTest {
 
 		//由于缓存容量只有3，当加入第四个元素的时候，根据FIFO规则，最先放入的对象将被移除
 		String value1 = fifoCache.get("key1");
-		Assert.assertNull(value1);
+		assertNull(value1);
 	}
 
 	@Test
@@ -39,7 +39,7 @@ public class CacheTest {
 		for (int i = 0; i < RandomUtil.randomInt(100, 1000); i++) {
 			fifoCache.put("key" + i, "value" + i);
 		}
-		Assert.assertEquals(100, fifoCache.size());
+		assertEquals(100, fifoCache.size());
 	}
 
 	@Test
@@ -56,16 +56,16 @@ public class CacheTest {
 		String value1 = lfuCache.get("key1");
 		String value2 = lfuCache.get("key2");
 		String value3 = lfuCache.get("key3");
-		Assert.assertNotNull(value1);
-		Assert.assertNull(value2);
-		Assert.assertNull(value3);
+		assertNotNull(value1);
+		assertNull(value2);
+		assertNull(value3);
 	}
 
 	@Test
 	public void lfuCacheTest2(){
 		Cache<String, String> lfuCache = CacheUtil.newLFUCache(3);
 		final String s = lfuCache.get(null);
-		Assert.assertNull(s);
+		assertNull(s);
 	}
 
 	@Test
@@ -81,10 +81,10 @@ public class CacheTest {
 		lruCache.put("key4", "value4", DateUnit.SECOND.getMillis() * 3);
 
 		String value1 = lruCache.get("key1");
-		Assert.assertNotNull(value1);
+		assertNotNull(value1);
 		//由于缓存容量只有3，当加入第四个元素的时候，根据LRU规则，最少使用的将被移除（2被移除）
 		String value2 = lruCache.get("key2");
-		Assert.assertNull(value2);
+		assertNull(value2);
 	}
 
 	@Test
@@ -103,20 +103,20 @@ public class CacheTest {
 
 		//5毫秒后由于value2设置了5毫秒过期，因此只有value2被保留下来
 		String value1 = timedCache.get("key1");
-		Assert.assertNull(value1);
+		assertNull(value1);
 		String value2 = timedCache.get("key2");
-		Assert.assertEquals("value2", value2);
+		assertEquals("value2", value2);
 
 		//5毫秒后，由于设置了默认过期，key3只被保留4毫秒，因此为null
 		String value3 = timedCache.get("key3");
-		Assert.assertNull(value3);
+		assertNull(value3);
 
 		String value3Supplier = timedCache.get("key3", () -> "Default supplier");
-		Assert.assertEquals("Default supplier", value3Supplier);
+		assertEquals("Default supplier", value3Supplier);
 
 		// 永不过期
 		String value4 = timedCache.get("key4");
-		Assert.assertEquals("value4", value4);
+		assertEquals("value4", value4);
 
 		//取消定时清理
 		timedCache.cancelPruneSchedule();
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java
index eaadb83db..152c778c0 100755
--- a/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/FileCacheTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.cache;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.cache.file.LFUFileCache;
 
@@ -14,6 +14,6 @@ public class FileCacheTest {
 	@Test
 	public void lfuFileCacheTest() {
 		LFUFileCache cache = new LFUFileCache(1000, 500, 2000);
-		Assert.assertNotNull(cache);
+		assertNotNull(cache);
 	}
 }
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/Issue3618Test.java b/hutool-cache/src/test/java/cn/hutool/cache/Issue3618Test.java
index d914091c2..5a097ef3e 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/Issue3618Test.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/Issue3618Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.cache;
 
 import cn.hutool.cache.impl.FIFOCache;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3618Test {
 	@Test
@@ -12,11 +12,11 @@ public class Issue3618Test {
 		cache.put(2, 1);
 		cache.put(3, 1);
 
-		Assert.assertEquals(3, cache.size());
+		assertEquals(3, cache.size());
 
 		// issue#3618 对于替换的键值对，不做满队列检查和清除
 		cache.put(3, 2);
 
-		Assert.assertEquals(3, cache.size());
+		assertEquals(3, cache.size());
 	}
 }
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/IssueI8MEIXTest.java b/hutool-cache/src/test/java/cn/hutool/cache/IssueI8MEIXTest.java
index 4126f292f..eb7565cd6 100644
--- a/hutool-cache/src/test/java/cn/hutool/cache/IssueI8MEIXTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/IssueI8MEIXTest.java
@@ -3,13 +3,13 @@ package cn.hutool.cache;
 import cn.hutool.cache.impl.TimedCache;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI8MEIXTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getRemoveTest() {
 		final TimedCache<String, String> cache = new TimedCache<>(200);
 		cache.put("a", "123");
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java
index ef739ac39..9b7886be0 100755
--- a/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/LRUCacheTest.java
@@ -4,9 +4,9 @@ import cn.hutool.cache.impl.LRUCache;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class LRUCacheTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void putTest(){
 		//https://github.com/dromara/hutool/issues/2227
 		final LRUCache<String, String> cache = CacheUtil.newLRUCache(100, 10);
@@ -55,7 +55,7 @@ public class LRUCacheTest {
 		for (int i = 0; i < 10; i++) {
 			sb1.append(cache.get(i));
 		}
-		Assert.assertEquals("0123456789", sb1.toString());
+		assertEquals("0123456789", sb1.toString());
 
 		// 新加11，此时0最久未使用，应该淘汰0
 		cache.put(11, 11);
@@ -64,7 +64,7 @@ public class LRUCacheTest {
 		for (int i = 0; i < 10; i++) {
 			sb2.append(cache.get(i));
 		}
-		Assert.assertEquals("null123456789", sb2.toString());
+		assertEquals("null123456789", sb2.toString());
 	}
 
 	@Test
@@ -82,7 +82,7 @@ public class LRUCacheTest {
 			cache.put(StrUtil.format("key-{}", i), i);
 		}
 
-		Assert.assertEquals(7, removeCount.get());
-		Assert.assertEquals(3, cache.size());
+		assertEquals(7, removeCount.get());
+		assertEquals(3, cache.size());
 	}
 }
diff --git a/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java b/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java
index f61ed77b7..247f43c5a 100755
--- a/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java
+++ b/hutool-cache/src/test/java/cn/hutool/cache/WeakCacheTest.java
@@ -2,9 +2,9 @@ package cn.hutool.cache;
 
 import cn.hutool.cache.impl.WeakCache;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class WeakCacheTest {
 
@@ -14,16 +14,16 @@ public class WeakCacheTest {
 		cache.put("abc", "123");
 		cache.put("def", "456");
 
-		Assert.assertEquals(2, cache.size());
+		assertEquals(2, cache.size());
 
 		// 检查被MutableObj包装的key能否正常移除
 		cache.remove("abc");
 
-		Assert.assertEquals(1, cache.size());
+		assertEquals(1, cache.size());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void removeByGcTest(){
 		// https://gitee.com/dromara/hutool/issues/I51O7M
 		WeakCache<String, String> cache = new WeakCache<>(-1);
@@ -31,7 +31,7 @@ public class WeakCacheTest {
 		cache.put("b", "2");
 
 		// 监听
-		Assert.assertEquals(2, cache.size());
+		assertEquals(2, cache.size());
 		cache.setListener(Console::log);
 
 		// GC测试
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java
index 233635d01..a6b5f8ecf 100755
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java
+++ b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java
@@ -2,9 +2,9 @@ package cn.hutool.captcha;
 
 import cn.hutool.captcha.generator.MathGenerator;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.*;
 
@@ -19,12 +19,12 @@ public class CaptchaTest {
 	public void lineCaptchaTest1() {
 		// 定义图形验证码的长和宽
 		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 100);
-		Assert.assertNotNull(lineCaptcha.getCode());
-		Assert.assertTrue(lineCaptcha.verify(lineCaptcha.getCode()));
+		assertNotNull(lineCaptcha.getCode());
+		assertTrue(lineCaptcha.verify(lineCaptcha.getCode()));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lineCaptchaTest3() {
 		// 定义图形验证码的长和宽
 		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 70, 4, 15);
@@ -33,7 +33,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lineCaptchaTestWithSize() {
 		// 定义图形验证码的长和宽
 		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 70, 4, 15, 0.65f);
@@ -42,7 +42,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lineCaptchaWithMathTest() {
 		// 定义图形验证码的长和宽
 		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 80);
@@ -52,7 +52,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lineCaptchaTest2() {
 
 		// 定义图形验证码的长和宽
@@ -72,7 +72,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void circleCaptchaTest() {
 
 		// 定义图形验证码的长和宽
@@ -86,7 +86,7 @@ public class CaptchaTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void circleCaptchaTestWithSize() {
 		// 定义图形验证码的长和宽
 		CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(200, 70, 4, 15, 0.65f);
@@ -95,7 +95,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void shearCaptchaTest() {
 
 		// 定义图形验证码的长和宽
@@ -108,7 +108,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void shearCaptchaTest2() {
 
 		// 定义图形验证码的长和宽
@@ -120,7 +120,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void ShearCaptchaWithMathTest() {
 		// 定义图形验证码的长和宽
 		ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(200, 45, 4, 4);
@@ -134,7 +134,7 @@ public class CaptchaTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void ShearCaptchaTestWithSize() {
 		// 定义图形验证码的长和宽
 		ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(200, 70, 4, 15, 0.65f);
@@ -143,7 +143,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void GifCaptchaTest() {
 		GifCaptcha captcha = CaptchaUtil.createGifCaptcha(200, 100, 4);
 		captcha.write("d:/test/gif_captcha.gif");
@@ -151,7 +151,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void GifCaptchaTestWithSize() {
 		// 定义图形验证码的长和宽
 		GifCaptcha captcha = CaptchaUtil.createGifCaptcha(200, 70, 4, 15, 0.65f);
@@ -160,7 +160,7 @@ public class CaptchaTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bgTest() {
 		LineCaptcha captcha = CaptchaUtil.createLineCaptcha(200, 100, 4, 1);
 		captcha.setBackground(Color.WHITE);
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java
index 6efd38772..7fc66cf0d 100755
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java
+++ b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaUtilTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.img.GraphicsUtil;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 import java.awt.Graphics;
@@ -17,7 +17,7 @@ import java.util.concurrent.ThreadLocalRandom;
 public class CaptchaUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void createTest() {
 		for(int i = 0; i < 1; i++) {
 			CaptchaUtil.createShearCaptcha(320, 240);
@@ -25,7 +25,7 @@ public class CaptchaUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void drawStringColourfulColorDistanceTest() {
 		for(int i = 0; i < 10; i++) {
 			AbstractCaptcha lineCaptcha = new TestLineCaptchaColorDistance(200, 100, 5, 10);
@@ -34,7 +34,7 @@ public class CaptchaUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void drawStringColourfulDefaultColorDistanceTest() {
 		for(int i = 0; i < 10; i++) {
 			AbstractCaptcha lineCaptcha = new TestLineCaptchaColorDistanceDefaultColorDistance(200, 100, 5, 10);
diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java
index 999be5c52..0e0cfffd8 100755
--- a/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java
+++ b/hutool-captcha/src/test/java/cn/hutool/captcha/GeneratorTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.captcha;
 
 import cn.hutool.captcha.generator.MathGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GeneratorTest {
 
diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java
index bcf2ba4b5..d1491dc6a 100644
--- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java
+++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationProxy.java
@@ -29,9 +29,9 @@ public class AnnotationProxy<T extends Annotation> implements Annotation, Invoca
 	 *
 	 * @param annotation 注解
 	 */
+	@SuppressWarnings("unchecked")
 	public AnnotationProxy(T annotation) {
 		this.annotation = annotation;
-		//noinspection unchecked
 		this.type = (Class<T>) annotation.annotationType();
 		this.attributes = initAttributes();
 	}
diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
index a1301a064..6f286ce64 100755
--- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
@@ -128,13 +128,13 @@ public class AnnotationUtil {
 	 * @return 注解对象数组
 	 * @since 5.8.0
 	 */
+	@SuppressWarnings("unchecked")
 	public static <T> T[] getAnnotations(AnnotatedElement annotationEle, boolean isToCombination, Class<T> annotationType) {
 		final Annotation[] annotations = getAnnotations(annotationEle, isToCombination,
 				(annotation -> null == annotationType || annotationType.isAssignableFrom(annotation.getClass())));
 
 		final T[] result = ArrayUtil.newArray(annotationType, annotations.length);
 		for (int i = 0; i < annotations.length; i++) {
-			//noinspection unchecked
 			result[i] = (T) annotations[i];
 		}
 		return result;
diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
index da4bb61f9..701737367 100755
--- a/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/LambdaUtil.java
@@ -27,24 +27,24 @@ public class LambdaUtil {
 	 * <li>引用特定对象的实例方法：<pre>{@code
 	 * MyTeacher myTeacher = new MyTeacher();
 	 * Class<MyTeacher> supplierClass = LambdaUtil.getRealClass(myTeacher::getAge);
-	 * Assert.assertEquals(MyTeacher.class, supplierClass);
+	 * assertEquals(MyTeacher.class, supplierClass);
 	 * }</pre></li>
 	 * <li>引用静态无参方法：<pre>{@code
 	 * Class<MyTeacher> staticSupplierClass = LambdaUtil.getRealClass(MyTeacher::takeAge);
-	 * Assert.assertEquals(MyTeacher.class, staticSupplierClass);
+	 * assertEquals(MyTeacher.class, staticSupplierClass);
 	 * }</pre></li>
 	 * </ul>
 	 * 在以下场景无法获取到正确类型
 	 * <pre>{@code
 	 * // 枚举测试，只能获取到枚举类型
 	 * Class<Enum<?>> enumSupplierClass = LambdaUtil.getRealClass(LambdaUtil.LambdaKindEnum.REF_NONE::ordinal);
-	 * Assert.assertEquals(Enum.class, enumSupplierClass);
+	 * assertEquals(Enum.class, enumSupplierClass);
 	 * // 调用父类方法，只能获取到父类类型
 	 * Class<Entity<?>> superSupplierClass = LambdaUtil.getRealClass(myTeacher::getId);
-	 * Assert.assertEquals(Entity.class, superSupplierClass);
+	 * assertEquals(Entity.class, superSupplierClass);
 	 * // 引用父类静态带参方法，只能获取到父类类型
 	 * Class<Entity<?>> staticSuperFunctionClass = LambdaUtil.getRealClass(MyTeacher::takeId);
-	 * Assert.assertEquals(Entity.class, staticSuperFunctionClass);
+	 * assertEquals(Entity.class, staticSuperFunctionClass);
 	 * }</pre>
 	 *
 	 * @param func lambda
@@ -114,11 +114,11 @@ public class LambdaUtil {
 	 * <ul>
 	 * <li>引用特定类型的任意对象的实例方法：<pre>{@code
 	 * Class<MyTeacher> functionClass = LambdaUtil.getRealClass(MyTeacher::getAge);
-	 * Assert.assertEquals(MyTeacher.class, functionClass);
+	 * assertEquals(MyTeacher.class, functionClass);
 	 * }</pre></li>
 	 * <li>引用静态带参方法：<pre>{@code
 	 * Class<MyTeacher> staticFunctionClass = LambdaUtil.getRealClass(MyTeacher::takeAgeBy);
-	 * Assert.assertEquals(MyTeacher.class, staticFunctionClass);
+	 * assertEquals(MyTeacher.class, staticFunctionClass);
 	 * }</pre></li>
 	 * </ul>
 	 *
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AbstractWrappedAnnotationAttributeTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AbstractWrappedAnnotationAttributeTest.java
index 66059a18d..a7829b2ff 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AbstractWrappedAnnotationAttributeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AbstractWrappedAnnotationAttributeTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -19,19 +19,19 @@ public class AbstractWrappedAnnotationAttributeTest {
 		CacheableAnnotationAttribute nameAttribute = new CacheableAnnotationAttribute(annotation, nameMethod);
 		AbstractWrappedAnnotationAttribute nameWrapper = new TestWrappedAnnotationAttribute(nameAttribute, valueAttribute);
 
-		Assert.assertEquals(nameWrapper.getAnnotation(), annotation);
+		assertEquals(nameWrapper.getAnnotation(), annotation);
 
 		// 注解属性
-		Assert.assertEquals(annotation, nameWrapper.getAnnotation());
-		Assert.assertEquals(annotation.annotationType(), nameWrapper.getAnnotationType());
-		Assert.assertEquals(nameAttribute, nameWrapper.getOriginal());
-		Assert.assertEquals(valueAttribute, nameWrapper.getLinked());
+		assertEquals(annotation, nameWrapper.getAnnotation());
+		assertEquals(annotation.annotationType(), nameWrapper.getAnnotationType());
+		assertEquals(nameAttribute, nameWrapper.getOriginal());
+		assertEquals(valueAttribute, nameWrapper.getLinked());
 
 		// 方法属性
-		Assert.assertEquals(nameMethod.getName(), nameWrapper.getAttributeName());
-		Assert.assertEquals(nameMethod.getReturnType(), nameWrapper.getAttributeType());
-		Assert.assertTrue(nameWrapper.isWrapped());
-		Assert.assertEquals("value1", nameWrapper.getValue());
+		assertEquals(nameMethod.getName(), nameWrapper.getAttributeName());
+		assertEquals(nameMethod.getReturnType(), nameWrapper.getAttributeType());
+		assertTrue(nameWrapper.isWrapped());
+		assertEquals("value1", nameWrapper.getValue());
 	}
 
 	@Test
@@ -43,24 +43,24 @@ public class AbstractWrappedAnnotationAttributeTest {
 		Method name1Method = ReflectUtil.getMethod(AnnotationForTest1.class, "name1");
 		CacheableAnnotationAttribute name1Attribute = new CacheableAnnotationAttribute(annotation1, name1Method);
 		AbstractWrappedAnnotationAttribute wrapper1 = new TestWrappedAnnotationAttribute(name1Attribute, value1Attribute);
-		Assert.assertEquals(name1Attribute, wrapper1.getNonWrappedOriginal());
-		Assert.assertEquals(CollUtil.newArrayList(name1Attribute, value1Attribute), wrapper1.getAllLinkedNonWrappedAttributes());
+		assertEquals(name1Attribute, wrapper1.getNonWrappedOriginal());
+		assertEquals(CollUtil.newArrayList(name1Attribute, value1Attribute), wrapper1.getAllLinkedNonWrappedAttributes());
 
 		// 包装第二层：( name1 + value1 ) + value2
 		Annotation annotation2 = ClassForTest1.class.getAnnotation(AnnotationForTest2.class);
 		Method value2Method = ReflectUtil.getMethod(AnnotationForTest2.class, "value2");
 		CacheableAnnotationAttribute value2Attribute = new CacheableAnnotationAttribute(annotation2, value2Method);
 		AbstractWrappedAnnotationAttribute wrapper2 = new TestWrappedAnnotationAttribute(wrapper1, value2Attribute);
-		Assert.assertEquals(name1Attribute, wrapper2.getNonWrappedOriginal());
-		Assert.assertEquals(CollUtil.newArrayList(name1Attribute, value1Attribute, value2Attribute), wrapper2.getAllLinkedNonWrappedAttributes());
+		assertEquals(name1Attribute, wrapper2.getNonWrappedOriginal());
+		assertEquals(CollUtil.newArrayList(name1Attribute, value1Attribute, value2Attribute), wrapper2.getAllLinkedNonWrappedAttributes());
 
 		// 包装第二层：value3 + ( ( name1 + value1 ) + value2 )
 		Annotation annotation3 = ClassForTest1.class.getAnnotation(AnnotationForTest3.class);
 		Method value3Method = ReflectUtil.getMethod(AnnotationForTest3.class, "value3");
 		CacheableAnnotationAttribute value3Attribute = new CacheableAnnotationAttribute(annotation3, value3Method);
 		AbstractWrappedAnnotationAttribute wrapper3 = new TestWrappedAnnotationAttribute(value3Attribute, wrapper2);
-		Assert.assertEquals(value3Attribute, wrapper3.getNonWrappedOriginal());
-		Assert.assertEquals(CollUtil.newArrayList(value3Attribute, name1Attribute, value1Attribute, value2Attribute), wrapper3.getAllLinkedNonWrappedAttributes());
+		assertEquals(value3Attribute, wrapper3.getNonWrappedOriginal());
+		assertEquals(CollUtil.newArrayList(value3Attribute, name1Attribute, value1Attribute, value2Attribute), wrapper3.getAllLinkedNonWrappedAttributes());
 
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasAnnotationPostProcessorTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasAnnotationPostProcessorTest.java
index 8675bca82..63a242057 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasAnnotationPostProcessorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasAnnotationPostProcessorTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -26,16 +26,16 @@ public class AliasAnnotationPostProcessorTest {
 
 		processor.process(synthesizedAnnotation, synthesizedAnnotationAggregator);
 		AnnotationAttribute valueAttribute = synthesizedAnnotation.getAttributes().get("value");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
-		Assert.assertTrue(valueAttribute.isWrapped());
-		Assert.assertEquals(ForceAliasedAnnotationAttribute.class, valueAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
+		assertTrue(valueAttribute.isWrapped());
+		assertEquals(ForceAliasedAnnotationAttribute.class, valueAttribute.getClass());
 
 		AnnotationAttribute nameAttribute = synthesizedAnnotation.getAttributes().get("name");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
-		Assert.assertFalse(nameAttribute.isWrapped());
-		Assert.assertEquals(CacheableAnnotationAttribute.class, nameAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
+		assertFalse(nameAttribute.isWrapped());
+		assertEquals(CacheableAnnotationAttribute.class, nameAttribute.getClass());
 
-		Assert.assertEquals(nameAttribute, ((WrappedAnnotationAttribute)valueAttribute).getLinked());
+		assertEquals(nameAttribute, ((WrappedAnnotationAttribute)valueAttribute).getLinked());
 	}
 
 	@AnnotationForTest
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasLinkAnnotationPostProcessorTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasLinkAnnotationPostProcessorTest.java
index 040ab8aac..fe7a34984 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasLinkAnnotationPostProcessorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasLinkAnnotationPostProcessorTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -26,16 +26,16 @@ public class AliasLinkAnnotationPostProcessorTest {
 
 		processor.process(synthesizedAnnotation, synthesizedAnnotationAggregator);
 		AnnotationAttribute valueAttribute = synthesizedAnnotation.getAttributes().get("value");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
-		Assert.assertFalse(valueAttribute.isWrapped());
-		Assert.assertEquals(CacheableAnnotationAttribute.class, valueAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
+		assertFalse(valueAttribute.isWrapped());
+		assertEquals(CacheableAnnotationAttribute.class, valueAttribute.getClass());
 
 		AnnotationAttribute nameAttribute = synthesizedAnnotation.getAttributes().get("name");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
-		Assert.assertTrue(nameAttribute.isWrapped());
-		Assert.assertEquals(ForceAliasedAnnotationAttribute.class, nameAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
+		assertTrue(nameAttribute.isWrapped());
+		assertEquals(ForceAliasedAnnotationAttribute.class, nameAttribute.getClass());
 
-		Assert.assertEquals(valueAttribute, ((WrappedAnnotationAttribute)nameAttribute).getLinked());
+		assertEquals(valueAttribute, ((WrappedAnnotationAttribute)nameAttribute).getLinked());
 	}
 
 	@Test
@@ -50,16 +50,16 @@ public class AliasLinkAnnotationPostProcessorTest {
 
 		processor.process(synthesizedAnnotation, synthesizedAnnotationAggregator);
 		AnnotationAttribute valueAttribute = synthesizedAnnotation.getAttributes().get("value2");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value2"), valueAttribute.getAttribute());
-		Assert.assertFalse(valueAttribute.isWrapped());
-		Assert.assertEquals(CacheableAnnotationAttribute.class, valueAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value2"), valueAttribute.getAttribute());
+		assertFalse(valueAttribute.isWrapped());
+		assertEquals(CacheableAnnotationAttribute.class, valueAttribute.getClass());
 
 		AnnotationAttribute nameAttribute = synthesizedAnnotation.getAttributes().get("name2");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name2"), nameAttribute.getAttribute());
-		Assert.assertTrue(nameAttribute.isWrapped());
-		Assert.assertEquals(AliasedAnnotationAttribute.class, nameAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name2"), nameAttribute.getAttribute());
+		assertTrue(nameAttribute.isWrapped());
+		assertEquals(AliasedAnnotationAttribute.class, nameAttribute.getClass());
 
-		Assert.assertEquals(valueAttribute, ((WrappedAnnotationAttribute)nameAttribute).getLinked());
+		assertEquals(valueAttribute, ((WrappedAnnotationAttribute)nameAttribute).getLinked());
 	}
 
 	@AnnotationForTest
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasedAnnotationAttributeTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasedAnnotationAttributeTest.java
index 8c0bc8cbc..59de18d12 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AliasedAnnotationAttributeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AliasedAnnotationAttributeTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -20,13 +20,13 @@ public class AliasedAnnotationAttributeTest {
 		final AliasedAnnotationAttribute valueAnnotationAttribute = new AliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 注解属性
-		Assert.assertEquals(annotation, valueAnnotationAttribute.getAnnotation());
-		Assert.assertEquals(annotation.annotationType(), valueAnnotationAttribute.getAnnotationType());
+		assertEquals(annotation, valueAnnotationAttribute.getAnnotation());
+		assertEquals(annotation.annotationType(), valueAnnotationAttribute.getAnnotationType());
 
 		// 方法属性
-		Assert.assertEquals(valueMethod.getAnnotation(Alias.class), valueAnnotationAttribute.getAnnotation(Alias.class));
-		Assert.assertEquals(valueMethod.getName(), valueAnnotationAttribute.getAttributeName());
-		Assert.assertEquals(nameMethod.getReturnType(), valueAnnotationAttribute.getAttributeType());
+		assertEquals(valueMethod.getAnnotation(Alias.class), valueAnnotationAttribute.getAnnotation(Alias.class));
+		assertEquals(valueMethod.getName(), valueAnnotationAttribute.getAttributeName());
+		assertEquals(nameMethod.getReturnType(), valueAnnotationAttribute.getAttributeType());
 	}
 
 	@Test
@@ -40,9 +40,9 @@ public class AliasedAnnotationAttributeTest {
 		final AliasedAnnotationAttribute annotationAttribute = new AliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 值处理
-		Assert.assertEquals("name", annotationAttribute.getValue());
-		Assert.assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(annotationAttribute.isWrapped());
+		assertEquals("name", annotationAttribute.getValue());
+		assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(annotationAttribute.isWrapped());
 	}
 
 	@Test
@@ -56,9 +56,9 @@ public class AliasedAnnotationAttributeTest {
 		final AliasedAnnotationAttribute annotationAttribute = new AliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 值处理
-		Assert.assertEquals("value", annotationAttribute.getValue());
-		Assert.assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(annotationAttribute.isWrapped());
+		assertEquals("value", annotationAttribute.getValue());
+		assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(annotationAttribute.isWrapped());
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
index 8765d96e3..f9d074e13 100755
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/AnnotationUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -20,41 +20,41 @@ public class AnnotationUtilTest {
 	@Test
 	public void getCombinationAnnotationsTest(){
 		final Annotation[] annotations = AnnotationUtil.getAnnotations(ClassWithAnnotation.class, true);
-		Assert.assertNotNull(annotations);
-		Assert.assertEquals(2, annotations.length);
+		assertNotNull(annotations);
+		assertEquals(2, annotations.length);
 	}
 
 	@Test
 	public void getCombinationAnnotationsWithClassTest(){
 		final AnnotationForTest[] annotations = AnnotationUtil.getCombinationAnnotations(ClassWithAnnotation.class, AnnotationForTest.class);
-		Assert.assertNotNull(annotations);
-		Assert.assertEquals(1, annotations.length);
-		Assert.assertTrue(annotations[0].value().equals("测试") || annotations[0].value().equals("repeat-annotation"));
+		assertNotNull(annotations);
+		assertEquals(1, annotations.length);
+		assertTrue(annotations[0].value().equals("测试") || annotations[0].value().equals("repeat-annotation"));
 	}
 
 	@Test
 	public void getAnnotationValueTest() {
 		final Object value = AnnotationUtil.getAnnotationValue(ClassWithAnnotation.class, AnnotationForTest.class);
-		Assert.assertTrue(value.equals("测试") || value.equals("repeat-annotation"));
+		assertTrue(value.equals("测试") || value.equals("repeat-annotation"));
 
 	}
 
 	@Test
 	public void getAnnotationValueTest2() {
 		final String[] names = AnnotationUtil.getAnnotationValue(ClassWithAnnotation.class, AnnotationForTest::names);
-		Assert.assertTrue(names.length == 1 && names[0].isEmpty() || ArrayUtil.equals(names, new String[]{"测试1", "测试2"}));
+		assertTrue(names.length == 1 && names[0].isEmpty() || ArrayUtil.equals(names, new String[]{"测试1", "测试2"}));
 	}
 
 	@Test
 	public void getAnnotationSyncAlias() {
 		// 直接获取
-		Assert.assertEquals("", ClassWithAnnotation.class.getAnnotation(AnnotationForTest.class).retry());
+		assertEquals("", ClassWithAnnotation.class.getAnnotation(AnnotationForTest.class).retry());
 
 		// 加别名适配
 		final AnnotationForTest annotation = AnnotationUtil.getAnnotationAlias(ClassWithAnnotation.class, AnnotationForTest.class);
 		String retryValue = annotation.retry();
-		Assert.assertTrue(retryValue.equals("测试") || retryValue.equals("repeat-annotation"));
-		Assert.assertTrue(AnnotationUtil.isSynthesizedAnnotation(annotation));
+		assertTrue(retryValue.equals("测试") || retryValue.equals("repeat-annotation"));
+		assertTrue(AnnotationUtil.isSynthesizedAnnotation(annotation));
 	}
 
 	@Test
@@ -62,7 +62,7 @@ public class AnnotationUtilTest {
 		getAnnotationSyncAlias();
 		// 使用AnnotationUtil.getAnnotationAlias获取对象上并不存在的注解
 		final Alias alias = AnnotationUtil.getAnnotationAlias(ClassWithAnnotation.class, Alias.class);
-		Assert.assertNull(alias);
+		assertNull(alias);
 	}
 
 	@AnnotationForTest(value = "测试", names = {"测试1", "测试2"})
@@ -78,14 +78,14 @@ public class AnnotationUtilTest {
 		// RootAnnotation -> RootMetaAnnotation1 -> RootMetaAnnotation2 -> RootMetaAnnotation3
 		//                -> RootMetaAnnotation3
 		final List<Annotation> annotations = AnnotationUtil.scanMetaAnnotation(RootAnnotation.class);
-		Assert.assertEquals(4, annotations.size());
-		Assert.assertTrue(annotations.get(0).annotationType() == RootMetaAnnotation3.class ||
+		assertEquals(4, annotations.size());
+		assertTrue(annotations.get(0).annotationType() == RootMetaAnnotation3.class ||
 				annotations.get(0).annotationType() == RootMetaAnnotation1.class);
-		Assert.assertTrue(annotations.get(1).annotationType() == RootMetaAnnotation1.class ||
+		assertTrue(annotations.get(1).annotationType() == RootMetaAnnotation1.class ||
 				annotations.get(1).annotationType() == RootMetaAnnotation2.class);
-		Assert.assertTrue(annotations.get(2).annotationType() == RootMetaAnnotation2.class ||
+		assertTrue(annotations.get(2).annotationType() == RootMetaAnnotation2.class ||
 				annotations.get(2).annotationType() == RootMetaAnnotation3.class);
-		Assert.assertEquals(RootMetaAnnotation3.class, annotations.get(3).annotationType());
+		assertEquals(RootMetaAnnotation3.class, annotations.get(3).annotationType());
 	}
 
 	@Test
@@ -93,12 +93,12 @@ public class AnnotationUtilTest {
 		// TargetClass -> TargetSuperClass ----------------------------------> SuperInterface
 		//             -> TargetSuperInterface -> SuperTargetSuperInterface -> SuperInterface
 		final List<Annotation> annotations = AnnotationUtil.scanClass(TargetClass.class);
-		Assert.assertEquals(5, annotations.size());
-		Assert.assertEquals("TargetClass", ((AnnotationForTest)annotations.get(0)).value());
-		Assert.assertEquals("TargetSuperClass", ((AnnotationForTest)annotations.get(1)).value());
-		Assert.assertEquals("TargetSuperInterface", ((AnnotationForTest)annotations.get(2)).value());
-		Assert.assertEquals("SuperInterface", ((AnnotationForTest)annotations.get(3)).value());
-		Assert.assertEquals("SuperTargetSuperInterface", ((AnnotationForTest)annotations.get(4)).value());
+		assertEquals(5, annotations.size());
+		assertEquals("TargetClass", ((AnnotationForTest)annotations.get(0)).value());
+		assertEquals("TargetSuperClass", ((AnnotationForTest)annotations.get(1)).value());
+		assertEquals("TargetSuperInterface", ((AnnotationForTest)annotations.get(2)).value());
+		assertEquals("SuperInterface", ((AnnotationForTest)annotations.get(3)).value());
+		assertEquals("SuperTargetSuperInterface", ((AnnotationForTest)annotations.get(4)).value());
 	}
 
 	@Test
@@ -106,12 +106,12 @@ public class AnnotationUtilTest {
 		// TargetClass -> TargetSuperClass
 		//             -> TargetSuperInterface
 		final Method method = ReflectUtil.getMethod(TargetClass.class, "testMethod");
-		Assert.assertNotNull(method);
+		assertNotNull(method);
 		final List<Annotation> annotations = AnnotationUtil.scanMethod(method);
-		Assert.assertEquals(3, annotations.size());
-		Assert.assertEquals("TargetClass", ((AnnotationForTest)annotations.get(0)).value());
-		Assert.assertEquals("TargetSuperClass", ((AnnotationForTest)annotations.get(1)).value());
-		Assert.assertEquals("TargetSuperInterface", ((AnnotationForTest)annotations.get(2)).value());
+		assertEquals(3, annotations.size());
+		assertEquals("TargetClass", ((AnnotationForTest)annotations.get(0)).value());
+		assertEquals("TargetSuperClass", ((AnnotationForTest)annotations.get(1)).value());
+		assertEquals("TargetSuperInterface", ((AnnotationForTest)annotations.get(2)).value());
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableAnnotationAttributeTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableAnnotationAttributeTest.java
index c1b92fcd1..b988d4f7f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableAnnotationAttributeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableAnnotationAttributeTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -15,11 +15,11 @@ public class CacheableAnnotationAttributeTest {
 		final Method attribute = ReflectUtil.getMethod(AnnotationForTest.class, "value");
 		final CacheableAnnotationAttribute annotationAttribute = new CacheableAnnotationAttribute(annotation, attribute);
 		// 注解属性
-		Assert.assertEquals(annotation, annotationAttribute.getAnnotation());
-		Assert.assertEquals(annotation.annotationType(), annotationAttribute.getAnnotationType());
+		assertEquals(annotation, annotationAttribute.getAnnotation());
+		assertEquals(annotation.annotationType(), annotationAttribute.getAnnotationType());
 		// 方法属性
-		Assert.assertEquals(attribute.getName(), annotationAttribute.getAttributeName());
-		Assert.assertEquals(attribute.getReturnType(), annotationAttribute.getAttributeType());
+		assertEquals(attribute.getName(), annotationAttribute.getAttributeName());
+		assertEquals(attribute.getReturnType(), annotationAttribute.getAttributeType());
 	}
 
 	@Test
@@ -29,9 +29,9 @@ public class CacheableAnnotationAttributeTest {
 		final CacheableAnnotationAttribute annotationAttribute = new CacheableAnnotationAttribute(annotation, attribute);
 
 		// 值处理
-		Assert.assertEquals("", annotationAttribute.getValue());
-		Assert.assertTrue(annotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertFalse(annotationAttribute.isWrapped());
+		assertEquals("", annotationAttribute.getValue());
+		assertTrue(annotationAttribute.isValueEquivalentToDefaultValue());
+		assertFalse(annotationAttribute.isWrapped());
 	}
 
 	@Test
@@ -41,9 +41,9 @@ public class CacheableAnnotationAttributeTest {
 		final CacheableAnnotationAttribute annotationAttribute = new CacheableAnnotationAttribute(annotation, attribute);
 
 		// 值处理
-		Assert.assertEquals("test", annotationAttribute.getValue());
-		Assert.assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertFalse(annotationAttribute.isWrapped());
+		assertEquals("test", annotationAttribute.getValue());
+		assertFalse(annotationAttribute.isValueEquivalentToDefaultValue());
+		assertFalse(annotationAttribute.isWrapped());
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableSynthesizedAnnotationAttributeProcessorTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableSynthesizedAnnotationAttributeProcessorTest.java
index facdd1263..c91130399 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableSynthesizedAnnotationAttributeProcessorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/CacheableSynthesizedAnnotationAttributeProcessorTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.annotation;
 import cn.hutool.core.lang.Opt;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.util.ClassUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
@@ -22,8 +22,8 @@ public class CacheableSynthesizedAnnotationAttributeProcessorTest {
 		Map<String, Object> values2 = MapBuilder.<String, Object> create().put("name", "name2").put("value", "value2").build();
 		SynthesizedAnnotation annotation2 = new TestSynthesizedAnnotation(0, 0, values2);
 
-		Assert.assertEquals("name2", processor.getAttributeValue("name", String.class, Arrays.asList(annotation1, annotation2)));
-		Assert.assertEquals(Integer.valueOf(111), processor.getAttributeValue("value", Integer.class, Arrays.asList(annotation1, annotation2)));
+		assertEquals("name2", processor.getAttributeValue("name", String.class, Arrays.asList(annotation1, annotation2)));
+		assertEquals(Integer.valueOf(111), processor.getAttributeValue("value", Integer.class, Arrays.asList(annotation1, annotation2)));
 	}
 
 	static class TestSynthesizedAnnotation implements SynthesizedAnnotation {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/ForceAliasedAnnotationAttributeTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/ForceAliasedAnnotationAttributeTest.java
index d5af87a62..903a9e19c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/ForceAliasedAnnotationAttributeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/ForceAliasedAnnotationAttributeTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -20,12 +20,12 @@ public class ForceAliasedAnnotationAttributeTest {
 		final ForceAliasedAnnotationAttribute valueAnnotationAttribute = new ForceAliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 注解属性
-		Assert.assertEquals(annotation, valueAnnotationAttribute.getAnnotation());
-		Assert.assertEquals(annotation.annotationType(), valueAnnotationAttribute.getAnnotationType());
+		assertEquals(annotation, valueAnnotationAttribute.getAnnotation());
+		assertEquals(annotation.annotationType(), valueAnnotationAttribute.getAnnotationType());
 
 		// 方法属性
-		Assert.assertEquals(valueMethod.getName(), valueAnnotationAttribute.getAttributeName());
-		Assert.assertEquals(valueMethod.getReturnType(), valueAnnotationAttribute.getAttributeType());
+		assertEquals(valueMethod.getName(), valueAnnotationAttribute.getAttributeName());
+		assertEquals(valueMethod.getReturnType(), valueAnnotationAttribute.getAttributeType());
 	}
 
 	@Test
@@ -39,9 +39,9 @@ public class ForceAliasedAnnotationAttributeTest {
 		final AliasedAnnotationAttribute valueAnnotationAttribute = new AliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 值处理
-		Assert.assertEquals("name", valueAnnotationAttribute.getValue());
-		Assert.assertFalse(valueAnnotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(valueAnnotationAttribute.isWrapped());
+		assertEquals("name", valueAnnotationAttribute.getValue());
+		assertFalse(valueAnnotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(valueAnnotationAttribute.isWrapped());
 	}
 
 	@Test
@@ -55,9 +55,9 @@ public class ForceAliasedAnnotationAttributeTest {
 		final ForceAliasedAnnotationAttribute valueAnnotationAttribute = new ForceAliasedAnnotationAttribute(valueAttribute, nameAttribute);
 
 		// 值处理
-		Assert.assertEquals("", valueAnnotationAttribute.getValue());
-		Assert.assertTrue(valueAnnotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(valueAnnotationAttribute.isWrapped());
+		assertEquals("", valueAnnotationAttribute.getValue());
+		assertTrue(valueAnnotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(valueAnnotationAttribute.isWrapped());
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java
index 5432ebb9f..4a5fd20ab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/GenericSynthesizedAggregateAnnotationTest.java
@@ -1,19 +1,16 @@
 package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import java.lang.annotation.Annotation;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * 合成注解{@link GenericSynthesizedAggregateAnnotation}的测试用例
  *
@@ -31,44 +28,44 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		final GenericSynthesizedAggregateAnnotation syntheticMetaAnnotation = new GenericSynthesizedAggregateAnnotation(childAnnotation);
 
 		// Annotation & AnnotatedElement
-		Assert.assertEquals(GenericSynthesizedAggregateAnnotation.class, syntheticMetaAnnotation.annotationType());
-		Assert.assertTrue(syntheticMetaAnnotation.isAnnotationPresent(GrandParentAnnotation.class));
-		Assert.assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ParentAnnotation.class));
-		Assert.assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ChildAnnotation.class));
-		Assert.assertEquals(grandParentAnnotation, syntheticMetaAnnotation.getAnnotation(GrandParentAnnotation.class));
-		Assert.assertEquals(parentAnnotation, syntheticMetaAnnotation.getAnnotation(ParentAnnotation.class));
-		Assert.assertEquals(childAnnotation, syntheticMetaAnnotation.getAnnotation(ChildAnnotation.class));
+		assertEquals(GenericSynthesizedAggregateAnnotation.class, syntheticMetaAnnotation.annotationType());
+		assertTrue(syntheticMetaAnnotation.isAnnotationPresent(GrandParentAnnotation.class));
+		assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ParentAnnotation.class));
+		assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ChildAnnotation.class));
+		assertEquals(grandParentAnnotation, syntheticMetaAnnotation.getAnnotation(GrandParentAnnotation.class));
+		assertEquals(parentAnnotation, syntheticMetaAnnotation.getAnnotation(ParentAnnotation.class));
+		assertEquals(childAnnotation, syntheticMetaAnnotation.getAnnotation(ChildAnnotation.class));
 		Annotation[] synthesizedAnnotations = syntheticMetaAnnotation.getAnnotations();
 		Arrays.sort(synthesizedAnnotations, Comparator.comparing(Annotation::toString));
-		Assert.assertEquals(
+		assertEquals(
 			Arrays.asList(childAnnotation, grandParentAnnotation, parentAnnotation),
 			Arrays.asList(synthesizedAnnotations)
 		);
 
 		// 扩展方法
-		Assert.assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(GrandParentAnnotation.class));
-		Assert.assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(ParentAnnotation.class));
-		Assert.assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(ChildAnnotation.class));
-		Assert.assertEquals(3, syntheticMetaAnnotation.getAllSynthesizedAnnotation().size());
+		assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(GrandParentAnnotation.class));
+		assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(ParentAnnotation.class));
+		assertNotNull(syntheticMetaAnnotation.getSynthesizedAnnotation(ChildAnnotation.class));
+		assertEquals(3, syntheticMetaAnnotation.getAllSynthesizedAnnotation().size());
 
 		// 属性
-		Assert.assertEquals(SynthesizedAnnotationSelector.NEAREST_AND_OLDEST_PRIORITY, syntheticMetaAnnotation.getAnnotationSelector());
-		Assert.assertEquals(CacheableSynthesizedAnnotationAttributeProcessor.class, syntheticMetaAnnotation.getAnnotationAttributeProcessor().getClass());
-		Assert.assertEquals(3, syntheticMetaAnnotation.getAnnotationPostProcessors().size());
+		assertEquals(SynthesizedAnnotationSelector.NEAREST_AND_OLDEST_PRIORITY, syntheticMetaAnnotation.getAnnotationSelector());
+		assertEquals(CacheableSynthesizedAnnotationAttributeProcessor.class, syntheticMetaAnnotation.getAnnotationAttributeProcessor().getClass());
+		assertEquals(3, syntheticMetaAnnotation.getAnnotationPostProcessors().size());
 	}
 
 	@Test
 	public void synthesisAnnotationAttributeTest() {
 		final ChildAnnotation rootAnnotation = AnnotatedClass.class.getAnnotation(ChildAnnotation.class);
 		GenericSynthesizedAggregateAnnotation syntheticMetaAnnotation = new GenericSynthesizedAggregateAnnotation(rootAnnotation);
-		Assert.assertEquals(syntheticMetaAnnotation.getSource(), Collections.singletonList(rootAnnotation));
-		Assert.assertEquals(syntheticMetaAnnotation.annotationType(), GenericSynthesizedAggregateAnnotation.class);
-		Assert.assertEquals(3, syntheticMetaAnnotation.getAnnotations().length);
+		assertEquals(syntheticMetaAnnotation.getSource(), Collections.singletonList(rootAnnotation));
+		assertEquals(syntheticMetaAnnotation.annotationType(), GenericSynthesizedAggregateAnnotation.class);
+		assertEquals(3, syntheticMetaAnnotation.getAnnotations().length);
 
-		Assert.assertEquals("Child!", syntheticMetaAnnotation.getAttributeValue("childValue", String.class));
-		Assert.assertEquals("Child!", syntheticMetaAnnotation.getAttributeValue("childValueAlias", String.class));
-		Assert.assertEquals("Child's Parent!", syntheticMetaAnnotation.getAttributeValue("parentValue", String.class));
-		Assert.assertEquals("Child's GrandParent!", syntheticMetaAnnotation.getAttributeValue("grandParentValue", String.class));
+		assertEquals("Child!", syntheticMetaAnnotation.getAttributeValue("childValue", String.class));
+		assertEquals("Child!", syntheticMetaAnnotation.getAttributeValue("childValueAlias", String.class));
+		assertEquals("Child's Parent!", syntheticMetaAnnotation.getAttributeValue("parentValue", String.class));
+		assertEquals("Child's GrandParent!", syntheticMetaAnnotation.getAttributeValue("grandParentValue", String.class));
 	}
 
 	@Test
@@ -78,39 +75,39 @@ public class GenericSynthesizedAggregateAnnotationTest {
 
 		final ChildAnnotation childAnnotation = syntheticMetaAnnotation.synthesize(ChildAnnotation.class);
 		SynthesizedAnnotation childSyntheticAnnotation = syntheticMetaAnnotation.getSynthesizedAnnotation(ChildAnnotation.class);
-		Assert.assertNotNull(childSyntheticAnnotation);
-		Assert.assertTrue(childSyntheticAnnotation.hasAttribute("childValue", String.class));
-		Assert.assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), childSyntheticAnnotation.getRoot());
-		Assert.assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), childSyntheticAnnotation.getAnnotation());
-		Assert.assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ChildAnnotation.class));
-		Assert.assertNotNull(childAnnotation);
-		Assert.assertEquals("Child!", childAnnotation.childValue());
-		Assert.assertEquals("Child!", childAnnotation.childValueAlias());
-		Assert.assertEquals(childAnnotation.grandParentType(), Integer.class);
-		Assert.assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(childAnnotation));
+		assertNotNull(childSyntheticAnnotation);
+		assertTrue(childSyntheticAnnotation.hasAttribute("childValue", String.class));
+		assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), childSyntheticAnnotation.getRoot());
+		assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), childSyntheticAnnotation.getAnnotation());
+		assertTrue(syntheticMetaAnnotation.isAnnotationPresent(ChildAnnotation.class));
+		assertNotNull(childAnnotation);
+		assertEquals("Child!", childAnnotation.childValue());
+		assertEquals("Child!", childAnnotation.childValueAlias());
+		assertEquals(childAnnotation.grandParentType(), Integer.class);
+		assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(childAnnotation));
 
 		final ParentAnnotation parentAnnotation = syntheticMetaAnnotation.synthesize(ParentAnnotation.class);
 		SynthesizedAnnotation parentSyntheticAnnotation = syntheticMetaAnnotation.getSynthesizedAnnotation(ParentAnnotation.class);
-		Assert.assertNotNull(parentSyntheticAnnotation);
-		Assert.assertTrue(parentSyntheticAnnotation.hasAttribute("parentValue", String.class));
-		Assert.assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), parentSyntheticAnnotation.getRoot());
-		Assert.assertEquals(ChildAnnotation.class.getAnnotation(ParentAnnotation.class), parentSyntheticAnnotation.getAnnotation());
-		Assert.assertNotNull(parentAnnotation);
-		Assert.assertEquals("Child's Parent!", parentAnnotation.parentValue());
-		Assert.assertEquals("java.lang.Void", parentAnnotation.grandParentType());
-		Assert.assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(parentAnnotation));
+		assertNotNull(parentSyntheticAnnotation);
+		assertTrue(parentSyntheticAnnotation.hasAttribute("parentValue", String.class));
+		assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), parentSyntheticAnnotation.getRoot());
+		assertEquals(ChildAnnotation.class.getAnnotation(ParentAnnotation.class), parentSyntheticAnnotation.getAnnotation());
+		assertNotNull(parentAnnotation);
+		assertEquals("Child's Parent!", parentAnnotation.parentValue());
+		assertEquals("java.lang.Void", parentAnnotation.grandParentType());
+		assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(parentAnnotation));
 
 		final GrandParentAnnotation grandParentAnnotation = syntheticMetaAnnotation.synthesize(GrandParentAnnotation.class);
 		SynthesizedAnnotation grandParentSyntheticAnnotation = syntheticMetaAnnotation.getSynthesizedAnnotation(GrandParentAnnotation.class);
-		Assert.assertNotNull(grandParentSyntheticAnnotation);
-		Assert.assertTrue(grandParentSyntheticAnnotation.hasAttribute("grandParentType", Class.class));
-		Assert.assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), grandParentSyntheticAnnotation.getRoot());
-		Assert.assertEquals(ChildAnnotation.class.getAnnotation(GrandParentAnnotation.class), grandParentSyntheticAnnotation.getAnnotation());
-		Assert.assertTrue(syntheticMetaAnnotation.isAnnotationPresent(GrandParentAnnotation.class));
-		Assert.assertNotNull(grandParentAnnotation);
-		Assert.assertEquals("Child's GrandParent!", grandParentAnnotation.grandParentValue());
-		Assert.assertEquals(grandParentAnnotation.grandParentType(), Integer.class);
-		Assert.assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(grandParentAnnotation));
+		assertNotNull(grandParentSyntheticAnnotation);
+		assertTrue(grandParentSyntheticAnnotation.hasAttribute("grandParentType", Class.class));
+		assertEquals(AnnotatedClass.class.getAnnotation(ChildAnnotation.class), grandParentSyntheticAnnotation.getRoot());
+		assertEquals(ChildAnnotation.class.getAnnotation(GrandParentAnnotation.class), grandParentSyntheticAnnotation.getAnnotation());
+		assertTrue(syntheticMetaAnnotation.isAnnotationPresent(GrandParentAnnotation.class));
+		assertNotNull(grandParentAnnotation);
+		assertEquals("Child's GrandParent!", grandParentAnnotation.grandParentValue());
+		assertEquals(grandParentAnnotation.grandParentType(), Integer.class);
+		assertThrows(IllegalArgumentException.class, () -> new GenericSynthesizedAggregateAnnotation(grandParentAnnotation));
 	}
 
 	@Test
@@ -118,8 +115,8 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		final Method method = ReflectUtil.getMethod(AnnotationForLinkTest.class, "value");
 		final SynthesizedAggregateAnnotation synthesizedAnnotationAggregator = new GenericSynthesizedAggregateAnnotation(method.getAnnotation(AliasFor.class));
 		final Link link = synthesizedAnnotationAggregator.synthesize(Link.class);
-		Assert.assertEquals(AnnotationForLinkTest.class, link.annotation());
-		Assert.assertEquals("name", link.attribute());
+		assertEquals(AnnotationForLinkTest.class, link.annotation());
+		assertEquals("name", link.attribute());
 	}
 
 	@Test
@@ -127,20 +124,20 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		AnnotationForMirrorTest annotation = ClassForMirrorTest.class.getAnnotation(AnnotationForMirrorTest.class);
 		SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		AnnotationForMirrorTest syntheticAnnotation = synthetic.synthesize(AnnotationForMirrorTest.class);
-		Assert.assertEquals("Foo", syntheticAnnotation.name());
-		Assert.assertEquals("Foo", syntheticAnnotation.value());
+		assertEquals("Foo", syntheticAnnotation.name());
+		assertEquals("Foo", syntheticAnnotation.value());
 
 		annotation = ClassForMirrorTest2.class.getAnnotation(AnnotationForMirrorTest.class);
 		synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		syntheticAnnotation = synthetic.synthesize(AnnotationForMirrorTest.class);
-		Assert.assertEquals("Foo", syntheticAnnotation.name());
-		Assert.assertEquals("Foo", syntheticAnnotation.value());
+		assertEquals("Foo", syntheticAnnotation.name());
+		assertEquals("Foo", syntheticAnnotation.value());
 
 		annotation = ClassForMirrorTest3.class.getAnnotation(AnnotationForMirrorTest.class);
 		synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		syntheticAnnotation = synthetic.synthesize(AnnotationForMirrorTest.class);
 		AnnotationForMirrorTest finalSyntheticAnnotation = syntheticAnnotation;
-		Assert.assertThrows(IllegalArgumentException.class, finalSyntheticAnnotation::name);
+		assertThrows(IllegalArgumentException.class, finalSyntheticAnnotation::name);
 	}
 
 	@Test
@@ -148,16 +145,16 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		AnnotationForAliasForTest annotation = ClassForAliasForTest.class.getAnnotation(AnnotationForAliasForTest.class);
 		SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		MetaAnnotationForAliasForTest metaAnnotation = synthetic.synthesize(MetaAnnotationForAliasForTest.class);
-		Assert.assertEquals("Meta", metaAnnotation.name());
+		assertEquals("Meta", metaAnnotation.name());
 		AnnotationForAliasForTest childAnnotation = synthetic.synthesize(AnnotationForAliasForTest.class);
-		Assert.assertEquals("", childAnnotation.value());
+		assertEquals("", childAnnotation.value());
 
 		annotation = ClassForAliasForTest2.class.getAnnotation(AnnotationForAliasForTest.class);
 		synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		metaAnnotation = synthetic.synthesize(MetaAnnotationForAliasForTest.class);
-		Assert.assertEquals("Foo", metaAnnotation.name());
+		assertEquals("Foo", metaAnnotation.name());
 		childAnnotation = synthetic.synthesize(AnnotationForAliasForTest.class);
-		Assert.assertEquals("Foo", childAnnotation.value());
+		assertEquals("Foo", childAnnotation.value());
 	}
 
 	@Test
@@ -165,16 +162,16 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		AnnotationForceForAliasForTest annotation = ClassForForceAliasForTest.class.getAnnotation(AnnotationForceForAliasForTest.class);
 		SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		MetaAnnotationForForceAliasForTest metaAnnotation = synthetic.synthesize(MetaAnnotationForForceAliasForTest.class);
-		Assert.assertEquals("", metaAnnotation.name());
+		assertEquals("", metaAnnotation.name());
 		AnnotationForceForAliasForTest childAnnotation = synthetic.synthesize(AnnotationForceForAliasForTest.class);
-		Assert.assertEquals("", childAnnotation.value());
+		assertEquals("", childAnnotation.value());
 
 		annotation = ClassForForceAliasForTest2.class.getAnnotation(AnnotationForceForAliasForTest.class);
 		synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		metaAnnotation = synthetic.synthesize(MetaAnnotationForForceAliasForTest.class);
-		Assert.assertEquals("Foo", metaAnnotation.name());
+		assertEquals("Foo", metaAnnotation.name());
 		childAnnotation = synthetic.synthesize(AnnotationForceForAliasForTest.class);
-		Assert.assertEquals("Foo", childAnnotation.value());
+		assertEquals("Foo", childAnnotation.value());
 	}
 
 	@Test
@@ -182,10 +179,10 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		AnnotationForMirrorThenAliasForTest annotation = ClassForAliasForAndMirrorTest.class.getAnnotation(AnnotationForMirrorThenAliasForTest.class);
 		SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 		MetaAnnotationForMirrorThenAliasForTest metaAnnotation = synthetic.synthesize(MetaAnnotationForMirrorThenAliasForTest.class);
-		Assert.assertEquals("test", metaAnnotation.name());
-		Assert.assertEquals("test", metaAnnotation.value());
+		assertEquals("test", metaAnnotation.name());
+		assertEquals("test", metaAnnotation.value());
 		AnnotationForMirrorThenAliasForTest childAnnotation = synthetic.synthesize(AnnotationForMirrorThenAliasForTest.class);
-		Assert.assertEquals("test", childAnnotation.childValue());
+		assertEquals("test", childAnnotation.childValue());
 	}
 
 	@Test
@@ -194,12 +191,12 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		final SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 
 		final MetaAnnotationForMultiAliasForTest1 metaAnnotation1 = synthetic.synthesize(MetaAnnotationForMultiAliasForTest1.class);
-		Assert.assertEquals("test", metaAnnotation1.name());
-		Assert.assertEquals("test", metaAnnotation1.value1());
+		assertEquals("test", metaAnnotation1.name());
+		assertEquals("test", metaAnnotation1.value1());
 		final MetaAnnotationForMultiAliasForTest2 metaAnnotation2 = synthetic.synthesize(MetaAnnotationForMultiAliasForTest2.class);
-		Assert.assertEquals("test", metaAnnotation2.value2());
+		assertEquals("test", metaAnnotation2.value2());
 		final AnnotationForMultiAliasForTest childAnnotation = synthetic.synthesize(AnnotationForMultiAliasForTest.class);
-		Assert.assertEquals("test", childAnnotation.value3());
+		assertEquals("test", childAnnotation.value3());
 	}
 
 	@Test
@@ -208,10 +205,10 @@ public class GenericSynthesizedAggregateAnnotationTest {
 		final SynthesizedAggregateAnnotation synthetic = new GenericSynthesizedAggregateAnnotation(annotation);
 
 		final MetaAnnotationForImplicitAliasTest metaAnnotation = synthetic.synthesize(MetaAnnotationForImplicitAliasTest.class);
-		Assert.assertEquals("Meta", metaAnnotation.name());
-		Assert.assertEquals("Foo", metaAnnotation.value());
+		assertEquals("Meta", metaAnnotation.name());
+		assertEquals("Foo", metaAnnotation.value());
 		final AnnotationForImplicitAliasTest childAnnotation = synthetic.synthesize(AnnotationForImplicitAliasTest.class);
-		Assert.assertEquals("Foo", childAnnotation.value());
+		assertEquals("Foo", childAnnotation.value());
 	}
 
 	// 注解结构如下：
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/MirrorLinkAnnotationPostProcessorTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/MirrorLinkAnnotationPostProcessorTest.java
index e65f4e611..e5f5b89b2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/MirrorLinkAnnotationPostProcessorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/MirrorLinkAnnotationPostProcessorTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -26,17 +26,17 @@ public class MirrorLinkAnnotationPostProcessorTest {
 
 		processor.process(synthesizedAnnotation, synthesizedAnnotationAggregator);
 		AnnotationAttribute valueAttribute = synthesizedAnnotation.getAttributes().get("value");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
-		Assert.assertTrue(valueAttribute.isWrapped());
-		Assert.assertEquals(MirroredAnnotationAttribute.class, valueAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "value"), valueAttribute.getAttribute());
+		assertTrue(valueAttribute.isWrapped());
+		assertEquals(MirroredAnnotationAttribute.class, valueAttribute.getClass());
 
 		AnnotationAttribute nameAttribute = synthesizedAnnotation.getAttributes().get("name");
-		Assert.assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
-		Assert.assertTrue(nameAttribute.isWrapped());
-		Assert.assertEquals(MirroredAnnotationAttribute.class, nameAttribute.getClass());
+		assertEquals(ReflectUtil.getMethod(AnnotationForTest.class, "name"), nameAttribute.getAttribute());
+		assertTrue(nameAttribute.isWrapped());
+		assertEquals(MirroredAnnotationAttribute.class, nameAttribute.getClass());
 
-		Assert.assertEquals(((WrappedAnnotationAttribute)nameAttribute).getLinked(), ((WrappedAnnotationAttribute)valueAttribute).getOriginal());
-		Assert.assertEquals(((WrappedAnnotationAttribute)nameAttribute).getOriginal(), ((WrappedAnnotationAttribute)valueAttribute).getLinked());
+		assertEquals(((WrappedAnnotationAttribute)nameAttribute).getLinked(), ((WrappedAnnotationAttribute)valueAttribute).getOriginal());
+		assertEquals(((WrappedAnnotationAttribute)nameAttribute).getOriginal(), ((WrappedAnnotationAttribute)valueAttribute).getLinked());
 	}
 
 	@AnnotationForTest
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/MirroredAnnotationAttributeTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/MirroredAnnotationAttributeTest.java
index a4f648514..44dd4f71c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/MirroredAnnotationAttributeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/MirroredAnnotationAttributeTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.annotation;
 
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
@@ -20,12 +20,12 @@ public class MirroredAnnotationAttributeTest {
 		final MirroredAnnotationAttribute nameAnnotationAttribute = new MirroredAnnotationAttribute(nameAttribute, valueAttribute);
 
 		// 注解属性
-		Assert.assertEquals(annotation, nameAnnotationAttribute.getAnnotation());
-		Assert.assertEquals(annotation.annotationType(), nameAnnotationAttribute.getAnnotationType());
+		assertEquals(annotation, nameAnnotationAttribute.getAnnotation());
+		assertEquals(annotation.annotationType(), nameAnnotationAttribute.getAnnotationType());
 
 		// 方法属性
-		Assert.assertEquals(nameMethod.getName(), nameAnnotationAttribute.getAttributeName());
-		Assert.assertEquals(nameMethod.getReturnType(), nameAnnotationAttribute.getAttributeType());
+		assertEquals(nameMethod.getName(), nameAnnotationAttribute.getAttributeName());
+		assertEquals(nameMethod.getReturnType(), nameAnnotationAttribute.getAttributeType());
 	}
 
 	@Test
@@ -39,9 +39,9 @@ public class MirroredAnnotationAttributeTest {
 		final MirroredAnnotationAttribute nameAnnotationAttribute = new MirroredAnnotationAttribute(nameAttribute, valueAttribute);
 
 		// 值处理
-		Assert.assertEquals("", nameAnnotationAttribute.getValue());
-		Assert.assertTrue(nameAnnotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(nameAnnotationAttribute.isWrapped());
+		assertEquals("", nameAnnotationAttribute.getValue());
+		assertTrue(nameAnnotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(nameAnnotationAttribute.isWrapped());
 	}
 
 	@Test
@@ -55,9 +55,9 @@ public class MirroredAnnotationAttributeTest {
 		final MirroredAnnotationAttribute nameAnnotationAttribute = new MirroredAnnotationAttribute(nameAttribute, valueAttribute);
 
 		// 值处理
-		Assert.assertEquals("name", nameAnnotationAttribute.getValue());
-		Assert.assertFalse(nameAnnotationAttribute.isValueEquivalentToDefaultValue());
-		Assert.assertTrue(nameAnnotationAttribute.isWrapped());
+		assertEquals("name", nameAnnotationAttribute.getValue());
+		assertFalse(nameAnnotationAttribute.isValueEquivalentToDefaultValue());
+		assertTrue(nameAnnotationAttribute.isWrapped());
 	}
 
 	@Retention(RetentionPolicy.RUNTIME)
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/SynthesizedAnnotationSelectorTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/SynthesizedAnnotationSelectorTest.java
index 80f06aeef..35b2158bc 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/SynthesizedAnnotationSelectorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/SynthesizedAnnotationSelectorTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.annotation;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
@@ -15,15 +15,15 @@ public class SynthesizedAnnotationSelectorTest {
 
 		TestSynthesizedAnnotation annotation1 = new TestSynthesizedAnnotation(0, 0);
 		TestSynthesizedAnnotation annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 1);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(1, 0);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 	}
 
 	@Test
@@ -32,15 +32,15 @@ public class SynthesizedAnnotationSelectorTest {
 
 		TestSynthesizedAnnotation annotation1 = new TestSynthesizedAnnotation(0, 0);
 		TestSynthesizedAnnotation annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 1);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 0);
 		annotation2 = new TestSynthesizedAnnotation(1, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 	}
 
 	@Test
@@ -49,15 +49,15 @@ public class SynthesizedAnnotationSelectorTest {
 
 		TestSynthesizedAnnotation annotation1 = new TestSynthesizedAnnotation(0, 0);
 		TestSynthesizedAnnotation annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 1);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 0);
 		annotation2 = new TestSynthesizedAnnotation(1, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 	}
 
 	@Test
@@ -66,15 +66,15 @@ public class SynthesizedAnnotationSelectorTest {
 
 		TestSynthesizedAnnotation annotation1 = new TestSynthesizedAnnotation(0, 0);
 		TestSynthesizedAnnotation annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(0, 1);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation2, selector.choose(annotation1, annotation2));
+		assertEquals(annotation2, selector.choose(annotation1, annotation2));
 
 		annotation1 = new TestSynthesizedAnnotation(1, 0);
 		annotation2 = new TestSynthesizedAnnotation(0, 0);
-		Assert.assertEquals(annotation1, selector.choose(annotation1, annotation2));
+		assertEquals(annotation1, selector.choose(annotation1, annotation2));
 	}
 
 	static class TestSynthesizedAnnotation implements SynthesizedAnnotation {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/TestIssueI8CLBJ.java b/hutool-core/src/test/java/cn/hutool/core/annotation/TestIssueI8CLBJ.java
index fd80af15d..90c2914a4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/TestIssueI8CLBJ.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/TestIssueI8CLBJ.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.annotation;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -20,9 +20,9 @@ public class TestIssueI8CLBJ {
 	@Test
 	public void test() throws NoSuchFieldException {
 		Field field = Foo.class.getDeclaredField("name");
-		Assert.assertNotNull(field);
+		assertNotNull(field);
 		Annotation[] annotations = field.getDeclaredAnnotations();
-		Assert.assertTrue(annotations.length > 0);
+		assertTrue(annotations.length > 0);
 
 		TestAnnotation annotation = AnnotationUtil.getSynthesizedAnnotation(TestAnnotation.class, annotations);
 		List<Thread> threadList = new ArrayList<>();
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/ElementAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/ElementAnnotationScannerTest.java
index df14b847b..c756334f8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/ElementAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/ElementAnnotationScannerTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation.scanner;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -17,21 +17,21 @@ public class ElementAnnotationScannerTest {
 	@Test
 	public void supportTest() {
 		final ElementAnnotationScanner scanner = new ElementAnnotationScanner();
-		Assert.assertTrue(scanner.support(ReflectUtil.getField(FieldAnnotationScannerTest.Example.class, "id")));
-		Assert.assertTrue(scanner.support(ReflectUtil.getMethod(FieldAnnotationScannerTest.Example.class, "getId")));
-		Assert.assertFalse(scanner.support(null));
-		Assert.assertTrue(scanner.support(FieldAnnotationScannerTest.Example.class));
+		assertTrue(scanner.support(ReflectUtil.getField(FieldAnnotationScannerTest.Example.class, "id")));
+		assertTrue(scanner.support(ReflectUtil.getMethod(FieldAnnotationScannerTest.Example.class, "getId")));
+		assertFalse(scanner.support(null));
+		assertTrue(scanner.support(FieldAnnotationScannerTest.Example.class));
 	}
 
 	@Test
 	public void getAnnotationsTest() {
 		final ElementAnnotationScanner scanner = new ElementAnnotationScanner();
 		final Field field = ReflectUtil.getField(FieldAnnotationScannerTest.Example.class, "id");
-		Assert.assertNotNull(field);
-		Assert.assertTrue(scanner.support(field));
+		assertNotNull(field);
+		assertTrue(scanner.support(field));
 		List<Annotation> annotations = scanner.getAnnotations(field);
-		Assert.assertEquals(1, annotations.size());
-		Assert.assertEquals(AnnotationForScannerTest.class, CollUtil.getFirst(annotations).annotationType());
+		assertEquals(1, annotations.size());
+		assertEquals(AnnotationForScannerTest.class, CollUtil.getFirst(annotations).annotationType());
 	}
 
 	@Test
@@ -43,9 +43,9 @@ public class ElementAnnotationScannerTest {
 			(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 			field, null
 		);
-		Assert.assertEquals(1, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals(AnnotationForScannerTest.class, map.get(0).get(0).annotationType());
+		assertEquals(1, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals(AnnotationForScannerTest.class, map.get(0).get(0).annotationType());
 	}
 
 	public static class Example {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/FieldAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/FieldAnnotationScannerTest.java
index e9881b234..0fa2f1362 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/FieldAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/FieldAnnotationScannerTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation.scanner;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
@@ -17,21 +17,21 @@ public class FieldAnnotationScannerTest {
 	@Test
 	public void supportTest() {
 		AnnotationScanner scanner = new FieldAnnotationScanner();
-		Assert.assertTrue(scanner.support(ReflectUtil.getField(Example.class, "id")));
-		Assert.assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
-		Assert.assertFalse(scanner.support(null));
-		Assert.assertFalse(scanner.support(Example.class));
+		assertTrue(scanner.support(ReflectUtil.getField(Example.class, "id")));
+		assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
+		assertFalse(scanner.support(null));
+		assertFalse(scanner.support(Example.class));
 	}
 
 	@Test
 	public void getAnnotationsTest() {
 		AnnotationScanner scanner = new FieldAnnotationScanner();
 		Field field = ReflectUtil.getField(Example.class, "id");
-		Assert.assertNotNull(field);
-		Assert.assertTrue(scanner.support(field));
+		assertNotNull(field);
+		assertTrue(scanner.support(field));
 		List<Annotation> annotations = scanner.getAnnotations(field);
-		Assert.assertEquals(1, annotations.size());
-		Assert.assertEquals(AnnotationForScannerTest.class, CollUtil.getFirst(annotations).annotationType());
+		assertEquals(1, annotations.size());
+		assertEquals(AnnotationForScannerTest.class, CollUtil.getFirst(annotations).annotationType());
 	}
 
 	@Test
@@ -43,9 +43,9 @@ public class FieldAnnotationScannerTest {
 			(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 			field, null
 		);
-		Assert.assertEquals(1, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals(AnnotationForScannerTest.class, map.get(0).get(0).annotationType());
+		assertEquals(1, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals(AnnotationForScannerTest.class, map.get(0).get(0).annotationType());
 	}
 
 	public static class Example {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/GenericAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/GenericAnnotationScannerTest.java
index 8b4707750..5d3625965 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/GenericAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/GenericAnnotationScannerTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.annotation.scanner;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.util.List;
@@ -12,56 +12,56 @@ public class GenericAnnotationScannerTest {
 	public void scanDirectlyTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(false, false, false);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(1, annotations.size());
+		assertEquals(1, annotations.size());
 	}
 
 	@Test
 	public void scanDirectlyAndMetaAnnotationTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(true, false, false);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(2, annotations.size());
+		assertEquals(2, annotations.size());
 	}
 
 	@Test
 	public void scanSuperclassTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(false, true, false);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(2, annotations.size());
+		assertEquals(2, annotations.size());
 	}
 
 	@Test
 	public void scanSuperclassAndMetaAnnotationTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(true, true, false);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(4, annotations.size());
+		assertEquals(4, annotations.size());
 	}
 
 	@Test
 	public void scanInterfaceTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(false, false, true);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(2, annotations.size());
+		assertEquals(2, annotations.size());
 	}
 
 	@Test
 	public void scanInterfaceAndMetaAnnotationTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(true, false, true);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(4, annotations.size());
+		assertEquals(4, annotations.size());
 	}
 
 	@Test
 	public void scanTypeHierarchyTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(false, true, true);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(3, annotations.size());
+		assertEquals(3, annotations.size());
 	}
 
 	@Test
 	public void scanTypeHierarchyAndMetaAnnotationTest() {
 		final GenericAnnotationScanner scanner = new GenericAnnotationScanner(true, true, true);
 		final List<Annotation> annotations = scanner.getAnnotations(ClassForTest.class);
-		Assert.assertEquals(6, annotations.size());
+		assertEquals(6, annotations.size());
 	}
 
 	@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE, ElementType.METHOD})
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MateAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MateAnnotationScannerTest.java
index 780edd62a..84edeb568 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MateAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MateAnnotationScannerTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation.scanner;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.*;
 import java.util.ArrayList;
@@ -16,32 +16,32 @@ public class MateAnnotationScannerTest {
 	@Test
 	public void supportTest() {
 		AnnotationScanner scanner = new MetaAnnotationScanner();
-		Assert.assertTrue(scanner.support(AnnotationForScannerTest.class));
-		Assert.assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
-		Assert.assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
-		Assert.assertFalse(scanner.support(null));
-		Assert.assertFalse(scanner.support(Example.class));
+		assertTrue(scanner.support(AnnotationForScannerTest.class));
+		assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
+		assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
+		assertFalse(scanner.support(null));
+		assertFalse(scanner.support(Example.class));
 	}
 
 	@Test
 	public void getAnnotationsTest() {
 		AnnotationScanner scanner = new MetaAnnotationScanner();
-		Assert.assertTrue(scanner.support(AnnotationForScannerTest3.class));
+		assertTrue(scanner.support(AnnotationForScannerTest3.class));
 		Map<Class<? extends Annotation>, Annotation> annotations = CollUtil.toMap(scanner.getAnnotations(AnnotationForScannerTest3.class), new HashMap<>(), Annotation::annotationType);
-		Assert.assertEquals(3, annotations.size());
-		Assert.assertTrue(annotations.containsKey(AnnotationForScannerTest.class));
-		Assert.assertTrue(annotations.containsKey(AnnotationForScannerTest1.class));
-		Assert.assertTrue(annotations.containsKey(AnnotationForScannerTest2.class));
-		Assert.assertFalse(annotations.containsKey(AnnotationForScannerTest3.class));
+		assertEquals(3, annotations.size());
+		assertTrue(annotations.containsKey(AnnotationForScannerTest.class));
+		assertTrue(annotations.containsKey(AnnotationForScannerTest1.class));
+		assertTrue(annotations.containsKey(AnnotationForScannerTest2.class));
+		assertFalse(annotations.containsKey(AnnotationForScannerTest3.class));
 
 		scanner = new MetaAnnotationScanner(false);
-		Assert.assertTrue(scanner.support(AnnotationForScannerTest3.class));
+		assertTrue(scanner.support(AnnotationForScannerTest3.class));
 		annotations = CollUtil.toMap(scanner.getAnnotations(AnnotationForScannerTest3.class), new HashMap<>(), Annotation::annotationType);
-		Assert.assertEquals(1, annotations.size());
-		Assert.assertTrue(annotations.containsKey(AnnotationForScannerTest2.class));
-		Assert.assertFalse(annotations.containsKey(AnnotationForScannerTest.class));
-		Assert.assertFalse(annotations.containsKey(AnnotationForScannerTest1.class));
-		Assert.assertFalse(annotations.containsKey(AnnotationForScannerTest3.class));
+		assertEquals(1, annotations.size());
+		assertTrue(annotations.containsKey(AnnotationForScannerTest2.class));
+		assertFalse(annotations.containsKey(AnnotationForScannerTest.class));
+		assertFalse(annotations.containsKey(AnnotationForScannerTest1.class));
+		assertFalse(annotations.containsKey(AnnotationForScannerTest3.class));
 	}
 
 	@Test
@@ -53,15 +53,15 @@ public class MateAnnotationScannerTest {
 			AnnotationForScannerTest3.class, null
 		);
 
-		Assert.assertEquals(3, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals(AnnotationForScannerTest2.class, map.get(0).get(0).annotationType());
+		assertEquals(3, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals(AnnotationForScannerTest2.class, map.get(0).get(0).annotationType());
 
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals(AnnotationForScannerTest1.class, map.get(1).get(0).annotationType());
+		assertEquals(1, map.get(1).size());
+		assertEquals(AnnotationForScannerTest1.class, map.get(1).get(0).annotationType());
 
-		Assert.assertEquals(1, map.get(2).size());
-		Assert.assertEquals(AnnotationForScannerTest.class, map.get(2).get(0).annotationType());
+		assertEquals(1, map.get(2).size());
+		assertEquals(AnnotationForScannerTest.class, map.get(2).get(0).annotationType());
 	}
 
 	static class Example {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MethodAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MethodAnnotationScannerTest.java
index 1ccde3908..b0c8c2c3c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MethodAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/MethodAnnotationScannerTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.annotation.scanner;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -15,45 +15,45 @@ public class MethodAnnotationScannerTest {
 	@Test
 	public void supportTest() {
 		AnnotationScanner scanner = new MethodAnnotationScanner();
-		Assert.assertTrue(scanner.support(ReflectUtil.getMethod(Example.class, "test")));
-		Assert.assertFalse(scanner.support(null));
-		Assert.assertFalse(scanner.support(Example.class));
-		Assert.assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
+		assertTrue(scanner.support(ReflectUtil.getMethod(Example.class, "test")));
+		assertFalse(scanner.support(null));
+		assertFalse(scanner.support(Example.class));
+		assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
 	}
 
 	@Test
 	public void getAnnotationsTest() {
 		AnnotationScanner scanner = new MethodAnnotationScanner();
 		Method method = ReflectUtil.getMethod(Example.class, "test");
-		Assert.assertNotNull(method);
+		assertNotNull(method);
 
 		// 不查找父类中具有相同方法签名的方法
 		List<Annotation> annotations = scanner.getAnnotations(method);
-		Assert.assertEquals(1, annotations.size());
-		Assert.assertEquals(CollUtil.getFirst(annotations).annotationType(), AnnotationForScannerTest.class);
+		assertEquals(1, annotations.size());
+		assertEquals(CollUtil.getFirst(annotations).annotationType(), AnnotationForScannerTest.class);
 
 		// 查找父类中具有相同方法签名的方法
 		scanner = new MethodAnnotationScanner(true);
 		annotations = scanner.getAnnotations(method);
-		Assert.assertEquals(3, annotations.size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
-		Assert.assertEquals("SuperInterface", ((AnnotationForScannerTest) annotations.get(2)).value());
+		assertEquals(3, annotations.size());
+		assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
+		assertEquals("SuperInterface", ((AnnotationForScannerTest) annotations.get(2)).value());
 
 		// 查找父类中具有相同方法签名的方法，但是不查找SuperInterface
 		scanner = new MethodAnnotationScanner(true).addExcludeTypes(SuperInterface.class);
 		annotations = scanner.getAnnotations(method);
-		Assert.assertEquals(2, annotations.size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
+		assertEquals(2, annotations.size());
+		assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
 
 		// 查找父类中具有相同方法签名的方法，但是只查找SuperClass
 		scanner = new MethodAnnotationScanner(true)
 			.setFilter(t -> ClassUtil.isAssignable(SuperClass.class, t));
 		annotations = scanner.getAnnotations(method);
-		Assert.assertEquals(2, annotations.size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
+		assertEquals(2, annotations.size());
+		assertEquals("Example", ((AnnotationForScannerTest) annotations.get(0)).value());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) annotations.get(1)).value());
 	}
 
 	@Test
@@ -66,8 +66,8 @@ public class MethodAnnotationScannerTest {
 			(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 			method, null
 		);
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
 
 		// 查找父类中具有相同方法签名的方法
 		map.clear();
@@ -75,13 +75,13 @@ public class MethodAnnotationScannerTest {
 			(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 			method, null
 		);
-		Assert.assertEquals(3, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
-		Assert.assertEquals(1, map.get(2).size());
-		Assert.assertEquals("SuperInterface", ((AnnotationForScannerTest) map.get(2).get(0)).value());
+		assertEquals(3, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(1, map.get(2).size());
+		assertEquals("SuperInterface", ((AnnotationForScannerTest) map.get(2).get(0)).value());
 
 		// 查找父类中具有相同方法签名的方法，但是不查找SuperInterface
 		map.clear();
@@ -91,11 +91,11 @@ public class MethodAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				method, null
 			);
-		Assert.assertEquals(2, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(2, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
 
 		// 查找父类中具有相同方法签名的方法，但是只查找SuperClass
 		map.clear();
@@ -105,11 +105,11 @@ public class MethodAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				method, null
 			);
-		Assert.assertEquals(2, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(2, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("SuperClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
 	}
 
 	static class Example extends SuperClass {
diff --git a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/TypeAnnotationScannerTest.java b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/TypeAnnotationScannerTest.java
index c9eed2014..a9c0f00d6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/TypeAnnotationScannerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/annotation/scanner/TypeAnnotationScannerTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.annotation.scanner;
 
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -16,42 +16,42 @@ public class TypeAnnotationScannerTest {
 	@Test
 	public void supportTest() {
 		AnnotationScanner scanner = new TypeAnnotationScanner();
-		Assert.assertTrue(scanner.support(Example.class));
-		Assert.assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
-		Assert.assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
-		Assert.assertFalse(scanner.support(null));
+		assertTrue(scanner.support(Example.class));
+		assertFalse(scanner.support(ReflectUtil.getField(Example.class, "id")));
+		assertFalse(scanner.support(ReflectUtil.getMethod(Example.class, "getId")));
+		assertFalse(scanner.support(null));
 	}
 
 	@Test
 	public void getAnnotationsTest() {
 		AnnotationScanner scanner = new TypeAnnotationScanner();
 		List<Annotation> annotations = scanner.getAnnotations(Example.class);
-		Assert.assertEquals(3, annotations.size());
-		annotations.forEach(a -> Assert.assertEquals(a.annotationType(), AnnotationForScannerTest.class));
+		assertEquals(3, annotations.size());
+		annotations.forEach(a -> assertEquals(a.annotationType(), AnnotationForScannerTest.class));
 
 		// 不查找父接口
 		scanner = new TypeAnnotationScanner().setIncludeInterfaces(false);
 		annotations = scanner.getAnnotations(Example.class);
-		Assert.assertEquals(2, annotations.size());
-		annotations.forEach(a -> Assert.assertEquals(a.annotationType(), AnnotationForScannerTest.class));
+		assertEquals(2, annotations.size());
+		annotations.forEach(a -> assertEquals(a.annotationType(), AnnotationForScannerTest.class));
 
 		// 不查找父类
 		scanner = new TypeAnnotationScanner().setIncludeSuperClass(false);
 		annotations = scanner.getAnnotations(Example.class);
-		Assert.assertEquals(1, annotations.size());
-		annotations.forEach(a -> Assert.assertEquals(a.annotationType(), AnnotationForScannerTest.class));
+		assertEquals(1, annotations.size());
+		annotations.forEach(a -> assertEquals(a.annotationType(), AnnotationForScannerTest.class));
 
 		// 不查找ExampleSupplerClass.class
 		scanner = new TypeAnnotationScanner().addExcludeTypes(ExampleSupplerClass.class);
 		annotations = scanner.getAnnotations(Example.class);
-		Assert.assertEquals(1, annotations.size());
-		annotations.forEach(a -> Assert.assertEquals(a.annotationType(), AnnotationForScannerTest.class));
+		assertEquals(1, annotations.size());
+		annotations.forEach(a -> assertEquals(a.annotationType(), AnnotationForScannerTest.class));
 
 		// 只查找ExampleSupplerClass.class
 		scanner = new TypeAnnotationScanner().setFilter(t -> ClassUtil.isAssignable(ExampleSupplerClass.class, t));
 		annotations = scanner.getAnnotations(Example.class);
-		Assert.assertEquals(2, annotations.size());
-		annotations.forEach(a -> Assert.assertEquals(a.annotationType(), AnnotationForScannerTest.class));
+		assertEquals(2, annotations.size());
+		annotations.forEach(a -> assertEquals(a.annotationType(), AnnotationForScannerTest.class));
 	}
 
 	@Test
@@ -63,13 +63,13 @@ public class TypeAnnotationScannerTest {
 			(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 			Example.class, null
 		);
-		Assert.assertEquals(3, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
-		Assert.assertEquals(1, map.get(2).size());
-		Assert.assertEquals("ExampleInterface", ((AnnotationForScannerTest) map.get(2).get(0)).value());
+		assertEquals(3, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(1, map.get(2).size());
+		assertEquals("ExampleInterface", ((AnnotationForScannerTest) map.get(2).get(0)).value());
 
 		// 不查找父接口
 		map.clear();
@@ -79,11 +79,11 @@ public class TypeAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				Example.class, null
 			);
-		Assert.assertEquals(2, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(2, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
 
 		// 不查找父类
 		map.clear();
@@ -93,9 +93,9 @@ public class TypeAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				Example.class, null
 			);
-		Assert.assertEquals(1, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
 
 		// 不查找ExampleSupplerClass.class
 		map.clear();
@@ -105,9 +105,9 @@ public class TypeAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				Example.class, null
 			);
-		Assert.assertEquals(1, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
 
 		// 只查找ExampleSupplerClass.class
 		map.clear();
@@ -117,11 +117,11 @@ public class TypeAnnotationScannerTest {
 				(index, annotation) -> map.computeIfAbsent(index, i -> new ArrayList<>()).add(annotation),
 				Example.class, null
 			);
-		Assert.assertEquals(2, map.size());
-		Assert.assertEquals(1, map.get(0).size());
-		Assert.assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
-		Assert.assertEquals(1, map.get(1).size());
-		Assert.assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
+		assertEquals(2, map.size());
+		assertEquals(1, map.get(0).size());
+		assertEquals("Example", ((AnnotationForScannerTest) map.get(0).get(0)).value());
+		assertEquals(1, map.get(1).size());
+		assertEquals("ExampleSupplerClass", ((AnnotationForScannerTest) map.get(1).get(0)).value());
 	}
 
 	@AnnotationForScannerTest("ExampleSupplerClass")
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java
index 1e69703fd..bcc8c5f8d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanCopyMappingTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.map.MapUtil;
 import lombok.Builder;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BeanCopyMappingTest {
 
@@ -24,7 +24,7 @@ public class BeanCopyMappingTest {
 		BeanUtil.copyProperties(b, a, copyOptions);
 		BeanUtil.copyProperties(a, c);
 
-		Assert.assertEquals("12312312", c.getCarNo());
+		assertEquals("12312312", c.getCarNo());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java
index 494b07472..1de737682 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanDescTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * {@link BeanDesc} 单元测试类
@@ -15,13 +15,13 @@ public class BeanDescTest {
 	@Test
 	public void propDescTes() {
 		BeanDesc desc = BeanUtil.getBeanDesc(User.class);
-		Assert.assertEquals("User", desc.getSimpleName());
+		assertEquals("User", desc.getSimpleName());
 
-		Assert.assertEquals("age", desc.getField("age").getName());
-		Assert.assertEquals("getAge", desc.getGetter("age").getName());
-		Assert.assertEquals("setAge", desc.getSetter("age").getName());
-		Assert.assertEquals(1, desc.getSetter("age").getParameterTypes().length);
-		Assert.assertSame(int.class, desc.getSetter("age").getParameterTypes()[0]);
+		assertEquals("age", desc.getField("age").getName());
+		assertEquals("getAge", desc.getGetter("age").getName());
+		assertEquals("setAge", desc.getSetter("age").getName());
+		assertEquals(1, desc.getSetter("age").getParameterTypes().length);
+		assertSame(int.class, desc.getSetter("age").getParameterTypes()[0]);
 
 	}
 
@@ -30,29 +30,29 @@ public class BeanDescTest {
 		BeanDesc desc = BeanUtil.getBeanDesc(User.class);
 
 		PropDesc prop = desc.getProp("name");
-		Assert.assertEquals("name", prop.getFieldName());
-		Assert.assertEquals("getName", prop.getGetter().getName());
-		Assert.assertEquals("setName", prop.getSetter().getName());
-		Assert.assertEquals(1, prop.getSetter().getParameterTypes().length);
-		Assert.assertSame(String.class, prop.getSetter().getParameterTypes()[0]);
+		assertEquals("name", prop.getFieldName());
+		assertEquals("getName", prop.getGetter().getName());
+		assertEquals("setName", prop.getSetter().getName());
+		assertEquals(1, prop.getSetter().getParameterTypes().length);
+		assertSame(String.class, prop.getSetter().getParameterTypes()[0]);
 	}
 
 	@Test
 	public void propDescOfBooleanTest() {
 		BeanDesc desc = BeanUtil.getBeanDesc(User.class);
 
-		Assert.assertEquals("isAdmin", desc.getGetter("isAdmin").getName());
-		Assert.assertEquals("setAdmin", desc.getSetter("isAdmin").getName());
-		Assert.assertEquals("isGender", desc.getGetter("gender").getName());
-		Assert.assertEquals("setGender", desc.getSetter("gender").getName());
+		assertEquals("isAdmin", desc.getGetter("isAdmin").getName());
+		assertEquals("setAdmin", desc.getSetter("isAdmin").getName());
+		assertEquals("isGender", desc.getGetter("gender").getName());
+		assertEquals("setGender", desc.getSetter("gender").getName());
 	}
 
 	@Test
 	public void propDescOfBooleanTest2() {
 		BeanDesc desc = BeanUtil.getBeanDesc(User.class);
 
-		Assert.assertEquals("isIsSuper", desc.getGetter("isSuper").getName());
-		Assert.assertEquals("setIsSuper", desc.getSetter("isSuper").getName());
+		assertEquals("isIsSuper", desc.getGetter("isSuper").getName());
+		assertEquals("setIsSuper", desc.getSetter("isSuper").getName());
 	}
 
 	@Test
@@ -61,19 +61,19 @@ public class BeanDescTest {
 
 		User user = new User();
 		desc.getProp("name").setValue(user, "张三");
-		Assert.assertEquals("张三", user.getName());
+		assertEquals("张三", user.getName());
 
 		Object value = desc.getProp("name").getValue(user);
-		Assert.assertEquals("张三", value);
+		assertEquals("张三", value);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void propDescOfBooleanTest3() {
 		BeanDesc desc = BeanUtil.getBeanDesc(User.class);
 
-		Assert.assertEquals("setLastPage", desc.getSetter("lastPage").getName());
-		Assert.assertEquals("setIsLastPage", desc.getSetter("isLastPage").getName());
+		assertEquals("setLastPage", desc.getSetter("lastPage").getName());
+		assertEquals("setIsLastPage", desc.getSetter("isLastPage").getName());
 	}
 
 	public static class User {
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java
index 647ce89e5..dfb866de3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanPathTest.java
@@ -4,15 +4,16 @@ import cn.hutool.core.lang.test.bean.ExamInfoDict;
 import cn.hutool.core.lang.test.bean.UserInfoDict;
 import cn.hutool.core.util.ArrayUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * {@link BeanPath} 单元测试
  *
@@ -22,7 +23,7 @@ public class BeanPathTest {
 
 	Map<String, Object> tempMap;
 
-	@Before
+	@BeforeEach
 	public void init() {
 		// ------------------------------------------------- 考试信息列表
 		final ExamInfoDict examInfoDict = new ExamInfoDict();
@@ -60,36 +61,36 @@ public class BeanPathTest {
 	@Test
 	public void beanPathTest1() {
 		final BeanPath pattern = new BeanPath("userInfo.examInfoDict[0].id");
-		Assert.assertEquals("userInfo", pattern.patternParts.get(0));
-		Assert.assertEquals("examInfoDict", pattern.patternParts.get(1));
-		Assert.assertEquals("0", pattern.patternParts.get(2));
-		Assert.assertEquals("id", pattern.patternParts.get(3));
+		assertEquals("userInfo", pattern.patternParts.get(0));
+		assertEquals("examInfoDict", pattern.patternParts.get(1));
+		assertEquals("0", pattern.patternParts.get(2));
+		assertEquals("id", pattern.patternParts.get(3));
 
 	}
 
 	@Test
 	public void beanPathTest2() {
 		final BeanPath pattern = new BeanPath("[userInfo][examInfoDict][0][id]");
-		Assert.assertEquals("userInfo", pattern.patternParts.get(0));
-		Assert.assertEquals("examInfoDict", pattern.patternParts.get(1));
-		Assert.assertEquals("0", pattern.patternParts.get(2));
-		Assert.assertEquals("id", pattern.patternParts.get(3));
+		assertEquals("userInfo", pattern.patternParts.get(0));
+		assertEquals("examInfoDict", pattern.patternParts.get(1));
+		assertEquals("0", pattern.patternParts.get(2));
+		assertEquals("id", pattern.patternParts.get(3));
 	}
 
 	@Test
 	public void beanPathTest3() {
 		final BeanPath pattern = new BeanPath("['userInfo']['examInfoDict'][0]['id']");
-		Assert.assertEquals("userInfo", pattern.patternParts.get(0));
-		Assert.assertEquals("examInfoDict", pattern.patternParts.get(1));
-		Assert.assertEquals("0", pattern.patternParts.get(2));
-		Assert.assertEquals("id", pattern.patternParts.get(3));
+		assertEquals("userInfo", pattern.patternParts.get(0));
+		assertEquals("examInfoDict", pattern.patternParts.get(1));
+		assertEquals("0", pattern.patternParts.get(2));
+		assertEquals("id", pattern.patternParts.get(3));
 	}
 
 	@Test
 	public void getTest() {
 		final BeanPath pattern = BeanPath.create("userInfo.examInfoDict[0].id");
 		final Object result = pattern.get(tempMap);
-		Assert.assertEquals(1, result);
+		assertEquals(1, result);
 	}
 
 	@Test
@@ -97,15 +98,15 @@ public class BeanPathTest {
 		final BeanPath pattern = BeanPath.create("userInfo.examInfoDict[0].id");
 		pattern.set(tempMap, 2);
 		final Object result = pattern.get(tempMap);
-		Assert.assertEquals(2, result);
+		assertEquals(2, result);
 	}
 
 	@Test
 	public void getMapTest() {
 		final BeanPath pattern = BeanPath.create("userInfo[id, photoPath]");
 		@SuppressWarnings("unchecked") final Map<String, Object> result = (Map<String, Object>) pattern.get(tempMap);
-		Assert.assertEquals(1, result.get("id"));
-		Assert.assertEquals("yx.mm.com", result.get("photoPath"));
+		assertEquals(1, result.get("id"));
+		assertEquals("yx.mm.com", result.get("photoPath"));
 	}
 
 	@Test
@@ -114,17 +115,17 @@ public class BeanPathTest {
 
 		BeanPath beanPath = BeanPath.create("list[0].name");
 		beanPath.set(map, "张三");
-		Assert.assertEquals("{list=[{name=张三}]}", map.toString());
+		assertEquals("{list=[{name=张三}]}", map.toString());
 
 		map.clear();
 		beanPath = BeanPath.create("list[1].name");
 		beanPath.set(map, "张三");
-		Assert.assertEquals("{list=[null, {name=张三}]}", map.toString());
+		assertEquals("{list=[null, {name=张三}]}", map.toString());
 
 		map.clear();
 		beanPath = BeanPath.create("list[0].1.name");
 		beanPath.set(map, "张三");
-		Assert.assertEquals("{list=[[null, {name=张三}]]}", map.toString());
+		assertEquals("{list=[[null, {name=张三}]]}", map.toString());
 	}
 
 	@Test
@@ -135,7 +136,7 @@ public class BeanPathTest {
 		BeanPath.create("hobby[1]").set(myUser, "KFC");
 		BeanPath.create("hobby[2]").set(myUser, "COFFE");
 
-		Assert.assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(myUser.getHobby()));
+		assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(myUser.getHobby()));
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
index 41b8df237..a79936bcc 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
@@ -5,7 +5,6 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.ValueProvider;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.map.MapUtil;
@@ -15,9 +14,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.*;
 import lombok.experimental.Accessors;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.beans.PropertyDescriptor;
 import java.io.Serializable;
@@ -27,6 +25,8 @@ import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Bean工具单元测试
  *
@@ -39,7 +39,7 @@ public class BeanUtilTest {
 
 		// HashMap不包含setXXX方法，不是bean
 		final boolean isBean = BeanUtil.isBean(HashMap.class);
-		Assert.assertFalse(isBean);
+		assertFalse(isBean);
 	}
 
 	@Test
@@ -65,21 +65,21 @@ public class BeanUtilTest {
 
 		}, CopyOptions.create());
 
-		Assert.assertEquals("张三", person.getName());
-		Assert.assertEquals(18, person.getAge());
+		assertEquals("张三", person.getName());
+		assertEquals(18, person.getAge());
 	}
 
 	@Test
 	public void fillBeanWithMapIgnoreCaseTest() {
 		final Map<String, Object> map = MapBuilder.<String, Object>create()
-				.put("Name", "Joe")
-				.put("aGe", 12)
-				.put("openId", "DFDFSDFWERWER")
-				.build();
+			.put("Name", "Joe")
+			.put("aGe", 12)
+			.put("openId", "DFDFSDFWERWER")
+			.build();
 		final SubPerson person = BeanUtil.fillBeanWithMapIgnoreCase(map, new SubPerson(), false);
-		Assert.assertEquals("Joe", person.getName());
-		Assert.assertEquals(12, person.getAge());
-		Assert.assertEquals("DFDFSDFWERWER", person.getOpenid());
+		assertEquals("Joe", person.getName());
+		assertEquals(12, person.getAge());
+		assertEquals("DFDFSDFWERWER", person.getOpenid());
 	}
 
 	@Test
@@ -91,11 +91,11 @@ public class BeanUtilTest {
 		person.setSubName("sub名字");
 
 		final Map<?, ?> map = BeanUtil.toBean(person, Map.class);
-		Assert.assertEquals("测试A11", map.get("name"));
-		Assert.assertEquals(14, map.get("age"));
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals("测试A11", map.get("name"));
+		assertEquals(14, map.get("age"));
+		assertEquals("11213232", map.get("openid"));
 		// static属性应被忽略
-		Assert.assertFalse(map.containsKey("SUBNAME"));
+		assertFalse(map.containsKey("SUBNAME"));
 	}
 
 	/**
@@ -109,9 +109,9 @@ public class BeanUtilTest {
 		map.put("age", "aaaaaa");
 
 		final Person person = BeanUtil.toBeanIgnoreError(map, Person.class);
-		Assert.assertEquals("Joe", person.getName());
+		assertEquals("Joe", person.getName());
 		// 错误的类型，不copy这个字段，使用对象创建的默认值
-		Assert.assertEquals(0, person.getAge());
+		assertEquals(0, person.getAge());
 	}
 
 	@Test
@@ -121,8 +121,8 @@ public class BeanUtilTest {
 		map.put("aGe", 12);
 
 		final Person person = BeanUtil.toBeanIgnoreCase(map, Person.class, false);
-		Assert.assertEquals("Joe", person.getName());
-		Assert.assertEquals(12, person.getAge());
+		assertEquals("Joe", person.getName());
+		assertEquals(12, person.getAge());
 	}
 
 	@Test
@@ -137,8 +137,8 @@ public class BeanUtilTest {
 		mapping.put("b_age", "age");
 
 		final Person person = BeanUtil.toBean(map, Person.class, CopyOptions.create().setFieldMapping(mapping));
-		Assert.assertEquals("Joe", person.getName());
-		Assert.assertEquals(12, person.getAge());
+		assertEquals("Joe", person.getName());
+		assertEquals(12, person.getAge());
 	}
 
 	/**
@@ -152,18 +152,20 @@ public class BeanUtilTest {
 
 		// 非空构造也可以实例化成功
 		final Person2 person = BeanUtil.toBean(map, Person2.class, CopyOptions.create());
-		Assert.assertEquals("Joe", person.name);
-		Assert.assertEquals(12, person.age);
+		assertEquals("Joe", person.name);
+		assertEquals(12, person.age);
 	}
 
 	/**
 	 * 测试在不忽略错误情况下，转换失败需要报错。
 	 */
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void mapToBeanWinErrorTest() {
-		final Map<String, String> map = new HashMap<>();
-		map.put("age", "哈哈");
-		BeanUtil.toBean(map, Person.class);
+		assertThrows(NumberFormatException.class, () -> {
+			final Map<String, String> map = new HashMap<>();
+			map.put("age", "哈哈");
+			BeanUtil.toBean(map, Person.class);
+		});
 	}
 
 	@Test
@@ -176,11 +178,11 @@ public class BeanUtilTest {
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person);
 
-		Assert.assertEquals("测试A11", map.get("name"));
-		Assert.assertEquals(14, map.get("age"));
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals("测试A11", map.get("name"));
+		assertEquals(14, map.get("age"));
+		assertEquals("11213232", map.get("openid"));
 		// static属性应被忽略
-		Assert.assertFalse(map.containsKey("SUBNAME"));
+		assertFalse(map.containsKey("SUBNAME"));
 	}
 
 	@Test
@@ -193,11 +195,11 @@ public class BeanUtilTest {
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person, (String[]) null);
 
-		Assert.assertEquals("测试A11", map.get("name"));
-		Assert.assertEquals(14, map.get("age"));
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals("测试A11", map.get("name"));
+		assertEquals(14, map.get("age"));
+		assertEquals("11213232", map.get("openid"));
 		// static属性应被忽略
-		Assert.assertFalse(map.containsKey("SUBNAME"));
+		assertFalse(map.containsKey("SUBNAME"));
 	}
 
 	@Test
@@ -209,7 +211,7 @@ public class BeanUtilTest {
 		person.setSubName("sub名字");
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person, true, true);
-		Assert.assertEquals("sub名字", map.get("sub_name"));
+		assertEquals("sub名字", map.get("sub_name"));
 	}
 
 	@Test
@@ -221,8 +223,8 @@ public class BeanUtilTest {
 		person.setSubName("sub名字");
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person, new LinkedHashMap<>(),
-				CopyOptions.create().setFieldValueEditor((key, value) -> key + "_" + value));
-		Assert.assertEquals("subName_sub名字", map.get("subName"));
+			CopyOptions.create().setFieldValueEditor((key, value) -> key + "_" + value));
+		assertEquals("subName_sub名字", map.get("subName"));
 	}
 
 	@Test
@@ -237,7 +239,7 @@ public class BeanUtilTest {
 		person.setBooleanb(true);
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person);
-		Assert.assertEquals("sub名字", map.get("aliasSubName"));
+		assertEquals("sub名字", map.get("aliasSubName"));
 	}
 
 	@Test
@@ -249,11 +251,11 @@ public class BeanUtilTest {
 		map.put("is_booleanb", true);
 
 		final SubPersonWithAlias subPersonWithAlias = BeanUtil.toBean(map, SubPersonWithAlias.class);
-		Assert.assertEquals("sub名字", subPersonWithAlias.getSubName());
+		assertEquals("sub名字", subPersonWithAlias.getSubName());
 
 		//https://gitee.com/dromara/hutool/issues/I6H0XF
-		Assert.assertFalse(subPersonWithAlias.isBooleana());
-		Assert.assertNull(subPersonWithAlias.getBooleanb());
+		assertFalse(subPersonWithAlias.isBooleana());
+		assertNull(subPersonWithAlias.getBooleanb());
 	}
 
 	@Test
@@ -269,8 +271,8 @@ public class BeanUtilTest {
 		person.setDate2(now.toLocalDate());
 
 		final Map<String, Object> map = BeanUtil.beanToMap(person, false, true);
-		Assert.assertEquals(now, map.get("date"));
-		Assert.assertEquals(now.toLocalDate(), map.get("date2"));
+		assertEquals(now, map.get("date"));
+		assertEquals(now.toLocalDate(), map.get("date2"));
 	}
 
 	@Test
@@ -282,16 +284,16 @@ public class BeanUtilTest {
 		person.setSubName("sub名字");
 
 		final Object name = BeanUtil.getProperty(person, "name");
-		Assert.assertEquals("测试A11", name);
+		assertEquals("测试A11", name);
 		final Object subName = BeanUtil.getProperty(person, "subName");
-		Assert.assertEquals("sub名字", subName);
+		assertEquals("sub名字", subName);
 	}
 
 	@Test
 	@SuppressWarnings("ConstantConditions")
 	public void getNullPropertyTest() {
 		final Object property = BeanUtil.getProperty(null, "name");
-		Assert.assertNull(property);
+		assertNull(property);
 	}
 
 	@Test
@@ -301,12 +303,12 @@ public class BeanUtilTest {
 		for (final PropertyDescriptor propertyDescriptor : propertyDescriptors) {
 			set.add(propertyDescriptor.getName());
 		}
-		Assert.assertTrue(set.contains("age"));
-		Assert.assertTrue(set.contains("id"));
-		Assert.assertTrue(set.contains("name"));
-		Assert.assertTrue(set.contains("openid"));
-		Assert.assertTrue(set.contains("slow"));
-		Assert.assertTrue(set.contains("subName"));
+		assertTrue(set.contains("age"));
+		assertTrue(set.contains("id"));
+		assertTrue(set.contains("name"));
+		assertTrue(set.contains("openid"));
+		assertTrue(set.contains("slow"));
+		assertTrue(set.contains("subName"));
 	}
 
 	@Test
@@ -318,15 +320,15 @@ public class BeanUtilTest {
 		person.setSubName("sub名字");
 
 		final SubPerson person1 = BeanUtil.copyProperties(person, SubPerson.class);
-		Assert.assertEquals(14, person1.getAge());
-		Assert.assertEquals("11213232", person1.getOpenid());
-		Assert.assertEquals("测试A11", person1.getName());
-		Assert.assertEquals("sub名字", person1.getSubName());
+		assertEquals(14, person1.getAge());
+		assertEquals("11213232", person1.getOpenid());
+		assertEquals("测试A11", person1.getName());
+		assertEquals("sub名字", person1.getSubName());
 	}
 
 	@Test
-	@Ignore
-	public void multiThreadTest(){
+	@Disabled
+	public void multiThreadTest() {
 		final Student student = new Student();
 		student.setName("张三");
 		student.setAge(123);
@@ -339,8 +341,8 @@ public class BeanUtilTest {
 
 		final List<Student> studentList = ListUtil.of(student, student2);
 
-		for (int i=0;i<5000;i++){
-			new Thread(()->{
+		for (int i = 0; i < 5000; i++) {
+			new Thread(() -> {
 				final List<Student> list = ObjectUtil.clone(studentList);
 				final List<Student> listReps = list.stream().map(s1 -> {
 					final Student s2 = new Student();
@@ -363,12 +365,12 @@ public class BeanUtilTest {
 		// 测试boolean参数值isXXX形式
 		final SubPerson p2 = new SubPerson();
 		BeanUtil.copyProperties(p1, p2);
-		Assert.assertTrue(p2.getSlow());
+		assertTrue(p2.getSlow());
 
 		// 测试boolean参数值非isXXX形式
 		final SubPerson2 p3 = new SubPerson2();
 		BeanUtil.copyProperties(p1, p3);
-		Assert.assertTrue(p3.getSlow());
+		assertTrue(p3.getSlow());
 	}
 
 	@Test
@@ -382,11 +384,11 @@ public class BeanUtilTest {
 
 		// null值不覆盖目标属性
 		BeanUtil.copyProperties(p1, p2, CopyOptions.create().ignoreNullValue());
-		Assert.assertEquals("oldName", p2.getName());
+		assertEquals("oldName", p2.getName());
 
 		// null覆盖目标属性
 		BeanUtil.copyProperties(p1, p2);
-		Assert.assertNull(p2.getName());
+		assertNull(p2.getName());
 	}
 
 	@Test
@@ -399,9 +401,9 @@ public class BeanUtilTest {
 
 		final Map<String, Object> map = MapUtil.newHashMap();
 		BeanUtil.copyProperties(p1, map);
-		Assert.assertTrue((Boolean) map.get("slow"));
-		Assert.assertEquals("测试", map.get("name"));
-		Assert.assertEquals("sub测试", map.get("subName"));
+		assertTrue((Boolean) map.get("slow"));
+		assertEquals("测试", map.get("name"));
+		assertEquals("sub测试", map.get("subName"));
 	}
 
 	@Test
@@ -414,9 +416,9 @@ public class BeanUtilTest {
 
 		final Map<String, Object> map = MapUtil.newHashMap();
 		BeanUtil.copyProperties(p1, map);
-		Assert.assertTrue((Boolean) map.get("isSlow"));
-		Assert.assertEquals("测试", map.get("name"));
-		Assert.assertEquals("sub测试", map.get("subName"));
+		assertTrue((Boolean) map.get("isSlow"));
+		assertEquals("测试", map.get("name"));
+		assertEquals("sub测试", map.get("subName"));
 	}
 
 	@Test
@@ -429,9 +431,9 @@ public class BeanUtilTest {
 
 		final Map<String, Object> map = MapUtil.newHashMap();
 		BeanUtil.copyProperties(p1, map, CopyOptions.create().setIgnoreNullValue(true));
-		Assert.assertTrue((Boolean) map.get("isSlow"));
-		Assert.assertEquals("测试", map.get("name"));
-		Assert.assertFalse(map.containsKey("subName"));
+		assertTrue((Boolean) map.get("isSlow"));
+		assertEquals("测试", map.get("name"));
+		assertFalse(map.containsKey("subName"));
 	}
 
 	@Test
@@ -443,8 +445,8 @@ public class BeanUtilTest {
 		final Person person2 = BeanUtil.trimStrFields(person);
 
 		// 是否改变原对象
-		Assert.assertEquals("张三", person.getName());
-		Assert.assertEquals("张三", person2.getName());
+		assertEquals("张三", person.getName());
+		assertEquals("张三", person2.getName());
 	}
 
 	// -----------------------------------------------------------------------------------------------------------------
@@ -529,9 +531,9 @@ public class BeanUtilTest {
 		final SubPersonWithOverlayTransientField dest = new SubPersonWithOverlayTransientField();
 		BeanUtil.copyProperties(source, dest);
 
-		Assert.assertEquals(source.getName(), dest.getName());
-		Assert.assertEquals(source.getAge(), dest.getAge());
-		Assert.assertEquals(source.getOpenid(), dest.getOpenid());
+		assertEquals(source.getName(), dest.getName());
+		assertEquals(source.getAge(), dest.getAge());
+		assertEquals(source.getOpenid(), dest.getOpenid());
 	}
 
 	@Test
@@ -562,8 +564,8 @@ public class BeanUtilTest {
 		info.setCode("123");
 		final HllFoodEntity entity = new HllFoodEntity();
 		BeanUtil.copyProperties(info, entity);
-		Assert.assertEquals(info.getBookID(), entity.getBookId());
-		Assert.assertEquals(info.getCode(), entity.getCode2());
+		assertEquals(info.getBookID(), entity.getBookId());
+		assertEquals(info.getCode(), entity.getCode2());
 	}
 
 	@Test
@@ -572,13 +574,13 @@ public class BeanUtilTest {
 		info.setBookID("0");
 		info.setCode("123");
 		final Food newFood = BeanUtil.copyProperties(info, Food.class, "code");
-		Assert.assertEquals(info.getBookID(), newFood.getBookID());
-		Assert.assertNull(newFood.getCode());
+		assertEquals(info.getBookID(), newFood.getBookID());
+		assertNull(newFood.getCode());
 	}
 
 	@Test
 	public void copyNullTest() {
-		Assert.assertNull(BeanUtil.copyProperties(null, Food.class));
+		assertNull(BeanUtil.copyProperties(null, Food.class));
 	}
 
 	@Test
@@ -589,8 +591,8 @@ public class BeanUtilTest {
 		final Food newFood = new Food();
 		final CopyOptions copyOptions = CopyOptions.create().setPropertiesFilter((f, v) -> !(v instanceof CharSequence) || StrUtil.isNotBlank(v.toString()));
 		BeanUtil.copyProperties(info, newFood, copyOptions);
-		Assert.assertEquals(info.getBookID(), newFood.getBookID());
-		Assert.assertNull(newFood.getCode());
+		assertEquals(info.getBookID(), newFood.getBookID());
+		assertNull(newFood.getCode());
 	}
 
 	@Test
@@ -601,13 +603,13 @@ public class BeanUtilTest {
 		o.setAge(123);
 		o.setOpenid("asd");
 
-		@SuppressWarnings("unchecked") final CopyOptions copyOptions = CopyOptions.create().setIgnoreProperties(Person::getAge,Person::getOpenid);
+		@SuppressWarnings("unchecked") final CopyOptions copyOptions = CopyOptions.create().setIgnoreProperties(Person::getAge, Person::getOpenid);
 		final Person n = new Person();
 		BeanUtil.copyProperties(o, n, copyOptions);
 
 		// 是否忽略拷贝属性
-		Assert.assertNotEquals(o.getAge(),n.getAge());
-		Assert.assertNotEquals(o.getOpenid(),n.getOpenid());
+		assertNotEquals(o.getAge(), n.getAge());
+		assertNotEquals(o.getOpenid(), n.getOpenid());
 	}
 
 	@Data
@@ -630,7 +632,7 @@ public class BeanUtilTest {
 	public void setPropertiesTest() {
 		final Map<String, Object> resultMap = MapUtil.newHashMap();
 		BeanUtil.setProperty(resultMap, "codeList[0].name", "张三");
-		Assert.assertEquals("{codeList=[{name=张三}]}", resultMap.toString());
+		assertEquals("{codeList=[{name=张三}]}", resultMap.toString());
 	}
 
 	@Test
@@ -641,7 +643,7 @@ public class BeanUtilTest {
 		final Station station2 = new Station();
 
 		BeanUtil.copyProperties(station, station2);
-		Assert.assertEquals(new Long(123456L), station2.getId());
+		assertEquals(new Long(123456L), station2.getId());
 	}
 
 	enum Version {
@@ -660,19 +662,22 @@ public class BeanUtilTest {
 		final Vto v1 = new Vto();
 		v1.setVersions(EnumSet.allOf(Version.class));
 		final Vto v2 = BeanUtil.copyProperties(v1, Vto.class);
-		Assert.assertNotNull(v2);
-		Assert.assertNotNull(v2.getVersions());
+		assertNotNull(v2);
+		assertNotNull(v2.getVersions());
 	}
 
 	@Test
 	public void enumSetTest() {
 		final Collection<Version> objects = CollUtil.create(EnumSet.class, Version.class);
-		Assert.assertNotNull(objects);
-		Assert.assertTrue(EnumSet.class.isAssignableFrom(objects.getClass()));
+		assertNotNull(objects);
+		assertTrue(EnumSet.class.isAssignableFrom(objects.getClass()));
 	}
 
-	static class Station extends Tree<Long> {}
-	static class Tree<T> extends Entity<T> {}
+	static class Station extends Tree<Long> {
+	}
+
+	static class Tree<T> extends Entity<T> {
+	}
 
 	@Data
 	public static class Entity<T> {
@@ -694,10 +699,10 @@ public class BeanUtilTest {
 		final List<Student> studentList = ListUtil.of(student, student2);
 		final List<Person> people = BeanUtil.copyToList(studentList, Person.class);
 
-		Assert.assertEquals(studentList.size(), people.size());
+		assertEquals(studentList.size(), people.size());
 		for (int i = 0; i < studentList.size(); i++) {
-			Assert.assertEquals(studentList.get(i).getName(), people.get(i).getName());
-			Assert.assertEquals(studentList.get(i).getAge(), people.get(i).getAge());
+			assertEquals(studentList.get(i).getName(), people.get(i).getName());
+			assertEquals(studentList.get(i).getAge(), people.get(i).getAge());
 		}
 
 	}
@@ -713,11 +718,11 @@ public class BeanUtilTest {
 		a.setSortOrder(9L);
 
 		final Map<String, Object> f = BeanUtil.beanToMap(
-				a,
-				new LinkedHashMap<>(),
-				false,
-				key -> Arrays.asList("id", "name", "code", "sortOrder").contains(key) ? key : null);
-		Assert.assertFalse(f.containsKey(null));
+			a,
+			new LinkedHashMap<>(),
+			false,
+			key -> Arrays.asList("id", "name", "code", "sortOrder").contains(key) ? key : null);
+		assertFalse(f.containsKey(null));
 	}
 
 	@Data
@@ -748,8 +753,8 @@ public class BeanUtilTest {
 		final BeanPath beanPath = BeanPath.create("testPojo2List.age");
 		final Object o = beanPath.get(testPojo);
 
-		Assert.assertEquals(Integer.valueOf(2), ArrayUtil.get(o, 0));
-		Assert.assertEquals(Integer.valueOf(3), ArrayUtil.get(o, 1));
+		assertEquals(Integer.valueOf(2), ArrayUtil.get(o, 0));
+		assertEquals(Integer.valueOf(3), ArrayUtil.get(o, 1));
 	}
 
 	@Data
@@ -764,7 +769,7 @@ public class BeanUtilTest {
 	}
 
 	@Data
-	public static class Student implements Serializable{
+	public static class Student implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		String name;
@@ -774,8 +779,8 @@ public class BeanUtilTest {
 
 	/**
 	 * @author dazer
-	 *  copyProperties(Object source, Object target, CopyOptions copyOptions)
-	 *  当：copyOptions的 setFieldNameEditor 不为空的时候，有bug,这里进行修复；
+	 * copyProperties(Object source, Object target, CopyOptions copyOptions)
+	 * 当：copyOptions的 setFieldNameEditor 不为空的时候，有bug,这里进行修复；
 	 */
 	@Test
 	public void beanToBeanCopyOptionsTest() {
@@ -786,17 +791,17 @@ public class BeanUtilTest {
 		childVo1.setChild_mother_name("赵敏敏");
 
 		final CopyOptions copyOptions = CopyOptions.create().
-				//setIgnoreNullValue(true).
-				//setIgnoreCase(false).
-						setFieldNameEditor(StrUtil::toCamelCase);
+			//setIgnoreNullValue(true).
+			//setIgnoreCase(false).
+				setFieldNameEditor(StrUtil::toCamelCase);
 
 		final ChildVo2 childVo2 = new ChildVo2();
 		BeanUtil.copyProperties(childVo1, childVo2, copyOptions);
 
-		Assert.assertEquals(childVo1.getChild_address(), childVo2.getChildAddress());
-		Assert.assertEquals(childVo1.getChild_name(), childVo2.getChildName());
-		Assert.assertEquals(childVo1.getChild_father_name(), childVo2.getChildFatherName());
-		Assert.assertEquals(childVo1.getChild_mother_name(), childVo2.getChildMotherName());
+		assertEquals(childVo1.getChild_address(), childVo2.getChildAddress());
+		assertEquals(childVo1.getChild_name(), childVo2.getChildName());
+		assertEquals(childVo1.getChild_father_name(), childVo2.getChildFatherName());
+		assertEquals(childVo1.getChild_mother_name(), childVo2.getChildMotherName());
 	}
 
 	@Data
@@ -816,11 +821,11 @@ public class BeanUtilTest {
 	}
 
 	@Test
-	public void issueI41WKPTest(){
+	public void issueI41WKPTest() {
 		final Test1 t1 = new Test1().setStrList(ListUtil.toList("list"));
 		final Test2 t2_hu = new Test2();
 		BeanUtil.copyProperties(t1, t2_hu, CopyOptions.create().setIgnoreError(true));
-		Assert.assertNull(t2_hu.getStrList());
+		assertNull(t2_hu.getStrList());
 	}
 
 	@Data
@@ -836,33 +841,35 @@ public class BeanUtilTest {
 	}
 
 	@Test
-	public void issuesI53O9JTest(){
+	public void issuesI53O9JTest() {
 		final Map<String, String> map = new HashMap<>();
 		map.put("statusIdUpdateTime", "");
 
 		final WkCrmCustomer customer = new WkCrmCustomer();
 		BeanUtil.copyProperties(map, customer);
 
-		Assert.assertNull(customer.getStatusIdUpdateTime());
+		assertNull(customer.getStatusIdUpdateTime());
 	}
 
 	@Data
-	public static class WkCrmCustomer{
+	public static class WkCrmCustomer {
 		private LocalDateTime statusIdUpdateTime;
 	}
 
 	@Test
-	public void valueProviderToBeanTest(){
+	public void valueProviderToBeanTest() {
 		// https://gitee.com/dromara/hutool/issues/I5B4R7
 		final CopyOptions copyOptions = CopyOptions.create();
-		final Map<String, String> filedMap= new HashMap<>();
+		final Map<String, String> filedMap = new HashMap<>();
 		filedMap.put("name", "sourceId");
 		copyOptions.setFieldMapping(filedMap);
 		final TestPojo pojo = BeanUtil.toBean(TestPojo.class, new ValueProvider<String>() {
 			final HashMap<String, Object> map = new HashMap<>();
+
 			{
 				map.put("sourceId", "123");
 			}
+
 			@Override
 			public Object value(final String key, final Type valueType) {
 				return map.get(key);
@@ -873,7 +880,7 @@ public class BeanUtilTest {
 				return map.containsKey(key);
 			}
 		}, copyOptions);
-		Assert.assertEquals("123", pojo.getName());
+		assertEquals("123", pojo.getName());
 	}
 
 	@Data
@@ -895,6 +902,7 @@ public class BeanUtilTest {
 		private Integer sex;
 		private String mobile;
 	}
+
 	@Test
 	public void isCommonFieldsEqualTest() {
 		final TestUserEntity userEntity = new TestUserEntity();
@@ -907,30 +915,30 @@ public class BeanUtilTest {
 
 		BeanUtil.copyProperties(userDTO, userEntity);
 
-		Assert.assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity));
+		assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity));
 
 		userEntity.setAge(13);
-		Assert.assertFalse(BeanUtil.isCommonFieldsEqual(userDTO, userEntity));
-		Assert.assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity, "age"));
+		assertFalse(BeanUtil.isCommonFieldsEqual(userDTO, userEntity));
+		assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity, "age"));
 
-		Assert.assertTrue(BeanUtil.isCommonFieldsEqual(null, null));
-		Assert.assertFalse(BeanUtil.isCommonFieldsEqual(null, userEntity));
-		Assert.assertFalse(BeanUtil.isCommonFieldsEqual(userEntity, null));
+		assertTrue(BeanUtil.isCommonFieldsEqual(null, null));
+		assertFalse(BeanUtil.isCommonFieldsEqual(null, userEntity));
+		assertFalse(BeanUtil.isCommonFieldsEqual(userEntity, null));
 
 		userEntity.setSex(0);
-		Assert.assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity, "age", "sex"));
+		assertTrue(BeanUtil.isCommonFieldsEqual(userDTO, userEntity, "age", "sex"));
 	}
 
 	@Test
 	public void hasGetterTest() {
 		// https://gitee.com/dromara/hutool/issues/I6M7Z7
 		final boolean b = BeanUtil.hasGetter(Object.class);
-		Assert.assertFalse(b);
+		assertFalse(b);
 	}
 
 	@Test
 	public void issueI9VTZGTest() {
 		final boolean bean = BeanUtil.isBean(Dict.class);
-		Assert.assertFalse(bean);
+		assertFalse(bean);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java
index 1eb69e92d..9a03e2613 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/DynaBeanTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * {@link DynaBean}单元测试
@@ -19,18 +19,18 @@ public class DynaBeanTest {
 		bean.set("age", 12);
 
 		String name = bean.get("name");
-		Assert.assertEquals(user.getName(), name);
+		assertEquals(user.getName(), name);
 		int age = bean.get("age");
-		Assert.assertEquals(user.getAge(), age);
+		assertEquals(user.getAge(), age);
 
 		//重复包装测试
 		DynaBean bean2 = new DynaBean(bean);
 		User user2 = bean2.getBean();
-		Assert.assertEquals(user, user2);
+		assertEquals(user, user2);
 
 		//执行指定方法
 		Object invoke = bean2.invoke("testMethod");
-		Assert.assertEquals("test for 李华", invoke);
+		assertEquals("test for 李华", invoke);
 	}
 
 
@@ -43,19 +43,19 @@ public class DynaBeanTest {
 		bean.set("age", age_before);
 
 		String name_after = bean.get("name");
-		Assert.assertEquals(name_before, name_after);
+		assertEquals(name_before, name_after);
 		int age_after = bean.get("age");
-		Assert.assertEquals(age_before, age_after);
+		assertEquals(age_before, age_after);
 
 		//重复包装测试
 		DynaBean bean2 = new DynaBean(bean);
 		User user2 = bean2.getBean();
 		User user1 = bean.getBean();
-		Assert.assertEquals(user1, user2);
+		assertEquals(user1, user2);
 
 		//执行指定方法
 		Object invoke = bean2.invoke("testMethod");
-		Assert.assertEquals("test for 李华", invoke);
+		assertEquals("test for 李华", invoke);
 	}
 
 
@@ -68,19 +68,19 @@ public class DynaBeanTest {
 		bean.set("age", age_before);
 
 		String name_after = bean.get("name");
-		Assert.assertEquals(name_before, name_after);
+		assertEquals(name_before, name_after);
 		int age_after = bean.get("age");
-		Assert.assertEquals(age_before, age_after);
+		assertEquals(age_before, age_after);
 
 		//重复包装测试
 		DynaBean bean2 = new DynaBean(bean);
 		User user2 = bean2.getBean();
 		User user1 = bean.getBean();
-		Assert.assertEquals(user1, user2);
+		assertEquals(user1, user2);
 
 		//执行指定方法
 		Object invoke = bean2.invoke("testMethod");
-		Assert.assertEquals("test for 李华", invoke);
+		assertEquals("test for 李华", invoke);
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java
index 488405fc0..41ac70682 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue1687Test.java
@@ -4,8 +4,8 @@ import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 
@@ -22,8 +22,8 @@ public class Issue1687Test {
 
 		final SysUser sysUser = BeanUtil.toBean(sysUserFb, SysUser.class);
 		// 别名错位导致找不到字段
-		Assert.assertNull(sysUser.getDepart());
-		Assert.assertEquals(new Long(456L), sysUser.getOrgId());
+		assertNull(sysUser.getDepart());
+		assertEquals(new Long(456L), sysUser.getOrgId());
 	}
 
 	@Test
@@ -38,8 +38,8 @@ public class Issue1687Test {
 		);
 		final SysUser sysUser = BeanUtil.toBean(sysUserFb, SysUser.class, copyOptions);
 
-		Assert.assertEquals(new Long(123L), sysUser.getDepart());
-		Assert.assertEquals(new Long(456L), sysUser.getOrgId());
+		assertEquals(new Long(123L), sysUser.getDepart());
+		assertEquals(new Long(456L), sysUser.getOrgId());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java
index 8ab6a9147..2658c3506 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2009Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.bean;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://github.com/dromara/hutool/issues/2009
@@ -71,6 +71,6 @@ public class Issue2009Test {
 		A a = new A();
 		BeanUtil.copyProperties(b, a);
 
-		Assert.assertEquals(b.getPapss(), a.getPapss());
+		assertEquals(b.getPapss(), a.getPapss());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java
index ae8920f16..262762e71 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2082Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://github.com/dromara/hutool/issues/2082<br>
@@ -14,7 +14,7 @@ public class Issue2082Test {
 	public void toBeanTest() {
 		TestBean2 testBean2 = new TestBean2();
 		TestBean test = BeanUtil.toBean(testBean2, TestBean.class);
-		Assert.assertNull(test.getId());
+		assertNull(test.getId());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java
index 8f6a344be..a4598d1c5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2202Test.java
@@ -3,8 +3,8 @@ package cn.hutool.core.bean;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.text.NamingCase;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -24,10 +24,10 @@ public class Issue2202Test {
 		ResponseSignVerifyParams case1 = BeanUtil.toBean(headerMap, ResponseSignVerifyParams.class,
 				CopyOptions.create().setFieldNameEditor(field -> NamingCase.toCamelCase(field, '-')));
 
-		Assert.assertEquals("serial", case1.getWechatpaySerial());
-		Assert.assertEquals("nonce", case1.getWechatpayNonce());
-		Assert.assertEquals("timestamp", case1.getWechatpayTimestamp());
-		Assert.assertEquals("signature", case1.getWechatpaySignature());
+		assertEquals("serial", case1.getWechatpaySerial());
+		assertEquals("nonce", case1.getWechatpayNonce());
+		assertEquals("timestamp", case1.getWechatpayTimestamp());
+		assertEquals("signature", case1.getWechatpaySignature());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2697Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2697Test.java
index 3f478a987..6a39d3391 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue2697Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue2697Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean;
 
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,7 +21,7 @@ public class Issue2697Test {
 		final Map<String, String> mapB = new HashMap<>(16);
 		BeanUtil.copyProperties(mapA, mapB, "12");
 
-		Assert.assertEquals(2, mapB.size());
-		Assert.assertFalse(mapB.containsKey("12"));
+		assertEquals(2, mapB.size());
+		assertFalse(mapB.containsKey("12"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3091Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3091Test.java
index d09db88d7..b3603651e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3091Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3091Test.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.core.bean;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -24,6 +24,6 @@ public class Issue3091Test {
 	public void copyToListTest() {
 		final List<Long> list = Arrays.asList(1L,2L);
 		final List<Integer> result = BeanUtil.copyToList(list, Integer.class);
-		Assert.assertEquals("[1, 2]", result.toString());
+		assertEquals("[1, 2]", result.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3452Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3452Test.java
index 6716668a5..16dbcd328 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3452Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3452Test.java
@@ -2,8 +2,8 @@ package cn.hutool.core.bean;
 
 import cn.hutool.core.bean.copier.CopyOptions;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,8 +17,8 @@ public class Issue3452Test {
 		properties.put("user_age", 25);
 		final User user = BeanUtil.fillBeanWithMap(
 			properties, new User(), CopyOptions.create());
-		Assert.assertEquals("JohnDoe", user.getName());
-		Assert.assertEquals(25, user.getUserAge());
+		assertEquals("JohnDoe", user.getName());
+		assertEquals(25, user.getUserAge());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3497Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3497Test.java
index c2af50c54..c3246fc84 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3497Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3497Test.java
@@ -3,8 +3,8 @@ package cn.hutool.core.bean;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -13,6 +13,6 @@ public class Issue3497Test {
 	public void mapToMapTest() {
 		final Map<String, String> aB = MapUtil.builder("a_b", "1").build();
 		final Map<?, ?> bean = BeanUtil.toBean(aB, Map.class, CopyOptions.create().setFieldNameEditor(StrUtil::toCamelCase));
-		Assert.assertEquals(bean.toString(), "{aB=1}");
+		assertEquals(bean.toString(), "{aB=1}");
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3645Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3645Test.java
index 6f69d0201..443698347 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/Issue3645Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/Issue3645Test.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.bean;
 
 import lombok.Data;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 public class Issue3645Test {
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI80FP4Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/IssueI80FP4Test.java
index a0e35b97c..fc3fc1bfd 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI80FP4Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/IssueI80FP4Test.java
@@ -2,8 +2,8 @@ package cn.hutool.core.bean;
 
 import cn.hutool.core.bean.copier.CopyOptions;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI80FP4Test {
 	@Test
@@ -15,7 +15,7 @@ public class IssueI80FP4Test {
 		final Dest dest = new Dest();
 		final CopyOptions copyOptions = CopyOptions.create().setIgnoreNullValue(true).setIgnoreCase(true).setIgnoreProperties("enderDest");
 		BeanUtil.copyProperties(sourceDest, dest, copyOptions);
-		Assert.assertNull(dest.getEnderDest());
+		assertNull(dest.getEnderDest());
 	}
 
 	@Test
@@ -27,7 +27,7 @@ public class IssueI80FP4Test {
 		final Dest dest = new Dest();
 		final CopyOptions copyOptions = CopyOptions.create().setIgnoreNullValue(true).setIgnoreCase(true).setIgnoreProperties("enderdest");
 		BeanUtil.copyProperties(sourceDest, dest, copyOptions);
-		Assert.assertNull(dest.getEnderDest());
+		assertNull(dest.getEnderDest());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI8JASOTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/IssueI8JASOTest.java
index 93bc9753d..c56fde232 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/IssueI8JASOTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/IssueI8JASOTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.bean;
 import cn.hutool.core.annotation.Alias;
 import lombok.Data;
 import lombok.Setter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI8JASOTest {
 
@@ -14,7 +14,7 @@ public class IssueI8JASOTest {
 		userOne.setEmail("123@qq.com");
 		final UserTwo userTwo = new UserTwo();
 		BeanUtil.copyProperties(userOne, userTwo);
-		Assert.assertEquals(userOne.getEmail(), userTwo.getEmail());
+		assertEquals(userOne.getEmail(), userTwo.getEmail());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java
index f459c7f94..35503d371 100644
--- a/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/copier/BeanCopierTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean.copier;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 
@@ -13,14 +13,14 @@ public class BeanCopierTest {
 		final A a = new A();
 
 		HashMap<Object, Object> map = BeanCopier.create(a, new HashMap<>(), CopyOptions.create()).copy();
-		Assert.assertEquals(1, map.size());
-		Assert.assertTrue(map.containsKey("value"));
-		Assert.assertNull(map.get("value"));
+		assertEquals(1, map.size());
+		assertTrue(map.containsKey("value"));
+		assertNull(map.get("value"));
 
 		// 忽略null的情况下，空字段不写入map
 		map = BeanCopier.create(a, new HashMap<>(), CopyOptions.create().ignoreNullValue()).copy();
-		Assert.assertFalse(map.containsKey("value"));
-		Assert.assertEquals(0, map.size());
+		assertFalse(map.containsKey("value"));
+		assertEquals(0, map.size());
 	}
 
 	/**
@@ -36,7 +36,7 @@ public class BeanCopierTest {
 		final BeanCopier<B> copier = BeanCopier.create(a, b, CopyOptions.create().setOverride(false));
 		copier.copy();
 
-		Assert.assertEquals("abc", b.getValue());
+		assertEquals("abc", b.getValue());
 	}
 
 	/**
@@ -52,7 +52,7 @@ public class BeanCopierTest {
 		final BeanCopier<B> copier = BeanCopier.create(a, b, CopyOptions.create());
 		copier.copy();
 
-		Assert.assertEquals("123", b.getValue());
+		assertEquals("123", b.getValue());
 	}
 
 	/**
@@ -67,12 +67,12 @@ public class BeanCopierTest {
 
 		BeanCopier<B> copier = BeanCopier.create(a, b, CopyOptions.create().setOverride(false));
 		copier.copy();
-		Assert.assertEquals("123", b.getValue());
+		assertEquals("123", b.getValue());
 
 		b.setValue(null);
 		copier = BeanCopier.create(a, b, CopyOptions.create().setOverride(false));
 		copier.copy();
-		Assert.assertEquals("abc", b.getValue());
+		assertEquals("abc", b.getValue());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/copier/Issue2718Test.java b/hutool-core/src/test/java/cn/hutool/core/bean/copier/Issue2718Test.java
index 237521c03..61cd85331 100755
--- a/hutool-core/src/test/java/cn/hutool/core/bean/copier/Issue2718Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/bean/copier/Issue2718Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.bean.copier;
 
 import lombok.Setter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 
@@ -16,7 +16,7 @@ public class Issue2718Test {
 				.create(deployment, new LinkedHashMap<String, Object>(), CopyOptions.create().setIgnoreProperties("resources"))
 				.copy();
 
-		Assert.assertTrue(target.isEmpty());
+		assertTrue(target.isEmpty());
 	}
 
 	@Test
@@ -27,7 +27,7 @@ public class Issue2718Test {
 				.create(deployment, new Deployment(), CopyOptions.create().setIgnoreProperties("resources"))
 				.copy();
 
-		Assert.assertNull(target.resources);
+		assertNull(target.resources);
 	}
 
 	@Setter
diff --git a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
index e74a985ac..44e8d7a5e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
@@ -5,8 +5,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,11 +29,11 @@ public class GenericBuilderTest {
 				.with(Box::setHeight, 7)
 				.build();
 
-		Assert.assertEquals(1024L, box.getId().longValue());
-		Assert.assertEquals("Hello World!", box.getTitle());
-		Assert.assertEquals(9, box.getLength().intValue());
-		Assert.assertEquals(8, box.getWidth().intValue());
-		Assert.assertEquals(7, box.getHeight().intValue());
+		assertEquals(1024L, box.getId().longValue());
+		assertEquals("Hello World!", box.getTitle());
+		assertEquals(9, box.getLength().intValue());
+		assertEquals(8, box.getWidth().intValue());
+		assertEquals(7, box.getHeight().intValue());
 
 		// 对象修改
 		Box boxModified = GenericBuilder
@@ -44,11 +44,11 @@ public class GenericBuilderTest {
 				.with(Box::setHeight, 5)
 				.build();
 
-		Assert.assertEquals(1024L, boxModified.getId().longValue());
-		Assert.assertEquals("Hello Friend!", box.getTitle());
-		Assert.assertEquals(3, boxModified.getLength().intValue());
-		Assert.assertEquals(4, boxModified.getWidth().intValue());
-		Assert.assertEquals(5, boxModified.getHeight().intValue());
+		assertEquals(1024L, boxModified.getId().longValue());
+		assertEquals("Hello Friend!", box.getTitle());
+		assertEquals(3, boxModified.getLength().intValue());
+		assertEquals(4, boxModified.getWidth().intValue());
+		assertEquals(5, boxModified.getHeight().intValue());
 
 		// 多参数构造
 		Box box1 = GenericBuilder
@@ -56,12 +56,12 @@ public class GenericBuilderTest {
 				.with(Box::alis)
 				.build();
 
-		Assert.assertEquals(2048L, box1.getId().longValue());
-		Assert.assertEquals("Hello Partner!", box1.getTitle());
-		Assert.assertEquals(222, box1.getLength().intValue());
-		Assert.assertEquals(333, box1.getWidth().intValue());
-		Assert.assertEquals(444, box1.getHeight().intValue());
-		Assert.assertEquals("TomXin:\"Hello Partner!\"", box1.getTitleAlias());
+		assertEquals(2048L, box1.getId().longValue());
+		assertEquals("Hello Partner!", box1.getTitle());
+		assertEquals(222, box1.getLength().intValue());
+		assertEquals(333, box1.getWidth().intValue());
+		assertEquals(444, box1.getHeight().intValue());
+		assertEquals("TomXin:\"Hello Partner!\"", box1.getTitleAlias());
 	}
 
 	@Test
@@ -73,9 +73,9 @@ public class GenericBuilderTest {
 				.with(Map::put, "yellow", "#FFFF00")
 				.with(Map::put, "blue", "#0000FF")
 				.build();
-		Assert.assertEquals("#FF0000", colorMap.get("red"));
-		Assert.assertEquals("#FFFF00", colorMap.get("yellow"));
-		Assert.assertEquals("#0000FF", colorMap.get("blue"));
+		assertEquals("#FF0000", colorMap.get("red"));
+		assertEquals("#FFFF00", colorMap.get("yellow"));
+		assertEquals("#0000FF", colorMap.get("blue"));
 	}
 
 	@Getter
diff --git a/hutool-core/src/test/java/cn/hutool/core/clone/CloneTest.java b/hutool-core/src/test/java/cn/hutool/core/clone/CloneTest.java
index fe1f12ef2..ee7dee1e0 100644
--- a/hutool-core/src/test/java/cn/hutool/core/clone/CloneTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/clone/CloneTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.clone;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 克隆单元测试
@@ -18,7 +18,7 @@ public class CloneTest {
 		//实现Cloneable接口
 		Cat cat = new Cat();
 		Cat cat2 = cat.clone();
-		Assert.assertEquals(cat, cat2);
+		assertEquals(cat, cat2);
 	}
 
 	@Test
@@ -26,7 +26,7 @@ public class CloneTest {
 		//继承CloneSupport类
 		Dog dog = new Dog();
 		Dog dog2 = dog.clone();
-		Assert.assertEquals(dog, dog2);
+		assertEquals(dog, dog2);
 	}
 
 	//------------------------------------------------------------------------------- private Class for test
diff --git a/hutool-core/src/test/java/cn/hutool/core/clone/DefaultCloneTest.java b/hutool-core/src/test/java/cn/hutool/core/clone/DefaultCloneTest.java
index da7be7da0..ca6a8f6cd 100644
--- a/hutool-core/src/test/java/cn/hutool/core/clone/DefaultCloneTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/clone/DefaultCloneTest.java
@@ -3,13 +3,14 @@ package cn.hutool.core.clone;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class DefaultCloneTest {
 
 	@Test
@@ -19,14 +20,14 @@ public class DefaultCloneTest {
 		oldCar.setWheelList(Stream.of(new Wheel("h")).collect(Collectors.toList()));
 
 		Car newCar = oldCar.clone0();
-		Assert.assertEquals(oldCar.getId(), newCar.getId());
-		Assert.assertEquals(oldCar.getWheelList(), newCar.getWheelList());
+		assertEquals(oldCar.getId(), newCar.getId());
+		assertEquals(oldCar.getWheelList(), newCar.getWheelList());
 
 		newCar.setId(2);
-		Assert.assertNotEquals(oldCar.getId(), newCar.getId());
+		assertNotEquals(oldCar.getId(), newCar.getId());
 		newCar.getWheelList().add(new Wheel("s"));
 
-		Assert.assertNotSame(oldCar, newCar);
+		assertNotSame(oldCar, newCar);
 
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/BCDTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/BCDTest.java
index 30fef7d4d..31e1e6248 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/BCDTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/BCDTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BCDTest {
 
@@ -13,6 +13,6 @@ public class BCDTest {
 		final byte[] bcd = BCD.strToBcd(strForTest);
 		final String str = BCD.bcdToStr(bcd);
 		//解码BCD
-		Assert.assertEquals(strForTest, str);
+		assertEquals(strForTest, str);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
index 5d74654bf..9ff0d8099 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base32Test.java
@@ -2,8 +2,8 @@ package cn.hutool.core.codec;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Base32Test {
 
@@ -11,28 +11,28 @@ public class Base32Test {
 	public void encodeAndDecodeTest(){
 		String a = "伦家是一个非常长的字符串";
 		String encode = Base32.encode(a);
-		Assert.assertEquals("4S6KNZNOW3TJRL7EXCAOJOFK5GOZ5ZNYXDUZLP7HTKCOLLMX46WKNZFYWI======", encode);
+		assertEquals("4S6KNZNOW3TJRL7EXCAOJOFK5GOZ5ZNYXDUZLP7HTKCOLLMX46WKNZFYWI======", encode);
 
 		String decodeStr = Base32.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 
 		// 支持小写模式解码
 		decodeStr = Base32.decodeStr(encode.toLowerCase());
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void hexEncodeAndDecodeTest(){
 		String a = "伦家是一个非常长的字符串";
 		String encode = Base32.encodeHex(StrUtil.utf8Bytes(a));
-		Assert.assertEquals("SIUADPDEMRJ9HBV4N20E9E5AT6EPTPDON3KPBFV7JA2EBBCNSUMADP5OM8======", encode);
+		assertEquals("SIUADPDEMRJ9HBV4N20E9E5AT6EPTPDON3KPBFV7JA2EBBCNSUMADP5OM8======", encode);
 
 		String decodeStr = Base32.decodeStrHex(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 
 		// 支持小写模式解码
 		decodeStr = Base32.decodeStrHex(encode.toLowerCase());
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
@@ -40,13 +40,13 @@ public class Base32Test {
 		String a = RandomUtil.randomString(RandomUtil.randomInt(1000));
 		String encode = Base32.encode(a);
 		String decodeStr = Base32.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void decodeTest(){
 		String a = "伦家是一个非常长的字符串";
 		String decodeStr = Base32.decodeStr("4S6KNZNOW3TJRL7EXCAOJOFK5GOZ5ZNYXDUZLP7HTKCOLLMX46WKNZFYWI");
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java
index 0dab5faf2..522e93318 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base58Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 
@@ -11,30 +11,30 @@ public class Base58Test {
 	public void encodeCheckedTest() {
 		String a = "hello world";
 		String encode = Base58.encodeChecked(0, a.getBytes());
-		Assert.assertEquals(1 + "3vQB7B6MrGQZaxCuFg4oh", encode);
+		assertEquals(1 + "3vQB7B6MrGQZaxCuFg4oh", encode);
 
 		// 无版本位
 		encode = Base58.encodeChecked(null, a.getBytes());
-		Assert.assertEquals("3vQB7B6MrGQZaxCuFg4oh", encode);
+		assertEquals("3vQB7B6MrGQZaxCuFg4oh", encode);
 	}
 	@Test
 	public void encodeTest() {
 		String a = "hello world";
 		String encode = Base58.encode(a.getBytes(StandardCharsets.UTF_8));
-		Assert.assertEquals("StV1DL6CwTryKyV", encode);
+		assertEquals("StV1DL6CwTryKyV", encode);
 	}
 	@Test
 	public void decodeCheckedTest() {
 		String a = "3vQB7B6MrGQZaxCuFg4oh";
 		byte[] decode = Base58.decodeChecked(1 + a);
-		Assert.assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
+		assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
 		decode = Base58.decodeChecked(a);
-		Assert.assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
+		assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
 	}
 	@Test
 	public void testDecode()  {
 		String a = "StV1DL6CwTryKyV";
 		byte[] decode = Base58.decode(a);
-		Assert.assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
+		assertArrayEquals("hello world".getBytes(StandardCharsets.UTF_8),decode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java
index 67c801ef2..094f89173 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base62Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.codec;
 
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Base62单元测试
@@ -16,20 +16,20 @@ public class Base62Test {
 	public void encodeAndDecodeTest() {
 		String a = "伦家是一个非常长的字符串66";
 		String encode = Base62.encode(a);
-		Assert.assertEquals("17vKU8W4JMG8dQF8lk9VNnkdMOeWn4rJMva6F0XsLrrT53iKBnqo", encode);
+		assertEquals("17vKU8W4JMG8dQF8lk9VNnkdMOeWn4rJMva6F0XsLrrT53iKBnqo", encode);
 
 		String decodeStr = Base62.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void encodeAndDecodeInvertedTest() {
 		String a = "伦家是一个非常长的字符串66";
 		String encode = Base62.encodeInverted(a);
-		Assert.assertEquals("17Vku8w4jmg8Dqf8LK9vnNKDmoEwN4RjmVA6f0xSlRRt53IkbNQO", encode);
+		assertEquals("17Vku8w4jmg8Dqf8LK9vnNKDmoEwN4RjmVA6f0xSlRRt53IkbNQO", encode);
 
 		String decodeStr = Base62.decodeStrInverted(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
@@ -37,7 +37,7 @@ public class Base62Test {
 		String a = RandomUtil.randomString(RandomUtil.randomInt(1000));
 		String encode = Base62.encode(a);
 		String decodeStr = Base62.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
@@ -45,6 +45,6 @@ public class Base62Test {
 		String a = RandomUtil.randomString(RandomUtil.randomInt(1000));
 		String encode = Base62.encodeInverted(a);
 		String decodeStr = Base62.decodeStrInverted(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java b/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
index bfc8fc960..1dacc9cee 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/Base64Test.java
@@ -3,8 +3,8 @@ package cn.hutool.core.codec;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Base64单元测试
@@ -16,59 +16,59 @@ public class Base64Test {
 
 	@Test
 	public void isBase64Test(){
-		Assert.assertTrue(Base64.isBase64(Base64.encode(RandomUtil.randomString(1000))));
+		assertTrue(Base64.isBase64(Base64.encode(RandomUtil.randomString(1000))));
 	}
 
 	@Test
 	public void isBase64Test2(){
 		String base64 = "dW1kb3MzejR3bmljM2J6djAyZzcwbWk5M213Nnk3cWQ3eDJwOHFuNXJsYmMwaXhxbmg0dmxrcmN0anRkbmd3\n" +
 				"ZzcyZWFwanI2NWNneTg2dnp6cmJoMHQ4MHpxY2R6c3pjazZtaQ==";
-		Assert.assertTrue(Base64.isBase64(base64));
+		assertTrue(Base64.isBase64(base64));
 
 		// '=' 不位于末尾
 		base64 = "dW1kb3MzejR3bmljM2J6=djAyZzcwbWk5M213Nnk3cWQ3eDJwOHFuNXJsYmMwaXhxbmg0dmxrcmN0anRkbmd3\n" +
 				"ZzcyZWFwanI2NWNneTg2dnp6cmJoMHQ4MHpxY2R6c3pjazZtaQ=";
-		Assert.assertFalse(Base64.isBase64(base64));
+		assertFalse(Base64.isBase64(base64));
 	}
 
 	@Test
 	public void encodeAndDecodeTest() {
 		String a = "伦家是一个非常长的字符串66";
 		String encode = Base64.encode(a);
-		Assert.assertEquals("5Lym5a625piv5LiA5Liq6Z2e5bi46ZW/55qE5a2X56ym5LiyNjY=", encode);
+		assertEquals("5Lym5a625piv5LiA5Liq6Z2e5bi46ZW/55qE5a2X56ym5LiyNjY=", encode);
 
 		String decodeStr = Base64.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void encodeAndDecodeWithoutPaddingTest() {
 		String a = "伦家是一个非常长的字符串66";
 		String encode = Base64.encodeWithoutPadding(StrUtil.utf8Bytes(a));
-		Assert.assertEquals("5Lym5a625piv5LiA5Liq6Z2e5bi46ZW/55qE5a2X56ym5LiyNjY", encode);
+		assertEquals("5Lym5a625piv5LiA5Liq6Z2e5bi46ZW/55qE5a2X56ym5LiyNjY", encode);
 
 		String decodeStr = Base64.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void encodeAndDecodeTest2() {
 		String a = "a61a5db5a67c01445ca2-HZ20181120172058/pdf/中国电信影像云单体网关Docker版-V1.2.pdf";
 		String encode = Base64.encode(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("YTYxYTVkYjVhNjdjMDE0NDVjYTItSFoyMDE4MTEyMDE3MjA1OC9wZGYv5Lit5Zu955S15L+h5b2x5YOP5LqR5Y2V5L2T572R5YWzRG9ja2Vy54mILVYxLjIucGRm", encode);
+		assertEquals("YTYxYTVkYjVhNjdjMDE0NDVjYTItSFoyMDE4MTEyMDE3MjA1OC9wZGYv5Lit5Zu955S15L+h5b2x5YOP5LqR5Y2V5L2T572R5YWzRG9ja2Vy54mILVYxLjIucGRm", encode);
 
 		String decodeStr = Base64.decodeStr(encode, CharsetUtil.UTF_8);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
 	public void encodeAndDecodeTest3() {
 		String a = ":";
 		String encode = Base64.encode(a);
-		Assert.assertEquals("Og==", encode);
+		assertEquals("Og==", encode);
 
 		String decodeStr = Base64.decodeStr(encode);
-		Assert.assertEquals(a, decodeStr);
+		assertEquals(a, decodeStr);
 	}
 
 	@Test
@@ -77,7 +77,7 @@ public class Base64Test {
 		String result = Base64.encode(orderDescription, "gbk");
 
 		final String s = Base64.decodeStr(result, "gbk");
-		Assert.assertEquals(orderDescription, s);
+		assertEquals(orderDescription, s);
 	}
 
 	@Test
@@ -87,7 +87,7 @@ public class Base64Test {
 //		Console.log(encode);
 
 		final String decodeStr = Base64.decodeStr(encode);
-		Assert.assertEquals(str, decodeStr);
+		assertEquals(str, decodeStr);
 	}
 
 	@Test
@@ -95,6 +95,6 @@ public class Base64Test {
 		String a = java.util.Base64.getEncoder().encodeToString("111".getBytes()); //java.util.Base64
 		String b = Base64.encode("111"); //cn.hutool.core.codec.Base64
 
-		Assert.assertEquals(a, b);
+		assertEquals(a, b);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java
index 86d6c6894..5c1d40411 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/CaesarTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CaesarTest {
 
@@ -10,9 +10,9 @@ public class CaesarTest {
 		String str = "1f2e9df6131b480b9fdddc633cf24996";
 
 		String encode = Caesar.encode(str, 3);
-		Assert.assertEquals("1H2G9FH6131D480D9HFFFE633EH24996", encode);
+		assertEquals("1H2G9FH6131D480D9HFFFE633EH24996", encode);
 
 		String decode = Caesar.decode(encode, 3);
-		Assert.assertEquals(str, decode);
+		assertEquals(str, decode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java
index 458cde5b1..4ca4dd1b2 100755
--- a/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/HashidsTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HashidsTest {
 	@Test
@@ -11,10 +11,10 @@ public class HashidsTest {
 		final String encoded2 = hashids.encodeFromHex("0x507f1f77bcf86cd799439011");
 		final String encoded3 = hashids.encodeFromHex("0X507f1f77bcf86cd799439011");
 
-		Assert.assertEquals("R2qnd2vkOJTXm7XV7yq4", encoded1);
-		Assert.assertEquals(encoded1, encoded2);
-		Assert.assertEquals(encoded1, encoded3);
+		assertEquals("R2qnd2vkOJTXm7XV7yq4", encoded1);
+		assertEquals(encoded1, encoded2);
+		assertEquals(encoded1, encoded3);
 		final String decoded = hashids.decodeToHex(encoded1);
-		Assert.assertEquals("507f1f77bcf86cd799439011", decoded);
+		assertEquals("507f1f77bcf86cd799439011", decoded);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java
index 5b78bd98a..ae2261673 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/MorseTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class MorseTest {
 
@@ -11,23 +11,23 @@ public class MorseTest {
 	public void test0() {
 		String text = "Hello World!";
 		String morse = "...././.-../.-../---/-...../.--/---/.-./.-../-../-.-.--/";
-		Assert.assertEquals(morse, morseCoder.encode(text));
-		Assert.assertEquals(morseCoder.decode(morse), text.toUpperCase());
+		assertEquals(morse, morseCoder.encode(text));
+		assertEquals(morseCoder.decode(morse), text.toUpperCase());
 	}
 
 	@Test
 	public void test1() {
 		String text = "你好，世界！";
 		String morse = "-..----.--...../-.--..-.-----.-/--------....--../-..---....-.--./---.-.-.-..--../--------.......-/";
-		Assert.assertEquals(morseCoder.encode(text), morse);
-		Assert.assertEquals(morseCoder.decode(morse), text);
+		assertEquals(morseCoder.encode(text), morse);
+		assertEquals(morseCoder.decode(morse), text);
 	}
 
 	@Test
 	public void test2() {
 		String text = "こんにちは";
 		String morse = "--.....-.-..--/--....-..-..--/--.....--.-.--/--.....--....-/--.....--.----/";
-		Assert.assertEquals(morseCoder.encode(text), morse);
-		Assert.assertEquals(morseCoder.decode(morse), text);
+		assertEquals(morseCoder.encode(text), morse);
+		assertEquals(morseCoder.decode(morse), text);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java
index 04bcbf435..a7733d96d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/PunyCodeTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PunyCodeTest {
 
@@ -9,11 +9,11 @@ public class PunyCodeTest {
 	public void encodeDecodeTest(){
 		final String text = "Hutool编码器";
 		final String strPunyCode = PunyCode.encode(text);
-		Assert.assertEquals("Hutool-ux9js33tgln", strPunyCode);
+		assertEquals("Hutool-ux9js33tgln", strPunyCode);
 		String decode = PunyCode.decode("Hutool-ux9js33tgln");
-		Assert.assertEquals(text, decode);
+		assertEquals(text, decode);
 		decode = PunyCode.decode("xn--Hutool-ux9js33tgln");
-		Assert.assertEquals(text, decode);
+		assertEquals(text, decode);
 	}
 
 	@Test
@@ -21,7 +21,7 @@ public class PunyCodeTest {
 		// 无需编码和解码
 		final String text = "Hutool";
 		final String strPunyCode = PunyCode.encode(text);
-		Assert.assertEquals("Hutool", strPunyCode);
+		assertEquals("Hutool", strPunyCode);
 	}
 
 	@Test
@@ -29,24 +29,24 @@ public class PunyCodeTest {
 		final String domain = "赵新虎.中国";
 		final String strPunyCode = PunyCode.encodeDomain(domain);
 		final String decode = PunyCode.decodeDomain(strPunyCode);
-		Assert.assertEquals(decode, domain);
+		assertEquals(decode, domain);
 	}
 
 	@Test
 	public void encodeEncodeDomainTest2(){
 		final String domain = "赵新虎.com";
 		final String strPunyCode = PunyCode.encodeDomain(domain);
-		Assert.assertEquals("xn--efvz93e52e.com", strPunyCode);
+		assertEquals("xn--efvz93e52e.com", strPunyCode);
 		final String decode = PunyCode.decodeDomain(strPunyCode);
-		Assert.assertEquals(domain, decode);
+		assertEquals(domain, decode);
 	}
 
 	@Test
 	public void encodeEncodeDomainTest3(){
 		final String domain = "赵新虎.COM";
 		final String strPunyCode = PunyCode.encodeDomain(domain);
-		Assert.assertEquals("xn--efvz93e52e.COM", strPunyCode);
+		assertEquals("xn--efvz93e52e.COM", strPunyCode);
 		final String decode = PunyCode.decodeDomain(strPunyCode);
-		Assert.assertEquals(domain, decode);
+		assertEquals(domain, decode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java b/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java
index f3f90172d..155ac91dd 100644
--- a/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/codec/RotTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.codec;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class RotTest {
 
@@ -10,9 +10,9 @@ public class RotTest {
 		String str = "1f2e9df6131b480b9fdddc633cf24996";
 
 		String encode13 = Rot.encode13(str);
-		Assert.assertEquals("4s5r2qs9464o713o2sqqqp966ps57229", encode13);
+		assertEquals("4s5r2qs9464o713o2sqqqp966ps57229", encode13);
 
 		String decode13 = Rot.decode13(encode13);
-		Assert.assertEquals(str, decode13);
+		assertEquals(str, decode13);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
index 69da448ba..1bfb2fb66 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollStreamUtilTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.map.MapUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 import java.util.stream.Collector;
@@ -19,54 +19,54 @@ public class CollStreamUtilTest {
 	@Test
 	public void testToIdentityMap() {
 		Map<Long, Student> map = CollStreamUtil.toIdentityMap(null, Student::getStudentId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.toIdentityMap(list, Student::getStudentId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 1, 2, "李四"));
 		list.add(new Student(1, 1, 3, "王五"));
 		map = CollStreamUtil.toIdentityMap(list, Student::getStudentId);
-		Assert.assertEquals(map.get(1L).getName(), "张三");
-		Assert.assertEquals(map.get(2L).getName(), "李四");
-		Assert.assertEquals(map.get(3L).getName(), "王五");
-		Assert.assertNull(map.get(4L));
+		assertEquals(map.get(1L).getName(), "张三");
+		assertEquals(map.get(2L).getName(), "李四");
+		assertEquals(map.get(3L).getName(), "王五");
+		assertNull(map.get(4L));
 
 		// 测试value为空时
 		list.add(null);
 		map = CollStreamUtil.toIdentityMap(list, Student::getStudentId);
-		Assert.assertNull(map.get(4L));
+		assertNull(map.get(4L));
 	}
 
 	@Test
 	public void testToMap() {
 		Map<Long, String> map = CollStreamUtil.toMap(null, Student::getStudentId, Student::getName);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.toMap(list, Student::getStudentId, Student::getName);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 1, 2, "李四"));
 		list.add(new Student(1, 1, 3, "王五"));
 		map = CollStreamUtil.toMap(list, Student::getStudentId, Student::getName);
-		Assert.assertEquals(map.get(1L), "张三");
-		Assert.assertEquals(map.get(2L), "李四");
-		Assert.assertEquals(map.get(3L), "王五");
-		Assert.assertNull(map.get(4L));
+		assertEquals(map.get(1L), "张三");
+		assertEquals(map.get(2L), "李四");
+		assertEquals(map.get(3L), "王五");
+		assertNull(map.get(4L));
 
 		// 测试value为空时
 		list.add(new Student(1, 1, 4, null));
 		map = CollStreamUtil.toMap(list, Student::getStudentId, Student::getName);
-		Assert.assertNull(map.get(4L));
+		assertNull(map.get(4L));
 	}
 
 	@Test
 	public void testGroupByKey() {
 		Map<Long, List<Student>> map = CollStreamUtil.groupByKey(null, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.groupByKey(list, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 2, 2, "李四"));
 		list.add(new Student(2, 1, 1, "擎天柱"));
@@ -86,16 +86,16 @@ public class CollStreamUtilTest {
 		List<Student> class3 = new ArrayList<>();
 		class3.add(new Student(2, 3, 2, "霸天虎"));
 		compare.put(3L, class3);
-		Assert.assertEquals(map, compare);
+		assertEquals(map, compare);
 	}
 
 	@Test
 	public void testGroupBy2Key() {
 		Map<Long, Map<Long, List<Student>>> map = CollStreamUtil.groupBy2Key(null, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.groupBy2Key(list, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 2, 2, "李四"));
 		list.add(new Student(1, 2, 3, "王五"));
@@ -125,17 +125,17 @@ public class CollStreamUtilTest {
 		list22.add(new Student(2, 2, 3, "霸天虎"));
 		map2.put(2L, list22);
 		compare.put(2L, map2);
-		Assert.assertEquals(map, compare);
+		assertEquals(map, compare);
 	}
 
 	@Test
 	public void testGroup2Map() {
 		Map<Long, Map<Long, Student>> map = CollStreamUtil.group2Map(null, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.group2Map(list, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 2, 1, "李四"));
 		list.add(new Student(2, 2, 1, "王五"));
@@ -148,7 +148,7 @@ public class CollStreamUtilTest {
 		Map<Long, Student> map2 = new HashMap<>();
 		map2.put(2L, new Student(2, 2, 1, "王五"));
 		compare.put(2L, map2);
-		Assert.assertEquals(compare, map);
+		assertEquals(compare, map);
 
 		// 对null友好
 		Map<Long, Map<Long, Student>> termIdClassIdStudentMap = CollStreamUtil.group2Map(Arrays.asList(null, new Student(2, 2, 1, "王五")), Student::getTermId, Student::getClassId);
@@ -156,17 +156,17 @@ public class CollStreamUtilTest {
 			put(null, MapUtil.of(null, null));
 			put(2L, MapUtil.of(2L, new Student(2, 2, 1, "王五")));
 		}};
-		Assert.assertEquals(termIdClassIdStudentCompareMap, termIdClassIdStudentMap);
+		assertEquals(termIdClassIdStudentCompareMap, termIdClassIdStudentMap);
 	}
 
 	@Test
 	public void testGroupKeyValue() {
 		Map<Long, List<Long>> map = CollStreamUtil.groupKeyValue(null, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.groupKeyValue(list, Student::getTermId, Student::getClassId);
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		list.add(new Student(1, 1, 1, "张三"));
 		list.add(new Student(1, 2, 1, "李四"));
 		list.add(new Student(2, 2, 1, "王五"));
@@ -175,7 +175,7 @@ public class CollStreamUtilTest {
 		Map<Long, List<Long>> compare = new HashMap<>();
 		compare.put(1L, Arrays.asList(1L, 2L));
 		compare.put(2L, Collections.singletonList(2L));
-		Assert.assertEquals(compare, map);
+		assertEquals(compare, map);
 	}
 
 	@Test
@@ -184,12 +184,12 @@ public class CollStreamUtilTest {
 
 		// 参数null测试
 		Map<Long, List<Student>> map = CollStreamUtil.groupBy(null, Student::getTermId, Collectors.toList());
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 
 		// 参数空数组测试
 		List<Student> list = new ArrayList<>();
 		map = CollStreamUtil.groupBy(list, Student::getTermId, Collectors.toList());
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 
 		// 放入元素
 		list.add(new Student(1, 1, 1, "张三"));
@@ -198,11 +198,11 @@ public class CollStreamUtilTest {
 		// 先根据termId分组，再通过classId比较，找出最大值所属的那个Student,返回的Optional
 		Map<Long, Optional<Student>> longOptionalMap = CollStreamUtil.groupBy(list, Student::getTermId, Collectors.maxBy(Comparator.comparing(Student::getClassId)));
 		//noinspection OptionalGetWithoutIsPresent
-		Assert.assertEquals("李四", longOptionalMap.get(1L).get().getName());
+		assertEquals("李四", longOptionalMap.get(1L).get().getName());
 
 		// 先根据termId分组，再转换为Map<studentId,name>
 		Map<Long, HashMap<Long, String>> groupThen = CollStreamUtil.groupBy(list, Student::getTermId, Collector.of(HashMap::new, (m, v) -> m.put(v.getStudentId(), v.getName()), (l, r) -> l));
-		Assert.assertEquals(
+		assertEquals(
 				MapUtil.builder()
 						.put(1L, MapUtil.builder().put(1L, "李四").build())
 						.put(2L, MapUtil.builder().put(1L, "王五").build())
@@ -217,23 +217,23 @@ public class CollStreamUtilTest {
 		Map<Long, List<Student>> termIdStudentsCompareMap = new HashMap<>();
 		termIdStudentsCompareMap.put(null, Arrays.asList(null, null));
 		termIdStudentsCompareMap.put(1L, Arrays.asList(new Student(1L, 1, 1, "张三"), new Student(1L, 2, 1, "李四")));
-		Assert.assertEquals(termIdStudentsCompareMap, termIdStudentsMap);
+		assertEquals(termIdStudentsCompareMap, termIdStudentsMap);
 
 		Map<Long, Long> termIdCountMap = CollStreamUtil.groupBy(students, Student::getTermId, Collectors.counting());
 		Map<Long, Long> termIdCountCompareMap = new HashMap<>();
 		termIdCountCompareMap.put(null, 2L);
 		termIdCountCompareMap.put(1L, 2L);
-		Assert.assertEquals(termIdCountCompareMap, termIdCountMap);
+		assertEquals(termIdCountCompareMap, termIdCountMap);
 	}
 
 
 	@Test
 	public void testTranslate2List() {
 		List<String> list = CollStreamUtil.toList(null, Student::getName);
-		Assert.assertEquals(list, Collections.EMPTY_LIST);
+		assertEquals(list, Collections.EMPTY_LIST);
 		List<Student> students = new ArrayList<>();
 		list = CollStreamUtil.toList(students, Student::getName);
-		Assert.assertEquals(list, Collections.EMPTY_LIST);
+		assertEquals(list, Collections.EMPTY_LIST);
 		students.add(new Student(1, 1, 1, "张三"));
 		students.add(new Student(1, 2, 2, "李四"));
 		students.add(new Student(2, 1, 1, "李四"));
@@ -246,16 +246,16 @@ public class CollStreamUtilTest {
 		compare.add("李四");
 		compare.add("李四");
 		compare.add("霸天虎");
-		Assert.assertEquals(list, compare);
+		assertEquals(list, compare);
 	}
 
 	@Test
 	public void testTranslate2Set() {
 		Set<String> set = CollStreamUtil.toSet(null, Student::getName);
-		Assert.assertEquals(set, Collections.EMPTY_SET);
+		assertEquals(set, Collections.EMPTY_SET);
 		List<Student> students = new ArrayList<>();
 		set = CollStreamUtil.toSet(students, Student::getName);
-		Assert.assertEquals(set, Collections.EMPTY_SET);
+		assertEquals(set, Collections.EMPTY_SET);
 		students.add(new Student(1, 1, 1, "张三"));
 		students.add(new Student(1, 2, 2, "李四"));
 		students.add(new Student(2, 1, 1, "李四"));
@@ -266,7 +266,7 @@ public class CollStreamUtilTest {
 		compare.add("张三");
 		compare.add("李四");
 		compare.add("霸天虎");
-		Assert.assertEquals(set, compare);
+		assertEquals(set, compare);
 	}
 
 	@Test
@@ -274,19 +274,19 @@ public class CollStreamUtilTest {
 		Map<Long, Student> map1 = null;
 		Map<Long, Student> map2 = Collections.emptyMap();
 		Map<Long, String> map = CollStreamUtil.merge(map1, map2, (s1, s2) -> s1.getName() + s2.getName());
-		Assert.assertEquals(map, Collections.EMPTY_MAP);
+		assertEquals(map, Collections.EMPTY_MAP);
 		map1 = new HashMap<>();
 		map1.put(1L, new Student(1, 1, 1, "张三"));
 		map = CollStreamUtil.merge(map1, map2, this::merge);
 		Map<Long, String> temp = new HashMap<>();
 		temp.put(1L, "张三");
-		Assert.assertEquals(map, temp);
+		assertEquals(map, temp);
 		map2 = new HashMap<>();
 		map2.put(1L, new Student(2, 1, 1, "李四"));
 		map = CollStreamUtil.merge(map1, map2, this::merge);
 		Map<Long, String> compare = new HashMap<>();
 		compare.put(1L, "张三李四");
-		Assert.assertEquals(map, compare);
+		assertEquals(map, compare);
 	}
 
 	private String merge(Student student1, Student student2) {
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
index 99bdf2068..258693049 100755
--- a/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
@@ -5,16 +5,13 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Test;
+import lombok.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * 集合工具类单元测试
  *
@@ -25,8 +22,8 @@ public class CollUtilTest {
 	@Test
 	public void testPredicateContains() {
 		final ArrayList<String> list = CollUtil.newArrayList("bbbbb", "aaaaa", "ccccc");
-		Assert.assertTrue(CollUtil.contains(list, s -> s.startsWith("a")));
-		Assert.assertFalse(CollUtil.contains(list, s -> s.startsWith("d")));
+		assertTrue(CollUtil.contains(list, s -> s.startsWith("a")));
+		assertFalse(CollUtil.contains(list, s -> s.startsWith("d")));
 	}
 
 	@Test
@@ -36,14 +33,14 @@ public class CollUtilTest {
 		final ArrayList<Integer> exceptResultList = CollUtil.newArrayList(1);
 
 		List<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
-		Assert.assertEquals(list, exceptRemovedList);
-		Assert.assertEquals(resultList, exceptResultList);
+		assertEquals(list, exceptRemovedList);
+		assertEquals(resultList, exceptResultList);
 
 		list = CollUtil.newArrayList(1, 2, 3);
 		resultList = new ArrayList<>();
 		CollUtil.removeWithAddIf(list, resultList, ele -> 1 == ele);
-		Assert.assertEquals(list, exceptRemovedList);
-		Assert.assertEquals(resultList, exceptResultList);
+		assertEquals(list, exceptRemovedList);
+		assertEquals(resultList, exceptResultList);
 	}
 
 	@Test
@@ -52,17 +49,17 @@ public class CollUtilTest {
 		List<String> answerList = CollUtil.newArrayList("a", "b");
 		CollUtil.padLeft(srcList, 1, "b");
 		CollUtil.padLeft(srcList, 2, "a");
-		Assert.assertEquals(srcList, answerList);
+		assertEquals(srcList, answerList);
 
 		srcList = CollUtil.newArrayList("a", "b");
 		answerList = CollUtil.newArrayList("a", "b");
 		CollUtil.padLeft(srcList, 2, "a");
-		Assert.assertEquals(srcList, answerList);
+		assertEquals(srcList, answerList);
 
 		srcList = CollUtil.newArrayList("c");
 		answerList = CollUtil.newArrayList("a", "a", "c");
 		CollUtil.padLeft(srcList, 3, "a");
-		Assert.assertEquals(srcList, answerList);
+		assertEquals(srcList, answerList);
 	}
 
 	@Test
@@ -70,18 +67,19 @@ public class CollUtilTest {
 		final List<String> srcList = CollUtil.newArrayList("a");
 		final List<String> answerList = CollUtil.newArrayList("a", "b", "b", "b", "b");
 		CollUtil.padRight(srcList, 5, "b");
-		Assert.assertEquals(srcList, answerList);
+		assertEquals(srcList, answerList);
 	}
 
+	@SuppressWarnings("ConstantValue")
 	@Test
 	public void isNotEmptyTest() {
-		Assert.assertFalse(CollUtil.isNotEmpty((Collection<?>) null));
+		assertFalse(CollUtil.isNotEmpty((Collection<?>) null));
 	}
 
 	@Test
 	public void newHashSetTest() {
 		final Set<String> set = CollUtil.newHashSet((String[]) null);
-		Assert.assertNotNull(set);
+		assertNotNull(set);
 	}
 
 	@Test
@@ -91,14 +89,14 @@ public class CollUtilTest {
 
 		final String[] keys = v1.keySet().toArray(new String[0]);
 		final ArrayList<Object> v1s = CollUtil.valuesOfKeys(v1, keys);
-		Assert.assertTrue(v1s.contains(12));
-		Assert.assertTrue(v1s.contains(23));
-		Assert.assertTrue(v1s.contains("张三"));
+		assertTrue(v1s.contains(12));
+		assertTrue(v1s.contains(23));
+		assertTrue(v1s.contains("张三"));
 
 		final ArrayList<Object> v2s = CollUtil.valuesOfKeys(v2, keys);
-		Assert.assertTrue(v2s.contains(15));
-		Assert.assertTrue(v2s.contains(13));
-		Assert.assertTrue(v2s.contains("李四"));
+		assertTrue(v2s.contains(15));
+		assertTrue(v2s.contains(13));
+		assertTrue(v2s.contains("李四"));
 	}
 
 	@Test
@@ -108,7 +106,7 @@ public class CollUtilTest {
 
 		final Collection<String> union = CollUtil.union(list1, list2);
 
-		Assert.assertEquals(3, CollUtil.count(union, "b"::equals));
+		assertEquals(3, CollUtil.count(union, "b"::equals));
 	}
 
 	@Test
@@ -117,7 +115,7 @@ public class CollUtilTest {
 		final ArrayList<String> list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d");
 
 		final Collection<String> intersection = CollUtil.intersection(list1, list2);
-		Assert.assertEquals(2, CollUtil.count(intersection, "b"::equals));
+		assertEquals(2, CollUtil.count(intersection, "b"::equals));
 	}
 
 	@Test
@@ -127,10 +125,10 @@ public class CollUtilTest {
 		final ArrayList<String> list3 = CollUtil.newArrayList();
 
 		final Collection<String> intersectionDistinct = CollUtil.intersectionDistinct(list1, list2);
-		Assert.assertEquals(CollUtil.newLinkedHashSet("a", "b", "c", "d"), intersectionDistinct);
+		assertEquals(CollUtil.newLinkedHashSet("a", "b", "c", "d"), intersectionDistinct);
 
 		final Collection<String> intersectionDistinct2 = CollUtil.intersectionDistinct(list1, list2, list3);
-		Assert.assertTrue(intersectionDistinct2.isEmpty());
+		assertTrue(intersectionDistinct2.isEmpty());
 	}
 
 	@Test
@@ -139,14 +137,14 @@ public class CollUtilTest {
 		final ArrayList<String> list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2");
 
 		final Collection<String> disjunction = CollUtil.disjunction(list1, list2);
-		Assert.assertTrue(disjunction.contains("b"));
-		Assert.assertTrue(disjunction.contains("x2"));
-		Assert.assertTrue(disjunction.contains("x"));
+		assertTrue(disjunction.contains("b"));
+		assertTrue(disjunction.contains("x2"));
+		assertTrue(disjunction.contains("x"));
 
 		final Collection<String> disjunction2 = CollUtil.disjunction(list2, list1);
-		Assert.assertTrue(disjunction2.contains("b"));
-		Assert.assertTrue(disjunction2.contains("x2"));
-		Assert.assertTrue(disjunction2.contains("x"));
+		assertTrue(disjunction2.contains("b"));
+		assertTrue(disjunction2.contains("x2"));
+		assertTrue(disjunction2.contains("x"));
 	}
 
 	@Test
@@ -156,9 +154,9 @@ public class CollUtilTest {
 		final ArrayList<String> list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2");
 
 		final Collection<String> disjunction = CollUtil.disjunction(list1, list2);
-		Assert.assertEquals(list2, disjunction);
+		assertEquals(list2, disjunction);
 		final Collection<String> disjunction2 = CollUtil.disjunction(list2, list1);
-		Assert.assertEquals(list2, disjunction2);
+		assertEquals(list2, disjunction2);
 	}
 
 	@Test
@@ -168,19 +166,19 @@ public class CollUtilTest {
 		final ArrayList<String> list2 = CollUtil.newArrayList("a", "b", "c");
 
 		final Collection<String> disjunction = CollUtil.disjunction(list1, list2);
-		Assert.assertTrue(disjunction.contains("1"));
-		Assert.assertTrue(disjunction.contains("2"));
-		Assert.assertTrue(disjunction.contains("3"));
-		Assert.assertTrue(disjunction.contains("a"));
-		Assert.assertTrue(disjunction.contains("b"));
-		Assert.assertTrue(disjunction.contains("c"));
+		assertTrue(disjunction.contains("1"));
+		assertTrue(disjunction.contains("2"));
+		assertTrue(disjunction.contains("3"));
+		assertTrue(disjunction.contains("a"));
+		assertTrue(disjunction.contains("b"));
+		assertTrue(disjunction.contains("c"));
 		final Collection<String> disjunction2 = CollUtil.disjunction(list2, list1);
-		Assert.assertTrue(disjunction2.contains("1"));
-		Assert.assertTrue(disjunction2.contains("2"));
-		Assert.assertTrue(disjunction2.contains("3"));
-		Assert.assertTrue(disjunction2.contains("a"));
-		Assert.assertTrue(disjunction2.contains("b"));
-		Assert.assertTrue(disjunction2.contains("c"));
+		assertTrue(disjunction2.contains("1"));
+		assertTrue(disjunction2.contains("2"));
+		assertTrue(disjunction2.contains("3"));
+		assertTrue(disjunction2.contains("a"));
+		assertTrue(disjunction2.contains("b"));
+		assertTrue(disjunction2.contains("c"));
 	}
 
 	@Test
@@ -188,8 +186,8 @@ public class CollUtilTest {
 		final List<String> list1 = CollUtil.newArrayList("a", "b", "b", "c", "d", "x");
 		final List<String> list2 = CollUtil.newArrayList("a", "b", "b", "b", "c", "d", "x2");
 		final Collection<String> subtract = CollUtil.subtract(list1, list2);
-		Assert.assertEquals(1, subtract.size());
-		Assert.assertEquals("x", subtract.iterator().next());
+		assertEquals(1, subtract.size());
+		assertEquals("x", subtract.iterator().next());
 	}
 
 	@Test
@@ -200,7 +198,7 @@ public class CollUtilTest {
 		map1.put("2", "v2");
 		map2.put("2", "v2");
 		final Collection<String> r2 = CollUtil.subtract(map1.keySet(), map2.keySet());
-		Assert.assertEquals("[1]", r2.toString());
+		assertEquals("[1]", r2.toString());
 	}
 
 	@Test
@@ -211,7 +209,7 @@ public class CollUtilTest {
 		map1.put("2", "v2");
 		map2.put("2", "v2");
 		final List<String> r2 = CollUtil.subtractToList(map1.keySet(), map2.keySet());
-		Assert.assertEquals("[1]", r2.toString());
+		assertEquals("[1]", r2.toString());
 	}
 
 	@Test
@@ -227,13 +225,13 @@ public class CollUtilTest {
 		// ----------------------------------------------------------------------------------------
 		final ArrayList<HashMap<String, String>> list = CollUtil.newArrayList(map1, map2);
 		final Map<String, List<String>> map = CollUtil.toListMap(list);
-		Assert.assertEquals("值1", map.get("a").get(0));
-		Assert.assertEquals("值2", map.get("a").get(1));
+		assertEquals("值1", map.get("a").get(0));
+		assertEquals("值2", map.get("a").get(1));
 
 		// ----------------------------------------------------------------------------------------
 		final List<Map<String, String>> listMap = CollUtil.toMapList(map);
-		Assert.assertEquals("值1", listMap.get(0).get("a"));
-		Assert.assertEquals("值2", listMap.get(1).get("a"));
+		assertEquals("值1", listMap.get(0).get("a"));
+		assertEquals("值2", listMap.get(1).get("a"));
 	}
 
 	@Test
@@ -243,24 +241,24 @@ public class CollUtilTest {
 		final ArrayList<Dict> list = CollUtil.newArrayList(v1, v2);
 
 		final List<Object> fieldValues = CollUtil.getFieldValues(list, "name");
-		Assert.assertEquals("张三", fieldValues.get(0));
-		Assert.assertEquals("李四", fieldValues.get(1));
+		assertEquals("张三", fieldValues.get(0));
+		assertEquals("李四", fieldValues.get(1));
 	}
 
 	@Test
 	public void splitTest() {
 		final ArrayList<Integer> list = CollUtil.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9);
 		final List<List<Integer>> split = CollUtil.split(list, 3);
-		Assert.assertEquals(3, split.size());
-		Assert.assertEquals(3, split.get(0).size());
+		assertEquals(3, split.size());
+		assertEquals(3, split.get(0).size());
 	}
 
 	@Test
 	public void splitTest2() {
 		final ArrayList<Integer> list = CollUtil.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9);
 		final List<List<Integer>> split = CollUtil.split(list, Integer.MAX_VALUE);
-		Assert.assertEquals(1, split.size());
-		Assert.assertEquals(9, split.get(0).size());
+		assertEquals(1, split.size());
+		assertEquals(9, split.get(0).size());
 	}
 
 	@Test
@@ -277,7 +275,7 @@ public class CollUtilTest {
 				result[0] = value;
 			}
 		});
-		Assert.assertEquals("1", result[0]);
+		assertEquals("1", result[0]);
 	}
 
 	@Test
@@ -286,7 +284,7 @@ public class CollUtilTest {
 
 		final Collection<String> filtered = CollUtil.edit(list, t -> t + 1);
 
-		Assert.assertEquals(CollUtil.newArrayList("a1", "b1", "c1"), filtered);
+		assertEquals(CollUtil.newArrayList("a1", "b1", "c1"), filtered);
 	}
 
 	@Test
@@ -296,8 +294,8 @@ public class CollUtilTest {
 		final ArrayList<String> filtered = CollUtil.filter(list, t -> false == "a".equals(t));
 
 		// 原地过滤
-		Assert.assertSame(list, filtered);
-		Assert.assertEquals(CollUtil.newArrayList("b", "c"), filtered);
+		assertSame(list, filtered);
+		assertEquals(CollUtil.newArrayList("b", "c"), filtered);
 	}
 
 	@Test
@@ -305,7 +303,7 @@ public class CollUtilTest {
 		final Set<String> set = CollUtil.newLinkedHashSet("a", "b", "", "  ", "c");
 		final Set<String> filtered = CollUtil.filter(set, StrUtil::isNotBlank);
 
-		Assert.assertEquals(CollUtil.newLinkedHashSet("a", "b", "c"), filtered);
+		assertEquals(CollUtil.newLinkedHashSet("a", "b", "c"), filtered);
 	}
 
 	@Test
@@ -321,12 +319,12 @@ public class CollUtilTest {
 			return true;
 		});
 
-		Assert.assertEquals(1, removed.size());
-		Assert.assertEquals("a", removed.get(0));
+		assertEquals(1, removed.size());
+		assertEquals("a", removed.get(0));
 
 		// 原地过滤
-		Assert.assertSame(list, filtered);
-		Assert.assertEquals(CollUtil.newArrayList("b", "c"), filtered);
+		assertSame(list, filtered);
+		assertEquals(CollUtil.newArrayList("b", "c"), filtered);
 	}
 
 	@Test
@@ -336,8 +334,8 @@ public class CollUtilTest {
 		final ArrayList<String> filtered = CollUtil.removeNull(list);
 
 		// 原地过滤
-		Assert.assertSame(list, filtered);
-		Assert.assertEquals(CollUtil.newArrayList("a", "b", "c", "", "  "), filtered);
+		assertSame(list, filtered);
+		assertEquals(CollUtil.newArrayList("a", "b", "c", "", "  "), filtered);
 	}
 
 	@Test
@@ -347,8 +345,8 @@ public class CollUtilTest {
 		final ArrayList<String> filtered = CollUtil.removeEmpty(list);
 
 		// 原地过滤
-		Assert.assertSame(list, filtered);
-		Assert.assertEquals(CollUtil.newArrayList("a", "b", "c", "  "), filtered);
+		assertSame(list, filtered);
+		assertEquals(CollUtil.newArrayList("a", "b", "c", "  "), filtered);
 	}
 
 	@Test
@@ -358,32 +356,32 @@ public class CollUtilTest {
 		final ArrayList<String> filtered = CollUtil.removeBlank(list);
 
 		// 原地过滤
-		Assert.assertSame(list, filtered);
-		Assert.assertEquals(CollUtil.newArrayList("a", "b", "c"), filtered);
+		assertSame(list, filtered);
+		assertEquals(CollUtil.newArrayList("a", "b", "c"), filtered);
 	}
 
 	@Test
 	public void groupTest() {
 		final List<String> list = CollUtil.newArrayList("1", "2", "3", "4", "5", "6");
 		final List<List<String>> group = CollUtil.group(list, null);
-		Assert.assertTrue(group.size() > 0);
+		assertFalse(group.isEmpty());
 
 		final List<List<String>> group2 = CollUtil.group(list, t -> {
 			// 按照奇数偶数分类
 			return Integer.parseInt(t) % 2;
 		});
-		Assert.assertEquals(CollUtil.newArrayList("2", "4", "6"), group2.get(0));
-		Assert.assertEquals(CollUtil.newArrayList("1", "3", "5"), group2.get(1));
+		assertEquals(CollUtil.newArrayList("2", "4", "6"), group2.get(0));
+		assertEquals(CollUtil.newArrayList("1", "3", "5"), group2.get(1));
 	}
 
 	@Test
 	public void groupByFieldTest() {
 		final List<TestBean> list = CollUtil.newArrayList(new TestBean("张三", 12), new TestBean("李四", 13), new TestBean("王五", 12));
 		final List<List<TestBean>> groupByField = CollUtil.groupByField(list, "age");
-		Assert.assertEquals("张三", groupByField.get(0).get(0).getName());
-		Assert.assertEquals("王五", groupByField.get(0).get(1).getName());
+		assertEquals("张三", groupByField.get(0).get(0).getName());
+		assertEquals("王五", groupByField.get(0).get(1).getName());
 
-		Assert.assertEquals("李四", groupByField.get(1).get(0).getName());
+		assertEquals("李四", groupByField.get(1).get(0).getName());
 	}
 
 	@Test
@@ -395,9 +393,9 @@ public class CollUtilTest {
 		);
 
 		CollUtil.sortByProperty(list, "createTime");
-		Assert.assertEquals("李四", list.get(0).getName());
-		Assert.assertEquals("王五", list.get(1).getName());
-		Assert.assertEquals("张三", list.get(2).getName());
+		assertEquals("李四", list.get(0).getName());
+		assertEquals("王五", list.get(1).getName());
+		assertEquals("张三", list.get(2).getName());
 	}
 
 	@Test
@@ -409,9 +407,9 @@ public class CollUtilTest {
 		);
 
 		CollUtil.sortByProperty(list, "age");
-		Assert.assertEquals("李四", list.get(0).getName());
-		Assert.assertEquals("张三", list.get(1).getName());
-		Assert.assertEquals("王五", list.get(2).getName());
+		assertEquals("李四", list.get(0).getName());
+		assertEquals("张三", list.get(1).getName());
+		assertEquals("王五", list.get(2).getName());
 	}
 
 	@Test
@@ -422,9 +420,9 @@ public class CollUtilTest {
 		);
 
 		final Map<String, TestBean> map = CollUtil.fieldValueMap(list, "name");
-		Assert.assertEquals("李四", map.get("李四").getName());
-		Assert.assertEquals("王五", map.get("王五").getName());
-		Assert.assertEquals("张三", map.get("张三").getName());
+		assertEquals("李四", map.get("李四").getName());
+		assertEquals("王五", map.get("王五").getName());
+		assertEquals("张三", map.get("张三").getName());
 	}
 
 	@Test
@@ -435,21 +433,21 @@ public class CollUtilTest {
 		);
 
 		final Map<String, Integer> map = CollUtil.fieldValueAsMap(list, "name", "age");
-		Assert.assertEquals(new Integer(12), map.get("张三"));
-		Assert.assertEquals(new Integer(13), map.get("李四"));
-		Assert.assertEquals(new Integer(14), map.get("王五"));
+		assertEquals(new Integer(12), map.get("张三"));
+		assertEquals(new Integer(13), map.get("李四"));
+		assertEquals(new Integer(14), map.get("王五"));
 	}
 
 	@Test
 	public void emptyTest() {
 		final SortedSet<String> emptySortedSet = CollUtil.empty(SortedSet.class);
-		Assert.assertEquals(Collections.emptySortedSet(), emptySortedSet);
+		assertEquals(Collections.emptySortedSet(), emptySortedSet);
 
 		final Set<String> emptySet = CollUtil.empty(Set.class);
-		Assert.assertEquals(Collections.emptySet(), emptySet);
+		assertEquals(Collections.emptySet(), emptySet);
 
 		final List<String> emptyList = CollUtil.empty(List.class);
-		Assert.assertEquals(Collections.emptyList(), emptyList);
+		assertEquals(Collections.emptyList(), emptyList);
 	}
 
 	@Data
@@ -470,16 +468,16 @@ public class CollUtilTest {
 		final List<Object> list1 = CollUtil.list(false);
 		final List<Object> list2 = CollUtil.list(true);
 
-		Assert.assertTrue(list1 instanceof ArrayList);
-		Assert.assertTrue(list2 instanceof LinkedList);
+		assertInstanceOf(ArrayList.class, list1);
+		assertInstanceOf(LinkedList.class, list2);
 	}
 
 	@Test
 	public void listTest2() {
 		final List<String> list1 = CollUtil.list(false, "a", "b", "c");
 		final List<String> list2 = CollUtil.list(true, "a", "b", "c");
-		Assert.assertEquals("[a, b, c]", list1.toString());
-		Assert.assertEquals("[a, b, c]", list2.toString());
+		assertEquals("[a, b, c]", list1.toString());
+		assertEquals("[a, b, c]", list2.toString());
 	}
 
 	@Test
@@ -491,18 +489,18 @@ public class CollUtilTest {
 
 		final List<String> list1 = CollUtil.list(false, set);
 		final List<String> list2 = CollUtil.list(true, set);
-		Assert.assertEquals("[a, b, c]", list1.toString());
-		Assert.assertEquals("[a, b, c]", list2.toString());
+		assertEquals("[a, b, c]", list1.toString());
+		assertEquals("[a, b, c]", list2.toString());
 	}
 
 	@Test
 	public void getTest() {
 		final HashSet<String> set = CollUtil.set(true, "A", "B", "C", "D");
 		String str = CollUtil.get(set, 2);
-		Assert.assertEquals("C", str);
+		assertEquals("C", str);
 
 		str = CollUtil.get(set, -1);
-		Assert.assertEquals("D", str);
+		assertEquals("D", str);
 	}
 
 	@Test
@@ -515,10 +513,10 @@ public class CollUtilTest {
 		list2.add("3");
 		CollUtil.addAllIfNotContains(list1, list2);
 
-		Assert.assertEquals(3, list1.size());
-		Assert.assertEquals("1", list1.get(0));
-		Assert.assertEquals("2", list1.get(1));
-		Assert.assertEquals("3", list1.get(2));
+		assertEquals(3, list1.size());
+		assertEquals("1", list1.get(0));
+		assertEquals("2", list1.get(1));
+		assertEquals("3", list1.get(2));
 	}
 
 	@Test
@@ -534,7 +532,7 @@ public class CollUtilTest {
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
 		arrayList.add(null);
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -551,7 +549,7 @@ public class CollUtilTest {
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
 		arrayList.add(null);
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -566,7 +564,7 @@ public class CollUtilTest {
 
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -579,7 +577,7 @@ public class CollUtilTest {
 		// Act
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
-		Assert.assertTrue(retval.isEmpty());
+		assertTrue(retval.isEmpty());
 	}
 
 	@Test
@@ -594,7 +592,7 @@ public class CollUtilTest {
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -609,21 +607,23 @@ public class CollUtilTest {
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
-	@Test(expected = IndexOutOfBoundsException.class)
+	@Test
 	public void subInput1PositiveNegativePositiveOutputArrayIndexOutOfBoundsException() {
-		// Arrange
-		final List<Integer> list = new ArrayList<>();
-		list.add(null);
-		final int start = 2_147_483_643;
-		final int end = -2_147_483_648;
-		final int step = 2;
+		assertThrows(IndexOutOfBoundsException.class, () -> {
+			// Arrange
+			final List<Integer> list = new ArrayList<>();
+			list.add(null);
+			final int start = 2_147_483_643;
+			final int end = -2_147_483_648;
+			final int step = 2;
 
-		// Act
-		CollUtil.sub(list, start, end, step);
-		// Method is not expected to return due to exception thrown
+			// Act
+			CollUtil.sub(list, start, end, step);
+			// Method is not expected to return due to exception thrown
+		});
 	}
 
 	@Test
@@ -636,7 +636,7 @@ public class CollUtilTest {
 		// Act
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
-		Assert.assertTrue(retval.isEmpty());
+		assertTrue(retval.isEmpty());
 	}
 
 	@Test
@@ -651,7 +651,7 @@ public class CollUtilTest {
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -666,7 +666,7 @@ public class CollUtilTest {
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -681,7 +681,7 @@ public class CollUtilTest {
 		final List<Integer> retval = CollUtil.sub(list, start, end, step);
 		// Assert result
 		final List<Integer> arrayList = new ArrayList<>();
-		Assert.assertEquals(arrayList, retval);
+		assertEquals(arrayList, retval);
 	}
 
 	@Test
@@ -693,7 +693,7 @@ public class CollUtilTest {
 		// Act
 		final List<Integer> retval = CollUtil.sub(list, start, end);
 		// Assert result
-		Assert.assertTrue(retval.isEmpty());
+		assertTrue(retval.isEmpty());
 	}
 
 	@Test
@@ -701,7 +701,7 @@ public class CollUtilTest {
 		final List<Integer> list = CollUtil.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9);
 		final List<Integer> sortPageAll = CollUtil.sortPageAll(1, 5, Comparator.reverseOrder(), list);
 
-		Assert.assertEquals(CollUtil.newArrayList(4, 3, 2, 1), sortPageAll);
+		assertEquals(CollUtil.newArrayList(4, 3, 2, 1), sortPageAll);
 	}
 
 	@Test
@@ -709,18 +709,18 @@ public class CollUtilTest {
 		final ArrayList<Integer> list1 = CollUtil.newArrayList(1, 2, 3, 4, 5);
 		final ArrayList<Integer> list2 = CollUtil.newArrayList(5, 3, 1, 9, 11);
 
-		Assert.assertTrue(CollUtil.containsAny(list1, list2));
+		assertTrue(CollUtil.containsAny(list1, list2));
 	}
 
 	@Test
 	public void containsAllTest() {
 		final ArrayList<Integer> list1 = CollUtil.newArrayList(1, 2, 3, 4, 5);
 		final ArrayList<Integer> list2 = CollUtil.newArrayList(5, 3, 1);
-		Assert.assertTrue(CollUtil.containsAll(list1, list2));
+		assertTrue(CollUtil.containsAll(list1, list2));
 
 		final ArrayList<Integer> list3 = CollUtil.newArrayList(1);
 		final ArrayList<Integer> list4 = CollUtil.newArrayList();
-		Assert.assertTrue(CollUtil.containsAll(list3, list4));
+		assertTrue(CollUtil.containsAll(list3, list4));
 	}
 
 	@Test
@@ -728,7 +728,7 @@ public class CollUtilTest {
 		// 测试：空数组返回null而不是报错
 		final List<String> test = CollUtil.newArrayList();
 		final String last = CollUtil.getLast(test);
-		Assert.assertNull(last);
+		assertNull(last);
 	}
 
 	@Test
@@ -738,39 +738,39 @@ public class CollUtilTest {
 
 		final Map<String, Integer> map = CollUtil.zip(keys, values);
 
-		Assert.assertEquals(4, Objects.requireNonNull(map).size());
+		assertEquals(4, Objects.requireNonNull(map).size());
 
-		Assert.assertEquals(1, map.get("a").intValue());
-		Assert.assertEquals(2, map.get("b").intValue());
-		Assert.assertEquals(3, map.get("c").intValue());
-		Assert.assertEquals(4, map.get("d").intValue());
+		assertEquals(1, map.get("a").intValue());
+		assertEquals(2, map.get("b").intValue());
+		assertEquals(3, map.get("c").intValue());
+		assertEquals(4, map.get("d").intValue());
 	}
 
 	@Test
 	public void toMapTest() {
 		final Collection<String> keys = CollUtil.newArrayList("a", "b", "c", "d");
 		final Map<String, String> map = CollUtil.toMap(keys, new HashMap<>(), (value) -> "key" + value);
-		Assert.assertEquals("a", map.get("keya"));
-		Assert.assertEquals("b", map.get("keyb"));
-		Assert.assertEquals("c", map.get("keyc"));
-		Assert.assertEquals("d", map.get("keyd"));
+		assertEquals("a", map.get("keya"));
+		assertEquals("b", map.get("keyb"));
+		assertEquals("c", map.get("keyc"));
+		assertEquals("d", map.get("keyd"));
 	}
 
 	@Test
 	public void addIfAbsentTest() {
 		// 为false的情况
-		Assert.assertFalse(CollUtil.addIfAbsent(null, null));
-		Assert.assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList(), null));
-		Assert.assertFalse(CollUtil.addIfAbsent(null, "123"));
-		Assert.assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList("123"), "123"));
-		Assert.assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
+		assertFalse(CollUtil.addIfAbsent(null, null));
+		assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList(), null));
+		assertFalse(CollUtil.addIfAbsent(null, "123"));
+		assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList("123"), "123"));
+		assertFalse(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
 			new Animal("jack", 20)));
 
 		// 正常情况
-		Assert.assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList("456"), "123"));
-		Assert.assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
+		assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList("456"), "123"));
+		assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
 			new Dog("jack", 20)));
-		Assert.assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
+		assertTrue(CollUtil.addIfAbsent(CollUtil.newArrayList(new Animal("jack", 20)),
 			new Animal("tom", 20)));
 	}
 
@@ -786,9 +786,9 @@ public class CollUtilTest {
 			Map.Entry::getKey,
 			entry -> Long.parseLong(entry.getValue()));
 
-		Assert.assertEquals(1L, (long) map.get("a"));
-		Assert.assertEquals(12L, (long) map.get("b"));
-		Assert.assertEquals(134L, (long) map.get("c"));
+		assertEquals(1L, (long) map.get("a"));
+		assertEquals(12L, (long) map.get("b"));
+		assertEquals(134L, (long) map.get("c"));
 	}
 
 	@Test
@@ -796,17 +796,17 @@ public class CollUtilTest {
 		final ArrayList<String> list = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d");
 		final Map<String, Integer> countMap = CollUtil.countMap(list);
 
-		Assert.assertEquals(Integer.valueOf(2), countMap.get("a"));
-		Assert.assertEquals(Integer.valueOf(2), countMap.get("b"));
-		Assert.assertEquals(Integer.valueOf(2), countMap.get("c"));
-		Assert.assertEquals(Integer.valueOf(1), countMap.get("d"));
+		assertEquals(Integer.valueOf(2), countMap.get("a"));
+		assertEquals(Integer.valueOf(2), countMap.get("b"));
+		assertEquals(Integer.valueOf(2), countMap.get("c"));
+		assertEquals(Integer.valueOf(1), countMap.get("d"));
 	}
 
 	@Test
 	public void indexOfTest() {
 		final ArrayList<String> list = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d");
 		final int i = CollUtil.indexOf(list, (str) -> str.charAt(0) == 'c');
-		Assert.assertEquals(2, i);
+		assertEquals(2, i);
 	}
 
 	@Test
@@ -814,7 +814,7 @@ public class CollUtilTest {
 		// List有优化
 		final ArrayList<String> list = CollUtil.newArrayList("a", "b", "c", "c", "a", "b", "d");
 		final int i = CollUtil.lastIndexOf(list, (str) -> str.charAt(0) == 'c');
-		Assert.assertEquals(3, i);
+		assertEquals(3, i);
 	}
 
 	@Test
@@ -822,7 +822,7 @@ public class CollUtilTest {
 		final Set<String> list = CollUtil.set(true, "a", "b", "c", "c", "a", "b", "d");
 		// 去重后c排第三
 		final int i = CollUtil.lastIndexOf(list, (str) -> str.charAt(0) == 'c');
-		Assert.assertEquals(2, i);
+		assertEquals(2, i);
 	}
 
 	@Test
@@ -832,7 +832,7 @@ public class CollUtilTest {
 			objects.add(Dict.create().set("name", "姓名：" + i));
 		}
 
-		Assert.assertEquals(0, CollUtil.page(3, 5, objects).size());
+		assertEquals(0, CollUtil.page(3, 5, objects).size());
 	}
 
 	@Test
@@ -841,15 +841,15 @@ public class CollUtilTest {
 		final List<Long> list2 = Arrays.asList(2L, 3L);
 
 		final List<Long> result = CollUtil.subtractToList(list1, list2);
-		Assert.assertEquals(1, result.size());
-		Assert.assertEquals(1L, (long) result.get(0));
+		assertEquals(1, result.size());
+		assertEquals(1L, (long) result.get(0));
 	}
 
 	@Test
 	public void sortComparableTest() {
 		final List<String> of = ListUtil.toList("a", "c", "b");
 		final List<String> sort = CollUtil.sort(of, new ComparableComparator<>());
-		Assert.assertEquals("a,b,c", CollUtil.join(sort, ","));
+		assertEquals("a,b,c", CollUtil.join(sort, ","));
 	}
 
 	@Test
@@ -872,9 +872,9 @@ public class CollUtilTest {
 		genderMap.put(5, "小孩");
 		genderMap.put(6, "男");
 
-		Assert.assertEquals(people.get(1).getGender(), "woman");
+		assertEquals(people.get(1).getGender(), "woman");
 		CollUtil.setValueByMap(people, genderMap, Person::getId, Person::setGender);
-		Assert.assertEquals(people.get(1).getGender(), "妇女");
+		assertEquals(people.get(1).getGender(), "妇女");
 
 		final Map<Integer, Person> personMap = new HashMap<>();
 		personMap.put(1, new Person("AA", 21, "男", 1));
@@ -890,13 +890,13 @@ public class CollUtilTest {
 			x.setAge(y.getAge());
 		});
 
-		Assert.assertEquals(people.get(1).getGender(), "小孩");
+		assertEquals(people.get(1).getGender(), "小孩");
 	}
 
 	@Test
 	public void distinctTest() {
 		final ArrayList<Integer> distinct = CollUtil.distinct(ListUtil.of(5, 3, 10, 9, 0, 5, 10, 9));
-		Assert.assertEquals(ListUtil.of(5, 3, 10, 9, 0), distinct);
+		assertEquals(ListUtil.of(5, 3, 10, 9, 0), distinct);
 	}
 
 	@Test
@@ -912,15 +912,15 @@ public class CollUtilTest {
 
 		// 覆盖模式下ff覆盖了aa，ee覆盖了bb
 		List<Person> distinct = CollUtil.distinct(people, Person::getGender, true);
-		Assert.assertEquals(2, distinct.size());
-		Assert.assertEquals("ff", distinct.get(0).getName());
-		Assert.assertEquals("ee", distinct.get(1).getName());
+		assertEquals(2, distinct.size());
+		assertEquals("ff", distinct.get(0).getName());
+		assertEquals("ee", distinct.get(1).getName());
 
 		// 非覆盖模式下，保留了最早加入的aa和bb
 		distinct = CollUtil.distinct(people, Person::getGender, false);
-		Assert.assertEquals(2, distinct.size());
-		Assert.assertEquals("aa", distinct.get(0).getName());
-		Assert.assertEquals("bb", distinct.get(1).getName());
+		assertEquals(2, distinct.size());
+		assertEquals("aa", distinct.get(0).getName());
+		assertEquals("bb", distinct.get(1).getName());
 	}
 
 	@SuppressWarnings("ConstantValue")
@@ -930,7 +930,7 @@ public class CollUtilTest {
 		final List<String> list2 = null;
 		final List<String> list3 = null;
 		final Collection<String> union = CollUtil.union(list1, list2, list3);
-		Assert.assertNotNull(union);
+		assertNotNull(union);
 	}
 
 	@SuppressWarnings("ConstantValue")
@@ -940,7 +940,7 @@ public class CollUtilTest {
 		final List<String> list2 = null;
 		final List<String> list3 = null;
 		final Set<String> set = CollUtil.unionDistinct(list1, list2, list3);
-		Assert.assertNotNull(set);
+		assertNotNull(set);
 	}
 
 	@SuppressWarnings({"ConfusingArgumentToVarargsMethod", "ConstantValue"})
@@ -950,10 +950,10 @@ public class CollUtilTest {
 		final List<String> list2 = null;
 		final List<String> list3 = null;
 		final List<String> list = CollUtil.unionAll(list1, list2, list3);
-		Assert.assertNotNull(list);
+		assertNotNull(list);
 
 		final List<String> resList2 = CollUtil.unionAll(null, null, null);
-		Assert.assertNotNull(resList2);
+		assertNotNull(resList2);
 	}
 
 	@Test
@@ -962,8 +962,8 @@ public class CollUtilTest {
 		final List<Integer> list2 = CollectionUtil.newArrayList(1, 2, 3);
 		final List<Integer> list3 = CollectionUtil.newArrayList(4, 5, 6);
 		final List<Integer> list = CollUtil.unionAll(list1, list2, list3);
-		Assert.assertNotNull(list);
-		Assert.assertArrayEquals(
+		assertNotNull(list);
+		assertArrayEquals(
 			CollectionUtil.newArrayList(1, 2, 2, 3, 3, 1, 2, 3, 4, 5, 6).toArray(),
 			list.toArray());
 	}
@@ -973,8 +973,8 @@ public class CollUtilTest {
 		final List<Integer> list1 = CollectionUtil.newArrayList(1, 2, 2, 3, 3);
 		final List<Integer> list2 = CollectionUtil.newArrayList(1, 2, 3);
 		final List<Integer> list = CollUtil.unionAll(list1, list2);
-		Assert.assertNotNull(list);
-		Assert.assertArrayEquals(
+		assertNotNull(list);
+		assertArrayEquals(
 			CollectionUtil.newArrayList(1, 2, 2, 3, 3, 1, 2, 3).toArray(),
 			list.toArray());
 	}
@@ -984,8 +984,8 @@ public class CollUtilTest {
 		final List<Integer> list1 = CollectionUtil.newArrayList(1, 2, 2, 3, 3);
 		final List<Integer> list2 = CollectionUtil.newArrayList(1, 2, 3);
 		@SuppressWarnings("ConfusingArgumentToVarargsMethod") final List<Integer> list = CollUtil.unionAll(list1, list2, null);
-		Assert.assertNotNull(list);
-		Assert.assertArrayEquals(
+		assertNotNull(list);
+		assertArrayEquals(
 			CollectionUtil.newArrayList(1, 2, 2, 3, 3, 1, 2, 3).toArray(),
 			list.toArray());
 	}
@@ -995,8 +995,8 @@ public class CollUtilTest {
 		final List<Integer> list1 = CollectionUtil.newArrayList(1, 2, 2, 3, 3);
 		final List<Integer> list2 = CollectionUtil.newArrayList(1, 2, 3);
 		final List<Integer> list = CollUtil.unionAll(list1, list2, null, null);
-		Assert.assertNotNull(list);
-		Assert.assertArrayEquals(
+		assertNotNull(list);
+		assertArrayEquals(
 			CollectionUtil.newArrayList(1, 2, 2, 3, 3, 1, 2, 3).toArray(),
 			list.toArray());
 	}
@@ -1010,7 +1010,7 @@ public class CollUtilTest {
 		list2.add("aa");
 		final List<String> list3 = null;
 		final Collection<String> collection = CollUtil.intersection(list1, list2, list3);
-		Assert.assertNotNull(collection);
+		assertNotNull(collection);
 	}
 
 	@Test
@@ -1021,7 +1021,7 @@ public class CollUtilTest {
 		// list2.add("aa");
 		final List<String> list3 = null;
 		final Collection<String> collection = CollUtil.intersectionDistinct(list1, list2, list3);
-		Assert.assertNotNull(collection);
+		assertNotNull(collection);
 	}
 
 	@Data
@@ -1055,33 +1055,34 @@ public class CollUtilTest {
 	public void getFirstTest() {
 		final List<?> nullList = null;
 		final Object first = CollUtil.getFirst(nullList);
-		Assert.assertNull(first);
+		assertNull(first);
 	}
 
 	@Test
 	public void testMatch() {
 		List<Integer> list = Arrays.asList(1, 2, 3, 4, 5, 6);
-		Assert.assertTrue(CollUtil.anyMatch(list, i -> i == 1));
-		Assert.assertFalse(CollUtil.anyMatch(list, i -> i > 6));
-		Assert.assertFalse(CollUtil.allMatch(list, i -> i == 1));
-		Assert.assertTrue(CollUtil.allMatch(list, i -> i <= 6));
+		assertTrue(CollUtil.anyMatch(list, i -> i == 1));
+		assertFalse(CollUtil.anyMatch(list, i -> i > 6));
+		assertFalse(CollUtil.allMatch(list, i -> i == 1));
+		assertTrue(CollUtil.allMatch(list, i -> i <= 6));
 	}
 
 	@Test
 	public void maxTest() {
 		List<Integer> list = Arrays.asList(1, 2, 3, 4, 5, 6);
-		Assert.assertEquals((Integer) 6, CollUtil.max(list));
+		assertEquals((Integer) 6, CollUtil.max(list));
 	}
 
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	@Test
 	public void maxEmptyTest() {
 		final List<? extends Comparable> emptyList = Collections.emptyList();
-		Assert.assertNull(CollUtil.max(emptyList));
+		assertNull(CollUtil.max(emptyList));
 	}
 
 	@Test
 	public void minNullTest() {
-		Assert.assertNull(CollUtil.max(null));
+		assertNull(CollUtil.max(null));
 	}
 
 	@Test
@@ -1098,6 +1099,6 @@ public class CollUtilTest {
 		coll2.add("1");
 		coll2.add("1");
 
-		Assert.assertTrue(CollUtil.containsAll(coll1, coll2));
+		assertTrue(CollUtil.containsAll(coll1, coll2));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/FilterIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/FilterIterTest.java
index 1ca61c177..4572dab55 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/FilterIterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/FilterIterTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.collection;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Iterator;
 
@@ -23,7 +23,7 @@ public class FilterIterTest {
 				count++;
 			}
 		}
-		Assert.assertEquals(2, count);
+		assertEquals(2, count);
 
 		it = ListUtil.of("1", "2").iterator();
 		// filter 不为空
@@ -34,7 +34,7 @@ public class FilterIterTest {
 				count++;
 			}
 		}
-		Assert.assertEquals(1, count);
+		assertEquals(1, count);
 	}
 
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
index 58767ba20..0e31a6f54 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.collection;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -23,20 +23,20 @@ public class IterUtilTest {
 
 	@Test
 	public void getFirstTest() {
-		Assert.assertNull(IterUtil.getFirst((Iterable<Object>) null));
-		Assert.assertNull(IterUtil.getFirst(CollUtil.newArrayList()));
+		assertNull(IterUtil.getFirst((Iterable<Object>) null));
+		assertNull(IterUtil.getFirst(CollUtil.newArrayList()));
 
-		Assert.assertEquals("1", IterUtil.getFirst(CollUtil.newArrayList("1", "2", "3")));
+		assertEquals("1", IterUtil.getFirst(CollUtil.newArrayList("1", "2", "3")));
 		final ArrayDeque<String> deque = new ArrayDeque<>();
 		deque.add("3");
 		deque.add("4");
-		Assert.assertEquals("3", IterUtil.getFirst(deque));
+		assertEquals("3", IterUtil.getFirst(deque));
 	}
 
 	@Test
 	public void getFirstNonNullTest(){
 		final ArrayList<String> strings = CollUtil.newArrayList(null, null, "123", "456", null);
-		Assert.assertEquals("123", IterUtil.getFirstNoneNull(strings));
+		assertEquals("123", IterUtil.getFirstNoneNull(strings));
 	}
 
 	@Test
@@ -44,39 +44,39 @@ public class IterUtilTest {
 		final ArrayList<Car> carList = CollUtil.newArrayList(new Car("123", "大众"), new Car("345", "奔驰"), new Car("567", "路虎"));
 		final Map<String, Car> carNameMap = IterUtil.fieldValueMap(carList.iterator(), "carNumber");
 
-		Assert.assertEquals("大众", carNameMap.get("123").getCarName());
-		Assert.assertEquals("奔驰", carNameMap.get("345").getCarName());
-		Assert.assertEquals("路虎", carNameMap.get("567").getCarName());
+		assertEquals("大众", carNameMap.get("123").getCarName());
+		assertEquals("奔驰", carNameMap.get("345").getCarName());
+		assertEquals("路虎", carNameMap.get("567").getCarName());
 	}
 
 	@Test
 	public void joinTest() {
 		final ArrayList<String> list = CollUtil.newArrayList("1", "2", "3", "4");
 		final String join = IterUtil.join(list.iterator(), ":");
-		Assert.assertEquals("1:2:3:4", join);
+		assertEquals("1:2:3:4", join);
 
 		final ArrayList<Integer> list1 = CollUtil.newArrayList(1, 2, 3, 4);
 		final String join1 = IterUtil.join(list1.iterator(), ":");
-		Assert.assertEquals("1:2:3:4", join1);
+		assertEquals("1:2:3:4", join1);
 
 		// 包装每个节点
 		final ArrayList<String> list2 = CollUtil.newArrayList("1", "2", "3", "4");
 		final String join2 = IterUtil.join(list2.iterator(), ":", "\"", "\"");
-		Assert.assertEquals("\"1\":\"2\":\"3\":\"4\"", join2);
+		assertEquals("\"1\":\"2\":\"3\":\"4\"", join2);
 	}
 
 	@Test
 	public void joinWithFuncTest() {
 		final ArrayList<String> list = CollUtil.newArrayList("1", "2", "3", "4");
 		final String join = IterUtil.join(list.iterator(), ":", String::valueOf);
-		Assert.assertEquals("1:2:3:4", join);
+		assertEquals("1:2:3:4", join);
 	}
 
 	@Test
 	public void joinWithNullTest() {
 		final ArrayList<String> list = CollUtil.newArrayList("1", null, "3", "4");
 		final String join = IterUtil.join(list.iterator(), ":", String::valueOf);
-		Assert.assertEquals("1:null:3:4", join);
+		assertEquals("1:null:3:4", join);
 	}
 
 	@Test
@@ -87,7 +87,7 @@ public class IterUtilTest {
 
 		final Map<String, List<String>> testMap = IterUtil.toListMap(Arrays.asList("and", "brave", "back"),
 				v -> v.substring(0, 1));
-		Assert.assertEquals(testMap, expectedMap);
+		assertEquals(testMap, expectedMap);
 	}
 
 	@Test
@@ -101,14 +101,14 @@ public class IterUtilTest {
 		expectedMap.put("456", benz);
 
 		final Map<String, Car> testMap = IterUtil.toMap(Arrays.asList(bmw, benz), Car::getCarNumber);
-		Assert.assertEquals(expectedMap, testMap);
+		assertEquals(expectedMap, testMap);
 	}
 
 	@Test
 	public void getElementTypeTest(){
 		final List<Integer> integers = Arrays.asList(null, 1);
 		final Class<?> elementType = IterUtil.getElementType(integers);
-		Assert.assertEquals(Integer.class,elementType);
+		assertEquals(Integer.class,elementType);
 	}
 
 	@Data
@@ -125,8 +125,8 @@ public class IterUtilTest {
 
 		IterUtil.filter(obj.iterator(), obj2::contains);
 
-		Assert.assertEquals(1, obj.size());
-		Assert.assertEquals("3", obj.get(0));
+		assertEquals(1, obj.size());
+		assertEquals("3", obj.get(0));
 	}
 
 	@Test
@@ -136,8 +136,8 @@ public class IterUtilTest {
 
 		final FilterIter<String> filtered = IterUtil.filtered(obj.iterator(), obj2::contains);
 
-		Assert.assertEquals("3", filtered.next());
-		Assert.assertFalse(filtered.hasNext());
+		assertEquals("3", filtered.next());
+		assertFalse(filtered.hasNext());
 	}
 
 	@Test
@@ -147,14 +147,14 @@ public class IterUtilTest {
 
 		final List<String> filtered = IterUtil.filterToList(obj.iterator(), obj2::contains);
 
-		Assert.assertEquals(1, filtered.size());
-		Assert.assertEquals("3", filtered.get(0));
+		assertEquals(1, filtered.size());
+		assertEquals("3", filtered.get(0));
 	}
 
 	@Test
 	public void getTest() {
 		final HashSet<String> set = CollUtil.set(true, "A", "B", "C", "D");
 		final String str = IterUtil.get(set.iterator(), 2);
-		Assert.assertEquals("C", str);
+		assertEquals("C", str);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java
index f0fd596d5..9fdb9a85f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java
@@ -6,17 +6,12 @@ import cn.hutool.core.util.PageUtil;
 import cn.hutool.core.util.RandomUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class ListUtilTest {
 
@@ -38,7 +33,7 @@ public class ListUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void splitBenchTest() {
 		final List<String> list = new ArrayList<>();
 		CollUtil.padRight(list, RandomUtil.randomInt(1000_0000, 1_0000_0000), "test");
@@ -85,10 +80,12 @@ public class ListUtilTest {
 		assertEquals("[[1], [2], [3], [], []]", lists.toString());
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void splitAvgNotZero() {
-		// limit不能小于等于0
-		ListUtil.splitAvg(Arrays.asList(1, 2, 3, 4), 0);
+		assertThrows(IllegalArgumentException.class, () -> {
+			// limit不能小于等于0
+			ListUtil.splitAvg(Arrays.asList(1, 2, 3, 4), 0);
+		});
 	}
 
 	@Test
@@ -104,63 +101,63 @@ public class ListUtilTest {
 	public void indexOfAll() {
 		final List<String> a = ListUtil.toLinkedList("1", "2", "3", "4", "3", "2", "1");
 		final int[] indexArray = ListUtil.indexOfAll(a, "2"::equals);
-		Assert.assertArrayEquals(new int[]{1,5}, indexArray);
+		assertArrayEquals(new int[]{1, 5}, indexArray);
 		final int[] indexArray2 = ListUtil.indexOfAll(a, "1"::equals);
-		Assert.assertArrayEquals(new int[]{0,6}, indexArray2);
+		assertArrayEquals(new int[]{0, 6}, indexArray2);
 	}
 
 	@Test
 	public void pageTest() {
-		final List<Integer> a = ListUtil.toLinkedList(1, 2, 3,4,5);
+		final List<Integer> a = ListUtil.toLinkedList(1, 2, 3, 4, 5);
 
 		PageUtil.setFirstPageNo(1);
-		final int[] a_1 = ListUtil.page(1,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] a1 = ListUtil.page(1,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] a2 = ListUtil.page(2,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] a3 = ListUtil.page(3,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] a4 = ListUtil.page(4,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		Assert.assertArrayEquals(new int[]{1,2},a_1);
-		Assert.assertArrayEquals(new int[]{1,2},a1);
-		Assert.assertArrayEquals(new int[]{3,4},a2);
-		Assert.assertArrayEquals(new int[]{5},a3);
-		Assert.assertArrayEquals(new int[]{},a4);
+		final int[] a_1 = ListUtil.page(1, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] a1 = ListUtil.page(1, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] a2 = ListUtil.page(2, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] a3 = ListUtil.page(3, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] a4 = ListUtil.page(4, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		assertArrayEquals(new int[]{1, 2}, a_1);
+		assertArrayEquals(new int[]{1, 2}, a1);
+		assertArrayEquals(new int[]{3, 4}, a2);
+		assertArrayEquals(new int[]{5}, a3);
+		assertArrayEquals(new int[]{}, a4);
 
 
 		PageUtil.setFirstPageNo(2);
-		final int[] b_1 = ListUtil.page(1,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] b1 = ListUtil.page(2,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] b2 = ListUtil.page(3,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] b3 = ListUtil.page(4,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] b4 = ListUtil.page(5,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		Assert.assertArrayEquals(new int[]{1,2},b_1);
-		Assert.assertArrayEquals(new int[]{1,2},b1);
-		Assert.assertArrayEquals(new int[]{3,4},b2);
-		Assert.assertArrayEquals(new int[]{5},b3);
-		Assert.assertArrayEquals(new int[]{},b4);
+		final int[] b_1 = ListUtil.page(1, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] b1 = ListUtil.page(2, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] b2 = ListUtil.page(3, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] b3 = ListUtil.page(4, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] b4 = ListUtil.page(5, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		assertArrayEquals(new int[]{1, 2}, b_1);
+		assertArrayEquals(new int[]{1, 2}, b1);
+		assertArrayEquals(new int[]{3, 4}, b2);
+		assertArrayEquals(new int[]{5}, b3);
+		assertArrayEquals(new int[]{}, b4);
 
 		PageUtil.setFirstPageNo(0);
-		final int[] c_1 = ListUtil.page(-1,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] c1 = ListUtil.page(0,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] c2 = ListUtil.page(1,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] c3 = ListUtil.page(2,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		final int[] c4 = ListUtil.page(3,2,a).stream().mapToInt(Integer::valueOf).toArray();
-		Assert.assertArrayEquals(new int[]{1,2},c_1);
-		Assert.assertArrayEquals(new int[]{1,2},c1);
-		Assert.assertArrayEquals(new int[]{3,4},c2);
-		Assert.assertArrayEquals(new int[]{5},c3);
-		Assert.assertArrayEquals(new int[]{},c4);
+		final int[] c_1 = ListUtil.page(-1, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] c1 = ListUtil.page(0, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] c2 = ListUtil.page(1, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] c3 = ListUtil.page(2, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		final int[] c4 = ListUtil.page(3, 2, a).stream().mapToInt(Integer::valueOf).toArray();
+		assertArrayEquals(new int[]{1, 2}, c_1);
+		assertArrayEquals(new int[]{1, 2}, c1);
+		assertArrayEquals(new int[]{3, 4}, c2);
+		assertArrayEquals(new int[]{5}, c3);
+		assertArrayEquals(new int[]{}, c4);
 
 
 		PageUtil.setFirstPageNo(1);
-		final int[] d1 = ListUtil.page(0,8,a).stream().mapToInt(Integer::valueOf).toArray();
-		Assert.assertArrayEquals(new int[]{1,2,3,4,5},d1);
+		final int[] d1 = ListUtil.page(0, 8, a).stream().mapToInt(Integer::valueOf).toArray();
+		assertArrayEquals(new int[]{1, 2, 3, 4, 5}, d1);
 
 		// page with consumer
 		final List<List<Integer>> pageListData = new ArrayList<>();
 		ListUtil.page(a, 2, pageListData::add);
-		Assert.assertArrayEquals(new int[]{1, 2}, pageListData.get(0).stream().mapToInt(Integer::valueOf).toArray());
-		Assert.assertArrayEquals(new int[]{3, 4}, pageListData.get(1).stream().mapToInt(Integer::valueOf).toArray());
-		Assert.assertArrayEquals(new int[]{5}, pageListData.get(2).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{1, 2}, pageListData.get(0).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{3, 4}, pageListData.get(1).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{5}, pageListData.get(2).stream().mapToInt(Integer::valueOf).toArray());
 
 
 		pageListData.clear();
@@ -170,9 +167,9 @@ public class ListUtilTest {
 				pageList.clear();
 			}
 		});
-		Assert.assertArrayEquals(new int[]{}, pageListData.get(0).stream().mapToInt(Integer::valueOf).toArray());
-		Assert.assertArrayEquals(new int[]{3, 4}, pageListData.get(1).stream().mapToInt(Integer::valueOf).toArray());
-		Assert.assertArrayEquals(new int[]{5}, pageListData.get(2).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{}, pageListData.get(0).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{3, 4}, pageListData.get(1).stream().mapToInt(Integer::valueOf).toArray());
+		assertArrayEquals(new int[]{5}, pageListData.get(2).stream().mapToInt(Integer::valueOf).toArray());
 
 		// 恢复默认值，避免影响其他测试用例
 		PageUtil.setFirstPageNo(0);
@@ -199,12 +196,12 @@ public class ListUtilTest {
 		}
 
 		final List<TestBean> beanList = ListUtil.toList(
-				new TestBean(2, "test2"),
-				new TestBean(1, "test1"),
-				new TestBean(5, "test5"),
-				new TestBean(4, "test4"),
-				new TestBean(3, "test3")
-				);
+			new TestBean(2, "test2"),
+			new TestBean(1, "test1"),
+			new TestBean(5, "test5"),
+			new TestBean(4, "test4"),
+			new TestBean(3, "test3")
+		);
 
 		final List<TestBean> order = ListUtil.sortByProperty(beanList, "order");
 		assertEquals("test1", order.get(0).getName());
@@ -240,7 +237,7 @@ public class ListUtilTest {
 	}
 
 	@Test
-	public void setOrPaddingNullTest(){
+	public void setOrPaddingNullTest() {
 		final List<String> list = new ArrayList<>();
 		list.add("1");
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java
index 43dca2f4c..6e216cb8c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java
@@ -5,8 +5,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.map.MapProxy;
 
@@ -20,13 +20,13 @@ public class MapProxyTest {
 
 		MapProxy mapProxy = new MapProxy(map);
 		Integer b = mapProxy.getInt("b");
-		Assert.assertEquals(new Integer(2), b);
+		assertEquals(new Integer(2), b);
 
 		Set<Object> keys = mapProxy.keySet();
-		Assert.assertFalse(keys.isEmpty());
+		assertFalse(keys.isEmpty());
 
 		Set<Entry<Object,Object>> entrys = mapProxy.entrySet();
-		Assert.assertFalse(entrys.isEmpty());
+		assertFalse(entrys.isEmpty());
 	}
 
 	private interface Student {
@@ -41,7 +41,7 @@ public class MapProxyTest {
 	public void classProxyTest() {
 		Student student = MapProxy.create(new HashMap<>()).toProxyBean(Student.class);
 		student.setName("小明").setAge(18);
-		Assert.assertEquals(student.getAge(), 18);
-		Assert.assertEquals(student.getName(), "小明");
+		assertEquals(student.getAge(), 18);
+		assertEquals(student.getName(), "小明");
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java
index e1b69b1f6..59602eac4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/PartitionIterTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.collection;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.NumberUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -14,7 +14,7 @@ public class PartitionIterTest {
 		final LineIter lineIter = new LineIter(ResourceUtil.getUtf8Reader("test_lines.csv"));
 		final PartitionIter<String> iter = new PartitionIter<>(lineIter, 3);
 		for (List<String> lines : iter) {
-			Assert.assertTrue(lines.size() > 0);
+			assertTrue(lines.size() > 0);
 		}
 	}
 
@@ -26,6 +26,6 @@ public class PartitionIterTest {
 		for (List<Integer> lines : iter) {
 			max = NumberUtil.max(max, NumberUtil.max(lines.toArray(new Integer[0])));
 		}
-		Assert.assertEquals(45, max);
+		assertEquals(45, max);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java
index 7ce717aa3..38ae82a6a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/RingIndexUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.collection;
 
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.List;
@@ -27,7 +27,7 @@ public class RingIndexUtilTest {
 		ThreadUtil.concurrencyTest(strList.size(), () -> {
 			final int index = RingIndexUtil.ringNextIntByObj(strList, atomicInteger);
 			final String s = strList.get(index);
-			Assert.assertNotNull(s);
+			assertNotNull(s);
 		});
 	}
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java b/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java
index 04c198716..648fec435 100644
--- a/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/collection/UniqueKeySetTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.collection;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
@@ -18,7 +18,7 @@ public class UniqueKeySetTest {
 		set.add(new UniqueTestBean("id2", "王五", "木星"));
 
 		// 后两个ID重复
-		Assert.assertEquals(2, set.size());
+		assertEquals(2, set.size());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java
index d59e2bbae..a8bfd6892 100644
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/CompareUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.comparator;
 
 import cn.hutool.core.collection.ListUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -11,10 +11,10 @@ public class CompareUtilTest {
 	@Test
 	public void compareTest(){
 		int compare = CompareUtil.compare(null, "a", true);
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 
 		compare = CompareUtil.compare(null, "a", false);
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
@@ -26,10 +26,10 @@ public class CompareUtilTest {
 
 		// 正序
 		list.sort(CompareUtil.comparingPinyin(e -> e));
-		Assert.assertEquals(list, ascendingOrderResult);
+		assertEquals(list, ascendingOrderResult);
 
 		// 反序
 		list.sort(CompareUtil.comparingPinyin(e -> e, true));
-		Assert.assertEquals(list, descendingOrderResult);
+		assertEquals(list, descendingOrderResult);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/IndexedComparatorTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/IndexedComparatorTest.java
index f6bede779..ac51821b2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/IndexedComparatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/IndexedComparatorTest.java
@@ -5,9 +5,9 @@ import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.lang.Console;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,10 +23,10 @@ public class IndexedComparatorTest {
 
 		final List<Object> sortSet = CollectionUtil.sort(set, new ArrayIndexedComparator<>(arr));
 
-		Assert.assertEquals("a", sortSet.get(0));
-		Assert.assertEquals( new User("9", null), sortSet.get(2));
-		Assert.assertEquals(3, sortSet.get(4));
-		Assert.assertNull(sortSet.get(5));
+		assertEquals("a", sortSet.get(0));
+		assertEquals( new User("9", null), sortSet.get(2));
+		assertEquals(3, sortSet.get(4));
+		assertNull(sortSet.get(5));
 	}
 
 	@Test
@@ -36,14 +36,14 @@ public class IndexedComparatorTest {
 
 		final List<Object> sortSet = CollectionUtil.sort(set, new ArrayIndexedComparator<>(arr).reversed());
 
-		Assert.assertEquals("a", sortSet.get(6));
-		Assert.assertNull(sortSet.get(1));
-		Assert.assertEquals( new User("9", null), sortSet.get(4));
-		Assert.assertEquals(3, sortSet.get(2));
+		assertEquals("a", sortSet.get(6));
+		assertNull(sortSet.get(1));
+		assertEquals( new User("9", null), sortSet.get(4));
+		assertEquals(3, sortSet.get(2));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void benchmarkSortTest() {
 		final Object[] arr ={"a", "b", new User("9", null), "1",3,null,"2"};
 		final Collection<Object> set = new HashSet<>(Arrays.asList(arr));
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/Issue3259Test.java b/hutool-core/src/test/java/cn/hutool/core/comparator/Issue3259Test.java
index 6301d056b..0bcd57b02 100755
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/Issue3259Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/Issue3259Test.java
@@ -17,9 +17,9 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.RandomUtil;
 import lombok.AllArgsConstructor;
 import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,11 +31,11 @@ public class Issue3259Test {
 		Model x = new Model(1, 1);
 		Model y = new Model(1, RandomUtil.randomInt(2, 100));
 
-		Assert.assertTrue(new FieldsComparator<>(Model.class, "a", "b").compare(x, y) < 0);
+		assertTrue(new FieldsComparator<>(Model.class, "a", "b").compare(x, y) < 0);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sortTest() {
 		for(int i = 2; i < 5; i++) {
 			Model x = new Model(1, 1);
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java
index 352d761f1..dc04b2702 100644
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/PropertyComparatorTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.comparator;
 import cn.hutool.core.collection.ListUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,15 +20,15 @@ public class PropertyComparatorTest {
 
 		// 默认null在末尾
 		final List<User> sortedList1 = ListUtil.sort(users, new PropertyComparator<>("b"));
-		Assert.assertEquals("a", sortedList1.get(0).getB());
-		Assert.assertEquals("d", sortedList1.get(1).getB());
-		Assert.assertNull(sortedList1.get(2).getB());
+		assertEquals("a", sortedList1.get(0).getB());
+		assertEquals("d", sortedList1.get(1).getB());
+		assertNull(sortedList1.get(2).getB());
 
 		// null在首
 		final List<User> sortedList2 = ListUtil.sort(users, new PropertyComparator<>("b", false));
-		Assert.assertNull(sortedList2.get(0).getB());
-		Assert.assertEquals("a", sortedList2.get(1).getB());
-		Assert.assertEquals("d", sortedList2.get(2).getB());
+		assertNull(sortedList2.get(0).getB());
+		assertEquals("a", sortedList2.get(1).getB());
+		assertEquals("d", sortedList2.get(2).getB());
 	}
 
 	@Test
@@ -41,9 +41,9 @@ public class PropertyComparatorTest {
 
 		// 反序
 		final List<User> sortedList = ListUtil.sort(users, new PropertyComparator<>("b").reversed());
-		Assert.assertNull(sortedList.get(0).getB());
-		Assert.assertEquals("d", sortedList.get(1).getB());
-		Assert.assertEquals("a", sortedList.get(2).getB());
+		assertNull(sortedList.get(0).getB());
+		assertEquals("d", sortedList.get(1).getB());
+		assertEquals("a", sortedList.get(2).getB());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java
index b542813db..bd773a0e7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/VersionComparatorTest.java
@@ -1,7 +1,8 @@
 package cn.hutool.core.comparator;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * 版本比较单元测试
@@ -13,110 +14,110 @@ public class VersionComparatorTest {
 	@Test
 	public void compareEmptyTest() {
 		int compare = VersionComparator.INSTANCE.compare("", "1.12.1");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 
 		compare = VersionComparator.INSTANCE.compare("", null);
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 		compare = VersionComparator.INSTANCE.compare(null, "");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
 	public void versionComparatorTest1() {
 		int compare = VersionComparator.INSTANCE.compare("1.2.1", "1.12.1");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("1.12.1", "1.2.1");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 	}
 
 	@Test
 	public void versionComparatorTest2() {
 		int compare = VersionComparator.INSTANCE.compare("1.12.1", "1.12.1c");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 
 		compare = VersionComparator.INSTANCE.compare("1.12.1c", "1.12.1");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 	}
 
 	@Test
 	public void versionComparatorTest3() {
 		int compare = VersionComparator.INSTANCE.compare(null, "1.12.1c");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("1.12.1c", null);
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 	}
 
 	@Test
 	public void versionComparatorTest4() {
 		int compare = VersionComparator.INSTANCE.compare("1.13.0", "1.12.1c");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("1.12.1c", "1.13.0");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
 	public void versionComparatorTest5() {
 		int compare = VersionComparator.INSTANCE.compare("V1.2", "V1.1");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("V1.1", "V1.2");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
 	public void versionComparatorTes6() {
 		int compare = VersionComparator.INSTANCE.compare("V0.0.20170102", "V0.0.20170101");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("V0.0.20170101", "V0.0.20170102");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
 	public void equalsTest() {
 		VersionComparator first = new VersionComparator();
 		VersionComparator other = new VersionComparator();
-		Assert.assertNotEquals(first, other);
+		assertNotEquals(first, other);
 	}
 
 	@Test
 	public void versionComparatorTest7() {
 		int compare = VersionComparator.INSTANCE.compare("1.12.2", "1.12.1c");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 
 		// 自反测试
 		compare = VersionComparator.INSTANCE.compare("1.12.1c", "1.12.2");
-		Assert.assertTrue(compare < 0);
+		assertTrue(compare < 0);
 	}
 
 	@Test
 	public void equalsTest2() {
 		final int compare = VersionComparator.INSTANCE.compare("1.12.0", "1.12");
-		Assert.assertEquals(0, compare);
+		assertEquals(0, compare);
 	}
 
 	@Test
 	public void I8Z3VETest() {
 		// 传递性测试
 		int compare = VersionComparator.INSTANCE.compare("260", "a-34");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 		compare = VersionComparator.INSTANCE.compare("a-34", "a-3");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 		compare = VersionComparator.INSTANCE.compare("260", "a-3");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 	}
 
 	@Test
 	public void startWithNoneNumberTest() {
 		final int compare = VersionComparator.INSTANCE.compare("V1", "A1");
-		Assert.assertTrue(compare > 0);
+		assertTrue(compare > 0);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/comparator/WindowsExplorerStringComparatorTest.java b/hutool-core/src/test/java/cn/hutool/core/comparator/WindowsExplorerStringComparatorTest.java
index 24b2da770..4f986aadd 100644
--- a/hutool-core/src/test/java/cn/hutool/core/comparator/WindowsExplorerStringComparatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/comparator/WindowsExplorerStringComparatorTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.comparator;
 
 import cn.hutool.core.lang.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java b/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
index 71c5cc129..47450c290 100644
--- a/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compiler/JavaSourceCompilerTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.compiler;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.ZipUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.InputStream;
@@ -37,7 +37,7 @@ public class JavaSourceCompilerTest {
 				.compile();
 		final Class<?> clazz = classLoader.loadClass("c.C");
 		final Object obj = ReflectUtil.newInstance(clazz);
-		Assert.assertTrue(String.valueOf(obj).startsWith("c.C@"));
+		assertTrue(String.valueOf(obj).startsWith("c.C@"));
 	}
 
 	@Test
@@ -50,7 +50,7 @@ public class JavaSourceCompilerTest {
 		} catch (final Exception ex) {
 			exception = ex;
 		} finally {
-			Assert.assertTrue(exception instanceof CompilerException);
+			assertTrue(exception instanceof CompilerException);
 		}
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java b/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java
index 0206367f9..eb22a9f9a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/IssueI5DRU0Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.compress;
 
 import cn.hutool.core.util.ZipUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
@@ -10,7 +10,7 @@ import java.nio.file.StandardCopyOption;
 public class IssueI5DRU0Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void appendTest(){
 		// https://gitee.com/dromara/hutool/issues/I5DRU0
 		// 向zip中添加文件的时候，如果添加的文件的父目录已经存在，会报错。实际中目录存在忽略即可。
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/IssueIAGYDGTest.java b/hutool-core/src/test/java/cn/hutool/core/compress/IssueIAGYDGTest.java
index 2841988c0..f1d3e5962 100644
--- a/hutool-core/src/test/java/cn/hutool/core/compress/IssueIAGYDGTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/IssueIAGYDGTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.compress;
 
 import cn.hutool.core.util.ZipUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
@@ -11,7 +11,7 @@ import java.io.File;
  */
 public class IssueIAGYDGTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void zipTest() {
 		// 第一次压缩后，IssueIAGYDG.zip也会作为文件压缩到IssueIAGYDG.zip中，导致死循环
 		final File filea = new File("d:/test/");
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java b/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
index e1de7097c..65f21ed5d 100755
--- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/ZipReaderTest.java
@@ -2,15 +2,15 @@ package cn.hutool.core.compress;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.ZipUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 public class ZipReaderTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipTest() {
 		File unzip = ZipUtil.unzip("d:/java.zip", "d:/test/java");
 		Console.log(unzip);
diff --git a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java b/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
index c2a2f5bd4..ca1bf98fb 100755
--- a/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/compress/ZipWriterTest.java
@@ -4,21 +4,21 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.FileResource;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ZipUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 public class ZipWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipDirTest() {
 		ZipUtil.zip(new File("d:/test"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addTest(){
 		final ZipWriter writer = ZipWriter.of(FileUtil.file("d:/test/test.zip"), CharsetUtil.CHARSET_UTF_8);
 		writer.add(new FileResource("d:/test/qr_c.png"));
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java
index 16e9e01ee..b197eb984 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/CastUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -22,24 +22,24 @@ public class CastUtilTest {
 		map.put(1, 1);
 
 		Collection<Number> collection2 = CastUtil.castUp(collection);
-		Assert.assertSame(collection, collection2);
+		assertSame(collection, collection2);
 
 		Collection<Integer> collection3 = CastUtil.castDown(collection2);
-		Assert.assertSame(collection2, collection3);
+		assertSame(collection2, collection3);
 
 		List<Number> list2 = CastUtil.castUp(list);
-		Assert.assertSame(list, list2);
+		assertSame(list, list2);
 		List<Integer> list3 = CastUtil.castDown(list2);
-		Assert.assertSame(list2, list3);
+		assertSame(list2, list3);
 
 		Set<Number> set2 = CastUtil.castUp(set);
-		Assert.assertSame(set, set2);
+		assertSame(set, set2);
 		Set<Integer> set3 = CastUtil.castDown(set2);
-		Assert.assertSame(set2, set3);
+		assertSame(set2, set3);
 
 		Map<Number, Serializable> map2 = CastUtil.castUp(map);
-		Assert.assertSame(map, map2);
+		assertSame(map, map2);
 		Map<Integer, Number> map3 = CastUtil.castDown(map2);
-		Assert.assertSame(map2, map3);
+		assertSame(map2, map3);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
index 9f2ea4bd3..70bb4c8b4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertOtherTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.TimeUnit;
 
@@ -16,10 +16,10 @@ public class ConvertOtherTest {
 	public void hexTest() {
 		String a = "我是一个小小的可爱的字符串";
 		String hex = Convert.toHex(a, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("e68891e698afe4b880e4b8aae5b08fe5b08fe79a84e58fafe788b1e79a84e5ad97e7aca6e4b8b2", hex);
+		assertEquals("e68891e698afe4b880e4b8aae5b08fe5b08fe79a84e58fafe788b1e79a84e5ad97e7aca6e4b8b2", hex);
 
 		String raw = Convert.hexToStr(hex, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(a, raw);
+		assertEquals(a, raw);
 	}
 
 	@Test
@@ -27,18 +27,18 @@ public class ConvertOtherTest {
 		String a = "我是一个小小的可爱的字符串";
 
 		String unicode = Convert.strToUnicode(a);
-		Assert.assertEquals("\\u6211\\u662f\\u4e00\\u4e2a\\u5c0f\\u5c0f\\u7684\\u53ef\\u7231\\u7684\\u5b57\\u7b26\\u4e32", unicode);
+		assertEquals("\\u6211\\u662f\\u4e00\\u4e2a\\u5c0f\\u5c0f\\u7684\\u53ef\\u7231\\u7684\\u5b57\\u7b26\\u4e32", unicode);
 
 		String raw = Convert.unicodeToStr(unicode);
-		Assert.assertEquals(raw, a);
+		assertEquals(raw, a);
 
 		// 针对有特殊空白符的Unicode
 		String str = "你 好";
 		String unicode2 = Convert.strToUnicode(str);
-		Assert.assertEquals("\\u4f60\\u00a0\\u597d", unicode2);
+		assertEquals("\\u4f60\\u00a0\\u597d", unicode2);
 
 		String str2 = Convert.unicodeToStr(unicode2);
-		Assert.assertEquals(str, str2);
+		assertEquals(str, str2);
 	}
 
 	@Test
@@ -47,14 +47,14 @@ public class ConvertOtherTest {
 		// 转换后result为乱码
 		String result = Convert.convertCharset(a, CharsetUtil.UTF_8, CharsetUtil.ISO_8859_1);
 		String raw = Convert.convertCharset(result, CharsetUtil.ISO_8859_1, "UTF-8");
-		Assert.assertEquals(raw, a);
+		assertEquals(raw, a);
 	}
 
 	@Test
 	public void convertTimeTest() {
 		long a = 4535345;
 		long minutes = Convert.convertTime(a, TimeUnit.MILLISECONDS, TimeUnit.MINUTES);
-		Assert.assertEquals(75, minutes);
+		assertEquals(75, minutes);
 	}
 
 	@Test
@@ -62,11 +62,11 @@ public class ConvertOtherTest {
 		// 去包装
 		Class<?> wrapClass = Integer.class;
 		Class<?> unWraped = Convert.unWrap(wrapClass);
-		Assert.assertEquals(int.class, unWraped);
+		assertEquals(int.class, unWraped);
 
 		// 包装
 		Class<?> primitiveClass = long.class;
 		Class<?> wraped = Convert.wrap(primitiveClass);
-		Assert.assertEquals(Long.class, wraped);
+		assertEquals(Long.class, wraped);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
index 90adb2689..a676b1cdd 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertTest.java
@@ -10,8 +10,7 @@ import cn.hutool.core.util.HexUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Getter;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -22,152 +21,152 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
 import java.util.concurrent.atomic.AtomicLongArray;
 import java.util.concurrent.atomic.DoubleAdder;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * 类型转换工具单元测试
  *
  * @author Looly
- *
  */
 public class ConvertTest {
 
 	@Test
 	public void toObjectTest() {
 		final Object result = Convert.convert(Object.class, "aaaa");
-		Assert.assertEquals("aaaa", result);
+		assertEquals("aaaa", result);
 	}
 
 	@Test
 	public void toStrTest() {
 		final int a = 1;
-		final long[] b = { 1, 2, 3, 4, 5 };
+		final long[] b = {1, 2, 3, 4, 5};
 
-		Assert.assertEquals("[1, 2, 3, 4, 5]", Convert.convert(String.class, b));
+		assertEquals("[1, 2, 3, 4, 5]", Convert.convert(String.class, b));
 
 		final String aStr = Convert.toStr(a);
-		Assert.assertEquals("1", aStr);
+		assertEquals("1", aStr);
 		final String bStr = Convert.toStr(b);
-		Assert.assertEquals("[1, 2, 3, 4, 5]", Convert.toStr(bStr));
+		assertEquals("[1, 2, 3, 4, 5]", Convert.toStr(bStr));
 	}
 
 	@Test
 	public void toStrTest2() {
 		final String result = Convert.convert(String.class, "aaaa");
-		Assert.assertEquals("aaaa", result);
+		assertEquals("aaaa", result);
 	}
 
 	@Test
 	public void toStrTest3() {
 		final char a = 'a';
 		final String result = Convert.convert(String.class, a);
-		Assert.assertEquals("a", result);
+		assertEquals("a", result);
 	}
 
 	@Test
 	public void toStrTest4() {
 		// 被当作八进制
-		@SuppressWarnings("OctalInteger")
-		final String result = Convert.toStr(001200);
-		Assert.assertEquals("640", result);
+		@SuppressWarnings("OctalInteger") final String result = Convert.toStr(001200);
+		assertEquals("640", result);
 	}
 
 	@Test
 	public void toIntTest() {
 		final String a = " 34232";
 		final Integer aInteger = Convert.toInt(a);
-		Assert.assertEquals(Integer.valueOf(34232), aInteger);
+		assertEquals(Integer.valueOf(34232), aInteger);
 		final int aInt = ConverterRegistry.getInstance().convert(int.class, a);
-		Assert.assertEquals(34232, aInt);
+		assertEquals(34232, aInt);
 
 		// 带小数测试
 		final String b = " 34232.00";
 		final Integer bInteger = Convert.toInt(b);
-		Assert.assertEquals(Integer.valueOf(34232), bInteger);
+		assertEquals(Integer.valueOf(34232), bInteger);
 		final int bInt = ConverterRegistry.getInstance().convert(int.class, b);
-		Assert.assertEquals(34232, bInt);
+		assertEquals(34232, bInt);
 
 		// boolean测试
 		final boolean c = true;
 		final Integer cInteger = Convert.toInt(c);
-		Assert.assertEquals(Integer.valueOf(1), cInteger);
+		assertEquals(Integer.valueOf(1), cInteger);
 		final int cInt = ConverterRegistry.getInstance().convert(int.class, c);
-		Assert.assertEquals(1, cInt);
+		assertEquals(1, cInt);
 
 		// boolean测试
 		final String d = "08";
 		final Integer dInteger = Convert.toInt(d);
-		Assert.assertEquals(Integer.valueOf(8), dInteger);
+		assertEquals(Integer.valueOf(8), dInteger);
 		final int dInt = ConverterRegistry.getInstance().convert(int.class, d);
-		Assert.assertEquals(8, dInt);
+		assertEquals(8, dInt);
 	}
 
 	@Test
 	public void toIntTest2() {
 		final ArrayList<String> array = new ArrayList<>();
 		final Integer aInt = Convert.convertQuietly(Integer.class, array, -1);
-		Assert.assertEquals(Integer.valueOf(-1), aInt);
+		assertEquals(Integer.valueOf(-1), aInt);
 	}
 
 	@Test
 	public void toLongTest() {
 		final String a = " 342324545435435";
 		final Long aLong = Convert.toLong(a);
-		Assert.assertEquals(Long.valueOf(342324545435435L), aLong);
+		assertEquals(Long.valueOf(342324545435435L), aLong);
 		final long aLong2 = ConverterRegistry.getInstance().convert(long.class, a);
-		Assert.assertEquals(342324545435435L, aLong2);
+		assertEquals(342324545435435L, aLong2);
 
 		// 带小数测试
 		final String b = " 342324545435435.245435435";
 		final Long bLong = Convert.toLong(b);
-		Assert.assertEquals(Long.valueOf(342324545435435L), bLong);
+		assertEquals(Long.valueOf(342324545435435L), bLong);
 		final long bLong2 = ConverterRegistry.getInstance().convert(long.class, b);
-		Assert.assertEquals(342324545435435L, bLong2);
+		assertEquals(342324545435435L, bLong2);
 
 		// boolean测试
 		final boolean c = true;
 		final Long cLong = Convert.toLong(c);
-		Assert.assertEquals(Long.valueOf(1), cLong);
+		assertEquals(Long.valueOf(1), cLong);
 		final long cLong2 = ConverterRegistry.getInstance().convert(long.class, c);
-		Assert.assertEquals(1, cLong2);
+		assertEquals(1, cLong2);
 
 		// boolean测试
 		final String d = "08";
 		final Long dLong = Convert.toLong(d);
-		Assert.assertEquals(Long.valueOf(8), dLong);
+		assertEquals(Long.valueOf(8), dLong);
 		final long dLong2 = ConverterRegistry.getInstance().convert(long.class, d);
-		Assert.assertEquals(8, dLong2);
+		assertEquals(8, dLong2);
 	}
 
 	@Test
 	public void toLongFromNumberWithFormatTest() {
 		final NumberWithFormat value = new NumberWithFormat(1678285713935L, null);
 		final Long aLong = Convert.convertWithCheck(Long.class, value, null, false);
-		Assert.assertEquals(new Long(1678285713935L), aLong);
+		assertEquals(new Long(1678285713935L), aLong);
 	}
 
 	@Test
 	public void toCharTest() {
 		final String str = "aadfdsfs";
 		final Character c = Convert.toChar(str);
-		Assert.assertEquals(Character.valueOf('a'), c);
+		assertEquals(Character.valueOf('a'), c);
 
 		// 转换失败
 		final Object str2 = "";
 		final Character c2 = Convert.toChar(str2);
-		Assert.assertNull(c2);
+		assertNull(c2);
 	}
 
 	@Test
 	public void toNumberTest() {
 		final Object a = "12.45";
 		final Number number = Convert.toNumber(a);
-		Assert.assertEquals(12.45D, number.doubleValue(), 0);
+		assertEquals(12.45D, number.doubleValue(), 0);
 	}
 
 	@Test
 	public void emptyToNumberTest() {
 		final Object a = "";
 		final Number number = Convert.toNumber(a);
-		Assert.assertNull(number);
+		assertNull(number);
 	}
 
 	@Test
@@ -175,10 +174,10 @@ public class ConvertTest {
 		// 测试 int 转 byte
 		final int int0 = 234;
 		final byte byte0 = Convert.intToByte(int0);
-		Assert.assertEquals(-22, byte0);
+		assertEquals(-22, byte0);
 
 		final int int1 = Convert.byteToUnsignedInt(byte0);
-		Assert.assertEquals(int0, int1);
+		assertEquals(int0, int1);
 	}
 
 	@Test
@@ -189,7 +188,7 @@ public class ConvertTest {
 
 		// 测试 byte 数组转 int
 		final int int3 = Convert.bytesToInt(bytesInt);
-		Assert.assertEquals(int2, int3);
+		assertEquals(int2, int3);
 	}
 
 	@Test
@@ -200,7 +199,7 @@ public class ConvertTest {
 		final byte[] bytesLong = Convert.longToBytes(long1);
 		final long long2 = Convert.bytesToLong(bytesLong);
 
-		Assert.assertEquals(long1, long2);
+		assertEquals(long1, long2);
 	}
 
 	@Test
@@ -209,7 +208,7 @@ public class ConvertTest {
 		final byte[] bytes = Convert.shortToBytes(short1);
 		final short short2 = Convert.bytesToShort(bytes);
 
-		Assert.assertEquals(short2, short1);
+		assertEquals(short2, short1);
 	}
 
 	@Test
@@ -217,63 +216,63 @@ public class ConvertTest {
 		final List<String> list = Arrays.asList("1", "2");
 		final String str = Convert.toStr(list);
 		final List<String> list2 = Convert.toList(String.class, str);
-		Assert.assertEquals("1", list2.get(0));
-		Assert.assertEquals("2", list2.get(1));
+		assertEquals("1", list2.get(0));
+		assertEquals("2", list2.get(1));
 
 		final List<Integer> list3 = Convert.toList(Integer.class, str);
-		Assert.assertEquals(1, list3.get(0).intValue());
-		Assert.assertEquals(2, list3.get(1).intValue());
+		assertEquals(1, list3.get(0).intValue());
+		assertEquals(2, list3.get(1).intValue());
 	}
 
 	@Test
-	public void toListTest2(){
+	public void toListTest2() {
 		final String str = "1,2";
 		final List<String> list2 = Convert.toList(String.class, str);
-		Assert.assertEquals("1", list2.get(0));
-		Assert.assertEquals("2", list2.get(1));
+		assertEquals("1", list2.get(0));
+		assertEquals("2", list2.get(1));
 
 		final List<Integer> list3 = Convert.toList(Integer.class, str);
-		Assert.assertEquals(1, list3.get(0).intValue());
-		Assert.assertEquals(2, list3.get(1).intValue());
+		assertEquals(1, list3.get(0).intValue());
+		assertEquals(2, list3.get(1).intValue());
 	}
 
 	@Test
-	public void toByteArrayTest(){
+	public void toByteArrayTest() {
 		// 测试Serializable转换为bytes，调用序列化转换
 		final byte[] bytes = Convert.toPrimitiveByteArray(new Product("zhangsan", "张三", "5.1.1"));
-		Assert.assertNotNull(bytes);
+		assertNotNull(bytes);
 
 		final Product product = Convert.convert(Product.class, bytes);
-		Assert.assertEquals("zhangsan", product.getName());
-		Assert.assertEquals("张三", product.getCName());
-		Assert.assertEquals("5.1.1", product.getVersion());
+		assertEquals("zhangsan", product.getName());
+		assertEquals("张三", product.getCName());
+		assertEquals("5.1.1", product.getVersion());
 	}
 
 	@Test
-	public void numberToByteArrayTest(){
+	public void numberToByteArrayTest() {
 		// 测试Serializable转换为bytes，调用序列化转换
 		final byte[] bytes = Convert.toPrimitiveByteArray(12L);
-		Assert.assertArrayEquals(ByteUtil.longToBytes(12L), bytes);
+		assertArrayEquals(ByteUtil.longToBytes(12L), bytes);
 	}
 
 	@Test
-	public void toAtomicIntegerArrayTest(){
+	public void toAtomicIntegerArrayTest() {
 		final String str = "1,2";
 		final AtomicIntegerArray atomicIntegerArray = Convert.convert(AtomicIntegerArray.class, str);
-		Assert.assertEquals("[1, 2]", atomicIntegerArray.toString());
+		assertEquals("[1, 2]", atomicIntegerArray.toString());
 	}
 
 	@Test
-	public void toAtomicLongArrayTest(){
+	public void toAtomicLongArrayTest() {
 		final String str = "1,2";
 		final AtomicLongArray atomicLongArray = Convert.convert(AtomicLongArray.class, str);
-		Assert.assertEquals("[1, 2]", atomicLongArray.toString());
+		assertEquals("[1, 2]", atomicLongArray.toString());
 	}
 
 	@Test
-	public void toClassTest(){
+	public void toClassTest() {
 		final Class<?> convert = Convert.convert(Class.class, "cn.hutool.core.convert.ConvertTest.Product");
-		Assert.assertSame(Product.class, convert);
+		assertSame(Product.class, convert);
 	}
 
 	@Data
@@ -287,16 +286,16 @@ public class ConvertTest {
 	}
 
 	@Test
-	public void enumToIntTest(){
+	public void enumToIntTest() {
 		final Integer integer = Convert.toInt(BuildingType.CUO);
-		Assert.assertEquals(1, integer.intValue());
+		assertEquals(1, integer.intValue());
 	}
 
 	@Test
-	public void toSetTest(){
+	public void toSetTest() {
 		final Set<Integer> result = Convert.convert(new TypeReference<Set<Integer>>() {
 		}, "1,2,3");
-		Assert.assertEquals(CollUtil.set(false, 1,2,3), result);
+		assertEquals(CollUtil.set(false, 1, 2, 3), result);
 	}
 
 	@Getter
@@ -311,103 +310,104 @@ public class ConvertTest {
 		private final int id;
 		private final String name;
 
-		BuildingType(final int id, final String name){
+		BuildingType(final int id, final String name) {
 			this.id = id;
 			this.name = name;
 		}
 	}
 
-	@Test(expected = DateException.class)
-	public void toDateTest(){
-		// 默认转换失败报错而不是返回null
-		Convert.convert(Date.class, "aaaa");
+	@Test
+	public void toDateTest() {
+		assertThrows(DateException.class, () -> {
+			// 默认转换失败报错而不是返回null
+			Convert.convert(Date.class, "aaaa");
+		});
 	}
 
 	@Test
-	public void toDateTest2(){
+	public void toDateTest2() {
 		final Date date = Convert.toDate("2021-01");
-		Assert.assertNull(date);
+		assertNull(date);
 	}
 
 	@Test
-	public void toSqlDateTest(){
+	public void toSqlDateTest() {
 		final java.sql.Date date = Convert.convert(java.sql.Date.class, DateUtil.parse("2021-07-28"));
-		Assert.assertEquals("2021-07-28", date.toString());
+		assertEquals("2021-07-28", date.toString());
 	}
 
 	@Test
-	public void toHashtableTest(){
+	public void toHashtableTest() {
 		final Map<String, String> map = MapUtil.newHashMap();
 		map.put("a1", "v1");
 		map.put("a2", "v2");
 		map.put("a3", "v3");
 
-		@SuppressWarnings("unchecked")
-		final Hashtable<String, String> hashtable = Convert.convert(Hashtable.class, map);
-		Assert.assertEquals("v1", hashtable.get("a1"));
-		Assert.assertEquals("v2", hashtable.get("a2"));
-		Assert.assertEquals("v3", hashtable.get("a3"));
+		@SuppressWarnings("unchecked") final Hashtable<String, String> hashtable = Convert.convert(Hashtable.class, map);
+		assertEquals("v1", hashtable.get("a1"));
+		assertEquals("v2", hashtable.get("a2"));
+		assertEquals("v3", hashtable.get("a3"));
 	}
 
 	@Test
-	public void toBigDecimalTest(){
+	public void toBigDecimalTest() {
 		// https://github.com/dromara/hutool/issues/1818
 		final String str = "33020000210909112800000124";
 		final BigDecimal bigDecimal = Convert.toBigDecimal(str);
-		Assert.assertEquals(str, bigDecimal.toPlainString());
+		assertEquals(str, bigDecimal.toPlainString());
 	}
 
 	@Test
-	public void toFloatTest(){
+	public void toFloatTest() {
 		// https://gitee.com/dromara/hutool/issues/I4M0E4
 		final String hex2 = "CD0CCB43";
 		final byte[] value = HexUtil.decodeHex(hex2);
 		final float f = Convert.toFloat(value);
-		Assert.assertEquals(406.1F, f, 0);
+		assertEquals(406.1F, f, 0);
 	}
 
 	@Test
-	public void floatToDoubleTest(){
+	public void floatToDoubleTest() {
 		final float a = 0.45f;
 		final double b = Convert.toDouble(a);
-		Assert.assertEquals(0.45D, b, 0);
+		assertEquals(0.45D, b, 0);
 	}
 
 	@Test
-	public void floatToDoubleAddrTest(){
+	public void floatToDoubleAddrTest() {
 		final float a = 0.45f;
 		final DoubleAdder adder = Convert.convert(DoubleAdder.class, a);
-		Assert.assertEquals(0.45D, adder.doubleValue(), 0);
+		assertEquals(0.45D, adder.doubleValue(), 0);
 	}
 
 	@Test
-	public void doubleToFloatTest(){
+	public void doubleToFloatTest() {
 		final double a = 0.45f;
 		final float b = Convert.toFloat(a);
-		Assert.assertEquals(a, b, 0);
+		assertEquals(a, b, 0);
 	}
 
 	@Test
-	public void localDateTimeToLocalDateTest(){
+	public void localDateTimeToLocalDateTest() {
 		final LocalDateTime localDateTime = LocalDateTime.now();
 		final LocalDate convert = Convert.convert(LocalDate.class, localDateTime);
-		Assert.assertEquals(localDateTime.toLocalDate(), convert);
+		assertEquals(localDateTime.toLocalDate(), convert);
 	}
 
 	@Test
-	public void toSBCTest(){
+	public void toSBCTest() {
 		final String s = Convert.toSBC(null);
-		Assert.assertNull(s);
+		assertNull(s);
 	}
 
 	@Test
-	public void toDBCTest(){
+	public void toDBCTest() {
 		final String s = Convert.toDBC(null);
-		Assert.assertNull(s);
+		assertNull(s);
 	}
 
 	@Test
-	public void testChineseMoneyToNumber(){
+	public void testChineseMoneyToNumber() {
 		/*
 		 * s=陆万柒仟伍佰伍拾陆圆, n=67556
 		 * s=陆万柒仟伍佰伍拾陆元, n=67556
@@ -418,29 +418,31 @@ public class ConvertTest {
 		 * s=叁角贰分, n=0.32
 		 * s=陆万柒仟伍佰伍拾陆元叁角贰分, n=67556.32
 		 */
-		Assert.assertEquals(67556, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆圆").longValue());
-		Assert.assertEquals(67556, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元").longValue());
-		Assert.assertEquals(0.3D, Convert.chineseMoneyToNumber("叁角").doubleValue(), 0);
-		Assert.assertEquals(0.02, Convert.chineseMoneyToNumber("贰分").doubleValue(), 0);
-		Assert.assertEquals(67556.3, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元叁角").doubleValue(), 0);
-		Assert.assertEquals(67556.02, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元贰分").doubleValue(), 0);
-		Assert.assertEquals(0.32, Convert.chineseMoneyToNumber("叁角贰分").doubleValue(), 0);
-		Assert.assertEquals(67556.32, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元叁角贰分").doubleValue(), 0);
+		assertEquals(67556, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆圆").longValue());
+		assertEquals(67556, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元").longValue());
+		assertEquals(0.3D, Convert.chineseMoneyToNumber("叁角").doubleValue(), 0);
+		assertEquals(0.02, Convert.chineseMoneyToNumber("贰分").doubleValue(), 0);
+		assertEquals(67556.3, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元叁角").doubleValue(), 0);
+		assertEquals(67556.02, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元贰分").doubleValue(), 0);
+		assertEquals(0.32, Convert.chineseMoneyToNumber("叁角贰分").doubleValue(), 0);
+		assertEquals(67556.32, Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾陆元叁角贰分").doubleValue(), 0);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void convertQuietlyTest(){
-		final String a = "12";
-		final Object s = Convert.convert(int.class, a, a);
-		Assert.assertEquals(12, s);
+	@Test
+	public void convertQuietlyTest() {
+		assertThrows(Exception.class, () -> {
+			final String a = "12";
+			final Object s = Convert.convert(int.class, a, a);
+			assertEquals(12, s);
+		});
 	}
 
 	@Test
 	public void issue3662Test() {
 		String s = Convert.digitToChinese(0);
-		Assert.assertEquals("零元整", s);
+		assertEquals("零元整", s);
 
 		s = Convert.digitToChinese(null);
-		Assert.assertEquals("零元整", s);
+		assertEquals("零元整", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java
index 8c92b5bd2..dedaa34d2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToArrayTest.java
@@ -3,9 +3,9 @@ package cn.hutool.core.convert;
 import cn.hutool.core.convert.impl.ArrayConverter;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URL;
@@ -25,14 +25,14 @@ public class ConvertToArrayTest {
 		String[] b = { "1", "2", "3", "4" };
 
 		Integer[] integerArray = Convert.toIntArray(b);
-		Assert.assertArrayEquals(integerArray, new Integer[]{1,2,3,4});
+		assertArrayEquals(integerArray, new Integer[]{1,2,3,4});
 
 		int[] intArray = Convert.convert(int[].class, b);
-		Assert.assertArrayEquals(intArray, new int[]{1,2,3,4});
+		assertArrayEquals(intArray, new int[]{1,2,3,4});
 
 		long[] c = {1,2,3,4,5};
 		Integer[] intArray2 = Convert.toIntArray(c);
-		Assert.assertArrayEquals(intArray2, new Integer[]{1,2,3,4,5});
+		assertArrayEquals(intArray2, new Integer[]{1,2,3,4,5});
 	}
 
 	@Test
@@ -41,7 +41,7 @@ public class ConvertToArrayTest {
 
 		final ArrayConverter arrayConverter = new ArrayConverter(Integer[].class, true);
 		Integer[] integerArray = (Integer[]) arrayConverter.convert(b, null);
-		Assert.assertArrayEquals(integerArray, new Integer[]{null, 1});
+		assertArrayEquals(integerArray, new Integer[]{null, 1});
 	}
 
 	@Test
@@ -49,14 +49,14 @@ public class ConvertToArrayTest {
 		String[] b = { "1", "2", "3", "4" };
 
 		Long[] longArray = Convert.toLongArray(b);
-		Assert.assertArrayEquals(longArray, new Long[]{1L,2L,3L,4L});
+		assertArrayEquals(longArray, new Long[]{1L,2L,3L,4L});
 
 		long[] longArray2 = Convert.convert(long[].class, b);
-		Assert.assertArrayEquals(longArray2, new long[]{1L,2L,3L,4L});
+		assertArrayEquals(longArray2, new long[]{1L,2L,3L,4L});
 
 		int[] c = {1,2,3,4,5};
 		Long[] intArray2 = Convert.toLongArray(c);
-		Assert.assertArrayEquals(intArray2, new Long[]{1L,2L,3L,4L,5L});
+		assertArrayEquals(intArray2, new Long[]{1L,2L,3L,4L,5L});
 	}
 
 	@Test
@@ -64,14 +64,14 @@ public class ConvertToArrayTest {
 		String[] b = { "1", "2", "3", "4" };
 
 		Double[] doubleArray = Convert.toDoubleArray(b);
-		Assert.assertArrayEquals(doubleArray, new Double[]{1D,2D,3D,4D});
+		assertArrayEquals(doubleArray, new Double[]{1D,2D,3D,4D});
 
 		double[] doubleArray2 = Convert.convert(double[].class, b);
-		Assert.assertArrayEquals(doubleArray2, new double[]{1D,2D,3D,4D}, 2);
+		assertArrayEquals(doubleArray2, new double[]{1D,2D,3D,4D}, 2);
 
 		int[] c = {1,2,3,4,5};
 		Double[] intArray2 = Convert.toDoubleArray(c);
-		Assert.assertArrayEquals(intArray2, new Double[]{1D,2D,3D,4D,5D});
+		assertArrayEquals(intArray2, new Double[]{1D,2D,3D,4D,5D});
 	}
 
 	@Test
@@ -80,18 +80,18 @@ public class ConvertToArrayTest {
 		//数组转数组测试
 		int[] a = new int[]{1,2,3,4};
 		long[] result = ConverterRegistry.getInstance().convert(long[].class, a);
-		Assert.assertArrayEquals(new long[]{1L, 2L, 3L, 4L}, result);
+		assertArrayEquals(new long[]{1L, 2L, 3L, 4L}, result);
 
 		//数组转数组测试
 		byte[] resultBytes = ConverterRegistry.getInstance().convert(byte[].class, a);
-		Assert.assertArrayEquals(new byte[]{1, 2, 3, 4}, resultBytes);
+		assertArrayEquals(new byte[]{1, 2, 3, 4}, resultBytes);
 
 		//字符串转数组
 		String arrayStr = "1,2,3,4,5";
 		//获取Converter类的方法2，自己实例化相应Converter对象
 		ArrayConverter c3 = new ArrayConverter(int[].class);
 		int[] result3 = (int[]) c3.convert(arrayStr, null);
-		Assert.assertArrayEquals(new int[]{1,2,3,4,5}, result3);
+		assertArrayEquals(new int[]{1,2,3,4,5}, result3);
 	}
 
 	@Test
@@ -102,9 +102,9 @@ public class ConvertToArrayTest {
 		list.add("c");
 
 		String[] result = Convert.toStrArray(list);
-		Assert.assertEquals(list.get(0), result[0]);
-		Assert.assertEquals(list.get(1), result[1]);
-		Assert.assertEquals(list.get(2), result[2]);
+		assertEquals(list.get(0), result[0]);
+		assertEquals(list.get(1), result[1]);
+		assertEquals(list.get(2), result[2]);
 	}
 
 	@Test
@@ -113,24 +113,24 @@ public class ConvertToArrayTest {
 		Character[] array = Convert.toCharArray(testStr);
 
 		//包装类型数组
-		Assert.assertEquals(new Character('a'), array[0]);
-		Assert.assertEquals(new Character('b'), array[1]);
-		Assert.assertEquals(new Character('c'), array[2]);
-		Assert.assertEquals(new Character('d'), array[3]);
-		Assert.assertEquals(new Character('e'), array[4]);
+		assertEquals(new Character('a'), array[0]);
+		assertEquals(new Character('b'), array[1]);
+		assertEquals(new Character('c'), array[2]);
+		assertEquals(new Character('d'), array[3]);
+		assertEquals(new Character('e'), array[4]);
 
 		//原始类型数组
 		char[] array2 = Convert.convert(char[].class, testStr);
-		Assert.assertEquals('a', array2[0]);
-		Assert.assertEquals('b', array2[1]);
-		Assert.assertEquals('c', array2[2]);
-		Assert.assertEquals('d', array2[3]);
-		Assert.assertEquals('e', array2[4]);
+		assertEquals('a', array2[0]);
+		assertEquals('b', array2[1]);
+		assertEquals('c', array2[2]);
+		assertEquals('d', array2[3]);
+		assertEquals('e', array2[4]);
 
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toUrlArrayTest() {
 		File[] files = FileUtil.file("D:\\workspace").listFiles();
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
index acbb34a07..d04f2ccb5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.convert;
 import cn.hutool.core.bean.BeanUtilTest.SubPerson;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.CaseInsensitiveMap;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -28,9 +28,9 @@ public class ConvertToBeanTest {
 		person.setSubName("sub名字");
 
 		Map<?, ?> map = Convert.convert(Map.class, person);
-		Assert.assertEquals(map.get("name"), "测试A11");
-		Assert.assertEquals(map.get("age"), 14);
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals(map.get("name"), "测试A11");
+		assertEquals(map.get("age"), 14);
+		assertEquals("11213232", map.get("openid"));
 	}
 
 	@Test
@@ -42,15 +42,15 @@ public class ConvertToBeanTest {
 		person.setSubName("sub名字");
 
 		Map<String, String> map = Convert.toMap(String.class, String.class, person);
-		Assert.assertEquals("测试A11", map.get("name"));
-		Assert.assertEquals("14", map.get("age"));
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals("测试A11", map.get("name"));
+		assertEquals("14", map.get("age"));
+		assertEquals("11213232", map.get("openid"));
 
 		final LinkedHashMap<String, String> map2 = Convert.convert(
 				new TypeReference<LinkedHashMap<String, String>>() {}, person);
-		Assert.assertEquals("测试A11", map2.get("name"));
-		Assert.assertEquals("14", map2.get("age"));
-		Assert.assertEquals("11213232", map2.get("openid"));
+		assertEquals("测试A11", map2.get("name"));
+		assertEquals("14", map2.get("age"));
+		assertEquals("11213232", map2.get("openid"));
 	}
 
 	@Test
@@ -63,10 +63,10 @@ public class ConvertToBeanTest {
 
 		Map<String, String> map2 = Convert.toMap(String.class, String.class, map1);
 
-		Assert.assertEquals("1", map2.get("key1"));
-		Assert.assertEquals("2", map2.get("key2"));
-		Assert.assertEquals("3", map2.get("key3"));
-		Assert.assertEquals("4", map2.get("key4"));
+		assertEquals("1", map2.get("key1"));
+		assertEquals("2", map2.get("key2"));
+		assertEquals("3", map2.get("key3"));
+		assertEquals("4", map2.get("key4"));
 	}
 	@Test
 	public void mapToMapWithSelfTypeTest() {
@@ -76,9 +76,9 @@ public class ConvertToBeanTest {
 		caseInsensitiveMap.put("tom", 3);
 
 		Map<String, String> map = Convert.toMap(String.class, String.class, caseInsensitiveMap);
-		Assert.assertEquals("2", map.get("jerry"));
-		Assert.assertEquals("2", map.get("Jerry"));
-		Assert.assertEquals("3", map.get("tom"));
+		assertEquals("2", map.get("jerry"));
+		assertEquals("2", map.get("Jerry"));
+		assertEquals("3", map.get("tom"));
 	}
 	@Test
 	public void beanToSpecifyMapTest() {
@@ -89,9 +89,9 @@ public class ConvertToBeanTest {
 		person.setSubName("sub名字");
 
 		Map<String, String> map = Convert.toMap(LinkedHashMap.class, String.class, String.class, person);
-		Assert.assertEquals("测试A11", map.get("name"));
-		Assert.assertEquals("14", map.get("age"));
-		Assert.assertEquals("11213232", map.get("openid"));
+		assertEquals("测试A11", map.get("name"));
+		assertEquals("14", map.get("age"));
+		assertEquals("11213232", map.get("openid"));
 	}
 	@Test
 	public void mapToBeanTest() {
@@ -103,17 +103,17 @@ public class ConvertToBeanTest {
 		map.put("subName", "sub名字");
 
 		SubPerson subPerson = Convert.convert(SubPerson.class, map);
-		Assert.assertEquals("88dc4b28-91b1-4a1a-bab5-444b795c7ecd", subPerson.getId().toString());
-		Assert.assertEquals(14, subPerson.getAge());
-		Assert.assertEquals("11213232", subPerson.getOpenid());
-		Assert.assertEquals("测试A11", subPerson.getName());
-		Assert.assertEquals("11213232", subPerson.getOpenid());
+		assertEquals("88dc4b28-91b1-4a1a-bab5-444b795c7ecd", subPerson.getId().toString());
+		assertEquals(14, subPerson.getAge());
+		assertEquals("11213232", subPerson.getOpenid());
+		assertEquals("测试A11", subPerson.getName());
+		assertEquals("11213232", subPerson.getOpenid());
 	}
 
 	@Test
 	public void nullStrToBeanTest(){
 		String nullStr = "null";
 		final SubPerson subPerson = Convert.convertQuietly(SubPerson.class, nullStr);
-		Assert.assertNull(subPerson);
+		assertNull(subPerson);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java
index 470738d3d..1c3a63574 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBooleanTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ConvertToBooleanTest {
 
@@ -9,10 +9,10 @@ public class ConvertToBooleanTest {
 	public void intToBooleanTest(){
 		int a = 100;
 		final Boolean aBoolean = Convert.toBool(a);
-		Assert.assertTrue(aBoolean);
+		assertTrue(aBoolean);
 
 		int b = 0;
 		final Boolean bBoolean = Convert.toBool(b);
-		Assert.assertFalse(bBoolean);
+		assertFalse(bBoolean);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
index 0f51ad24f..163d80a6e 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToCollectionTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.convert;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -24,104 +24,104 @@ public class ConvertToCollectionTest {
 	public void toCollectionTest() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<?> list = (List<?>) Convert.convert(Collection.class, a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals(1, list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals(1, list.get(4));
 	}
 
 	@Test
 	public void toListTest() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<?> list = Convert.toList(a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals(1, list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals(1, list.get(4));
 	}
 
 	@Test
 	public void toListTest2() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<String> list = Convert.toList(String.class, a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals("1", list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals("1", list.get(4));
 	}
 
 	@Test
 	public void toListTest3() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<String> list = Convert.toList(String.class, a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals("1", list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals("1", list.get(4));
 	}
 
 	@Test
 	public void toListTest4() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<String> list = Convert.convert(new TypeReference<List<String>>() {}, a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals("1", list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals("1", list.get(4));
 	}
 
 	@Test
 	public void strToListTest() {
 		String a = "a,你,好,123";
 		List<?> list = Convert.toList(a);
-		Assert.assertEquals(4, list.size());
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("123", list.get(3));
+		assertEquals(4, list.size());
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("123", list.get(3));
 
 		String b = "a";
 		List<?> list2 = Convert.toList(b);
-		Assert.assertEquals(1, list2.size());
-		Assert.assertEquals("a", list2.get(0));
+		assertEquals(1, list2.size());
+		assertEquals("a", list2.get(0));
 	}
 
 	@Test
 	public void strToListTest2() {
 		String a = "a,你,好,123";
 		List<String> list = Convert.toList(String.class, a);
-		Assert.assertEquals(4, list.size());
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("123", list.get(3));
+		assertEquals(4, list.size());
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("123", list.get(3));
 	}
 
 	@Test
 	public void numberToListTest() {
 		Integer i = 1;
 		ArrayList<?> list = Convert.convert(ArrayList.class, i);
-		Assert.assertSame(i, list.get(0));
+		assertSame(i, list.get(0));
 
 		BigDecimal b = BigDecimal.ONE;
 		ArrayList<?> list2 = Convert.convert(ArrayList.class, b);
-		Assert.assertEquals(b, list2.get(0));
+		assertEquals(b, list2.get(0));
 	}
 
 	@Test
 	public void toLinkedListTest() {
 		Object[] a = { "a", "你", "好", "", 1 };
 		List<?> list = Convert.convert(LinkedList.class, a);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals(1, list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals(1, list.get(4));
 	}
 
 	@Test
@@ -129,10 +129,10 @@ public class ConvertToCollectionTest {
 		Object[] a = { "a", "你", "好", "", 1 };
 		LinkedHashSet<?> set = Convert.convert(LinkedHashSet.class, a);
 		ArrayList<?> list = CollUtil.newArrayList(set);
-		Assert.assertEquals("a", list.get(0));
-		Assert.assertEquals("你", list.get(1));
-		Assert.assertEquals("好", list.get(2));
-		Assert.assertEquals("", list.get(3));
-		Assert.assertEquals(1, list.get(4));
+		assertEquals("a", list.get(0));
+		assertEquals("你", list.get(1));
+		assertEquals("好", list.get(2));
+		assertEquals("", list.get(3));
+		assertEquals(1, list.get(4));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java
index 9afe78007..449c3e333 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToNumberTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.convert;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.concurrent.atomic.AtomicLong;
@@ -14,7 +14,7 @@ public class ConvertToNumberTest {
 		final DateTime date = DateUtil.parse("2020-05-17 12:32:00");
 		final Long dateLong = Convert.toLong(date);
 		assert date != null;
-		Assert.assertEquals(date.getTime(), dateLong.longValue());
+		assertEquals(date.getTime(), dateLong.longValue());
 	}
 
 	@Test
@@ -22,7 +22,7 @@ public class ConvertToNumberTest {
 		final DateTime date = DateUtil.parse("2020-05-17 12:32:00");
 		final Integer dateInt = Convert.toInt(date);
 		assert date != null;
-		Assert.assertEquals((int)date.getTime(), dateInt.intValue());
+		assertEquals((int)date.getTime(), dateInt.intValue());
 	}
 
 	@Test
@@ -30,15 +30,15 @@ public class ConvertToNumberTest {
 		final DateTime date = DateUtil.parse("2020-05-17 12:32:00");
 		final AtomicLong dateLong = Convert.convert(AtomicLong.class, date);
 		assert date != null;
-		Assert.assertEquals(date.getTime(), dateLong.longValue());
+		assertEquals(date.getTime(), dateLong.longValue());
 	}
 
 	@Test
 	public void toBigDecimalTest(){
 		BigDecimal bigDecimal = Convert.toBigDecimal("1.1f");
-		Assert.assertEquals(1.1f, bigDecimal.floatValue(), 0);
+		assertEquals(1.1f, bigDecimal.floatValue(), 0);
 
 		bigDecimal = Convert.toBigDecimal("1L");
-		Assert.assertEquals(1L, bigDecimal.longValue());
+		assertEquals(1L, bigDecimal.longValue());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java
index a6e01b89e..fd8c5425a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToSBCAndDBCTest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 类型转换工具单元测试
  * 全角半角转换
- * 
+ *
  * @author Looly
  *
  */
@@ -16,13 +16,13 @@ public class ConvertToSBCAndDBCTest {
 	public void toSBCTest() {
 		String a = "123456789";
 		String sbc = Convert.toSBC(a);
-		Assert.assertEquals("１２３４５６７８９", sbc);
+		assertEquals("１２３４５６７８９", sbc);
 	}
-	
+
 	@Test
 	public void toDBCTest() {
 		String a = "１２３４５６７８９";
 		String dbc = Convert.toDBC(a);
-		Assert.assertEquals("123456789", dbc);
+		assertEquals("123456789", dbc);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConverterRegistryTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConverterRegistryTest.java
index a00591514..823ef9b16 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ConverterRegistryTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConverterRegistryTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * ConverterRegistry 单元测试
@@ -9,28 +9,28 @@ import org.junit.Test;
  *
  */
 public class ConverterRegistryTest {
-	
+
 	@Test
 	public void getConverterTest() {
 		Converter<Object> converter = ConverterRegistry.getInstance().getConverter(CharSequence.class, false);
-		Assert.assertNotNull(converter);
+		assertNotNull(converter);
 	}
-	
+
 	@Test
 	public void customTest(){
 		int a = 454553;
 		ConverterRegistry converterRegistry = ConverterRegistry.getInstance();
-		
+
 		CharSequence result = converterRegistry.convert(CharSequence.class, a);
-		Assert.assertEquals("454553", result);
-		
+		assertEquals("454553", result);
+
 		//此处做为示例自定义CharSequence转换，因为Hutool中已经提供CharSequence转换，请尽量不要替换
 		//替换可能引发关联转换异常（例如覆盖CharSequence转换会影响全局）
 		converterRegistry.putCustom(CharSequence.class, CustomConverter.class);
 		result = converterRegistry.convert(CharSequence.class, a);
-		Assert.assertEquals("Custom: 454553", result);
+		assertEquals("Custom: 454553", result);
 	}
-	
+
 	public static class CustomConverter implements Converter<CharSequence>{
 		@Override
 		public CharSequence convert(Object value, CharSequence defaultValue) throws IllegalArgumentException {
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java
index e3815d7c0..44ad6a22f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/DateConvertTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
@@ -15,42 +15,42 @@ public class DateConvertTest {
 	public void toDateTest() {
 		String a = "2017-05-06";
 		Date value = Convert.toDate(a);
-		Assert.assertEquals(a, DateUtil.formatDate(value));
+		assertEquals(a, DateUtil.formatDate(value));
 
 		long timeLong = DateUtil.date().getTime();
 		Date value2 = Convert.toDate(timeLong);
-		Assert.assertEquals(timeLong, value2.getTime());
+		assertEquals(timeLong, value2.getTime());
 	}
 
 	@Test
 	public void toDateFromIntTest() {
 		int dateLong = -1497600000;
 		Date value = Convert.toDate(dateLong);
-		Assert.assertNotNull(value);
-		Assert.assertEquals("Mon Dec 15 00:00:00 CST 1969", value.toString().replace("GMT+08:00", "CST"));
+		assertNotNull(value);
+		assertEquals("Mon Dec 15 00:00:00 CST 1969", value.toString().replace("GMT+08:00", "CST"));
 
 		final java.sql.Date sqlDate = Convert.convert(java.sql.Date.class, dateLong);
-		Assert.assertNotNull(sqlDate);
-		Assert.assertEquals("1969-12-15", sqlDate.toString());
+		assertNotNull(sqlDate);
+		assertEquals("1969-12-15", sqlDate.toString());
 	}
 
 	@Test
 	public void toDateFromLocalDateTimeTest() {
 		LocalDateTime localDateTime = LocalDateTime.parse("2017-05-06T08:30:00", DateTimeFormatter.ISO_DATE_TIME);
 		Date value = Convert.toDate(localDateTime);
-		Assert.assertNotNull(value);
-		Assert.assertEquals("2017-05-06", DateUtil.formatDate(value));
+		assertNotNull(value);
+		assertEquals("2017-05-06", DateUtil.formatDate(value));
 	}
 
 	@Test
 	public void toSqlDateTest() {
 		String a = "2017-05-06";
 		java.sql.Date value = Convert.convert(java.sql.Date.class, a);
-		Assert.assertEquals("2017-05-06", value.toString());
+		assertEquals("2017-05-06", value.toString());
 
 		long timeLong = DateUtil.date().getTime();
 		java.sql.Date value2 = Convert.convert(java.sql.Date.class, timeLong);
-		Assert.assertEquals(timeLong, value2.getTime());
+		assertEquals(timeLong, value2.getTime());
 	}
 
 	@Test
@@ -58,14 +58,14 @@ public class DateConvertTest {
 		Date src = new Date();
 
 		LocalDateTime ldt = Convert.toLocalDateTime(src);
-		Assert.assertEquals(ldt, DateUtil.toLocalDateTime(src));
+		assertEquals(ldt, DateUtil.toLocalDateTime(src));
 
 		Timestamp ts = Timestamp.from(src.toInstant());
 		ldt = Convert.toLocalDateTime(ts);
-		Assert.assertEquals(ldt, DateUtil.toLocalDateTime(src));
+		assertEquals(ldt, DateUtil.toLocalDateTime(src));
 
 		String str = "2020-12-12 12:12:12.0";
 		ldt = Convert.toLocalDateTime(str);
-		Assert.assertEquals(ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")), str);
+		assertEquals(ldt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.S")), str);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java
index 9a9fa21e3..8cc86b1b7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/EnumConvertTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Enum转换单元测试
@@ -11,19 +11,19 @@ public class EnumConvertTest {
 	@Test
 	public void convertTest(){
 		TestEnum bbb = Convert.convert(TestEnum.class, "BBB");
-		Assert.assertEquals(TestEnum.B, bbb);
+		assertEquals(TestEnum.B, bbb);
 
 		bbb = Convert.convert(TestEnum.class, 22);
-		Assert.assertEquals(TestEnum.B, bbb);
+		assertEquals(TestEnum.B, bbb);
 	}
 
 	@Test
 	public void toEnumTest(){
 		TestEnum ccc = Convert.toEnum(TestEnum.class, "CCC");
-		Assert.assertEquals(TestEnum.C, ccc);
+		assertEquals(TestEnum.C, ccc);
 
 		ccc = Convert.toEnum(TestEnum.class, 33);
-		Assert.assertEquals(TestEnum.C, ccc);
+		assertEquals(TestEnum.C, ccc);
 	}
 
 	enum TestEnum {
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/Issue2611Test.java b/hutool-core/src/test/java/cn/hutool/core/convert/Issue2611Test.java
index c549d0b12..0d3f0c25d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/Issue2611Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/Issue2611Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.util.NumberUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
@@ -12,6 +12,6 @@ public class Issue2611Test {
 	public void chineseMoneyToNumberTest(){
 		final BigDecimal value = Convert.chineseMoneyToNumber("陆万柒仟伍佰伍拾柒元");
 
-		Assert.assertEquals("67,557.00", NumberUtil.decimalFormatMoney(value.doubleValue()));
+		assertEquals("67,557.00", NumberUtil.decimalFormatMoney(value.doubleValue()));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/Issue3241Test.java b/hutool-core/src/test/java/cn/hutool/core/convert/Issue3241Test.java
index 66610be46..1922bd312 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/Issue3241Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/Issue3241Test.java
@@ -12,14 +12,14 @@
 
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
 public class Issue3241Test {
 	@Test
 	public void toBigDecimalTest() {
-		Assert.assertEquals(new BigDecimal("9.0E+7"), Convert.toBigDecimal("9.0E+7"));
+		assertEquals(new BigDecimal("9.0E+7"), Convert.toBigDecimal("9.0E+7"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/IssueI7WJHHTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/IssueI7WJHHTest.java
index d3068a3a0..5d089bbca 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/IssueI7WJHHTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/IssueI7WJHHTest.java
@@ -13,8 +13,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.lang.Opt;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Optional;
 
@@ -25,7 +25,7 @@ public class IssueI7WJHHTest {
 		final Optional<Integer> optional = Optional.of(1);
 		final Integer integer = Convert.toInt(optional);
 
-		Assert.assertEquals(Integer.valueOf(1), integer);
+		assertEquals(Integer.valueOf(1), integer);
 	}
 
 	@Test
@@ -33,6 +33,6 @@ public class IssueI7WJHHTest {
 		final Opt<Integer> optional = Opt.of(1);
 		final Integer integer = Convert.toInt(optional);
 
-		Assert.assertEquals(Integer.valueOf(1), integer);
+		assertEquals(Integer.valueOf(1), integer);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java
index dc1acc463..3ba080512 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.map.MapBuilder;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -23,8 +23,8 @@ public class MapConvertTest {
 		user.setAge(45);
 
 		final HashMap<?, ?> map = Convert.convert(HashMap.class, user);
-		Assert.assertEquals("AAA", map.get("name"));
-		Assert.assertEquals(45, map.get("age"));
+		assertEquals("AAA", map.get("name"));
+		assertEquals(45, map.get("age"));
 	}
 
 	@Test
@@ -35,8 +35,8 @@ public class MapConvertTest {
 				.put("age", 45).map();
 
 		final LinkedHashMap<?, ?> map = Convert.convert(LinkedHashMap.class, srcMap);
-		Assert.assertEquals("AAA", map.get("name"));
-		Assert.assertEquals(45, map.get("age"));
+		assertEquals("AAA", map.get("name"));
+		assertEquals(45, map.get("age"));
 	}
 
 	public static class User {
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
index 196b60c22..343683940 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
@@ -1,353 +1,359 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class NumberChineseFormatterTest {
 
 	@Test
-	public void formatThousandTest(){
+	public void formatThousandTest() {
 		String f = NumberChineseFormatter.formatThousand(10, false);
-		Assert.assertEquals("十", f);
+		assertEquals("十", f);
 		f = NumberChineseFormatter.formatThousand(11, false);
-		Assert.assertEquals("十一", f);
+		assertEquals("十一", f);
 		f = NumberChineseFormatter.formatThousand(19, false);
-		Assert.assertEquals("十九", f);
+		assertEquals("十九", f);
 	}
 
 	// 测试千
 	@Test
-	public void formatThousandLongTest(){
+	public void formatThousandLongTest() {
 		String f = NumberChineseFormatter.format(0, false);
-		Assert.assertEquals("零", f);
+		assertEquals("零", f);
 		f = NumberChineseFormatter.format(1, false);
-		Assert.assertEquals("一", f);
+		assertEquals("一", f);
 		f = NumberChineseFormatter.format(10, false);
-		Assert.assertEquals("一十", f);
+		assertEquals("一十", f);
 		f = NumberChineseFormatter.format(12, false);
-		Assert.assertEquals("一十二", f);
+		assertEquals("一十二", f);
 		f = NumberChineseFormatter.format(100, false);
-		Assert.assertEquals("一百", f);
+		assertEquals("一百", f);
 		f = NumberChineseFormatter.format(101, false);
-		Assert.assertEquals("一百零一", f);
+		assertEquals("一百零一", f);
 		f = NumberChineseFormatter.format(110, false);
-		Assert.assertEquals("一百一十", f);
+		assertEquals("一百一十", f);
 		f = NumberChineseFormatter.format(112, false);
-		Assert.assertEquals("一百一十二", f);
+		assertEquals("一百一十二", f);
 		f = NumberChineseFormatter.format(1000, false);
-		Assert.assertEquals("一千", f);
+		assertEquals("一千", f);
 		f = NumberChineseFormatter.format(1001, false);
-		Assert.assertEquals("一千零一", f);
+		assertEquals("一千零一", f);
 		f = NumberChineseFormatter.format(1010, false);
-		Assert.assertEquals("一千零一十", f);
+		assertEquals("一千零一十", f);
 		f = NumberChineseFormatter.format(1100, false);
-		Assert.assertEquals("一千一百", f);
+		assertEquals("一千一百", f);
 		f = NumberChineseFormatter.format(1101, false);
-		Assert.assertEquals("一千一百零一", f);
+		assertEquals("一千一百零一", f);
 		f = NumberChineseFormatter.format(9999, false);
-		Assert.assertEquals("九千九百九十九", f);
+		assertEquals("九千九百九十九", f);
 	}
 
 	// 测试万
 	@Test
-	public void formatTenThousandLongTest(){
+	public void formatTenThousandLongTest() {
 		String f = NumberChineseFormatter.format(1_0000, false);
-		Assert.assertEquals("一万", f);
+		assertEquals("一万", f);
 		f = NumberChineseFormatter.format(1_0001, false);
-		Assert.assertEquals("一万零一", f);
+		assertEquals("一万零一", f);
 		f = NumberChineseFormatter.format(1_0010, false);
-		Assert.assertEquals("一万零一十", f);
+		assertEquals("一万零一十", f);
 		f = NumberChineseFormatter.format(1_0100, false);
-		Assert.assertEquals("一万零一百", f);
+		assertEquals("一万零一百", f);
 		f = NumberChineseFormatter.format(1_1000, false);
-		Assert.assertEquals("一万一千", f);
+		assertEquals("一万一千", f);
 		f = NumberChineseFormatter.format(10_1000, false);
-		Assert.assertEquals("一十万零一千", f);
+		assertEquals("一十万零一千", f);
 		f = NumberChineseFormatter.format(10_0100, false);
-		Assert.assertEquals("一十万零一百", f);
+		assertEquals("一十万零一百", f);
 		f = NumberChineseFormatter.format(100_1000, false);
-		Assert.assertEquals("一百万零一千", f);
+		assertEquals("一百万零一千", f);
 		f = NumberChineseFormatter.format(100_0100, false);
-		Assert.assertEquals("一百万零一百", f);
+		assertEquals("一百万零一百", f);
 		f = NumberChineseFormatter.format(1000_1000, false);
-		Assert.assertEquals("一千万零一千", f);
+		assertEquals("一千万零一千", f);
 		f = NumberChineseFormatter.format(1000_0100, false);
-		Assert.assertEquals("一千万零一百", f);
+		assertEquals("一千万零一百", f);
 		f = NumberChineseFormatter.format(9999_0000, false);
-		Assert.assertEquals("九千九百九十九万", f);
+		assertEquals("九千九百九十九万", f);
 	}
 
 	// 测试亿
 	@Test
-	public void formatHundredMillionLongTest(){
+	public void formatHundredMillionLongTest() {
 		String f = NumberChineseFormatter.format(1_0000_0000L, false);
-		Assert.assertEquals("一亿", f);
+		assertEquals("一亿", f);
 		f = NumberChineseFormatter.format(1_0000_0001L, false);
-		Assert.assertEquals("一亿零一", f);
+		assertEquals("一亿零一", f);
 		f = NumberChineseFormatter.format(1_0000_1000L, false);
-		Assert.assertEquals("一亿零一千", f);
+		assertEquals("一亿零一千", f);
 		f = NumberChineseFormatter.format(1_0001_0000L, false);
-		Assert.assertEquals("一亿零一万", f);
+		assertEquals("一亿零一万", f);
 		f = NumberChineseFormatter.format(1_0010_0000L, false);
-		Assert.assertEquals("一亿零一十万", f);
+		assertEquals("一亿零一十万", f);
 		f = NumberChineseFormatter.format(1_0010_0000L, false);
-		Assert.assertEquals("一亿零一十万", f);
+		assertEquals("一亿零一十万", f);
 		f = NumberChineseFormatter.format(1_0100_0000L, false);
-		Assert.assertEquals("一亿零一百万", f);
+		assertEquals("一亿零一百万", f);
 		f = NumberChineseFormatter.format(1_1000_0000L, false);
-		Assert.assertEquals("一亿一千万", f);
+		assertEquals("一亿一千万", f);
 		f = NumberChineseFormatter.format(10_1000_0000L, false);
-		Assert.assertEquals("一十亿零一千万", f);
+		assertEquals("一十亿零一千万", f);
 		f = NumberChineseFormatter.format(100_1000_0000L, false);
-		Assert.assertEquals("一百亿零一千万", f);
+		assertEquals("一百亿零一千万", f);
 		f = NumberChineseFormatter.format(1000_1000_0000L, false);
-		Assert.assertEquals("一千亿零一千万", f);
+		assertEquals("一千亿零一千万", f);
 		f = NumberChineseFormatter.format(1100_1000_0000L, false);
-		Assert.assertEquals("一千一百亿零一千万", f);
+		assertEquals("一千一百亿零一千万", f);
 		f = NumberChineseFormatter.format(9999_0000_0000L, false);
-		Assert.assertEquals("九千九百九十九亿", f);
+		assertEquals("九千九百九十九亿", f);
 	}
 
 	// 测试万亿
 	@Test
-	public void formatTrillionsLongTest(){
+	public void formatTrillionsLongTest() {
 		String f = NumberChineseFormatter.format(1_0000_0000_0000L, false);
-		Assert.assertEquals("一万亿", f);
+		assertEquals("一万亿", f);
 		f = NumberChineseFormatter.format(1_0000_1000_0000L, false);
-		Assert.assertEquals("一万亿零一千万", f);
+		assertEquals("一万亿零一千万", f);
 		f = NumberChineseFormatter.format(1_0010_0000_0000L, false);
-		Assert.assertEquals("一万零一十亿", f);
+		assertEquals("一万零一十亿", f);
 	}
 
 	@Test
 	public void formatTest() {
 		String f0 = NumberChineseFormatter.format(5000_8000, false);
-		Assert.assertEquals("五千万零八千", f0);
+		assertEquals("五千万零八千", f0);
 		String f1 = NumberChineseFormatter.format(1_0889.72356, false);
-		Assert.assertEquals("一万零八百八十九点七二", f1);
+		assertEquals("一万零八百八十九点七二", f1);
 		f1 = NumberChineseFormatter.format(12653, false);
-		Assert.assertEquals("一万二千六百五十三", f1);
+		assertEquals("一万二千六百五十三", f1);
 		f1 = NumberChineseFormatter.format(215.6387, false);
-		Assert.assertEquals("二百一十五点六四", f1);
+		assertEquals("二百一十五点六四", f1);
 		f1 = NumberChineseFormatter.format(1024, false);
-		Assert.assertEquals("一千零二十四", f1);
+		assertEquals("一千零二十四", f1);
 		f1 = NumberChineseFormatter.format(100350089, false);
-		Assert.assertEquals("一亿零三十五万零八十九", f1);
+		assertEquals("一亿零三十五万零八十九", f1);
 		f1 = NumberChineseFormatter.format(1200, false);
-		Assert.assertEquals("一千二百", f1);
+		assertEquals("一千二百", f1);
 		f1 = NumberChineseFormatter.format(12, false);
-		Assert.assertEquals("一十二", f1);
+		assertEquals("一十二", f1);
 		f1 = NumberChineseFormatter.format(0.05, false);
-		Assert.assertEquals("零点零五", f1);
+		assertEquals("零点零五", f1);
 	}
 
 	@Test
 	public void formatTest2() {
 		String f1 = NumberChineseFormatter.format(-0.3, false, false);
-		Assert.assertEquals("负零点三", f1);
+		assertEquals("负零点三", f1);
 
 		f1 = NumberChineseFormatter.format(10, false, false);
-		Assert.assertEquals("一十", f1);
+		assertEquals("一十", f1);
 	}
 
 	@Test
 	public void formatTest3() {
 //		String f1 = NumberChineseFormatter.format(5000_8000, false, false);
-//		Assert.assertEquals("五千万零八千", f1);
+//		assertEquals("五千万零八千", f1);
 
 		String f2 = NumberChineseFormatter.format(1_0035_0089, false, false);
-		Assert.assertEquals("一亿零三十五万零八十九", f2);
+		assertEquals("一亿零三十五万零八十九", f2);
 	}
 
 	@Test
 	public void formatMaxTest() {
 		String f3 = NumberChineseFormatter.format(99_9999_9999_9999L, false, false);
-		Assert.assertEquals("九十九万九千九百九十九亿九千九百九十九万九千九百九十九", f3);
+		assertEquals("九十九万九千九百九十九亿九千九百九十九万九千九百九十九", f3);
 	}
 
 	@Test
 	public void formatTraditionalTest() {
 		String f1 = NumberChineseFormatter.format(10889.72356, true);
-		Assert.assertEquals("壹万零捌佰捌拾玖点柒贰", f1);
+		assertEquals("壹万零捌佰捌拾玖点柒贰", f1);
 		f1 = NumberChineseFormatter.format(12653, true);
-		Assert.assertEquals("壹万贰仟陆佰伍拾叁", f1);
+		assertEquals("壹万贰仟陆佰伍拾叁", f1);
 		f1 = NumberChineseFormatter.format(215.6387, true);
-		Assert.assertEquals("贰佰壹拾伍点陆肆", f1);
+		assertEquals("贰佰壹拾伍点陆肆", f1);
 		f1 = NumberChineseFormatter.format(1024, true);
-		Assert.assertEquals("壹仟零贰拾肆", f1);
+		assertEquals("壹仟零贰拾肆", f1);
 		f1 = NumberChineseFormatter.format(100350089, true);
-		Assert.assertEquals("壹亿零叁拾伍万零捌拾玖", f1);
+		assertEquals("壹亿零叁拾伍万零捌拾玖", f1);
 		f1 = NumberChineseFormatter.format(1200, true);
-		Assert.assertEquals("壹仟贰佰", f1);
+		assertEquals("壹仟贰佰", f1);
 		f1 = NumberChineseFormatter.format(12, true);
-		Assert.assertEquals("壹拾贰", f1);
+		assertEquals("壹拾贰", f1);
 		f1 = NumberChineseFormatter.format(0.05, true);
-		Assert.assertEquals("零点零伍", f1);
+		assertEquals("零点零伍", f1);
 	}
 
 	@Test
 	public void formatSimpleTest() {
 		String f1 = NumberChineseFormatter.formatSimple(1_2345);
-		Assert.assertEquals("1.23万", f1);
+		assertEquals("1.23万", f1);
 		f1 = NumberChineseFormatter.formatSimple(-5_5555);
-		Assert.assertEquals("-5.56万", f1);
+		assertEquals("-5.56万", f1);
 		f1 = NumberChineseFormatter.formatSimple(1_2345_6789);
-		Assert.assertEquals("1.23亿", f1);
+		assertEquals("1.23亿", f1);
 		f1 = NumberChineseFormatter.formatSimple(-5_5555_5555);
-		Assert.assertEquals("-5.56亿", f1);
+		assertEquals("-5.56亿", f1);
 		f1 = NumberChineseFormatter.formatSimple(1_2345_6789_1011L);
-		Assert.assertEquals("1.23万亿", f1);
+		assertEquals("1.23万亿", f1);
 		f1 = NumberChineseFormatter.formatSimple(-5_5555_5555_5555L);
-		Assert.assertEquals("-5.56万亿", f1);
+		assertEquals("-5.56万亿", f1);
 		f1 = NumberChineseFormatter.formatSimple(123);
-		Assert.assertEquals("123", f1);
+		assertEquals("123", f1);
 		f1 = NumberChineseFormatter.formatSimple(-123);
-		Assert.assertEquals("-123", f1);
+		assertEquals("-123", f1);
 	}
 
 	@Test
 	public void digitToChineseTest() {
 		String digitToChinese = Convert.digitToChinese(12_4124_1241_2421.12);
-		Assert.assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元壹角贰分", digitToChinese);
+		assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元壹角贰分", digitToChinese);
 
 		digitToChinese = Convert.digitToChinese(12_0000_1241_2421L);
-		Assert.assertEquals("壹拾贰万亿零壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese);
+		assertEquals("壹拾贰万亿零壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese);
 
 		digitToChinese = Convert.digitToChinese(12_0000_0000_2421L);
-		Assert.assertEquals("壹拾贰万亿零贰仟肆佰贰拾壹元整", digitToChinese);
+		assertEquals("壹拾贰万亿零贰仟肆佰贰拾壹元整", digitToChinese);
 
 		digitToChinese = Convert.digitToChinese(12_4124_1241_2421D);
-		Assert.assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese);
+		assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese);
 
 		digitToChinese = Convert.digitToChinese(2421.02);
-		Assert.assertEquals("贰仟肆佰贰拾壹元零贰分", digitToChinese);
+		assertEquals("贰仟肆佰贰拾壹元零贰分", digitToChinese);
 	}
 
 	@Test
 	public void digitToChineseTest2() {
 		double a = 67556.32;
 		String digitUppercase = Convert.digitToChinese(a);
-		Assert.assertEquals("陆万柒仟伍佰伍拾陆元叁角贰分", digitUppercase);
+		assertEquals("陆万柒仟伍佰伍拾陆元叁角贰分", digitUppercase);
 
 		a = 1024.00;
 		digitUppercase = Convert.digitToChinese(a);
-		Assert.assertEquals("壹仟零贰拾肆元整", digitUppercase);
+		assertEquals("壹仟零贰拾肆元整", digitUppercase);
 
 		double b = 1024;
 		digitUppercase = Convert.digitToChinese(b);
-		Assert.assertEquals("壹仟零贰拾肆元整", digitUppercase);
+		assertEquals("壹仟零贰拾肆元整", digitUppercase);
 	}
 
 	@Test
 	public void digitToChineseTest3() {
 		String digitToChinese = Convert.digitToChinese(2_0000_0000.00);
-		Assert.assertEquals("贰亿元整", digitToChinese);
+		assertEquals("贰亿元整", digitToChinese);
 		digitToChinese = Convert.digitToChinese(2_0000.00);
-		Assert.assertEquals("贰万元整", digitToChinese);
+		assertEquals("贰万元整", digitToChinese);
 		digitToChinese = Convert.digitToChinese(2_0000_0000_0000.00);
-		Assert.assertEquals("贰万亿元整", digitToChinese);
+		assertEquals("贰万亿元整", digitToChinese);
 	}
 
 	@Test
 	public void digitToChineseTest4() {
 		String digitToChinese = Convert.digitToChinese(400_0000.00);
-		Assert.assertEquals("肆佰万元整", digitToChinese);
+		assertEquals("肆佰万元整", digitToChinese);
 	}
 
 	@Test
-	public void numberCharToChineseTest(){
+	public void numberCharToChineseTest() {
 		String s = NumberChineseFormatter.numberCharToChinese('1', false);
-		Assert.assertEquals("一", s);
+		assertEquals("一", s);
 		s = NumberChineseFormatter.numberCharToChinese('2', false);
-		Assert.assertEquals("二", s);
+		assertEquals("二", s);
 		s = NumberChineseFormatter.numberCharToChinese('0', false);
-		Assert.assertEquals("零", s);
+		assertEquals("零", s);
 
 		// 非数字字符原样返回
 		s = NumberChineseFormatter.numberCharToChinese('A', false);
-		Assert.assertEquals("A", s);
+		assertEquals("A", s);
 	}
 
 	@Test
-	public void chineseToNumberTest(){
-		Assert.assertEquals(0, NumberChineseFormatter.chineseToNumber("零"));
-		Assert.assertEquals(102, NumberChineseFormatter.chineseToNumber("一百零二"));
-		Assert.assertEquals(112, NumberChineseFormatter.chineseToNumber("一百一十二"));
-		Assert.assertEquals(1012, NumberChineseFormatter.chineseToNumber("一千零一十二"));
-		Assert.assertEquals(1000000, NumberChineseFormatter.chineseToNumber("一百万"));
-		Assert.assertEquals(2000100112, NumberChineseFormatter.chineseToNumber("二十亿零一十万零一百一十二"));
+	public void chineseToNumberTest() {
+		assertEquals(0, NumberChineseFormatter.chineseToNumber("零"));
+		assertEquals(102, NumberChineseFormatter.chineseToNumber("一百零二"));
+		assertEquals(112, NumberChineseFormatter.chineseToNumber("一百一十二"));
+		assertEquals(1012, NumberChineseFormatter.chineseToNumber("一千零一十二"));
+		assertEquals(1000000, NumberChineseFormatter.chineseToNumber("一百万"));
+		assertEquals(2000100112, NumberChineseFormatter.chineseToNumber("二十亿零一十万零一百一十二"));
 	}
 
 	@Test
-	public void chineseToNumberTest2(){
-		Assert.assertEquals(120, NumberChineseFormatter.chineseToNumber("一百二"));
-		Assert.assertEquals(1200, NumberChineseFormatter.chineseToNumber("一千二"));
-		Assert.assertEquals(22000, NumberChineseFormatter.chineseToNumber("两万二"));
-		Assert.assertEquals(22003, NumberChineseFormatter.chineseToNumber("两万二零三"));
-		Assert.assertEquals(22010, NumberChineseFormatter.chineseToNumber("两万二零一十"));
+	public void chineseToNumberTest2() {
+		assertEquals(120, NumberChineseFormatter.chineseToNumber("一百二"));
+		assertEquals(1200, NumberChineseFormatter.chineseToNumber("一千二"));
+		assertEquals(22000, NumberChineseFormatter.chineseToNumber("两万二"));
+		assertEquals(22003, NumberChineseFormatter.chineseToNumber("两万二零三"));
+		assertEquals(22010, NumberChineseFormatter.chineseToNumber("两万二零一十"));
 	}
 
 	@Test
-	public void chineseToNumberTest3(){
+	public void chineseToNumberTest3() {
 		// issue#1726，对于单位开头的数组，默认赋予1
 		// 十二 -> 一十二
 		// 百二 -> 一百二
-		Assert.assertEquals(12, NumberChineseFormatter.chineseToNumber("十二"));
-		Assert.assertEquals(120, NumberChineseFormatter.chineseToNumber("百二"));
-		Assert.assertEquals(1300, NumberChineseFormatter.chineseToNumber("千三"));
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void badNumberTest(){
-		// 连续数字检查
-		NumberChineseFormatter.chineseToNumber("一百一二三");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void badNumberTest2(){
-		// 非法字符
-		NumberChineseFormatter.chineseToNumber("一百你三");
+		assertEquals(12, NumberChineseFormatter.chineseToNumber("十二"));
+		assertEquals(120, NumberChineseFormatter.chineseToNumber("百二"));
+		assertEquals(1300, NumberChineseFormatter.chineseToNumber("千三"));
 	}
 
 	@Test
-	public void singleMoneyTest(){
+	public void badNumberTest() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			// 连续数字检查
+			NumberChineseFormatter.chineseToNumber("一百一二三");
+		});
+	}
+
+	@Test
+	public void badNumberTest2() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			// 非法字符
+			NumberChineseFormatter.chineseToNumber("一百你三");
+		});
+	}
+
+	@Test
+	public void singleMoneyTest() {
 		String format = NumberChineseFormatter.format(0.01, false, true);
-		Assert.assertEquals("一分", format);
+		assertEquals("一分", format);
 		format = NumberChineseFormatter.format(0.10, false, true);
-		Assert.assertEquals("一角", format);
+		assertEquals("一角", format);
 		format = NumberChineseFormatter.format(0.12, false, true);
-		Assert.assertEquals("一角二分", format);
+		assertEquals("一角二分", format);
 
 		format = NumberChineseFormatter.format(1.00, false, true);
-		Assert.assertEquals("一元整", format);
+		assertEquals("一元整", format);
 		format = NumberChineseFormatter.format(1.10, false, true);
-		Assert.assertEquals("一元一角", format);
+		assertEquals("一元一角", format);
 		format = NumberChineseFormatter.format(1.02, false, true);
-		Assert.assertEquals("一元零二分", format);
+		assertEquals("一元零二分", format);
 	}
 
 	@Test
-	public void singleNumberTest(){
+	public void singleNumberTest() {
 		String format = NumberChineseFormatter.format(0.01, false, false);
-		Assert.assertEquals("零点零一", format);
+		assertEquals("零点零一", format);
 		format = NumberChineseFormatter.format(0.10, false, false);
-		Assert.assertEquals("零点一", format);
+		assertEquals("零点一", format);
 		format = NumberChineseFormatter.format(0.12, false, false);
-		Assert.assertEquals("零点一二", format);
+		assertEquals("零点一二", format);
 
 		format = NumberChineseFormatter.format(1.00, false, false);
-		Assert.assertEquals("一", format);
+		assertEquals("一", format);
 		format = NumberChineseFormatter.format(1.10, false, false);
-		Assert.assertEquals("一点一", format);
+		assertEquals("一点一", format);
 		format = NumberChineseFormatter.format(1.02, false, false);
-		Assert.assertEquals("一点零二", format);
+		assertEquals("一点零二", format);
 	}
 
 	@Test
 	public void dotTest() {
 		final String format = NumberChineseFormatter.format(new BigDecimal("3.1415926"), false, false);
-		Assert.assertEquals("三点一四一五九二六", format);
+		assertEquals("三点一四一五九二六", format);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java
index 795d79fa1..25680cd6c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/NumberConverterTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.convert.impl.NumberConverter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class NumberConverterTest {
 
@@ -10,13 +10,13 @@ public class NumberConverterTest {
 	public void toDoubleTest(){
 		final NumberConverter numberConverter = new NumberConverter(Double.class);
 		final Number convert = numberConverter.convert("1,234.55", null);
-		Assert.assertEquals(1234.55D, convert);
+		assertEquals(1234.55D, convert);
 	}
 
 	@Test
 	public void toIntegerTest(){
 		final NumberConverter numberConverter = new NumberConverter(Integer.class);
 		final Number convert = numberConverter.convert("1,234.55", null);
-		Assert.assertEquals(1234, convert);
+		assertEquals(1234, convert);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java
index 47135706a..feb93efce 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java
@@ -1,43 +1,43 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class NumberWordFormatTest {
 
 	@Test
 	public void formatTest() {
 		final String format = NumberWordFormatter.format(100.23);
-		Assert.assertEquals("ONE HUNDRED AND CENTS TWENTY THREE ONLY", format);
+		assertEquals("ONE HUNDRED AND CENTS TWENTY THREE ONLY", format);
 
 		final String format2 = NumberWordFormatter.format("2100.00");
-		Assert.assertEquals("TWO THOUSAND ONE HUNDRED AND CENTS  ONLY", format2);
+		assertEquals("TWO THOUSAND ONE HUNDRED AND CENTS  ONLY", format2);
 
 		final String format3 = NumberWordFormatter.format("1234567890123.12");
-		Assert.assertEquals("ONE TRILLION TWO HUNDRED AND THIRTY FOUR BILLION FIVE HUNDRED AND SIXTY SEVEN MILLION EIGHT HUNDRED AND NINETY THOUSAND ONE HUNDRED AND TWENTY THREE AND CENTS TWELVE ONLY", format3);
+		assertEquals("ONE TRILLION TWO HUNDRED AND THIRTY FOUR BILLION FIVE HUNDRED AND SIXTY SEVEN MILLION EIGHT HUNDRED AND NINETY THOUSAND ONE HUNDRED AND TWENTY THREE AND CENTS TWELVE ONLY", format3);
 	}
 
 	@Test
 	public void formatSimpleTest() {
 		final String format1 = NumberWordFormatter.formatSimple(1200, false);
-		Assert.assertEquals("1.2k", format1);
+		assertEquals("1.2k", format1);
 
 		final String format2 = NumberWordFormatter.formatSimple(4384324, false);
-		Assert.assertEquals("4.38m", format2);
+		assertEquals("4.38m", format2);
 
 		final String format3 = NumberWordFormatter.formatSimple(4384324, true);
-		Assert.assertEquals("438.43w", format3);
+		assertEquals("438.43w", format3);
 
 		final String format4 = NumberWordFormatter.formatSimple(4384324);
-		Assert.assertEquals("438.43w", format4);
+		assertEquals("438.43w", format4);
 
 		final String format5 = NumberWordFormatter.formatSimple(438);
-		Assert.assertEquals("438", format5);
+		assertEquals("438", format5);
 	}
 
 	@Test
 	public void formatSimpleTest2(){
 		final String s = NumberWordFormatter.formatSimple(1000);
-		Assert.assertEquals("1k", s);
+		assertEquals("1k", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatterTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatterTest.java
index d4c5a6740..fa527f7b6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatterTest.java
@@ -1,8 +1,10 @@
 package cn.hutool.core.convert;
 
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class NumberWordFormatterTest {
 
@@ -10,46 +12,48 @@ public class NumberWordFormatterTest {
 	public void testFormatNull() {
 		// 测试传入null值的情况
 		String result = NumberWordFormatter.format(null);
-		Assert.assertEquals("", result);
+		assertEquals("", result);
 	}
 
 	@Test
 	public void testFormatInteger() {
 		// 测试传入整数的情况
 		String result = NumberWordFormatter.format(1234);
-		Assert.assertEquals("ONE THOUSAND TWO HUNDRED AND THIRTY FOUR ONLY", result);
+		assertEquals("ONE THOUSAND TWO HUNDRED AND THIRTY FOUR ONLY", result);
 
 		result = NumberWordFormatter.format(1204);
-		Assert.assertEquals("ONE THOUSAND TWO HUNDRED AND FOUR ONLY", result);
+		assertEquals("ONE THOUSAND TWO HUNDRED AND FOUR ONLY", result);
 
 		result = NumberWordFormatter.format(1004);
-		Assert.assertEquals("ONE THOUSAND FOUR ONLY", result);
+		assertEquals("ONE THOUSAND FOUR ONLY", result);
 	}
 
 	@Test
 	public void testFormatDecimal() {
 		// 测试传入小数的情况
 		String result = NumberWordFormatter.format(1234.56);
-		Assert.assertEquals("ONE THOUSAND TWO HUNDRED AND THIRTY FOUR AND CENTS FIFTY SIX ONLY", result);
+		assertEquals("ONE THOUSAND TWO HUNDRED AND THIRTY FOUR AND CENTS FIFTY SIX ONLY", result);
 	}
 
 	@Test
 	public void testFormatLargeNumber() {
 		// 测试传入大数字的情况
 		String result = NumberWordFormatter.format(1234567890123L);
-		Assert.assertEquals("ONE TRILLION TWO HUNDRED AND THIRTY FOUR BILLION FIVE HUNDRED AND SIXTY SEVEN MILLION EIGHT HUNDRED AND NINETY THOUSAND ONE HUNDRED AND TWENTY THREE ONLY", result);
+		assertEquals("ONE TRILLION TWO HUNDRED AND THIRTY FOUR BILLION FIVE HUNDRED AND SIXTY SEVEN MILLION EIGHT HUNDRED AND NINETY THOUSAND ONE HUNDRED AND TWENTY THREE ONLY", result);
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void testFormatNonNumeric() {
-		// 测试传入非数字字符串的情况
-		NumberWordFormatter.format("non-numeric");
+		assertThrows(NumberFormatException.class, () -> {
+			// 测试传入非数字字符串的情况
+			NumberWordFormatter.format("non-numeric");
+		});
 	}
 
 	@Test
 	public void issue3579Test() {
-		Assert.assertEquals("ZERO AND CENTS TEN ONLY", NumberWordFormatter.format(0.1));
-		Assert.assertEquals("ZERO AND CENTS ONE ONLY", NumberWordFormatter.format(0.01));
+		assertEquals("ZERO AND CENTS TEN ONLY", NumberWordFormatter.format(0.1));
+		assertEquals("ZERO AND CENTS ONE ONLY", NumberWordFormatter.format(0.01));
 	}
 }
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java
index 8fbfc9b9b..a954beea6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/PrimitiveConvertTest.java
@@ -1,18 +1,22 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class PrimitiveConvertTest {
 
 	@Test
-	public void toIntTest(){
+	public void toIntTest() {
 		final int convert = Convert.convert(int.class, "123");
-		Assert.assertEquals(123, convert);
+		assertEquals(123, convert);
 	}
 
-	@Test(expected = NumberFormatException.class)
-	public void toIntErrorTest(){
-		final int convert = Convert.convert(int.class, "aaaa");
+	@Test
+	public void toIntErrorTest() {
+		assertThrows(NumberFormatException.class, () -> {
+			Convert.convert(int.class, "aaaa");
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java
index 5a990e77b..155d191a8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/StringConvertTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.TimeZone;
 
@@ -10,6 +10,6 @@ public class StringConvertTest {
 	@Test
 	public void timezoneToStrTest(){
 		final String s = Convert.toStr(TimeZone.getTimeZone("Asia/Shanghai"));
-		Assert.assertEquals("Asia/Shanghai", s);
+		assertEquals("Asia/Shanghai", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java
index 0edd91a98..9132a8790 100644
--- a/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/TemporalAccessorConverterTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.convert;
 
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.time.LocalDate;
@@ -21,42 +21,42 @@ public class TemporalAccessorConverterTest {
 		// 通过转换获取的Instant为UTC时间
 		Instant instant = Convert.convert(Instant.class, dateStr);
 		Instant instant1 = DateUtil.parse(dateStr).toInstant();
-		Assert.assertEquals(instant1, instant);
+		assertEquals(instant1, instant);
 	}
 
 	@Test
 	public void toLocalDateTimeTest(){
 		LocalDateTime localDateTime = Convert.convert(LocalDateTime.class, "2019-02-18");
-		Assert.assertEquals("2019-02-18T00:00", localDateTime.toString());
+		assertEquals("2019-02-18T00:00", localDateTime.toString());
 	}
 
 	@Test
 	public void toLocalDateTest(){
 		LocalDate localDate = Convert.convert(LocalDate.class, "2019-02-18");
-		Assert.assertEquals("2019-02-18", localDate.toString());
+		assertEquals("2019-02-18", localDate.toString());
 	}
 
 	@Test
 	public void toLocalTimeTest(){
 		LocalTime localTime = Convert.convert(LocalTime.class, "2019-02-18");
-		Assert.assertEquals("00:00", localTime.toString());
+		assertEquals("00:00", localTime.toString());
 	}
 
 	@Test
 	public void toZonedDateTimeTest(){
 		ZonedDateTime zonedDateTime = Convert.convert(ZonedDateTime.class, "2019-02-18");
-		Assert.assertEquals("2019-02-18T00:00+08:00", zonedDateTime.toString().substring(0, 22));
+		assertEquals("2019-02-18T00:00+08:00", zonedDateTime.toString().substring(0, 22));
 	}
 
 	@Test
 	public void toOffsetDateTimeTest(){
 		OffsetDateTime zonedDateTime = Convert.convert(OffsetDateTime.class, "2019-02-18");
-		Assert.assertEquals("2019-02-18T00:00+08:00", zonedDateTime.toString());
+		assertEquals("2019-02-18T00:00+08:00", zonedDateTime.toString());
 	}
 
 	@Test
 	public void toOffsetTimeTest(){
 		OffsetTime offsetTime = Convert.convert(OffsetTime.class, "2019-02-18");
-		Assert.assertEquals("00:00+08:00", offsetTime.toString());
+		assertEquals("00:00+08:00", offsetTime.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ToBytesTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ToBytesTest.java
index c3ee3c75d..d0812ed8f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/convert/ToBytesTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/convert/ToBytesTest.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.core.convert;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +27,8 @@ public class ToBytesTest {
 		byteList.add((byte) 3);
 
 		final byte[] bytes = Convert.convert(byte[].class, byteList);
-		Assert.assertEquals(1, bytes[0]);
-		Assert.assertEquals(2, bytes[1]);
-		Assert.assertEquals(3, bytes[2]);
+		assertEquals(1, bytes[0]);
+		assertEquals(2, bytes[1]);
+		assertEquals(3, bytes[2]);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java b/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java
index 29102976d..6e3582b38 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/BetweenFormatterTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.date.BetweenFormatter.Level;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 
@@ -29,7 +29,7 @@ public class BetweenFormatterTest {
 	public void formatTest() {
 		long betweenMs = DateUtil.betweenMs(DateUtil.parse("2017-01-01 22:59:59"), DateUtil.parse("2017-01-02 23:59:58"));
 		BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.MILLISECOND, 1);
-		Assert.assertEquals(formater.toString(), "1天");
+		assertEquals(formater.toString(), "1天");
 	}
 
 	@Test
@@ -37,7 +37,7 @@ public class BetweenFormatterTest {
 		final long betweenMs = DateUtil.betweenMs(DateUtil.parse("2017-01-01 22:59:59"), DateUtil.parse("2017-01-02 23:59:58"));
 		final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND, 1);
 		formatter.setLevelFormatter(levelFormatterEn);
-		Assert.assertEquals(formatter.toString(), "1 day");
+		assertEquals(formatter.toString(), "1 day");
 	}
 
 	@Test
@@ -46,26 +46,26 @@ public class BetweenFormatterTest {
 		final BetweenFormatter formatter = new BetweenFormatter(betweenMs, BetweenFormatter.Level.MILLISECOND, 5);
 		formatter.setSeparator(",");
 		formatter.setLevelFormatter(levelFormatterEn);
-		Assert.assertEquals(formatter.toString(), "1 hour,10 second,1 millisecond");
+		assertEquals(formatter.toString(), "1 hour,10 second,1 millisecond");
 	}
 
 	@Test
 	public void formatBetweenTest() {
 		long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 11:23:19"), DateUtil.parse("2018-07-16 11:23:20"));
 		BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.SECOND, 1);
-		Assert.assertEquals(formater.toString(), "1秒");
+		assertEquals(formater.toString(), "1秒");
 	}
 
 	@Test
 	public void formatBetweenTest2() {
 		long betweenMs = DateUtil.betweenMs(DateUtil.parse("2018-07-16 12:25:23"), DateUtil.parse("2018-07-16 11:23:20"));
 		BetweenFormatter formater = new BetweenFormatter(betweenMs, Level.SECOND, 5);
-		Assert.assertEquals(formater.toString(), "1小时2分3秒");
+		assertEquals(formater.toString(), "1小时2分3秒");
 	}
 
 	@Test
 	public void formatTest2() {
 		BetweenFormatter formater = new BetweenFormatter(584, Level.SECOND, 1);
-		Assert.assertEquals(formater.toString(), "0秒");
+		assertEquals(formater.toString(), "0秒");
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java
index 7b0a20101..32d423935 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java
@@ -1,29 +1,33 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class CalendarUtilTest {
 
 	@Test
-	public void formatChineseDate(){
+	public void formatChineseDate() {
 		Calendar calendar = Objects.requireNonNull(DateUtil.parse("2018-02-24 12:13:14")).toCalendar();
 		final String chineseDate = CalendarUtil.formatChineseDate(calendar, false);
-		Assert.assertEquals("二〇一八年二月二十四日", chineseDate);
+		assertEquals("二〇一八年二月二十四日", chineseDate);
 		final String chineseDateTime = CalendarUtil.formatChineseDate(calendar, true);
-		Assert.assertEquals("二〇一八年二月二十四日十二时十三分十四秒", chineseDateTime);
+		assertEquals("二〇一八年二月二十四日十二时十三分十四秒", chineseDateTime);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void parseTest(){
-		final Calendar calendar = CalendarUtil.parse("2021-09-27 00:00:112323", false,
+	@Test
+	public void parseTest() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			final Calendar calendar = CalendarUtil.parse("2021-09-27 00:00:112323", false,
 				DatePattern.NORM_DATETIME_FORMAT);
 
-		// https://github.com/dromara/hutool/issues/1849
-		// 在使用严格模式时，秒不正确，抛出异常
-		DateUtil.date(calendar);
+			// https://github.com/dromara/hutool/issues/1849
+			// 在使用严格模式时，秒不正确，抛出异常
+			DateUtil.date(calendar);
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
index bb983173a..c297d41c8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
@@ -11,65 +11,65 @@ public class ChineseDateTest {
 	@Test
 	public void chineseDateTest() {
 		ChineseDate date = new ChineseDate(DateUtil.parseDate("2020-01-25"));
-		Assert.assertEquals("2020-01-25 00:00:00", date.getGregorianDate().toString());
-		Assert.assertEquals(2020, date.getChineseYear());
+		assertEquals("2020-01-25 00:00:00", date.getGregorianDate().toString());
+		assertEquals(2020, date.getChineseYear());
 
-		Assert.assertEquals(1, date.getMonth());
-		Assert.assertEquals("一月", date.getChineseMonth());
-		Assert.assertEquals("正月", date.getChineseMonthName());
+		assertEquals(1, date.getMonth());
+		assertEquals("一月", date.getChineseMonth());
+		assertEquals("正月", date.getChineseMonthName());
 
 
-		Assert.assertEquals(1, date.getDay());
-		Assert.assertEquals("初一", date.getChineseDay());
+		assertEquals(1, date.getDay());
+		assertEquals("初一", date.getChineseDay());
 
-		Assert.assertEquals("庚子", date.getCyclical());
-		Assert.assertEquals("鼠", date.getChineseZodiac());
-		Assert.assertEquals("春节", date.getFestivals());
-		Assert.assertEquals("庚子鼠年 正月初一", date.toString());
+		assertEquals("庚子", date.getCyclical());
+		assertEquals("鼠", date.getChineseZodiac());
+		assertEquals("春节", date.getFestivals());
+		assertEquals("庚子鼠年 正月初一", date.toString());
 
 		date = new ChineseDate(DateUtil.parseDate("2020-01-14"));
-		Assert.assertEquals("己亥猪年 腊月二十", date.toString());
+		assertEquals("己亥猪年 腊月二十", date.toString());
 		date = new ChineseDate(DateUtil.parseDate("2020-01-24"));
-		Assert.assertEquals("己亥猪年 腊月三十", date.toString());
+		assertEquals("己亥猪年 腊月三十", date.toString());
 
-		Assert.assertEquals("2019-12-30", date.toStringNormal());
+		assertEquals("2019-12-30", date.toStringNormal());
 	}
 
 	@Test
 	public void toStringNormalTest(){
 		ChineseDate date = new ChineseDate(DateUtil.parseDate("2020-03-1"));
-		Assert.assertEquals("2020-02-08", date.toStringNormal());
+		assertEquals("2020-02-08", date.toStringNormal());
 	}
 
 	@Test
 	public void parseTest(){
 		ChineseDate date = new ChineseDate(DateUtil.parseDate("1996-07-14"));
-		Assert.assertEquals("丙子鼠年 五月廿九", date.toString());
+		assertEquals("丙子鼠年 五月廿九", date.toString());
 
 		date = new ChineseDate(DateUtil.parseDate("1996-07-15"));
-		Assert.assertEquals("丙子鼠年 五月三十", date.toString());
+		assertEquals("丙子鼠年 五月三十", date.toString());
 	}
 
 	@Test
 	public void getChineseMonthTest(){
 		ChineseDate chineseDate = new ChineseDate(2020,6,15);
-		Assert.assertEquals("2020-08-04 00:00:00", chineseDate.getGregorianDate().toString());
-		Assert.assertEquals("六月", chineseDate.getChineseMonth());
+		assertEquals("2020-08-04 00:00:00", chineseDate.getGregorianDate().toString());
+		assertEquals("六月", chineseDate.getChineseMonth());
 
 		chineseDate = new ChineseDate(2020,4,15);
-		Assert.assertEquals("2020-06-06 00:00:00", chineseDate.getGregorianDate().toString());
-		Assert.assertEquals("闰四月", chineseDate.getChineseMonth());
+		assertEquals("2020-06-06 00:00:00", chineseDate.getGregorianDate().toString());
+		assertEquals("闰四月", chineseDate.getChineseMonth());
 
 		chineseDate = new ChineseDate(2020,5,15);
-		Assert.assertEquals("2020-07-05 00:00:00", chineseDate.getGregorianDate().toString());
-		Assert.assertEquals("五月", chineseDate.getChineseMonth());
+		assertEquals("2020-07-05 00:00:00", chineseDate.getGregorianDate().toString());
+		assertEquals("五月", chineseDate.getChineseMonth());
 	}
 
 	@Test
 	public void getFestivalsTest(){
 		// issue#I1XHSF@Gitee，2023-01-20对应农历腊月29，非除夕
 		ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("2023-01-20"));
-		Assert.assertTrue(StrUtil.isEmpty(chineseDate.getFestivals()));
+		assertTrue(StrUtil.isEmpty(chineseDate.getFestivals()));
 	}
 
 	@Test
@@ -77,23 +77,23 @@ public class ChineseDateTest {
 		// 修复这两个日期不正确的问题
 		// 问题出在计算与1900-01-31相差天数的问题上了，相差天数非整天
 		ChineseDate date = new ChineseDate(DateUtil.parseDate("1991-09-14"));
-		Assert.assertEquals("辛未羊年 八月初七", date.toString());
+		assertEquals("辛未羊年 八月初七", date.toString());
 		date = new ChineseDate(DateUtil.parseDate("1991-09-15"));
-		Assert.assertEquals("辛未羊年 八月初八", date.toString());
+		assertEquals("辛未羊年 八月初八", date.toString());
 	}
 
 	@Test
 	public void dateTest2(){
 		//noinspection ConstantConditions
 		ChineseDate date = new ChineseDate(DateUtil.parse("2020-10-19"));
-		Assert.assertEquals("庚子鼠年 九月初三", date.toString());
+		assertEquals("庚子鼠年 九月初三", date.toString());
 	}
 
 	@Test
 	public void dateTest2_2(){
 		//noinspection ConstantConditions
 		ChineseDate date = new ChineseDate(DateUtil.parse("2020-07-20"));
-		Assert.assertEquals("庚子鼠年 五月三十", date.toString());
+		assertEquals("庚子鼠年 五月三十", date.toString());
 	}
 
 	@Test
@@ -101,7 +101,7 @@ public class ChineseDateTest {
 		// 初一，offset为0测试
 		//noinspection ConstantConditions
 		ChineseDate date = new ChineseDate(DateUtil.parse("2099-03-22"));
-		Assert.assertEquals("己未羊年 闰二月初一", date.toString());
+		assertEquals("己未羊年 闰二月初一", date.toString());
 	}
 
 	@Test
@@ -111,8 +111,8 @@ public class ChineseDateTest {
 		//noinspection ConstantConditions
 		final ChineseDate c2 = new ChineseDate(DateUtil.parse("2028-06-27"));
 
-		Assert.assertEquals("戊申猴年 五月初五", c1.toString());
-		Assert.assertEquals("戊申猴年 闰五月初五", c2.toString());
+		assertEquals("戊申猴年 五月初五", c1.toString());
+		assertEquals("戊申猴年 闰五月初五", c2.toString());
 	}
 
 	@Test
@@ -120,7 +120,7 @@ public class ChineseDateTest {
 		//https://github.com/dromara/hutool/issues/2112
 		ChineseDate springFestival = new ChineseDate(DateUtil.parseDate("2022-02-01"));
 		final String chineseMonth = springFestival.getChineseMonth();
-		Assert.assertEquals("一月", chineseMonth);
+		assertEquals("一月", chineseMonth);
 	}
 
 	@Test
@@ -129,17 +129,17 @@ public class ChineseDateTest {
 		Date date = DateUtil.parse("1970-01-01");
 		//noinspection ConstantConditions
 		ChineseDate chineseDate = new ChineseDate(date);
-		Assert.assertEquals("己酉鸡年 冬月廿四", chineseDate.toString());
+		assertEquals("己酉鸡年 冬月廿四", chineseDate.toString());
 
 		date = DateUtil.parse("1970-01-02");
 		//noinspection ConstantConditions
 		chineseDate = new ChineseDate(date);
-		Assert.assertEquals("己酉鸡年 冬月廿五", chineseDate.toString());
+		assertEquals("己酉鸡年 冬月廿五", chineseDate.toString());
 
 		date = DateUtil.parse("1970-01-03");
 		//noinspection ConstantConditions
 		chineseDate = new ChineseDate(date);
-		Assert.assertEquals("己酉鸡年 冬月廿六", chineseDate.toString());
+		assertEquals("己酉鸡年 冬月廿六", chineseDate.toString());
 	}
 
 	@Test
@@ -148,16 +148,16 @@ public class ChineseDateTest {
 		Date date = DateUtil.parse("1900-01-31");
 		//noinspection ConstantConditions
 		ChineseDate chineseDate = new ChineseDate(date);
-		Assert.assertEquals("庚子鼠年 正月初一", chineseDate.toString());
+		assertEquals("庚子鼠年 正月初一", chineseDate.toString());
 	}
 
 	@Test
 	public void getGregorianDateTest(){
 		// https://gitee.com/dromara/hutool/issues/I4ZSGJ
 		ChineseDate chineseDate = new ChineseDate(1998, 5, 1);
-		Assert.assertEquals("1998-06-24 00:00:00", chineseDate.getGregorianDate().toString());
+		assertEquals("1998-06-24 00:00:00", chineseDate.getGregorianDate().toString());
 
 		chineseDate = new ChineseDate(1998, 5, 1, false);
-		Assert.assertEquals("1998-05-26 00:00:00", chineseDate.getGregorianDate().toString());
+		assertEquals("1998-05-26 00:00:00", chineseDate.getGregorianDate().toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java
index ec77f8c8e..afcdda170 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateBetweenTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.date.BetweenFormatter.Level;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -14,18 +14,18 @@ public class DateBetweenTest {
 		Date start = DateUtil.parse("2017-02-01 12:23:46");
 		Date end = DateUtil.parse("2018-02-01 12:23:46");
 		long betweenYear = new DateBetween(start, end).betweenYear(false);
-		Assert.assertEquals(1, betweenYear);
+		assertEquals(1, betweenYear);
 
 		Date start1 = DateUtil.parse("2017-02-01 12:23:46");
 		Date end1 = DateUtil.parse("2018-03-01 12:23:46");
 		long betweenYear1 = new DateBetween(start1, end1).betweenYear(false);
-		Assert.assertEquals(1, betweenYear1);
+		assertEquals(1, betweenYear1);
 
 		// 不足1年
 		Date start2 = DateUtil.parse("2017-02-01 12:23:46");
 		Date end2 = DateUtil.parse("2018-02-01 11:23:46");
 		long betweenYear2 = new DateBetween(start2, end2).betweenYear(false);
-		Assert.assertEquals(0, betweenYear2);
+		assertEquals(0, betweenYear2);
 	}
 
 	@Test
@@ -33,7 +33,7 @@ public class DateBetweenTest {
 		Date start = DateUtil.parse("2000-02-29");
 		Date end = DateUtil.parse("2018-02-28");
 		long betweenYear = new DateBetween(start, end).betweenYear(false);
-		Assert.assertEquals(18, betweenYear);
+		assertEquals(18, betweenYear);
 	}
 
 	@Test
@@ -41,18 +41,18 @@ public class DateBetweenTest {
 		Date start = DateUtil.parse("2017-02-01 12:23:46");
 		Date end = DateUtil.parse("2018-02-01 12:23:46");
 		long betweenMonth = new DateBetween(start, end).betweenMonth(false);
-		Assert.assertEquals(12, betweenMonth);
+		assertEquals(12, betweenMonth);
 
 		Date start1 = DateUtil.parse("2017-02-01 12:23:46");
 		Date end1 = DateUtil.parse("2018-03-01 12:23:46");
 		long betweenMonth1 = new DateBetween(start1, end1).betweenMonth(false);
-		Assert.assertEquals(13, betweenMonth1);
+		assertEquals(13, betweenMonth1);
 
 		// 不足
 		Date start2 = DateUtil.parse("2017-02-01 12:23:46");
 		Date end2 = DateUtil.parse("2018-02-01 11:23:46");
 		long betweenMonth2 = new DateBetween(start2, end2).betweenMonth(false);
-		Assert.assertEquals(11, betweenMonth2);
+		assertEquals(11, betweenMonth2);
 	}
 
 	@Test
@@ -60,7 +60,7 @@ public class DateBetweenTest {
 		Date date1 = DateUtil.parse("2017-03-01 20:33:23");
 		Date date2 = DateUtil.parse("2017-03-01 23:33:23");
 		String formatBetween = DateUtil.formatBetween(date1, date2, Level.SECOND);
-		Assert.assertEquals("3小时", formatBetween);
+		assertEquals("3小时", formatBetween);
 	}
 
 	@Test
@@ -73,7 +73,7 @@ public class DateBetweenTest {
 				LocalDateTimeUtil.parse("2020-11-21", "yyy-MM-dd"),
 				LocalDateTimeUtil.parse("2020-11-23", "yyy-MM-dd"),
 				ChronoUnit.WEEKS);
-		Assert.assertEquals(betweenWeek, betweenWeek2);
+		assertEquals(betweenWeek, betweenWeek2);
 	}
 
 	@Test
@@ -85,6 +85,6 @@ public class DateBetweenTest {
 		Date edate = DateUtil.parse(dateStr2);
 
 		long result = DateUtil.betweenYear(sdate, edate, false);
-		Assert.assertEquals(0, result);
+		assertEquals(0, result);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java
index 88310c2ef..45c44e307 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateFieldTest.java
@@ -1,15 +1,15 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DateFieldTest {
-	
+
 	@Test
 	public void ofTest() {
 		DateField field = DateField.of(11);
-		Assert.assertEquals(DateField.HOUR_OF_DAY, field);
+		assertEquals(DateField.HOUR_OF_DAY, field);
 		field = DateField.of(12);
-		Assert.assertEquals(DateField.MINUTE, field);
+		assertEquals(DateField.MINUTE, field);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java
index c1d5a8ab0..ff57777d4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateModifierTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.date;
 
 import java.util.Date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DateModifierTest {
 
@@ -14,49 +14,49 @@ public class DateModifierTest {
 
 		// 毫秒
 		DateTime begin = DateUtil.truncate(date, DateField.MILLISECOND);
-		Assert.assertEquals(dateStr, begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals(dateStr, begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 秒
 		begin = DateUtil.truncate(date, DateField.SECOND);
-		Assert.assertEquals("2017-03-01 22:33:23.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:33:23.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 分
 		begin = DateUtil.truncate(date, DateField.MINUTE);
-		Assert.assertEquals("2017-03-01 22:33:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:33:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 小时
 		begin = DateUtil.truncate(date, DateField.HOUR);
-		Assert.assertEquals("2017-03-01 22:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.truncate(date, DateField.HOUR_OF_DAY);
-		Assert.assertEquals("2017-03-01 22:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 上下午，原始日期是22点，上下午的起始就是12点
 		begin = DateUtil.truncate(date, DateField.AM_PM);
-		Assert.assertEquals("2017-03-01 12:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 12:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 天，day of xxx按照day处理
 		begin = DateUtil.truncate(date, DateField.DAY_OF_WEEK_IN_MONTH);
-		Assert.assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.truncate(date, DateField.DAY_OF_WEEK);
-		Assert.assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.truncate(date, DateField.DAY_OF_MONTH);
-		Assert.assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 星期
 		begin = DateUtil.truncate(date, DateField.WEEK_OF_MONTH);
-		Assert.assertEquals("2017-02-27 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-02-27 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.truncate(date, DateField.WEEK_OF_YEAR);
-		Assert.assertEquals("2017-02-27 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-02-27 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 月
 		begin = DateUtil.truncate(date, DateField.MONTH);
-		Assert.assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
-		
+		assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+
 		// 年
 		begin = DateUtil.truncate(date, DateField.YEAR);
-		Assert.assertEquals("2017-01-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-01-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
-	
+
 	@Test
 	public void truncateDayOfWeekInMonthTest() {
 		String dateStr = "2017-03-01 22:33:23.123";
@@ -64,7 +64,7 @@ public class DateModifierTest {
 
 		// 天，day of xxx按照day处理
 		DateTime begin = DateUtil.truncate(date, DateField.DAY_OF_WEEK_IN_MONTH);
-		Assert.assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 00:00:00.000", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
 
 	@Test
@@ -74,46 +74,46 @@ public class DateModifierTest {
 
 		// 毫秒
 		DateTime begin = DateUtil.ceiling(date, DateField.MILLISECOND);
-		Assert.assertEquals(dateStr, begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals(dateStr, begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 秒
 		begin = DateUtil.ceiling(date, DateField.SECOND);
-		Assert.assertEquals("2017-03-01 22:33:23.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:33:23.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 分
 		begin = DateUtil.ceiling(date, DateField.MINUTE);
-		Assert.assertEquals("2017-03-01 22:33:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:33:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 小时
 		begin = DateUtil.ceiling(date, DateField.HOUR);
-		Assert.assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.ceiling(date, DateField.HOUR_OF_DAY);
-		Assert.assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 上下午，原始日期是22点，上下午的结束就是23点
 		begin = DateUtil.ceiling(date, DateField.AM_PM);
-		Assert.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 天，day of xxx按照day处理
 		begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK_IN_MONTH);
-		Assert.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK);
-		Assert.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.ceiling(date, DateField.DAY_OF_MONTH);
-		Assert.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 星期
 		begin = DateUtil.ceiling(date, DateField.WEEK_OF_MONTH);
-		Assert.assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 		begin = DateUtil.ceiling(date, DateField.WEEK_OF_YEAR);
-		Assert.assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		// 月
 		begin = DateUtil.ceiling(date, DateField.MONTH);
-		Assert.assertEquals("2017-03-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
-		
+		assertEquals("2017-03-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+
 		// 年
 		begin = DateUtil.ceiling(date, DateField.YEAR);
-		Assert.assertEquals("2017-12-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2017-12-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java
index db42a5a59..c0fbe2394 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateTimeTest.java
@@ -1,7 +1,8 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * DateTime单元测试
@@ -17,19 +18,19 @@ public class DateTimeTest {
 
 		// 年
 		int year = dateTime.year();
-		Assert.assertEquals(2017, year);
+		assertEquals(2017, year);
 
 		// 季度（非季节）
 		Quarter season = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q1, season);
+		assertEquals(Quarter.Q1, season);
 
 		// 月份
 		Month month = dateTime.monthEnum();
-		Assert.assertEquals(Month.JANUARY, month);
+		assertEquals(Month.JANUARY, month);
 
 		// 日
 		int day = dateTime.dayOfMonth();
-		Assert.assertEquals(5, day);
+		assertEquals(5, day);
 	}
 
 	@Test
@@ -38,48 +39,48 @@ public class DateTimeTest {
 
 		// 年
 		int year = dateTime.year();
-		Assert.assertEquals(2017, year);
+		assertEquals(2017, year);
 
 		// 季度（非季节）
 		Quarter season = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q1, season);
+		assertEquals(Quarter.Q1, season);
 
 		// 月份
 		Month month = dateTime.monthEnum();
-		Assert.assertEquals(Month.JANUARY, month);
+		assertEquals(Month.JANUARY, month);
 
 		// 日
 		int day = dateTime.dayOfMonth();
-		Assert.assertEquals(5, day);
+		assertEquals(5, day);
 	}
 
 	@Test
 	public void quarterTest() {
 		DateTime dateTime = new DateTime("2017-01-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
 		Quarter quarter = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q1, quarter);
+		assertEquals(Quarter.Q1, quarter);
 
 		dateTime = new DateTime("2017-04-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
 		quarter = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q2, quarter);
+		assertEquals(Quarter.Q2, quarter);
 
 		dateTime = new DateTime("2017-07-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
 		quarter = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q3, quarter);
+		assertEquals(Quarter.Q3, quarter);
 
 		dateTime = new DateTime("2017-10-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
 		quarter = dateTime.quarterEnum();
-		Assert.assertEquals(Quarter.Q4, quarter);
+		assertEquals(Quarter.Q4, quarter);
 
 		// 精确到毫秒
 		DateTime beginTime = new DateTime("2017-10-01 00:00:00.000", DatePattern.NORM_DATETIME_MS_FORMAT);
 		dateTime = DateUtil.beginOfQuarter(dateTime);
-		Assert.assertEquals(beginTime, dateTime);
+		assertEquals(beginTime, dateTime);
 
 		// 精确到毫秒
 		DateTime endTime = new DateTime("2017-12-31 23:59:59.999", DatePattern.NORM_DATETIME_MS_FORMAT);
 		dateTime = DateUtil.endOfQuarter(dateTime);
-		Assert.assertEquals(endTime, dateTime);
+		assertEquals(endTime, dateTime);
 	}
 
 	@Test
@@ -88,21 +89,21 @@ public class DateTimeTest {
 
 		// 默认情况下DateTime为可变对象
 		DateTime offsite = dateTime.offset(DateField.YEAR, 0);
-		Assert.assertSame(offsite, dateTime);
+		assertSame(offsite, dateTime);
 
 		// 设置为不可变对象后变动将返回新对象
 		dateTime.setMutable(false);
 		offsite = dateTime.offset(DateField.YEAR, 0);
-		Assert.assertNotSame(offsite, dateTime);
+		assertNotSame(offsite, dateTime);
 	}
 
 	@Test
 	public void toStringTest() {
 		DateTime dateTime = new DateTime("2017-01-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
-		Assert.assertEquals("2017-01-05 12:34:23", dateTime.toString());
+		assertEquals("2017-01-05 12:34:23", dateTime.toString());
 
 		String dateStr = dateTime.toString("yyyy/MM/dd");
-		Assert.assertEquals("2017/01/05", dateStr);
+		assertEquals("2017/01/05", dateStr);
 	}
 
 	@Test
@@ -110,34 +111,36 @@ public class DateTimeTest {
 		DateTime dateTime = new DateTime("2017-01-05 12:34:23", DatePattern.NORM_DATETIME_FORMAT);
 
 		String dateStr = dateTime.toString(DatePattern.UTC_WITH_ZONE_OFFSET_PATTERN);
-		Assert.assertEquals("2017-01-05T12:34:23+0800", dateStr);
+		assertEquals("2017-01-05T12:34:23+0800", dateStr);
 
 		dateStr = dateTime.toString(DatePattern.UTC_WITH_XXX_OFFSET_PATTERN);
-		Assert.assertEquals("2017-01-05T12:34:23+08:00", dateStr);
+		assertEquals("2017-01-05T12:34:23+08:00", dateStr);
 	}
 
 	@Test
 	public void monthTest() {
 		//noinspection ConstantConditions
 		int month = DateUtil.parse("2017-07-01").month();
-		Assert.assertEquals(6, month);
+		assertEquals(6, month);
 	}
 
 	@Test
 	public void weekOfYearTest() {
 		DateTime date = DateUtil.parse("2016-12-27");
 		//noinspection ConstantConditions
-		Assert.assertEquals(2016, date.year());
+		assertEquals(2016, date.year());
 		//跨年的周返回的总是1
-		Assert.assertEquals(1, date.weekOfYear());
+		assertEquals(1, date.weekOfYear());
 	}
 
 	/**
 	 * 严格模式下，不允许非常规的数字，如秒部分最多59，99则报错
 	 */
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void ofTest(){
-		String a = "2021-09-27 00:00:99";
-		new DateTime(a, DatePattern.NORM_DATETIME_FORMAT, false);
+		assertThrows(IllegalArgumentException.class, () -> {
+			String a = "2021-09-27 00:00:99";
+			new DateTime(a, DatePattern.NORM_DATETIME_FORMAT, false);
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
index 1af34ca29..3a535a7c9 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
@@ -5,8 +5,7 @@ import cn.hutool.core.date.BetweenFormatter.Level;
 import cn.hutool.core.date.format.FastDateFormat;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -14,15 +13,9 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
-import java.util.TimeZone;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * 时间工具单元测试<br>
@@ -40,20 +33,20 @@ public class DateUtilTest {
 	public void nowTest() {
 		// 当前时间
 		final Date date = DateUtil.date();
-		Assert.assertNotNull(date);
+		assertNotNull(date);
 		// 当前时间
 		final Date date2 = DateUtil.date(Calendar.getInstance());
-		Assert.assertNotNull(date2);
+		assertNotNull(date2);
 		// 当前时间
 		final Date date3 = DateUtil.date(System.currentTimeMillis());
-		Assert.assertNotNull(date3);
+		assertNotNull(date3);
 
 		// 当前日期字符串，格式：yyyy-MM-dd HH:mm:ss
 		final String now = DateUtil.now();
-		Assert.assertNotNull(now);
+		assertNotNull(now);
 		// 当前日期字符串，格式：yyyy-MM-dd
 		final String today = DateUtil.today();
-		Assert.assertNotNull(today);
+		assertNotNull(today);
 	}
 
 	@Test
@@ -62,15 +55,15 @@ public class DateUtilTest {
 		final Date date = DateUtil.parse(dateStr);
 
 		final String format = DateUtil.format(date, "yyyy/MM/dd");
-		Assert.assertEquals("2017/03/01", format);
+		assertEquals("2017/03/01", format);
 
 		// 常用格式的格式化
 		final String formatDate = DateUtil.formatDate(date);
-		Assert.assertEquals("2017-03-01", formatDate);
+		assertEquals("2017-03-01", formatDate);
 		final String formatDateTime = DateUtil.formatDateTime(date);
-		Assert.assertEquals("2017-03-01 00:00:00", formatDateTime);
+		assertEquals("2017-03-01 00:00:00", formatDateTime);
 		final String formatTime = DateUtil.formatTime(date);
-		Assert.assertEquals("00:00:00", formatTime);
+		assertEquals("00:00:00", formatTime);
 	}
 
 	@Test
@@ -79,10 +72,10 @@ public class DateUtilTest {
 		final Date date = DateUtil.parse(dateStr);
 
 		final String format = DateUtil.format(date, "#sss");
-		Assert.assertEquals("1488297600", format);
+		assertEquals("1488297600", format);
 
 		final DateTime parse = DateUtil.parse(format, "#sss");
-		Assert.assertEquals(date, parse);
+		assertEquals(date, parse);
 	}
 
 	@Test
@@ -91,10 +84,10 @@ public class DateUtilTest {
 		final Date date = DateUtil.parse(dateStr);
 
 		final String format = DateUtil.format(date, "#SSS");
-		Assert.assertEquals("1488297600000", format);
+		assertEquals("1488297600000", format);
 
 		final DateTime parse = DateUtil.parse(format, "#SSS");
-		Assert.assertEquals(date, parse);
+		assertEquals(date, parse);
 	}
 
 	@Test
@@ -104,16 +97,16 @@ public class DateUtilTest {
 
 		// 一天的开始
 		final Date beginOfDay = DateUtil.beginOfDay(date);
-		Assert.assertEquals("2017-03-01 00:00:00", beginOfDay.toString());
+		assertEquals("2017-03-01 00:00:00", beginOfDay.toString());
 		// 一天的结束
 		final Date endOfDay = DateUtil.endOfDay(date);
-		Assert.assertEquals("2017-03-01 23:59:59", endOfDay.toString());
+		assertEquals("2017-03-01 23:59:59", endOfDay.toString());
 	}
 
 	@Test
 	public void endOfDayTest() {
 		final DateTime parse = DateUtil.parse("2020-05-31 00:00:00");
-		Assert.assertEquals("2020-05-31 23:59:59", DateUtil.endOfDay(parse).toString());
+		assertEquals("2020-05-31 23:59:59", DateUtil.endOfDay(parse).toString());
 	}
 
 	@Test
@@ -121,7 +114,7 @@ public class DateUtilTest {
 		final String dateStr2 = "2020-02-29 12:59:34";
 		final Date date2 = DateUtil.parse(dateStr2);
 		final DateTime dateTime = DateUtil.truncate(date2, DateField.MINUTE);
-		Assert.assertEquals("2020-02-29 12:59:00", dateTime.toString());
+		assertEquals("2020-02-29 12:59:00", dateTime.toString());
 	}
 
 	@Test
@@ -131,10 +124,10 @@ public class DateUtilTest {
 
 
 		DateTime dateTime = DateUtil.ceiling(date2, DateField.MINUTE);
-		Assert.assertEquals("2020-02-29 12:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2020-02-29 12:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		dateTime = DateUtil.ceiling(date2, DateField.MINUTE, true);
-		Assert.assertEquals("2020-02-29 12:59:59.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2020-02-29 12:59:59.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
 
 	@Test
@@ -144,10 +137,10 @@ public class DateUtilTest {
 
 
 		DateTime dateTime = DateUtil.ceiling(date2, DateField.DAY_OF_MONTH);
-		Assert.assertEquals("2020-02-29 23:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2020-02-29 23:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		dateTime = DateUtil.ceiling(date2, DateField.DAY_OF_MONTH, true);
-		Assert.assertEquals("2020-02-29 23:59:59.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertEquals("2020-02-29 23:59:59.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
 
 	@Test
@@ -158,18 +151,18 @@ public class DateUtilTest {
 
 		// 一周的开始
 		final Date beginOfWeek = DateUtil.beginOfWeek(date);
-		Assert.assertEquals("2017-02-27 00:00:00", beginOfWeek.toString());
+		assertEquals("2017-02-27 00:00:00", beginOfWeek.toString());
 		// 一周的结束
 		final Date endOfWeek = DateUtil.endOfWeek(date);
-		Assert.assertEquals("2017-03-05 23:59:59", endOfWeek.toString());
+		assertEquals("2017-03-05 23:59:59", endOfWeek.toString());
 
 		final Calendar calendar = DateUtil.calendar(date);
 		// 一周的开始
 		final Calendar begin = DateUtil.beginOfWeek(calendar);
-		Assert.assertEquals("2017-02-27 00:00:00", DateUtil.date(begin).toString());
+		assertEquals("2017-02-27 00:00:00", DateUtil.date(begin).toString());
 		// 一周的结束
 		final Calendar end = DateUtil.endOfWeek(calendar);
-		Assert.assertEquals("2017-03-05 23:59:59", DateUtil.date(end).toString());
+		assertEquals("2017-03-05 23:59:59", DateUtil.date(end).toString());
 	}
 
 	@Test
@@ -178,11 +171,11 @@ public class DateUtilTest {
 		final DateTime date = DateUtil.parseDate(beginStr);
 		final Calendar calendar = date.toCalendar();
 		final Calendar begin = DateUtil.beginOfWeek(calendar, false);
-		Assert.assertEquals("2020-03-08 00:00:00", DateUtil.date(begin).toString());
+		assertEquals("2020-03-08 00:00:00", DateUtil.date(begin).toString());
 
 		final Calendar calendar2 = date.toCalendar();
 		final Calendar end = DateUtil.endOfWeek(calendar2, false);
-		Assert.assertEquals("2020-03-14 23:59:59", DateUtil.date(end).toString());
+		assertEquals("2020-03-14 23:59:59", DateUtil.date(end).toString());
 	}
 
 	@Test
@@ -191,19 +184,23 @@ public class DateUtilTest {
 		final Date date = DateUtil.parse(dateStr);
 
 		final Date newDate = DateUtil.offset(date, DateField.DAY_OF_MONTH, 2);
-		Assert.assertEquals("2017-03-03 22:33:23", newDate.toString());
+		assertNotNull(newDate);
+		assertEquals("2017-03-03 22:33:23", newDate.toString());
 
 		// 偏移天
 		final DateTime newDate2 = DateUtil.offsetDay(date, 3);
-		Assert.assertEquals("2017-03-04 22:33:23", newDate2.toString());
+		assertNotNull(newDate2);
+		assertEquals("2017-03-04 22:33:23", newDate2.toString());
 
 		// 偏移小时
 		final DateTime newDate3 = DateUtil.offsetHour(date, -3);
-		Assert.assertEquals("2017-03-01 19:33:23", newDate3.toString());
+		assertNotNull(newDate3);
+		assertEquals("2017-03-01 19:33:23", newDate3.toString());
 
 		// 偏移月
 		final DateTime offsetMonth = DateUtil.offsetMonth(date, -1);
-		Assert.assertEquals("2017-02-01 22:33:23", offsetMonth.toString());
+		assertNotNull(offsetMonth);
+		assertEquals("2017-02-01 22:33:23", offsetMonth.toString());
 	}
 
 	@Test
@@ -213,10 +210,10 @@ public class DateUtilTest {
 		for (int i = 0; i < 4; i++) {
 			list.add(DateUtil.offsetMonth(st, i));
 		}
-		Assert.assertEquals("2018-05-31 00:00:00", list.get(0).toString());
-		Assert.assertEquals("2018-06-30 00:00:00", list.get(1).toString());
-		Assert.assertEquals("2018-07-31 00:00:00", list.get(2).toString());
-		Assert.assertEquals("2018-08-31 00:00:00", list.get(3).toString());
+		assertEquals("2018-05-31 00:00:00", list.get(0).toString());
+		assertEquals("2018-06-30 00:00:00", list.get(1).toString());
+		assertEquals("2018-07-31 00:00:00", list.get(2).toString());
+		assertEquals("2018-08-31 00:00:00", list.get(3).toString());
 	}
 
 	@Test
@@ -229,75 +226,75 @@ public class DateUtilTest {
 
 		// 相差月
 		long betweenMonth = DateUtil.betweenMonth(date1, date2, false);
-		Assert.assertEquals(1, betweenMonth);// 相差一个月
+		assertEquals(1, betweenMonth);// 相差一个月
 		// 反向
 		betweenMonth = DateUtil.betweenMonth(date2, date1, false);
-		Assert.assertEquals(1, betweenMonth);// 相差一个月
+		assertEquals(1, betweenMonth);// 相差一个月
 
 		// 相差天
 		long betweenDay = DateUtil.between(date1, date2, DateUnit.DAY);
-		Assert.assertEquals(31, betweenDay);// 相差一个月，31天
+		assertEquals(31, betweenDay);// 相差一个月，31天
 		// 反向
 		betweenDay = DateUtil.between(date2, date1, DateUnit.DAY);
-		Assert.assertEquals(31, betweenDay);// 相差一个月，31天
+		assertEquals(31, betweenDay);// 相差一个月，31天
 
 		// 相差小时
 		long betweenHour = DateUtil.between(date1, date2, DateUnit.HOUR);
-		Assert.assertEquals(745, betweenHour);
+		assertEquals(745, betweenHour);
 		// 反向
 		betweenHour = DateUtil.between(date2, date1, DateUnit.HOUR);
-		Assert.assertEquals(745, betweenHour);
+		assertEquals(745, betweenHour);
 
 		// 相差分
 		long betweenMinute = DateUtil.between(date1, date2, DateUnit.MINUTE);
-		Assert.assertEquals(44721, betweenMinute);
+		assertEquals(44721, betweenMinute);
 		// 反向
 		betweenMinute = DateUtil.between(date2, date1, DateUnit.MINUTE);
-		Assert.assertEquals(44721, betweenMinute);
+		assertEquals(44721, betweenMinute);
 
 		// 相差秒
 		long betweenSecond = DateUtil.between(date1, date2, DateUnit.SECOND);
-		Assert.assertEquals(2683311, betweenSecond);
+		assertEquals(2683311, betweenSecond);
 		// 反向
 		betweenSecond = DateUtil.between(date2, date1, DateUnit.SECOND);
-		Assert.assertEquals(2683311, betweenSecond);
+		assertEquals(2683311, betweenSecond);
 
 		// 相差秒
 		long betweenMS = DateUtil.between(date1, date2, DateUnit.MS);
-		Assert.assertEquals(2683311000L, betweenMS);
+		assertEquals(2683311000L, betweenMS);
 		// 反向
 		betweenMS = DateUtil.between(date2, date1, DateUnit.MS);
-		Assert.assertEquals(2683311000L, betweenMS);
+		assertEquals(2683311000L, betweenMS);
 	}
 
 	@Test
 	public void betweenTest2() {
 		final long between = DateUtil.between(DateUtil.parse("2019-05-06 02:15:00"), DateUtil.parse("2019-05-06 02:20:00"), DateUnit.HOUR);
-		Assert.assertEquals(0, between);
+		assertEquals(0, between);
 	}
 
 	@Test
 	public void betweenTest3() {
 		final long between = DateUtil.between(DateUtil.parse("2020-03-31 23:59:59"), DateUtil.parse("2020-04-01 00:00:00"), DateUnit.SECOND);
-		Assert.assertEquals(1, between);
+		assertEquals(1, between);
 	}
 
 	@Test
 	public void formatChineseDateTest() {
 		String formatChineseDate = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24"), true, false);
-		Assert.assertEquals("二〇一八年二月二十四日", formatChineseDate);
+		assertEquals("二〇一八年二月二十四日", formatChineseDate);
 
 		formatChineseDate = DateUtil.formatChineseDate(DateUtil.parse("2018-02-14"), true, false);
-		Assert.assertEquals("二〇一八年二月十四日", formatChineseDate);
+		assertEquals("二〇一八年二月十四日", formatChineseDate);
 	}
 
 	@Test
 	public void formatChineseDateTimeTest() {
 		String formatChineseDateTime = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24 12:13:14"), true, true);
-		Assert.assertEquals("二〇一八年二月二十四日十二时十三分十四秒", formatChineseDateTime);
+		assertEquals("二〇一八年二月二十四日十二时十三分十四秒", formatChineseDateTime);
 
 		formatChineseDateTime = DateUtil.formatChineseDate(DateUtil.parse("2022-01-18 12:00:00"), true, true);
-		Assert.assertEquals("二〇二二年一月十八日十二时零分零秒", formatChineseDateTime);
+		assertEquals("二〇二二年一月十八日十二时零分零秒", formatChineseDateTime);
 	}
 
 	@Test
@@ -310,7 +307,7 @@ public class DateUtilTest {
 
 		final long between = DateUtil.between(date1, date2, DateUnit.MS);
 		final String formatBetween = DateUtil.formatBetween(between, Level.MINUTE);
-		Assert.assertEquals("31天1小时21分", formatBetween);
+		assertEquals("31天1小时21分", formatBetween);
 	}
 
 	@Test
@@ -330,46 +327,46 @@ public class DateUtilTest {
 	public void currentTest() {
 		final long current = DateUtil.current();
 		final String currentStr = String.valueOf(current);
-		Assert.assertEquals(13, currentStr.length());
+		assertEquals(13, currentStr.length());
 
 		final long currentNano = DateUtil.current();
 		final String currentNanoStr = String.valueOf(currentNano);
-		Assert.assertNotNull(currentNanoStr);
+		assertNotNull(currentNanoStr);
 	}
 
 	@Test
 	public void weekOfYearTest() {
 		// 第一周周日
 		final int weekOfYear1 = DateUtil.weekOfYear(DateUtil.parse("2016-01-03"));
-		Assert.assertEquals(1, weekOfYear1);
+		assertEquals(1, weekOfYear1);
 
 		// 第二周周四
 		final int weekOfYear2 = DateUtil.weekOfYear(DateUtil.parse("2016-01-07"));
-		Assert.assertEquals(2, weekOfYear2);
+		assertEquals(2, weekOfYear2);
 	}
 
 	@Test
 	public void timeToSecondTest() {
 		int second = DateUtil.timeToSecond("00:01:40");
-		Assert.assertEquals(100, second);
+		assertEquals(100, second);
 		second = DateUtil.timeToSecond("00:00:40");
-		Assert.assertEquals(40, second);
+		assertEquals(40, second);
 		second = DateUtil.timeToSecond("01:00:00");
-		Assert.assertEquals(3600, second);
+		assertEquals(3600, second);
 		second = DateUtil.timeToSecond("00:00:00");
-		Assert.assertEquals(0, second);
+		assertEquals(0, second);
 	}
 
 	@Test
 	public void secondToTimeTest() {
 		String time = DateUtil.secondToTime(3600);
-		Assert.assertEquals("01:00:00", time);
+		assertEquals("01:00:00", time);
 		time = DateUtil.secondToTime(3800);
-		Assert.assertEquals("01:03:20", time);
+		assertEquals("01:03:20", time);
 		time = DateUtil.secondToTime(0);
-		Assert.assertEquals("00:00:00", time);
+		assertEquals("00:00:00", time);
 		time = DateUtil.secondToTime(30);
-		Assert.assertEquals("00:00:30", time);
+		assertEquals("00:00:30", time);
 	}
 
 	@Test
@@ -378,7 +375,7 @@ public class DateUtilTest {
 		final String s2 = "55:00:50";
 		final int i = DateUtil.timeToSecond(s1) + DateUtil.timeToSecond(s2);
 		final String s = DateUtil.secondToTime(i);
-		Assert.assertEquals("110:03:08", s);
+		assertEquals("110:03:08", s);
 	}
 
 	@Test
@@ -388,7 +385,7 @@ public class DateUtilTest {
 		final Date birthDate = DateUtil.parse(birthday, "yyMMdd");
 		// 获取出生年(完全表现形式,如：2010)
 		final int sYear = DateUtil.year(birthDate);
-		Assert.assertEquals(1970, sYear);
+		assertEquals(1970, sYear);
 	}
 
 	@Test
@@ -396,13 +393,13 @@ public class DateUtilTest {
 		final String dateStr = "2018-10-10 12:11:11";
 		final Date date = DateUtil.parse(dateStr);
 		final String format = DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN);
-		Assert.assertEquals(dateStr, format);
+		assertEquals(dateStr, format);
 	}
 
 	@Test
 	public void parseTest4() {
 		final String ymd = DateUtil.parse("2019-3-21 12:20:15", "yyyy-MM-dd").toString(DatePattern.PURE_DATE_PATTERN);
-		Assert.assertEquals("20190321", ymd);
+		assertEquals("20190321", ymd);
 	}
 
 	@Test
@@ -410,33 +407,33 @@ public class DateUtilTest {
 		// 测试时间解析
 		//noinspection ConstantConditions
 		String time = DateUtil.parse("22:12:12").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("22:12:12", time);
+		assertEquals("22:12:12", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("2:12:12").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("02:12:12", time);
+		assertEquals("02:12:12", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("2:2:12").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("02:02:12", time);
+		assertEquals("02:02:12", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("2:2:1").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("02:02:01", time);
+		assertEquals("02:02:01", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("22:2:1").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("22:02:01", time);
+		assertEquals("22:02:01", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("2:22:1").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("02:22:01", time);
+		assertEquals("02:22:01", time);
 
 		// 测试两位时间解析
 		//noinspection ConstantConditions
 		time = DateUtil.parse("2:22").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("02:22:00", time);
+		assertEquals("02:22:00", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("12:22").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("12:22:00", time);
+		assertEquals("12:22:00", time);
 		//noinspection ConstantConditions
 		time = DateUtil.parse("12:2").toString(DatePattern.NORM_TIME_FORMAT);
-		Assert.assertEquals("12:02:00", time);
+		assertEquals("12:02:00", time);
 
 	}
 
@@ -445,7 +442,7 @@ public class DateUtilTest {
 		final String str = "Tue Jun 4 16:25:15 +0800 2019";
 		final DateTime dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-06-04 16:25:15", dateTime.toString());
+		assertEquals("2019-06-04 16:25:15", dateTime.toString());
 	}
 
 	@Test
@@ -453,12 +450,12 @@ public class DateUtilTest {
 		String str = "2019-06-01T19:45:43.000 +0800";
 		DateTime dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-06-01 19:45:43", dateTime.toString());
+		assertEquals("2019-06-01 19:45:43", dateTime.toString());
 
 		str = "2019-06-01T19:45:43 +08:00";
 		dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-06-01 19:45:43", dateTime.toString());
+		assertEquals("2019-06-01 19:45:43", dateTime.toString());
 	}
 
 	@Test
@@ -466,7 +463,7 @@ public class DateUtilTest {
 		final String str = "2020-06-28T02:14:13.000Z";
 		final DateTime dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2020-06-28 02:14:13", dateTime.toString());
+		assertEquals("2020-06-28 02:14:13", dateTime.toString());
 	}
 
 	/**
@@ -476,23 +473,23 @@ public class DateUtilTest {
 	public void parseNormFullTest() {
 		String str = "2020-02-06 01:58:00.000020";
 		DateTime dateTime = DateUtil.parse(str);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2020-02-06 01:58:00.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertNotNull(dateTime);
+		assertEquals("2020-02-06 01:58:00.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		str = "2020-02-06 01:58:00.00002";
 		dateTime = DateUtil.parse(str);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2020-02-06 01:58:00.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertNotNull(dateTime);
+		assertEquals("2020-02-06 01:58:00.000", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		str = "2020-02-06 01:58:00.111000";
 		dateTime = DateUtil.parse(str);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2020-02-06 01:58:00.111", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertNotNull(dateTime);
+		assertEquals("2020-02-06 01:58:00.111", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 
 		str = "2020-02-06 01:58:00.111";
 		dateTime = DateUtil.parse(str);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2020-02-06 01:58:00.111", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
+		assertNotNull(dateTime);
+		assertEquals("2020-02-06 01:58:00.111", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
 	}
 
 	/**
@@ -502,7 +499,7 @@ public class DateUtilTest {
 	public void parseEmptyTest() {
 		final String str = " ";
 		final DateTime dateTime = DateUtil.parse(str);
-		Assert.assertNull(dateTime);
+		assertNull(dateTime);
 	}
 
 	@Test
@@ -511,12 +508,12 @@ public class DateUtilTest {
 		String str = "2019-06-01T19:45:43+08:00";
 		DateTime dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-06-01 19:45:43", dateTime.toString());
+		assertEquals("2019-06-01 19:45:43", dateTime.toString());
 
 		str = "2019-06-01T19:45:43 +08:00";
 		dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-06-01 19:45:43", dateTime.toString());
+		assertEquals("2019-06-01 19:45:43", dateTime.toString());
 	}
 
 	@Test
@@ -525,10 +522,10 @@ public class DateUtilTest {
 		final String str = "2019-09-17T13:26:17.948Z";
 		final DateTime dateTime = DateUtil.parse(str);
 		assert dateTime != null;
-		Assert.assertEquals("2019-09-17 13:26:17", dateTime.toString());
+		assertEquals("2019-09-17 13:26:17", dateTime.toString());
 
 		final DateTime offset = DateUtil.offsetHour(dateTime, 8);
-		Assert.assertEquals("2019-09-17 21:26:17", offset.toString());
+		assertEquals("2019-09-17 21:26:17", offset.toString());
 	}
 
 	@Test
@@ -536,7 +533,7 @@ public class DateUtilTest {
 		final String dateStr = "2018-4-10";
 		final Date date = DateUtil.parseDate(dateStr);
 		final String format = DateUtil.format(date, DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("2018-04-10", format);
+		assertEquals("2018-04-10", format);
 	}
 
 	@Test
@@ -550,9 +547,9 @@ public class DateUtilTest {
 		final DateTime dt2 = DateUtil.parse(dateStr2);
 		final DateTime dt3 = DateUtil.parse(dateStr3);
 		final DateTime dt4 = DateUtil.parse(dateStr4);
-		Assert.assertEquals(dt1, dt2);
-		Assert.assertEquals(dt2, dt3);
-		Assert.assertEquals(dt3, dt4);
+		assertEquals(dt1, dt2);
+		assertEquals(dt2, dt3);
+		assertEquals(dt3, dt4);
 	}
 
 	@Test
@@ -566,9 +563,9 @@ public class DateUtilTest {
 		final DateTime dt2 = DateUtil.parse(dateStr2);
 		final DateTime dt3 = DateUtil.parse(dateStr3);
 		final DateTime dt4 = DateUtil.parse(dateStr4);
-		Assert.assertEquals(dt1, dt2);
-		Assert.assertEquals(dt2, dt3);
-		Assert.assertEquals(dt3, dt4);
+		assertEquals(dt1, dt2);
+		assertEquals(dt2, dt3);
+		assertEquals(dt3, dt4);
 	}
 
 	@Test
@@ -582,9 +579,9 @@ public class DateUtilTest {
 		final DateTime dt2 = DateUtil.parse(dateStr2);
 		final DateTime dt3 = DateUtil.parse(dateStr3);
 		final DateTime dt4 = DateUtil.parse(dateStr4);
-		Assert.assertEquals(dt1, dt2);
-		Assert.assertEquals(dt2, dt3);
-		Assert.assertEquals(dt3, dt4);
+		assertEquals(dt1, dt2);
+		assertEquals(dt2, dt3);
+		assertEquals(dt3, dt4);
 	}
 
 	@Test
@@ -594,7 +591,7 @@ public class DateUtilTest {
 
 		final DateTime dt1 = DateUtil.parse(dateStr1);
 		final DateTime dt2 = DateUtil.parse(dateStr2);
-		Assert.assertEquals(dt1, dt2);
+		assertEquals(dt1, dt2);
 	}
 
 	@Test
@@ -604,7 +601,7 @@ public class DateUtilTest {
 
 		final DateTime dt1 = DateUtil.parse(dateStr1);
 		final DateTime dt2 = DateUtil.parse(dateStr2);
-		Assert.assertEquals(dt1, dt2);
+		assertEquals(dt1, dt2);
 	}
 
 	@Test
@@ -614,68 +611,68 @@ public class DateUtilTest {
 
 		// parse方法支持UTC格式测试
 		final DateTime dt2 = DateUtil.parse(dateStr1);
-		Assert.assertEquals(dt, dt2);
+		assertEquals(dt, dt2);
 
 		// 默认使用Pattern对应的时区，即UTC时区
 		String dateStr = dt.toString();
-		Assert.assertEquals("2018-09-13 05:34:31", dateStr);
+		assertEquals("2018-09-13 05:34:31", dateStr);
 
 		// 使用当前（上海）时区
 		dateStr = dt.toString(TimeZone.getTimeZone("GMT+8:00"));
-		Assert.assertEquals("2018-09-13 13:34:31", dateStr);
+		assertEquals("2018-09-13 13:34:31", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:32+0800";
 		dt = DateUtil.parseUTC(dateStr1);
 		dateStr = dt.toString(TimeZone.getTimeZone("GMT+8:00"));
-		Assert.assertEquals("2018-09-13 13:34:32", dateStr);
+		assertEquals("2018-09-13 13:34:32", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:33+08:00";
 		dt = DateUtil.parseUTC(dateStr1);
 		dateStr = dt.toString(TimeZone.getTimeZone("GMT+8:00"));
-		Assert.assertEquals("2018-09-13 13:34:33", dateStr);
+		assertEquals("2018-09-13 13:34:33", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:34+0800";
 		dt = DateUtil.parse(dateStr1);
 		assert dt != null;
 		dateStr = dt.toString(TimeZone.getTimeZone("GMT+8:00"));
-		Assert.assertEquals("2018-09-13 13:34:34", dateStr);
+		assertEquals("2018-09-13 13:34:34", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:35+08:00";
 		dt = DateUtil.parse(dateStr1);
 		assert dt != null;
 		dateStr = dt.toString(TimeZone.getTimeZone("GMT+8:00"));
-		Assert.assertEquals("2018-09-13 13:34:35", dateStr);
+		assertEquals("2018-09-13 13:34:35", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:36.999+0800";
 		dt = DateUtil.parseUTC(dateStr1);
 		final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(DatePattern.NORM_DATETIME_MS_PATTERN);
 		simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
 		dateStr = dt.toString(simpleDateFormat);
-		Assert.assertEquals("2018-09-13 13:34:36.999", dateStr);
+		assertEquals("2018-09-13 13:34:36.999", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:37.999+08:00";
 		dt = DateUtil.parseUTC(dateStr1);
 		dateStr = dt.toString(simpleDateFormat);
-		Assert.assertEquals("2018-09-13 13:34:37.999", dateStr);
+		assertEquals("2018-09-13 13:34:37.999", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:38.999+0800";
 		dt = DateUtil.parse(dateStr1);
 		assert dt != null;
 		dateStr = dt.toString(simpleDateFormat);
-		Assert.assertEquals("2018-09-13 13:34:38.999", dateStr);
+		assertEquals("2018-09-13 13:34:38.999", dateStr);
 
 		dateStr1 = "2018-09-13T13:34:39.999+08:00";
 		dt = DateUtil.parse(dateStr1);
 		assert dt != null;
 		dateStr = dt.toString(simpleDateFormat);
-		Assert.assertEquals("2018-09-13 13:34:39.999", dateStr);
+		assertEquals("2018-09-13 13:34:39.999", dateStr);
 
 		// 使用UTC时区
 		dateStr1 = "2018-09-13T13:34:39.99";
 		dt = DateUtil.parse(dateStr1);
 		assert dt != null;
 		dateStr = dt.toString();
-		Assert.assertEquals("2018-09-13 13:34:39", dateStr);
+		assertEquals("2018-09-13 13:34:39", dateStr);
 	}
 
 	@Test
@@ -684,15 +681,15 @@ public class DateUtilTest {
 		// 检查不同毫秒长度都可以正常匹配
 		String utcTime = "2021-03-30T12:56:51.3Z";
 		DateTime parse = DateUtil.parseUTC(utcTime);
-		Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
+		assertEquals("2021-03-30 12:56:51", parse.toString());
 
 		utcTime = "2021-03-30T12:56:51.34Z";
 		parse = DateUtil.parseUTC(utcTime);
-		Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
+		assertEquals("2021-03-30 12:56:51", parse.toString());
 
 		utcTime = "2021-03-30T12:56:51.345Z";
 		parse = DateUtil.parseUTC(utcTime);
-		Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
+		assertEquals("2021-03-30 12:56:51", parse.toString());
 	}
 
 	@Test
@@ -700,8 +697,8 @@ public class DateUtilTest {
 		// issue#I5M6DP
 		final String dateStr = "2022-08-13T09:30";
 		final DateTime dateTime = DateUtil.parse(dateStr);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2022-08-13 09:30:00", dateTime.toString());
+		assertNotNull(dateTime);
+		assertEquals("2022-08-13 09:30:00", dateTime.toString());
 	}
 
 	@Test
@@ -714,10 +711,10 @@ public class DateUtilTest {
 		final DateTime parse = DateUtil.parse(dateStr, sdf);
 
 		DateTime dateTime = DateUtil.parseRFC2822(dateStr);
-		Assert.assertEquals(parse, dateTime);
+		assertEquals(parse, dateTime);
 
 		dateTime = DateUtil.parse(dateStr);
-		Assert.assertEquals(parse, dateTime);
+		assertEquals(parse, dateTime);
 	}
 
 	@Test
@@ -731,21 +728,21 @@ public class DateUtilTest {
 		final FastDateFormat fdf = FastDateFormat.getInstance(DatePattern.JDK_DATETIME_PATTERN, TimeZone.getTimeZone("America/Chicago"), Locale.US);
 		final DateTime parse2 = DateUtil.parse(dateStr, fdf);
 
-		Assert.assertEquals(parse, parse2);
+		assertEquals(parse, parse2);
 	}
 
 	@Test
 	public void parseJDkTest() {
 		final String dateStr = "Thu May 16 17:57:18 GMT+08:00 2019";
 		final DateTime time = DateUtil.parse(dateStr);
-		Assert.assertEquals("2019-05-16 17:57:18", Objects.requireNonNull(time).toString());
+		assertEquals("2019-05-16 17:57:18", Objects.requireNonNull(time).toString());
 	}
 
 	@Test
 	public void parseISOTest() {
 		final String dateStr = "2020-04-23T02:31:00.000Z";
 		final DateTime time = DateUtil.parse(dateStr);
-		Assert.assertEquals("2020-04-23 02:31:00", Objects.requireNonNull(time).toString());
+		assertEquals("2020-04-23 02:31:00", Objects.requireNonNull(time).toString());
 	}
 
 	@Test
@@ -753,7 +750,7 @@ public class DateUtilTest {
 		final DateTime date = DateUtil.date();
 		date.setField(DateField.YEAR, 2019);
 		final DateTime endOfYear = DateUtil.endOfYear(date);
-		Assert.assertEquals("2019-12-31 23:59:59", endOfYear.toString());
+		assertEquals("2019-12-31 23:59:59", endOfYear.toString());
 	}
 
 	@Test
@@ -761,7 +758,7 @@ public class DateUtilTest {
 		final Date date = DateUtil.endOfQuarter(
 				DateUtil.parse("2020-05-31 00:00:00"));
 
-		Assert.assertEquals("2020-06-30 23:59:59", DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"));
+		assertEquals("2020-06-30 23:59:59", DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"));
 	}
 
 	@Test
@@ -770,21 +767,21 @@ public class DateUtilTest {
 		final DateTime now = DateUtil.parse("2019-09-15 13:00");
 
 		final DateTime startOfWeek = DateUtil.beginOfWeek(now);
-		Assert.assertEquals("2019-09-09 00:00:00", startOfWeek.toString());
+		assertEquals("2019-09-09 00:00:00", startOfWeek.toString());
 		final DateTime endOfWeek = DateUtil.endOfWeek(now);
-		Assert.assertEquals("2019-09-15 23:59:59", endOfWeek.toString());
+		assertEquals("2019-09-15 23:59:59", endOfWeek.toString());
 
 		final long between = DateUtil.between(endOfWeek, startOfWeek, DateUnit.DAY);
 		// 周一和周日相距6天
-		Assert.assertEquals(6, between);
+		assertEquals(6, between);
 	}
 
 	@Test
 	public void dayOfWeekTest() {
 		final int dayOfWeek = DateUtil.dayOfWeek(DateUtil.parse("2018-03-07"));
-		Assert.assertEquals(Calendar.WEDNESDAY, dayOfWeek);
+		assertEquals(Calendar.WEDNESDAY, dayOfWeek);
 		final Week week = DateUtil.dayOfWeekEnum(DateUtil.parse("2018-03-07"));
-		Assert.assertEquals(Week.WEDNESDAY, week);
+		assertEquals(Week.WEDNESDAY, week);
 	}
 
 	@Test
@@ -792,53 +789,53 @@ public class DateUtilTest {
 		final Date date1 = DateUtil.parse("2021-04-13 23:59:59.999");
 		final Date date2 = DateUtil.parse("2021-04-13 23:59:10");
 
-		Assert.assertEquals(1, DateUtil.compare(date1, date2));
-		Assert.assertEquals(1, DateUtil.compare(date1, date2, DatePattern.NORM_DATETIME_PATTERN));
-		Assert.assertEquals(0, DateUtil.compare(date1, date2, DatePattern.NORM_DATE_PATTERN));
-		Assert.assertEquals(0, DateUtil.compare(date1, date2, DatePattern.NORM_DATETIME_MINUTE_PATTERN));
+		assertEquals(1, DateUtil.compare(date1, date2));
+		assertEquals(1, DateUtil.compare(date1, date2, DatePattern.NORM_DATETIME_PATTERN));
+		assertEquals(0, DateUtil.compare(date1, date2, DatePattern.NORM_DATE_PATTERN));
+		assertEquals(0, DateUtil.compare(date1, date2, DatePattern.NORM_DATETIME_MINUTE_PATTERN));
 
 
 		final Date date11 = DateUtil.parse("2021-04-13 23:59:59.999");
 		final Date date22 = DateUtil.parse("2021-04-11 23:10:10");
-		Assert.assertEquals(0, DateUtil.compare(date11, date22, DatePattern.NORM_MONTH_PATTERN));
+		assertEquals(0, DateUtil.compare(date11, date22, DatePattern.NORM_MONTH_PATTERN));
 	}
 
 	@Test
 	public void yearAndQTest() {
 		final String yearAndQuarter = DateUtil.yearAndQuarter(DateUtil.parse("2018-12-01"));
-		Assert.assertEquals("20184", yearAndQuarter);
+		assertEquals("20184", yearAndQuarter);
 
 		final LinkedHashSet<String> yearAndQuarters = DateUtil.yearAndQuarter(DateUtil.parse("2018-09-10"), DateUtil.parse("2018-12-20"));
 		final List<String> list = CollUtil.list(false, yearAndQuarters);
-		Assert.assertEquals(2, list.size());
-		Assert.assertEquals("20183", list.get(0));
-		Assert.assertEquals("20184", list.get(1));
+		assertEquals(2, list.size());
+		assertEquals("20183", list.get(0));
+		assertEquals("20184", list.get(1));
 
 		final LinkedHashSet<String> yearAndQuarters2 = DateUtil.yearAndQuarter(DateUtil.parse("2018-10-10"), DateUtil.parse("2018-12-10"));
 		final List<String> list2 = CollUtil.list(false, yearAndQuarters2);
-		Assert.assertEquals(1, list2.size());
-		Assert.assertEquals("20184", list2.get(0));
+		assertEquals(1, list2.size());
+		assertEquals("20184", list2.get(0));
 	}
 
 	@Test
 	public void formatHttpDateTest() {
 		final String formatHttpDate = DateUtil.formatHttpDate(DateUtil.parse("2019-01-02 22:32:01"));
-		Assert.assertEquals("Wed, 02 Jan 2019 14:32:01 GMT", formatHttpDate);
+		assertEquals("Wed, 02 Jan 2019 14:32:01 GMT", formatHttpDate);
 	}
 
 	@Test
 	public void toInstantTest() {
 		final LocalDateTime localDateTime = LocalDateTime.parse("2017-05-06T08:30:00", DateTimeFormatter.ISO_DATE_TIME);
 		Instant instant = DateUtil.toInstant(localDateTime);
-		Assert.assertEquals("2017-05-06T00:30:00Z", instant.toString());
+		assertEquals("2017-05-06T00:30:00Z", instant.toString());
 
 		final LocalDate localDate = localDateTime.toLocalDate();
 		instant = DateUtil.toInstant(localDate);
-		Assert.assertNotNull(instant);
+		assertNotNull(instant);
 
 		final LocalTime localTime = localDateTime.toLocalTime();
 		instant = DateUtil.toInstant(localTime);
-		Assert.assertNotNull(instant);
+		assertNotNull(instant);
 	}
 
 	@Test
@@ -846,12 +843,12 @@ public class DateUtilTest {
 		//LocalDateTime ==> date
 		final LocalDateTime localDateTime = LocalDateTime.parse("2017-05-06T08:30:00", DateTimeFormatter.ISO_DATE_TIME);
 		final DateTime date = DateUtil.date(localDateTime);
-		Assert.assertEquals("2017-05-06 08:30:00", date.toString());
+		assertEquals("2017-05-06 08:30:00", date.toString());
 
 		//LocalDate ==> date
 		final LocalDate localDate = localDateTime.toLocalDate();
 		final DateTime date2 = DateUtil.date(localDate);
-		Assert.assertEquals("2017-05-06",
+		assertEquals("2017-05-06",
 				DateUtil.format(date2, DatePattern.NORM_DATE_PATTERN));
 	}
 
@@ -860,7 +857,7 @@ public class DateUtilTest {
 		// 测试负数日期
 		final long dateLong = -1497600000;
 		final DateTime date = DateUtil.date(dateLong);
-		Assert.assertEquals("1969-12-15 00:00:00", date.toString());
+		assertEquals("1969-12-15 00:00:00", date.toString());
 	}
 
 	@Test
@@ -870,14 +867,16 @@ public class DateUtilTest {
 		final int age = DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
 
 		// issue#I6E6ZG，法定生日当天不算年龄，从第二天开始计算
-		Assert.assertEquals(17, age);
+		assertEquals(17, age);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void ageTest2() {
-		final String d1 = "2019-02-29";
-		final String d2 = "2018-02-28";
-		DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
+		assertThrows(IllegalArgumentException.class, () -> {
+			final String d1 = "2019-02-29";
+			final String d2 = "2018-02-28";
+			DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
+		});
 	}
 
 	@Test
@@ -888,7 +887,7 @@ public class DateUtilTest {
 		final String d2 = "2000-02-29";
 		final int age = DateUtil.age(DateUtil.parse(d1), DateUtil.parse(d2));
 		// issue#I6E6ZG，法定生日当天不算年龄，从第二天开始计算
-		Assert.assertEquals(2, age);
+		assertEquals(2, age);
 	}
 
 	@Test
@@ -899,7 +898,7 @@ public class DateUtilTest {
 		final String d2 = "2000-02-29";
 		final int age = DateUtil.age(DateUtil.parse(d1), DateUtil.parse(d2));
 		// issue#I6E6ZG，法定生日当天不算年龄，从第二天开始计算
-		Assert.assertEquals(1, age);
+		assertEquals(1, age);
 	}
 
 	@Test
@@ -909,7 +908,7 @@ public class DateUtilTest {
 		final int length = 3;
 		//noinspection deprecation
 		final boolean expired = DateUtil.isExpired(startDate, DateField.DAY_OF_YEAR, length, endDate);
-		Assert.assertTrue(expired);
+		assertTrue(expired);
 	}
 
 	@Test
@@ -918,12 +917,12 @@ public class DateUtilTest {
 		final String strDate = "2019-12-01 17:02:30";
 		LocalDateTime ldt = DateUtil.parseLocalDateTime(strDate);
 		String strDate1 = DateUtil.formatLocalDateTime(ldt);
-		Assert.assertEquals(strDate, strDate1);
+		assertEquals(strDate, strDate1);
 
 		final String strDate2 = "2019-12-01 17:02:30.111";
 		ldt = DateUtil.parseLocalDateTime(strDate2, DatePattern.NORM_DATETIME_MS_PATTERN);
 		strDate1 = DateUtil.format(ldt, DatePattern.NORM_DATETIME_PATTERN);
-		Assert.assertEquals(strDate, strDate1);
+		assertEquals(strDate, strDate1);
 	}
 
 	@Test
@@ -931,7 +930,7 @@ public class DateUtilTest {
 		// 测试字符串与LocalDateTime的互相转换
 		final String strDate = "2019-12-01";
 		final LocalDateTime localDateTime = DateUtil.parseLocalDateTime(strDate, "yyyy-MM-dd");
-		Assert.assertEquals(strDate, DateUtil.format(localDateTime, DatePattern.NORM_DATE_PATTERN));
+		assertEquals(strDate, DateUtil.format(localDateTime, DatePattern.NORM_DATE_PATTERN));
 	}
 
 	@Test
@@ -940,7 +939,7 @@ public class DateUtilTest {
 		final DateTime end = DateUtil.parse("2019-10-05");
 
 		final long weekCount = DateUtil.betweenWeek(start, end, true);
-		Assert.assertEquals(30L, weekCount);
+		assertEquals(30L, weekCount);
 	}
 
 	@Test
@@ -950,7 +949,7 @@ public class DateUtilTest {
 			final long betweenDay = DateUtil.betweenDay(
 					DateUtil.parseDate("1970-01-01"),
 					DateUtil.parseDate(datr), false);
-			Assert.assertEquals(Math.abs(LocalDate.parse(datr).toEpochDay()), betweenDay);
+			assertEquals(Math.abs(LocalDate.parse(datr).toEpochDay()), betweenDay);
 		}
 	}
 
@@ -960,37 +959,37 @@ public class DateUtilTest {
 			DateUtil.parse("2024-03-01"),
 			DateUtil.parse("2024-03-31"), true);
 
-		Assert.assertEquals(30, betweenDay);
+		assertEquals(30, betweenDay);
 	}
 
 	@Test
 	public void dayOfYearTest() {
 		final int dayOfYear = DateUtil.dayOfYear(DateUtil.parse("2020-01-01"));
-		Assert.assertEquals(1, dayOfYear);
+		assertEquals(1, dayOfYear);
 		final int lengthOfYear = DateUtil.lengthOfYear(2020);
-		Assert.assertEquals(366, lengthOfYear);
+		assertEquals(366, lengthOfYear);
 	}
 
 	@SuppressWarnings("ConstantConditions")
 	@Test
 	public void parseSingleNumberTest() {
 		DateTime dateTime = DateUtil.parse("2020-5-08");
-		Assert.assertEquals("2020-05-08 00:00:00", dateTime.toString());
+		assertEquals("2020-05-08 00:00:00", dateTime.toString());
 		dateTime = DateUtil.parse("2020-5-8");
-		Assert.assertEquals("2020-05-08 00:00:00", dateTime.toString());
+		assertEquals("2020-05-08 00:00:00", dateTime.toString());
 		dateTime = DateUtil.parse("2020-05-8");
-		Assert.assertEquals("2020-05-08 00:00:00", dateTime.toString());
+		assertEquals("2020-05-08 00:00:00", dateTime.toString());
 
 		//datetime
 		dateTime = DateUtil.parse("2020-5-8 3:12:3");
-		Assert.assertEquals("2020-05-08 03:12:03", dateTime.toString());
+		assertEquals("2020-05-08 03:12:03", dateTime.toString());
 		dateTime = DateUtil.parse("2020-5-8 3:2:3");
-		Assert.assertEquals("2020-05-08 03:02:03", dateTime.toString());
+		assertEquals("2020-05-08 03:02:03", dateTime.toString());
 		dateTime = DateUtil.parse("2020-5-8 3:12:13");
-		Assert.assertEquals("2020-05-08 03:12:13", dateTime.toString());
+		assertEquals("2020-05-08 03:12:13", dateTime.toString());
 
 		dateTime = DateUtil.parse("2020-5-8 4:12:26.223");
-		Assert.assertEquals("2020-05-08 04:12:26", dateTime.toString());
+		assertEquals("2020-05-08 04:12:26", dateTime.toString());
 	}
 
 	@SuppressWarnings("ConstantConditions")
@@ -998,14 +997,16 @@ public class DateUtilTest {
 	public void parseISO8601Test() {
 		final String dt = "2020-06-03 12:32:12,333";
 		final DateTime parse = DateUtil.parse(dt);
-		Assert.assertEquals("2020-06-03 12:32:12", parse.toString());
+		assertEquals("2020-06-03 12:32:12", parse.toString());
 	}
 
-	@Test(expected = DateException.class)
+	@Test
 	public void parseNotFitTest() {
 		//https://github.com/dromara/hutool/issues/1332
-		// 在日期格式不匹配的时候，测试是否正常报错
-		DateUtil.parse("2020-12-23", DatePattern.PURE_DATE_PATTERN);
+		assertThrows(DateException.class, () -> {
+			// 在日期格式不匹配的时候，测试是否正常报错
+			DateUtil.parse("2020-12-23", DatePattern.PURE_DATE_PATTERN);
+		});
 	}
 
 	@Test
@@ -1014,60 +1015,60 @@ public class DateUtilTest {
 		calendar.set(2021, Calendar.JULY, 14, 23, 59, 59);
 		final Date date = new DateTime(calendar);
 
-		Assert.assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_FORMATTER));
-		Assert.assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_FORMAT));
-		Assert.assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN));
+		assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_FORMATTER));
+		assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_FORMAT));
+		assertEquals("2021-07-14 23:59:59", DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN));
 	}
 
 	@Test
 	public void formatNormDateTimeFormatterTest() {
 		String format = DateUtil.format(DateUtil.parse("2021-07-14 10:05:38"), DatePattern.NORM_DATETIME_FORMATTER);
-		Assert.assertEquals("2021-07-14 10:05:38", format);
+		assertEquals("2021-07-14 10:05:38", format);
 
 		format = DateUtil.format(LocalDateTimeUtil.parse("2021-07-14T10:05:38"),
 				"yyyy-MM-dd HH:mm:ss");
-		Assert.assertEquals("2021-07-14 10:05:38", format);
+		assertEquals("2021-07-14 10:05:38", format);
 	}
 
 	@Test
 	public void isWeekendTest() {
 		DateTime parse = DateUtil.parse("2021-07-28");
-		Assert.assertFalse(DateUtil.isWeekend(parse));
+		assertFalse(DateUtil.isWeekend(parse));
 
 		parse = DateUtil.parse("2021-07-25");
-		Assert.assertTrue(DateUtil.isWeekend(parse));
+		assertTrue(DateUtil.isWeekend(parse));
 		parse = DateUtil.parse("2021-07-24");
-		Assert.assertTrue(DateUtil.isWeekend(parse));
+		assertTrue(DateUtil.isWeekend(parse));
 	}
 
 	@Test
 	public void parseSingleMonthAndDayTest() {
 		DateTime parse = DateUtil.parse("2021-1-1");
-		Assert.assertNotNull(parse);
-		Assert.assertEquals("2021-01-01 00:00:00", parse.toString());
+		assertNotNull(parse);
+		assertEquals("2021-01-01 00:00:00", parse.toString());
 
 		parse = DateUtil.parse("2021-1-22 00:00:00");
-		Assert.assertNotNull(parse);
-		Assert.assertEquals("2021-01-22 00:00:00", parse.toString());
+		assertNotNull(parse);
+		assertEquals("2021-01-22 00:00:00", parse.toString());
 	}
 
 	@Test
 	public void parseByDateTimeFormatterTest() {
 		final DateTime parse = DateUtil.parse("2021-12-01", DatePattern.NORM_DATE_FORMATTER);
-		Assert.assertEquals("2021-12-01 00:00:00", parse.toString());
+		assertEquals("2021-12-01 00:00:00", parse.toString());
 	}
 
 	@Test
 	public void isSameWeekTest() {
 		// 周六与周日比较
 		final boolean isSameWeek = DateUtil.isSameWeek(DateTime.of("2022-01-01", "yyyy-MM-dd"), DateTime.of("2022-01-02", "yyyy-MM-dd"), true);
-		Assert.assertTrue(isSameWeek);
+		assertTrue(isSameWeek);
 		// 周日与周一比较
 		final boolean isSameWeek1 = DateUtil.isSameWeek(DateTime.of("2022-01-02", "yyyy-MM-dd"), DateTime.of("2022-01-03", "yyyy-MM-dd"), false);
-		Assert.assertTrue(isSameWeek1);
+		assertTrue(isSameWeek1);
 		// 跨月比较
 		final boolean isSameWeek2 = DateUtil.isSameWeek(DateTime.of("2021-12-29", "yyyy-MM-dd"), DateTime.of("2022-01-01", "yyyy-MM-dd"), true);
-		Assert.assertTrue(isSameWeek2);
+		assertTrue(isSameWeek2);
 	}
 
 	@Test
@@ -1098,17 +1099,17 @@ public class DateUtilTest {
 		final DateTime startTime  = DateUtil.parse("2022-03-23 05:00:00");
 		final DateTime endTime    = DateUtil.parse("2022-03-23 13:00:00");
 
-		Assert.assertFalse(DateUtil.isOverlap(oneStartTime, oneEndTime, realStartTime, realEndTime));
-		Assert.assertFalse(DateUtil.isOverlap(oneStartTime2, oneEndTime2, realStartTime, realEndTime));
-		Assert.assertTrue(DateUtil.isOverlap(oneStartTime3, oneEndTime3, realStartTime, realEndTime));
+		assertFalse(DateUtil.isOverlap(oneStartTime, oneEndTime, realStartTime, realEndTime));
+		assertFalse(DateUtil.isOverlap(oneStartTime2, oneEndTime2, realStartTime, realEndTime));
+		assertTrue(DateUtil.isOverlap(oneStartTime3, oneEndTime3, realStartTime, realEndTime));
 
-		Assert.assertFalse(DateUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
-		Assert.assertFalse(DateUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
+		assertFalse(DateUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
+		assertFalse(DateUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
 
-		Assert.assertTrue(DateUtil.isOverlap(startTime,startTime,startTime,startTime));
-		Assert.assertTrue(DateUtil.isOverlap(startTime,startTime,startTime,endTime));
-		Assert.assertFalse(DateUtil.isOverlap(startTime,startTime,endTime,endTime));
-		Assert.assertTrue(DateUtil.isOverlap(startTime,endTime,endTime,endTime));
+		assertTrue(DateUtil.isOverlap(startTime,startTime,startTime,startTime));
+		assertTrue(DateUtil.isOverlap(startTime,startTime,startTime,endTime));
+		assertFalse(DateUtil.isOverlap(startTime,startTime,endTime,endTime));
+		assertTrue(DateUtil.isOverlap(startTime,endTime,endTime,endTime));
 	}
 
 	@Test
@@ -1119,7 +1120,7 @@ public class DateUtilTest {
 		final DateTime oneStartTime2 = DateUtil.parseDate("2019-04-05");
 		final DateTime oneEndTime2 = DateUtil.parseDate("2021-04-05");
 
-		Assert.assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, oneStartTime2, oneEndTime2));
+		assertTrue(DateUtil.isOverlap(oneStartTime, oneEndTime, oneStartTime2, oneEndTime2));
 	}
 
 	@Test
@@ -1130,15 +1131,16 @@ public class DateUtilTest {
 		final boolean between = DateUtil.isIn(DateUtil.parse(startTimeStr),
 				DateUtil.parse(endTimeStr),
 				DateUtil.parse(sourceStr));
-		Assert.assertTrue(between);
+		assertTrue(between);
 	}
 
 	@Test
 	public void isLastDayTest() {
 		final DateTime dateTime = DateUtil.parse("2022-09-30");
+		assertNotNull(dateTime);
 		final int dayOfMonth = DateUtil.getLastDayOfMonth(dateTime);
-		Assert.assertEquals(dayOfMonth, dateTime.dayOfMonth());
-		Assert.assertTrue("not is last day of this month !!", DateUtil.isLastDayOfMonth(dateTime));
+		assertEquals(dayOfMonth, dateTime.dayOfMonth());
+		assertTrue(DateUtil.isLastDayOfMonth(dateTime));
 	}
 
 
@@ -1149,45 +1151,45 @@ public class DateUtilTest {
 	public void parseUTCTest4() {
 		final String dateStr = "2023-02-07T00:02:16.12345+08:00";
 		final DateTime dateTime = DateUtil.parse(dateStr);
-		Assert.assertNotNull(dateTime);
-		Assert.assertEquals("2023-02-07 00:02:16", dateTime.toString());
+		assertNotNull(dateTime);
+		assertEquals("2023-02-07 00:02:16", dateTime.toString());
 
 		final String dateStr2 = "2023-02-07T00:02:16.12345-08:00";
 		final DateTime dateTime2 = DateUtil.parse(dateStr2);
-		Assert.assertNotNull(dateTime2);
-		Assert.assertEquals("2023-02-07 00:02:16", dateTime2.toString());
+		assertNotNull(dateTime2);
+		assertEquals("2023-02-07 00:02:16", dateTime2.toString());
 
 		final String dateStr3 = "2021-03-17T06:31:33.9999";
 		final DateTime dateTime3 = DateUtil.parse(dateStr3);
-		Assert.assertNotNull(dateTime3);
-		Assert.assertEquals("2021-03-17 06:31:33", dateTime3.toString());
+		assertNotNull(dateTime3);
+		assertEquals("2021-03-17 06:31:33", dateTime3.toString());
 	}
 
 	@Test
 	public void calendarTest() {
 		final Date date = DateUtil.date();
 		final Calendar c = DateUtil.calendar(date);
-		Assert.assertEquals(DateUtil.date(c), date);
+		assertEquals(DateUtil.date(c), date);
 	}
 
 	@Test
 	public void issueI7H34NTest() {
 		final DateTime parse = DateUtil.parse("2019-10-22T09:56:03.000123Z");
-		Assert.assertNotNull(parse);
-		Assert.assertEquals("2019-10-22 09:56:03", parse.toString());
+		assertNotNull(parse);
+		assertEquals("2019-10-22 09:56:03", parse.toString());
 	}
 
 	@Test
 	public void issueI8NMP7Test() {
 		final String str = "1702262524444";
 		final DateTime parse = DateUtil.parse(str);
-		Assert.assertEquals("2023-12-11 10:42:04", Objects.requireNonNull(parse).toString());
+		assertEquals("2023-12-11 10:42:04", Objects.requireNonNull(parse).toString());
 	}
 
 	@Test
 	public void formatSpeedTest(){
 		Date value = new Date();
-		long t0 = System.currentTimeMillis();
+		//long t0 = System.currentTimeMillis();
 		//此处先加载FastDateFormat对象，保存到FastDateFormat.CACHE中
 		//解决后面两个for循环中保存到FastDateFormat对象创建未时差异的问题。
 		FastDateFormat.getInstance("YYYY-MM-dd HH:mm:ss.SSS");
@@ -1197,19 +1199,21 @@ public class DateUtilTest {
 		for(int i=0; i<50000; i++){
 			strTime = DateUtil.format(value, "YYYY-MM-dd HH:mm:ss.SSS");
 		}
+		assertNotNull(strTime);
 		long t2 = System.currentTimeMillis();
 
 		for(int i=0; i<50000; i++){
 			strTime = FastDateFormat.getInstance("YYYY-MM-dd HH:mm:ss.SSS").format(value);
 		}
+		assertNotNull(strTime);
 		long t3 = System.currentTimeMillis();
 
-		long initTime = t1 - t0;
+		//long initTime = t1 - t0;
 		long formtTime1 = t2 - t1;
 		long formatTime2 = t3 - t2;
 
 		//此处仍然不明白，两个for循环实际执行format方法都一样，为什么第1个for时间大致是第2个for的3倍。
-		Assert.assertTrue(formtTime1 > formatTime2);
+		assertTrue(formtTime1 > formatTime2);
 
 		/*
 		 * 		System.out.println("t1-t0="+(t1-t0));
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/FastDateFormatTest.java b/hutool-core/src/test/java/cn/hutool/core/date/FastDateFormatTest.java
index 46d67cbcf..ff7548acb 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/FastDateFormatTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/FastDateFormatTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.date.format.FastDateFormat;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class FastDateFormatTest {
 	private static final TimeZone timezone = TimeZone.getTimeZone("Etc/Utc");
@@ -41,6 +41,7 @@ public class FastDateFormatTest {
 		);
 	}
 
+	@SuppressWarnings("SuspiciousDateFormat")
 	@Test
 	public void weekYearTest() {
 		Date date = DateUtil.date(0L);
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java b/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java
index 274d8ea0a..66489c2d7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java
@@ -1,14 +1,14 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.date.chinese.GanZhi;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class GanzhiTest {
 
 	@Test
 	public void getGanzhiOfYearTest(){
-		Assert.assertEquals("庚子", GanZhi.getGanzhiOfYear(2020));
+		assertEquals("庚子", GanZhi.getGanzhiOfYear(2020));
 	}
 
 	@Test
@@ -16,7 +16,7 @@ public class GanzhiTest {
 		//通过公历构建
 		ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("1993-01-06"));
 		String cyclicalYMD = chineseDate.getCyclicalYMD();
-		Assert.assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
+		assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
 	}
 
 	@Test
@@ -24,7 +24,7 @@ public class GanzhiTest {
 		//通过农历构建
 		ChineseDate chineseDate = new ChineseDate(1992,12,14);
 		String cyclicalYMD = chineseDate.getCyclicalYMD();
-		Assert.assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
+		assertEquals("壬申年癸丑月丁亥日",cyclicalYMD);
 	}
 
 	@Test
@@ -32,7 +32,7 @@ public class GanzhiTest {
 		//通过公历构建
 		ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("2020-08-28"));
 		String cyclicalYMD = chineseDate.getCyclicalYMD();
-		Assert.assertEquals("庚子年甲申月癸卯日",cyclicalYMD);
+		assertEquals("庚子年甲申月癸卯日",cyclicalYMD);
 	}
 
 	@Test
@@ -40,6 +40,6 @@ public class GanzhiTest {
 		//通过公历构建
 		ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate("1905-08-28"));
 		String cyclicalYMD = chineseDate.getCyclicalYMD();
-		Assert.assertEquals("乙巳年甲申月己亥日",cyclicalYMD);
+		assertEquals("乙巳年甲申月己亥日",cyclicalYMD);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java
index 9f285eb00..4363f4c47 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue2612Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
 
@@ -9,10 +9,10 @@ public class Issue2612Test {
 
 	@Test
 	public void parseTest(){
-		Assert.assertEquals("2022-09-14 23:59:00",
+		assertEquals("2022-09-14 23:59:00",
 				Objects.requireNonNull(DateUtil.parse("2022-09-14T23:59:00-08:00")).toString());
 
-		Assert.assertEquals("2022-09-14 23:59:00",
+		assertEquals("2022-09-14 23:59:00",
 				Objects.requireNonNull(DateUtil.parse("2022-09-14T23:59:00-0800")).toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java
index 432459ff0..f8dced6f7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue2981Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2981Test {
 	/**
@@ -15,8 +15,8 @@ public class Issue2981Test {
 		final String str2 = "2019-01-01T00:00:00.000";
 		final String str3 = "2019-01-01 00:00:00.000";
 
-		Assert.assertEquals(1546300800000L, DateUtil.parse(str1).getTime());
-		Assert.assertEquals(1546272000000L, DateUtil.parse(str2).getTime());
-		Assert.assertEquals(1546272000000L, DateUtil.parse(str3).getTime());
+		assertEquals(1546300800000L, DateUtil.parse(str1).getTime());
+		assertEquals(1546272000000L, DateUtil.parse(str2).getTime());
+		assertEquals(1546272000000L, DateUtil.parse(str3).getTime());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java
index d28f81f76..6bb69b89c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue3011Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 
@@ -18,6 +18,6 @@ public class Issue3011Test {
 		calendar2.set(2021, Calendar.FEBRUARY, 12);
 
 
-		Assert.assertFalse(DateUtil.isSameMonth(calendar1, calendar2));
+		assertFalse(DateUtil.isSameMonth(calendar1, calendar2));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3036Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue3036Test.java
index 95029a833..8023dc133 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3036Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue3036Test.java
@@ -12,11 +12,15 @@
 
 package cn.hutool.core.date;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class Issue3036Test {
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void getZodiacTest() {
-		DateUtil.getZodiac(Month.UNDECIMBER.getValue(), 10);
+		assertThrows(IllegalArgumentException.class, () -> {
+			DateUtil.getZodiac(Month.UNDECIMBER.getValue(), 10);
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3301Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue3301Test.java
index a3fa2523a..0d9a6568d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3301Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue3301Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
@@ -17,6 +17,6 @@ public class Issue3301Test {
 		TemporalAccessor temporal = DateTimeFormatter.ISO_INSTANT.parse(text);
 
 		LocalDateTime actual = LocalDateTimeUtil.of(temporal);
-		Assert.assertEquals(now.toLocalDateTime().toString(), actual.toString());
+		assertEquals(now.toLocalDateTime().toString(), actual.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3348Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue3348Test.java
index 67f2cdc8c..389abd053 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3348Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue3348Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3348Test {
 
@@ -11,6 +11,6 @@ public class Issue3348Test {
 		final String formatChineseDate = DateUtil.formatChineseDate(
 			DateUtil.parse("2023-10-23"), true, false);
 		Console.log(formatChineseDate);
-		Assert.assertEquals("二〇二三年十月二十三日", formatChineseDate);
+		assertEquals("二〇二三年十月二十三日", formatChineseDate);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/Issue3608Test.java b/hutool-core/src/test/java/cn/hutool/core/date/Issue3608Test.java
index 4e1580a48..3de2924c9 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/Issue3608Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/Issue3608Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.date;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -11,7 +11,7 @@ import java.util.TimeZone;
 
 public class Issue3608Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void parseTest() throws ParseException {
 		String dateTime = "1940-06-01 00:00:00";
 		final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/IssueI7QI6RTest.java b/hutool-core/src/test/java/cn/hutool/core/date/IssueI7QI6RTest.java
index d2e47b69c..bd5910bdb 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/IssueI7QI6RTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/IssueI7QI6RTest.java
@@ -12,16 +12,22 @@
 
 package cn.hutool.core.date;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IssueI7QI6RTest {
-	@Test(expected = DateException.class)
+	@Test
 	public void parseTest() {
-		DateUtil.parse("2023-08-04 1");
+		assertThrows(DateException.class, () -> {
+			DateUtil.parse("2023-08-04 1");
+		});
 	}
 
-	@Test(expected = DateException.class)
+	@Test
 	public void parseTest2() {
-		DateUtil.parse("2023-08-04-1");
+		assertThrows(DateException.class, () -> {
+			DateUtil.parse("2023-08-04-1");
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/IssueI7XMYWTest.java b/hutool-core/src/test/java/cn/hutool/core/date/IssueI7XMYWTest.java
index a5645f818..3343cec13 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/IssueI7XMYWTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/IssueI7XMYWTest.java
@@ -12,16 +12,16 @@
 
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI7XMYWTest {
 	@Test
 	public void ageTest() {
 		DateTime date1 = DateUtil.parse("2023-08-31");
-		Assert.assertEquals(49, DateUtil.age(DateUtil.parse("1973-08-31"), date1));
+		assertEquals(49, DateUtil.age(DateUtil.parse("1973-08-31"), date1));
 
 		date1 = DateUtil.parse("2023-08-30");
-		Assert.assertEquals(49, DateUtil.age(DateUtil.parse("1973-08-30"), date1));
+		assertEquals(49, DateUtil.age(DateUtil.parse("1973-08-30"), date1));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/IssueI82Y1LTest.java b/hutool-core/src/test/java/cn/hutool/core/date/IssueI82Y1LTest.java
index 0e847f4f3..6024fd553 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/IssueI82Y1LTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/IssueI82Y1LTest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI82Y1LTest {
 	@Test
 	public void parseTest() {
 		final String dt1 = "2023-09-14T05:00:03.648519Z";
-		Assert.assertEquals("2023-09-14 05:10:51", DateUtil.parse(dt1).toString());
+		assertEquals("2023-09-14 05:10:51", DateUtil.parse(dt1).toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/IssueI97WU6Test.java b/hutool-core/src/test/java/cn/hutool/core/date/IssueI97WU6Test.java
index 468b3bc4e..44dc4ceaf 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/IssueI97WU6Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/IssueI97WU6Test.java
@@ -1,14 +1,14 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI97WU6Test {
 	@Test
 	public void getTermTest() {
 		// 润十月没有三十，十月有三十
 		final ChineseDate chineseDate = new ChineseDate(1984, 10, 30, false);
-		Assert.assertEquals("甲子鼠年 寒月三十", chineseDate.toString());
-		Assert.assertEquals("小雪", chineseDate.getTerm());
+		assertEquals("甲子鼠年 寒月三十", chineseDate.toString());
+		assertEquals("小雪", chineseDate.getTerm());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/IssueI9C2D4Test.java b/hutool-core/src/test/java/cn/hutool/core/date/IssueI9C2D4Test.java
index a9ef0b193..1ef0e2e93 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/IssueI9C2D4Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/IssueI9C2D4Test.java
@@ -1,34 +1,34 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI9C2D4Test {
 	@Test
 	public void parseHttpTest() {
 		String dateStr = "Thu, 28 Mar 2024 14:33:49 GMT";
 		final DateTime parse = DateUtil.parse(dateStr);
-		Assert.assertEquals("2024-03-28 14:33:49", parse.toString());
+		assertEquals("2024-03-28 14:33:49", parse.toString());
 	}
 
 	@Test
 	public void parseHttpTest2() {
 		String dateStr = "星期四, 28 三月 2024 14:33:49 GMT";
 		final DateTime parse = DateUtil.parse(dateStr);
-		Assert.assertEquals("2024-03-28 14:33:49", parse.toString());
+		assertEquals("2024-03-28 14:33:49", parse.toString());
 	}
 
 	@Test
 	public void parseTimeTest() {
 		String dateStr = "15时45分59秒";
 		final DateTime parse = DateUtil.parse(dateStr);
-		Assert.assertEquals("15:45:59", parse.toString().split(" ")[1]);
+		assertEquals("15:45:59", parse.toString().split(" ")[1]);
 	}
 
 	@Test
 	public void parseTimeTest2() {
 		String dateStr = "15:45:59";
 		final DateTime parse = DateUtil.parse(dateStr);
-		Assert.assertEquals("15:45:59", parse.toString().split(" ")[1]);
+		assertEquals("15:45:59", parse.toString().split(" ")[1]);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
index 6bae06b96..0c7f9c963 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/LocalDateTimeUtilTest.java
@@ -1,7 +1,6 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -12,11 +11,13 @@ import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class LocalDateTimeUtilTest {
 
 	@Test
 	public void nowTest() {
-		Assert.assertNotNull(LocalDateTimeUtil.now());
+		assertNotNull(LocalDateTimeUtil.now());
 	}
 
 	@Test
@@ -25,98 +26,99 @@ public class LocalDateTimeUtilTest {
 		final DateTime dt = DateUtil.parse(dateStr);
 
 		LocalDateTime of = LocalDateTimeUtil.of(dt);
-		Assert.assertNotNull(of);
-		Assert.assertEquals(dateStr, of.toString());
+		assertNotNull(of);
+		assertEquals(dateStr, of.toString());
 
 		// 不加Z是标准当地时间，与UTC时间不同
 		of = LocalDateTimeUtil.ofUTC(dt.getTime());
-		Assert.assertNotEquals(dateStr, of.toString());
+		assertNotEquals(dateStr, of.toString());
 	}
 
 	@Test
 	public void parseOffsetTest() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2021-07-30T16:27:27+08:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-		Assert.assertEquals("2021-07-30T16:27:27", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("2021-07-30T16:27:27", Objects.requireNonNull(localDateTime).toString());
 	}
 
 	@Test
 	public void parseTest() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56", DateTimeFormatter.ISO_DATE_TIME);
-		Assert.assertEquals("2020-01-23T12:23:56", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("2020-01-23T12:23:56", Objects.requireNonNull(localDateTime).toString());
 	}
 
 	@Test
 	public void parseTest2() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23", DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("2020-01-23T00:00", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("2020-01-23T00:00", Objects.requireNonNull(localDateTime).toString());
 	}
 
 	@Test
 	public void parseTest3() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("12:23:56", DatePattern.NORM_TIME_PATTERN);
-		Assert.assertEquals("12:23:56", Objects.requireNonNull(localDateTime).toLocalTime().toString());
+		assertEquals("12:23:56", Objects.requireNonNull(localDateTime).toLocalTime().toString());
 	}
 
 	@Test
 	public void parseTest4() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56");
-		Assert.assertEquals("2020-01-23T12:23:56", localDateTime.toString());
+		assertEquals("2020-01-23T12:23:56", localDateTime.toString());
 	}
 
 	@Test
 	public void parseTest5() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("19940121183604", "yyyyMMddHHmmss");
-		Assert.assertEquals("1994-01-21T18:36:04", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("1994-01-21T18:36:04", Objects.requireNonNull(localDateTime).toString());
 	}
 
 	@Test
 	public void parseTest6() {
 		LocalDateTime localDateTime = LocalDateTimeUtil.parse("19940121183604682", "yyyyMMddHHmmssSSS");
-		Assert.assertEquals("1994-01-21T18:36:04.682", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("1994-01-21T18:36:04.682", Objects.requireNonNull(localDateTime).toString());
 
 		localDateTime = LocalDateTimeUtil.parse("1994012118360468", "yyyyMMddHHmmssSS");
-		Assert.assertEquals("1994-01-21T18:36:04.680", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("1994-01-21T18:36:04.680", Objects.requireNonNull(localDateTime).toString());
 
 		localDateTime = LocalDateTimeUtil.parse("199401211836046", "yyyyMMddHHmmssS");
-		Assert.assertEquals("1994-01-21T18:36:04.600", Objects.requireNonNull(localDateTime).toString());
+		assertEquals("1994-01-21T18:36:04.600", Objects.requireNonNull(localDateTime).toString());
 	}
 
 	@Test
 	public void parseDateTest() {
 		LocalDate localDate = LocalDateTimeUtil.parseDate("2020-01-23");
-		Assert.assertEquals("2020-01-23", localDate.toString());
+		assertEquals("2020-01-23", localDate.toString());
 
 		localDate = LocalDateTimeUtil.parseDate("2020-01-23T12:23:56", DateTimeFormatter.ISO_DATE_TIME);
-		Assert.assertEquals("2020-01-23", localDate.toString());
+		assertNotNull(localDate);
+		assertEquals("2020-01-23", localDate.toString());
 	}
 
 	@Test
 	public void parseSingleMonthAndDayTest() {
 		final LocalDate localDate = LocalDateTimeUtil.parseDate("2020-1-1", "yyyy-M-d");
-		Assert.assertEquals("2020-01-01", localDate.toString());
+		assertEquals("2020-01-01", localDate.toString());
 	}
 
 	@Test
 	public void formatTest() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56");
 		String format = LocalDateTimeUtil.format(localDateTime, DatePattern.NORM_DATETIME_PATTERN);
-		Assert.assertEquals("2020-01-23 12:23:56", format);
+		assertEquals("2020-01-23 12:23:56", format);
 
 		format = LocalDateTimeUtil.formatNormal(localDateTime);
-		Assert.assertEquals("2020-01-23 12:23:56", format);
+		assertEquals("2020-01-23 12:23:56", format);
 
 		format = LocalDateTimeUtil.format(localDateTime, DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("2020-01-23", format);
+		assertEquals("2020-01-23", format);
 	}
 
 	@Test
 	public void formatLocalDateTest() {
 		final LocalDate date = LocalDate.parse("2020-01-23");
 		String format = LocalDateTimeUtil.format(date, DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("2020-01-23", format);
+		assertEquals("2020-01-23", format);
 
 		format = LocalDateTimeUtil.formatNormal(date);
-		Assert.assertEquals("2020-01-23", format);
+		assertEquals("2020-01-23", format);
 	}
 
 	@Test
@@ -124,19 +126,19 @@ public class LocalDateTimeUtilTest {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56");
 		LocalDateTime offset = LocalDateTimeUtil.offset(localDateTime, 1, ChronoUnit.DAYS);
 		// 非同一对象
-		Assert.assertNotSame(localDateTime, offset);
+		assertNotSame(localDateTime, offset);
 
-		Assert.assertEquals("2020-01-24T12:23:56", offset.toString());
+		assertEquals("2020-01-24T12:23:56", offset.toString());
 
 		offset = LocalDateTimeUtil.offset(localDateTime, -1, ChronoUnit.DAYS);
-		Assert.assertEquals("2020-01-22T12:23:56", offset.toString());
+		assertEquals("2020-01-22T12:23:56", offset.toString());
 	}
 
 	@Test
 	public void ofTest2(){
 		final Instant instant = Objects.requireNonNull(DateUtil.parse("2022-02-22")).toInstant();
 		final LocalDateTime of = LocalDateTimeUtil.of((TemporalAccessor) instant);
-		Assert.assertEquals("2022-02-22T00:00", of.toString());
+		assertEquals("2022-02-22T00:00", of.toString());
 	}
 
 	@Test
@@ -144,7 +146,7 @@ public class LocalDateTimeUtilTest {
 		final Duration between = LocalDateTimeUtil.between(
 				LocalDateTimeUtil.parse("2019-02-02T00:00:00"),
 				LocalDateTimeUtil.parse("2020-02-02T00:00:00"));
-		Assert.assertEquals(365, between.toDays());
+		assertEquals(365, between.toDays());
 	}
 
 	@SuppressWarnings("ConstantConditions")
@@ -155,45 +157,45 @@ public class LocalDateTimeUtilTest {
 		final LocalDateTime end = LocalDateTime.parse("2019-02-02T09:00:00");
 
 		// 不在时间范围内 用例
-		Assert.assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T06:00:00"), begin, end));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T13:00:00"), begin, end));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-01T08:00:00"), begin, end));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-03T09:00:00"), begin, end));
+		assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T06:00:00"), begin, end));
+		assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T13:00:00"), begin, end));
+		assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-01T08:00:00"), begin, end));
+		assertFalse(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-03T09:00:00"), begin, end));
 
 		// 在时间范围内 用例
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:00:00"), begin, end));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:00:01"), begin, end));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:11:00"), begin, end));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:22:00"), begin, end));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:59:59"), begin, end));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T09:00:00"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:00:00"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:00:01"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:11:00"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:22:00"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T08:59:59"), begin, end));
+		assertTrue(LocalDateTimeUtil.isIn(LocalDateTime.parse("2019-02-02T09:00:00"), begin, end));
 
 		// 测试边界条件
-		Assert.assertTrue(LocalDateTimeUtil.isIn(begin, begin, end, true, false));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(begin, begin, end, false, false));
-		Assert.assertTrue(LocalDateTimeUtil.isIn(end, begin, end, false, true));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(end, begin, end, false, false));
+		assertTrue(LocalDateTimeUtil.isIn(begin, begin, end, true, false));
+		assertFalse(LocalDateTimeUtil.isIn(begin, begin, end, false, false));
+		assertTrue(LocalDateTimeUtil.isIn(end, begin, end, false, true));
+		assertFalse(LocalDateTimeUtil.isIn(end, begin, end, false, false));
 
 		// begin、end互换
-		Assert.assertTrue(LocalDateTimeUtil.isIn(begin, end, begin, true, true));
+		assertTrue(LocalDateTimeUtil.isIn(begin, end, begin, true, true));
 
 		// 比较当前时间范围
 		final LocalDateTime now = LocalDateTime.now();
-		Assert.assertTrue(LocalDateTimeUtil.isIn(now, now.minusHours(1L), now.plusHours(1L)));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(now, now.minusHours(1L), now.minusHours(2L)));
-		Assert.assertFalse(LocalDateTimeUtil.isIn(now, now.plusHours(1L), now.plusHours(2L)));
+		assertTrue(LocalDateTimeUtil.isIn(now, now.minusHours(1L), now.plusHours(1L)));
+		assertFalse(LocalDateTimeUtil.isIn(now, now.minusHours(1L), now.minusHours(2L)));
+		assertFalse(LocalDateTimeUtil.isIn(now, now.plusHours(1L), now.plusHours(2L)));
 
 		// 异常入参
-		Assert.assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(null, begin, end, false, false));
-		Assert.assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(begin, null, end, false, false));
-		Assert.assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(begin, begin, null, false, false));
+		assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(null, begin, end, false, false));
+		assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(begin, null, end, false, false));
+		assertThrows(IllegalArgumentException.class, () -> LocalDateTimeUtil.isIn(begin, begin, null, false, false));
 	}
 
 	@Test
 	public void beginOfDayTest() {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56");
 		final LocalDateTime beginOfDay = LocalDateTimeUtil.beginOfDay(localDateTime);
-		Assert.assertEquals("2020-01-23T00:00", beginOfDay.toString());
+		assertEquals("2020-01-23T00:00", beginOfDay.toString());
 	}
 
 	@Test
@@ -201,34 +203,34 @@ public class LocalDateTimeUtilTest {
 		final LocalDateTime localDateTime = LocalDateTimeUtil.parse("2020-01-23T12:23:56");
 
 		LocalDateTime endOfDay = LocalDateTimeUtil.endOfDay(localDateTime);
-		Assert.assertEquals("2020-01-23T23:59:59.999999999", endOfDay.toString());
+		assertEquals("2020-01-23T23:59:59.999999999", endOfDay.toString());
 
 		endOfDay = LocalDateTimeUtil.endOfDay(localDateTime, true);
-		Assert.assertEquals("2020-01-23T23:59:59", endOfDay.toString());
+		assertEquals("2020-01-23T23:59:59", endOfDay.toString());
 	}
 
 	@Test
 	public void dayOfWeekTest() {
 		final Week one = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 20));
-		Assert.assertEquals(Week.MONDAY, one);
+		assertEquals(Week.MONDAY, one);
 
 		final Week two = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 21));
-		Assert.assertEquals(Week.TUESDAY, two);
+		assertEquals(Week.TUESDAY, two);
 
 		final Week three = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 22));
-		Assert.assertEquals(Week.WEDNESDAY, three);
+		assertEquals(Week.WEDNESDAY, three);
 
 		final Week four = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 23));
-		Assert.assertEquals(Week.THURSDAY, four);
+		assertEquals(Week.THURSDAY, four);
 
 		final Week five = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 24));
-		Assert.assertEquals(Week.FRIDAY, five);
+		assertEquals(Week.FRIDAY, five);
 
 		final Week six = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 25));
-		Assert.assertEquals(Week.SATURDAY, six);
+		assertEquals(Week.SATURDAY, six);
 
 		final Week seven = LocalDateTimeUtil.dayOfWeek(LocalDate.of(2021, 9, 26));
-		Assert.assertEquals(Week.SUNDAY, seven);
+		assertEquals(Week.SUNDAY, seven);
 	}
 
 	@Test
@@ -254,42 +256,42 @@ public class LocalDateTimeUtilTest {
 
 
 
-		Assert.assertFalse(LocalDateTimeUtil.isOverlap(oneStartTime,oneEndTime,realStartTime,realEndTime));
-		Assert.assertFalse(LocalDateTimeUtil.isOverlap(oneStartTime2,oneEndTime2,realStartTime,realEndTime));
-		Assert.assertTrue(LocalDateTimeUtil.isOverlap(oneStartTime3,oneEndTime3,realStartTime,realEndTime));
+		assertFalse(LocalDateTimeUtil.isOverlap(oneStartTime,oneEndTime,realStartTime,realEndTime));
+		assertFalse(LocalDateTimeUtil.isOverlap(oneStartTime2,oneEndTime2,realStartTime,realEndTime));
+		assertTrue(LocalDateTimeUtil.isOverlap(oneStartTime3,oneEndTime3,realStartTime,realEndTime));
 
-		Assert.assertFalse(LocalDateTimeUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
-		Assert.assertFalse(LocalDateTimeUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
+		assertFalse(LocalDateTimeUtil.isOverlap(realStartTime1,realEndTime1,startTime,endTime));
+		assertFalse(LocalDateTimeUtil.isOverlap(startTime,endTime,realStartTime1,realEndTime1));
 
-		Assert.assertTrue(LocalDateTimeUtil.isOverlap(startTime,startTime,startTime,startTime));
-		Assert.assertTrue(LocalDateTimeUtil.isOverlap(startTime,startTime,startTime,endTime));
-		Assert.assertFalse(LocalDateTimeUtil.isOverlap(startTime,startTime,endTime,endTime));
-		Assert.assertTrue(LocalDateTimeUtil.isOverlap(startTime,endTime,endTime,endTime));
+		assertTrue(LocalDateTimeUtil.isOverlap(startTime,startTime,startTime,startTime));
+		assertTrue(LocalDateTimeUtil.isOverlap(startTime,startTime,startTime,endTime));
+		assertFalse(LocalDateTimeUtil.isOverlap(startTime,startTime,endTime,endTime));
+		assertTrue(LocalDateTimeUtil.isOverlap(startTime,endTime,endTime,endTime));
 	}
 
 	@Test
 	public void weekOfYearTest(){
 		final LocalDate date1 = LocalDate.of(2021, 12, 31);
 		final int weekOfYear1 = LocalDateTimeUtil.weekOfYear(date1);
-		Assert.assertEquals(52, weekOfYear1);
+		assertEquals(52, weekOfYear1);
 
 		final int weekOfYear2 = LocalDateTimeUtil.weekOfYear(date1.atStartOfDay());
-		Assert.assertEquals(52, weekOfYear2);
+		assertEquals(52, weekOfYear2);
 	}
 
 	@Test
 	public void weekOfYearTest2(){
 		final LocalDate date1 = LocalDate.of(2022, 1, 31);
 		final int weekOfYear1 = LocalDateTimeUtil.weekOfYear(date1);
-		Assert.assertEquals(5, weekOfYear1);
+		assertEquals(5, weekOfYear1);
 
 		final int weekOfYear2 = LocalDateTimeUtil.weekOfYear(date1.atStartOfDay());
-		Assert.assertEquals(5, weekOfYear2);
+		assertEquals(5, weekOfYear2);
 	}
 
 	@Test
 	public void parseBlankTest(){
 		final LocalDateTime parse = LocalDateTimeUtil.parse("");
-		Assert.assertNull(parse);
+		assertNull(parse);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java b/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java
index 3700ea6d3..86c451bf1 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java
@@ -1,69 +1,71 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class MonthTest {
 
 	@SuppressWarnings("ConstantConditions")
 	@Test
 	public void getLastDayTest(){
 		int lastDay = Month.of(Calendar.JANUARY).getLastDay(false);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.FEBRUARY).getLastDay(false);
-		Assert.assertEquals(28, lastDay);
+		assertEquals(28, lastDay);
 		lastDay = Month.of(Calendar.FEBRUARY).getLastDay(true);
-		Assert.assertEquals(29, lastDay);
+		assertEquals(29, lastDay);
 		lastDay = Month.of(Calendar.MARCH).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.APRIL).getLastDay(true);
-		Assert.assertEquals(30, lastDay);
+		assertEquals(30, lastDay);
 		lastDay = Month.of(Calendar.MAY).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.JUNE).getLastDay(true);
-		Assert.assertEquals(30, lastDay);
+		assertEquals(30, lastDay);
 		lastDay = Month.of(Calendar.JULY).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.AUGUST).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.SEPTEMBER).getLastDay(true);
-		Assert.assertEquals(30, lastDay);
+		assertEquals(30, lastDay);
 		lastDay = Month.of(Calendar.OCTOBER).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 		lastDay = Month.of(Calendar.NOVEMBER).getLastDay(true);
-		Assert.assertEquals(30, lastDay);
+		assertEquals(30, lastDay);
 		lastDay = Month.of(Calendar.DECEMBER).getLastDay(true);
-		Assert.assertEquals(31, lastDay);
+		assertEquals(31, lastDay);
 	}
 
 	@Test
 	public void toJdkMonthTest(){
 		final java.time.Month month = Month.AUGUST.toJdkMonth();
-		Assert.assertEquals(java.time.Month.AUGUST, month);
+		assertEquals(java.time.Month.AUGUST, month);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void toJdkMonthTest2(){
-		Month.UNDECIMBER.toJdkMonth();
+		assertThrows(IllegalArgumentException.class, Month.UNDECIMBER::toJdkMonth);
 	}
 
 	@Test
 	public void ofTest(){
 		Month month = Month.of("Jan");
-		Assert.assertEquals(Month.JANUARY, month);
+		assertEquals(Month.JANUARY, month);
 
 		month = Month.of("JAN");
-		Assert.assertEquals(Month.JANUARY, month);
+		assertEquals(Month.JANUARY, month);
 
 		month = Month.of("FEBRUARY");
-		Assert.assertEquals(Month.FEBRUARY, month);
+		assertEquals(Month.FEBRUARY, month);
 
 		month = Month.of("February");
-		Assert.assertEquals(Month.FEBRUARY, month);
+		assertEquals(Month.FEBRUARY, month);
 
 		month = Month.of(java.time.Month.FEBRUARY);
-		Assert.assertEquals(Month.FEBRUARY, month);
+		assertEquals(Month.FEBRUARY, month);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java
index eca415c5b..58f75cb57 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/TemporalAccessorUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -11,25 +11,25 @@ public class TemporalAccessorUtilTest {
 	@Test
 	public void formatLocalDateTest(){
 		final String format = TemporalAccessorUtil.format(LocalDate.of(2020, 12, 7), DatePattern.NORM_DATETIME_PATTERN);
-		Assert.assertEquals("2020-12-07 00:00:00", format);
+		assertEquals("2020-12-07 00:00:00", format);
 	}
 
 	@Test
 	public void formatLocalTimeTest(){
 		final String today = TemporalAccessorUtil.format(LocalDate.now(), DatePattern.NORM_DATE_PATTERN);
 		final String format = TemporalAccessorUtil.format(LocalTime.MIN, DatePattern.NORM_DATETIME_PATTERN);
-		Assert.assertEquals(today + " 00:00:00", format);
+		assertEquals(today + " 00:00:00", format);
 	}
 
 	@Test
 	public void formatCustomTest(){
 		final String today = TemporalAccessorUtil.format(
 				LocalDate.of(2021, 6, 26), "#sss");
-		Assert.assertEquals("1624636800", today);
+		assertEquals("1624636800", today);
 
 		final String today2 = TemporalAccessorUtil.format(
 				LocalDate.of(2021, 6, 26), "#SSS");
-		Assert.assertEquals("1624636800000", today2);
+		assertEquals("1624636800000", today2);
 	}
 
 	@Test
@@ -41,6 +41,6 @@ public class TemporalAccessorUtilTest {
 				LocalDateTimeUtil.parse(sourceStr, DatePattern.NORM_DATETIME_FORMATTER),
 				LocalDateTimeUtil.parse(startTimeStr, DatePattern.NORM_DATETIME_FORMATTER),
 				LocalDateTimeUtil.parse(endTimeStr, DatePattern.NORM_DATETIME_FORMATTER));
-		Assert.assertTrue(between);
+		assertTrue(between);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TimeIntervalTest.java b/hutool-core/src/test/java/cn/hutool/core/date/TimeIntervalTest.java
index 731c46ddd..af5904f36 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/TimeIntervalTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/TimeIntervalTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.date;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TimeIntervalTest {
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java b/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java
index 68fc8002a..d0a9879ab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/TimeZoneTest.java
@@ -2,22 +2,22 @@ package cn.hutool.core.date;
 
 import java.util.TimeZone;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.date.format.FastDateFormat;
 
 public class TimeZoneTest {
-	
+
 	@Test
 	public void timeZoneConvertTest() {
 		DateTime dt = DateUtil.parse("2018-07-10 21:44:32", //
 				FastDateFormat.getInstance(DatePattern.NORM_DATETIME_PATTERN, TimeZone.getTimeZone("GMT+8:00")));
-		Assert.assertEquals("2018-07-10 21:44:32", dt.toString());
-		
+		assertEquals("2018-07-10 21:44:32", dt.toString());
+
 		dt.setTimeZone(TimeZone.getTimeZone("Europe/London"));
 		int hour = dt.getField(DateField.HOUR_OF_DAY);
-		Assert.assertEquals(14, hour);
-		Assert.assertEquals("2018-07-10 14:44:32", dt.toString());
+		assertEquals(14, hour);
+		assertEquals("2018-07-10 14:44:32", dt.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java b/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java
index 1f548dc65..51e2d5542 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java
@@ -1,11 +1,10 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.DayOfWeek;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class WeekTest {
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java
index 91ea2f884..ecc757816 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 
@@ -9,28 +9,28 @@ public class ZodiacTest {
 
 	@Test
 	public void getZodiacTest() {
-		Assert.assertEquals("摩羯座", Zodiac.getZodiac(Month.JANUARY, 19));
-		Assert.assertEquals("水瓶座", Zodiac.getZodiac(Month.JANUARY, 20));
-		Assert.assertEquals("巨蟹座", Zodiac.getZodiac(6, 17));
+		assertEquals("摩羯座", Zodiac.getZodiac(Month.JANUARY, 19));
+		assertEquals("水瓶座", Zodiac.getZodiac(Month.JANUARY, 20));
+		assertEquals("巨蟹座", Zodiac.getZodiac(6, 17));
 
 		final Calendar calendar = Calendar.getInstance();
 		calendar.set(2022, Calendar.JULY, 17);
-		Assert.assertEquals("巨蟹座", Zodiac.getZodiac(calendar.getTime()));
-		Assert.assertEquals("巨蟹座", Zodiac.getZodiac(calendar));
-		Assert.assertNull(Zodiac.getZodiac((Calendar) null));
+		assertEquals("巨蟹座", Zodiac.getZodiac(calendar.getTime()));
+		assertEquals("巨蟹座", Zodiac.getZodiac(calendar));
+		assertNull(Zodiac.getZodiac((Calendar) null));
 	}
 
 	@Test
 	public void getChineseZodiacTest() {
-		Assert.assertEquals("狗", Zodiac.getChineseZodiac(1994));
-		Assert.assertEquals("狗", Zodiac.getChineseZodiac(2018));
-		Assert.assertEquals("猪", Zodiac.getChineseZodiac(2019));
+		assertEquals("狗", Zodiac.getChineseZodiac(1994));
+		assertEquals("狗", Zodiac.getChineseZodiac(2018));
+		assertEquals("猪", Zodiac.getChineseZodiac(2019));
 
 		final Calendar calendar = Calendar.getInstance();
 		calendar.set(2022, Calendar.JULY, 17);
-		Assert.assertEquals("虎", Zodiac.getChineseZodiac(calendar.getTime()));
-		Assert.assertEquals("虎", Zodiac.getChineseZodiac(calendar));
-		Assert.assertNull(Zodiac.getChineseZodiac(1899));
-		Assert.assertNull(Zodiac.getChineseZodiac((Calendar) null));
+		assertEquals("虎", Zodiac.getChineseZodiac(calendar.getTime()));
+		assertEquals("虎", Zodiac.getChineseZodiac(calendar));
+		assertNull(Zodiac.getChineseZodiac(1899));
+		assertNull(Zodiac.getChineseZodiac((Calendar) null));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java
index b7399645a..aa5ef1648 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.date;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.ZoneId;
 import java.util.TimeZone;
@@ -9,7 +9,7 @@ import java.util.TimeZone;
 public class ZoneUtilTest {
 	@Test
 	public void toTest() {
-		Assert.assertEquals(ZoneId.systemDefault(), ZoneUtil.toZoneId(null));
-		Assert.assertEquals(TimeZone.getDefault(), ZoneUtil.toTimeZone(null));
+		assertEquals(ZoneId.systemDefault(), ZoneUtil.toZoneId(null));
+		assertEquals(TimeZone.getDefault(), ZoneUtil.toTimeZone(null));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java b/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java
index f0831322e..2e67066e1 100755
--- a/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/chinese/IssueI5YB1ATest.java
@@ -1,14 +1,14 @@
 package cn.hutool.core.date.chinese;
 
 import cn.hutool.core.date.ChineseDate;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI5YB1ATest {
 	@Test
 		public void chineseDateTest() {
 		// 四月非闰月，因此isLeapMonth参数无效
 		final ChineseDate date = new ChineseDate(2023, 4, 8, true);
-		Assert.assertEquals("2023-05-26 00:00:00", date.getGregorianDate().toString());
+		assertEquals("2023-05-26 00:00:00", date.getGregorianDate().toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java b/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java
index ba85a528e..49a1726cb 100644
--- a/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java
@@ -2,80 +2,80 @@ package cn.hutool.core.date.chinese;
 
 import cn.hutool.core.date.ChineseDate;
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class SolarTermsTest {
 
 	@Test
 	public void getTermTest1(){
 		final int term = SolarTerms.getTerm(1987, 3);
-		Assert.assertEquals(4, term);
+		assertEquals(4, term);
 	}
 
 	@Test
 	public void getTermTest() {
 
-		Assert.assertEquals("小寒", SolarTerms.getTerm(2021, 1, 5));
+		assertEquals("小寒", SolarTerms.getTerm(2021, 1, 5));
 
-		Assert.assertEquals("大寒", SolarTerms.getTerm(2021, 1, 20));
+		assertEquals("大寒", SolarTerms.getTerm(2021, 1, 20));
 
-		Assert.assertEquals("立春", SolarTerms.getTerm(2021, 2, 3));
+		assertEquals("立春", SolarTerms.getTerm(2021, 2, 3));
 
-		Assert.assertEquals("雨水", SolarTerms.getTerm(2021, 2, 18));
+		assertEquals("雨水", SolarTerms.getTerm(2021, 2, 18));
 
-		Assert.assertEquals("惊蛰", SolarTerms.getTerm(2021, 3, 5));
+		assertEquals("惊蛰", SolarTerms.getTerm(2021, 3, 5));
 
-		Assert.assertEquals("春分", SolarTerms.getTerm(2021, 3, 20));
+		assertEquals("春分", SolarTerms.getTerm(2021, 3, 20));
 
-		Assert.assertEquals("清明", SolarTerms.getTerm(2021, 4, 4));
+		assertEquals("清明", SolarTerms.getTerm(2021, 4, 4));
 
-		Assert.assertEquals("谷雨", SolarTerms.getTerm(2021, 4, 20));
+		assertEquals("谷雨", SolarTerms.getTerm(2021, 4, 20));
 
-		Assert.assertEquals("立夏", SolarTerms.getTerm(2021, 5, 5));
+		assertEquals("立夏", SolarTerms.getTerm(2021, 5, 5));
 
-		Assert.assertEquals("小满", SolarTerms.getTerm(2021, 5, 21));
+		assertEquals("小满", SolarTerms.getTerm(2021, 5, 21));
 
-		Assert.assertEquals("芒种", SolarTerms.getTerm(2021, 6, 5));
+		assertEquals("芒种", SolarTerms.getTerm(2021, 6, 5));
 
-		Assert.assertEquals("夏至", SolarTerms.getTerm(2021, 6, 21));
+		assertEquals("夏至", SolarTerms.getTerm(2021, 6, 21));
 
-		Assert.assertEquals("小暑", SolarTerms.getTerm(2021, 7, 7));
+		assertEquals("小暑", SolarTerms.getTerm(2021, 7, 7));
 
-		Assert.assertEquals("大暑", SolarTerms.getTerm(2021, 7, 22));
+		assertEquals("大暑", SolarTerms.getTerm(2021, 7, 22));
 
-		Assert.assertEquals("立秋", SolarTerms.getTerm(2021, 8, 7));
+		assertEquals("立秋", SolarTerms.getTerm(2021, 8, 7));
 
-		Assert.assertEquals("处暑", SolarTerms.getTerm(2021, 8, 23));
+		assertEquals("处暑", SolarTerms.getTerm(2021, 8, 23));
 
-		Assert.assertEquals("白露", SolarTerms.getTerm(2021, 9, 7));
+		assertEquals("白露", SolarTerms.getTerm(2021, 9, 7));
 
-		Assert.assertEquals("秋分", SolarTerms.getTerm(2021, 9, 23));
+		assertEquals("秋分", SolarTerms.getTerm(2021, 9, 23));
 
-		Assert.assertEquals("寒露", SolarTerms.getTerm(2021, 10, 8));
+		assertEquals("寒露", SolarTerms.getTerm(2021, 10, 8));
 
-		Assert.assertEquals("霜降", SolarTerms.getTerm(2021, 10, 23));
+		assertEquals("霜降", SolarTerms.getTerm(2021, 10, 23));
 
-		Assert.assertEquals("立冬", SolarTerms.getTerm(2021, 11, 7));
+		assertEquals("立冬", SolarTerms.getTerm(2021, 11, 7));
 
-		Assert.assertEquals("小雪", SolarTerms.getTerm(2021, 11, 22));
+		assertEquals("小雪", SolarTerms.getTerm(2021, 11, 22));
 
-		Assert.assertEquals("大雪", SolarTerms.getTerm(2021, 12, 7));
+		assertEquals("大雪", SolarTerms.getTerm(2021, 12, 7));
 
-		Assert.assertEquals("冬至", SolarTerms.getTerm(2021, 12, 21));
+		assertEquals("冬至", SolarTerms.getTerm(2021, 12, 21));
 	}
 
 
 	@Test
 	public void getTermByDateTest() {
-		Assert.assertEquals("春分", SolarTerms.getTerm(DateUtil.parseDate("2021-03-20")));
-		Assert.assertEquals("处暑", SolarTerms.getTerm(DateUtil.parseDate("2022-08-23")));
+		assertEquals("春分", SolarTerms.getTerm(DateUtil.parseDate("2021-03-20")));
+		assertEquals("处暑", SolarTerms.getTerm(DateUtil.parseDate("2022-08-23")));
 	}
 
 
 	@Test
 	public void getTermByChineseDateTest() {
-		Assert.assertEquals("清明", SolarTerms.getTerm(new ChineseDate(2021, 2, 23)));
-		Assert.assertEquals("秋分", SolarTerms.getTerm(new ChineseDate(2022, 8, 28)));
+		assertEquals("清明", SolarTerms.getTerm(new ChineseDate(2021, 2, 23)));
+		assertEquals("秋分", SolarTerms.getTerm(new ChineseDate(2022, 8, 28)));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/exceptions/CheckedUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/exceptions/CheckedUtilTest.java
index 5790f24fa..83073de7d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/exceptions/CheckedUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/exceptions/CheckedUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.exceptions;
 
 import cn.hutool.core.lang.func.Func1;
 import cn.hutool.core.lang.func.VoidFunc0;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,7 +34,7 @@ public class CheckedUtilTest {
 			//本行代码原本需要抛出受检查异常，现在只抛出运行时异常
 			CheckedUtil.uncheck(() -> new FileInputStream(noFile)).call();
 		} catch (Exception re) {
-			Assert.assertTrue(re instanceof RuntimeException);
+			assertTrue(re instanceof RuntimeException);
 		}
 	}
 
@@ -54,7 +54,7 @@ public class CheckedUtilTest {
 			//本行代码原本需要抛出受检查异常，现在只抛出运行时异常
 			CheckedUtil.uncheck(afunc).call("hello world");
 		} catch (Exception re) {
-			Assert.assertTrue(re instanceof RuntimeException);
+			assertTrue(re instanceof RuntimeException);
 		}
 
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java
index 25aef0111..33789db41 100644
--- a/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/exceptions/ExceptionUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.exceptions;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.IORuntimeException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
@@ -17,14 +17,14 @@ public class ExceptionUtilTest {
 	@Test
 	public void wrapTest() {
 		IORuntimeException e = ExceptionUtil.wrap(new IOException(), IORuntimeException.class);
-		Assert.assertNotNull(e);
+		assertNotNull(e);
 	}
 
 	@Test
 	public void getRootTest() {
 		// 查找入口方法
 		StackTraceElement ele = ExceptionUtil.getRootStackElement();
-		Assert.assertEquals("main", ele.getMethodName());
+		assertEquals("main", ele.getMethodName());
 	}
 
 	@Test
@@ -33,17 +33,17 @@ public class ExceptionUtilTest {
 		IOException ioException = new IOException();
 		IllegalArgumentException argumentException = new IllegalArgumentException(ioException);
 		IOException ioException1 = ExceptionUtil.convertFromOrSuppressedThrowable(argumentException, IOException.class, true);
-		Assert.assertNotNull(ioException1);
+		assertNotNull(ioException1);
 	}
 
 	@Test
 	public void bytesIntConvertTest(){
 		final String s = Convert.toStr(12);
 		final int integer = Convert.toInt(s);
-		Assert.assertEquals(12, integer);
+		assertEquals(12, integer);
 
 		final byte[] bytes = Convert.intToBytes(12);
 		final int i = Convert.bytesToInt(bytes);
-		Assert.assertEquals(12, i);
+		assertEquals(12, i);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java
index f126d925e..952f081f7 100755
--- a/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/FontUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.img;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Font;
 
@@ -10,6 +10,6 @@ public class FontUtilTest {
 	@Test
 	public void createFontTest(){
 		final Font font = FontUtil.createFont();
-		Assert.assertNotNull(font);
+		assertNotNull(font);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java b/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
index 1cb6572ab..c7b4868a1 100755
--- a/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/ImgTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.img;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.URLUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -15,19 +15,19 @@ import java.io.File;
 public class ImgTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cutTest1() {
 		Img.from(FileUtil.file("e:/pic/face.jpg")).cut(0, 0, 200).write(FileUtil.file("e:/pic/face_radis.png"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void compressTest() {
 		Img.from(FileUtil.file("f:/test/4347273249269e3fb272341acc42d4e.jpg")).setQuality(0.8).write(FileUtil.file("f:/test/test_dest.jpg"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void compressWithBackgroundColorTest() {
 		Img.from(FileUtil.file("D:/test/before_compress.png"))
 				.setBackgroundColor(Color.WHITE)
@@ -36,20 +36,20 @@ public class ImgTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final Img from = Img.from(FileUtil.file("d:/test/81898311-001d6100-95eb-11ea-83c2-a14d7b1010bd.png"));
 		ImgUtil.write(from.getImg(), FileUtil.file("d:/test/dest.jpg"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void roundTest() {
 		Img.from(FileUtil.file("e:/pic/face.jpg")).round(0.5).write(FileUtil.file("e:/pic/face_round.png"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pressTextTest() {
 		Img.from(FileUtil.file("d:/test/617180969474805871.jpg"))
 				.setPositionBaseCentre(false)
@@ -63,7 +63,7 @@ public class ImgTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pressTextFullScreenTest() {
 		Img.from(FileUtil.file("d:/test/1435859438434136064.jpg"))
 				.setTargetImageType(ImgUtil.IMAGE_TYPE_PNG)
@@ -77,7 +77,7 @@ public class ImgTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pressImgTest() {
 		Img.from(FileUtil.file("d:/test/图片1.JPG"))
 				.pressImage(ImgUtil.read("d:/test/617180969474805871.jpg"), new Rectangle(0, 0, 800, 800), 1f)
@@ -85,7 +85,7 @@ public class ImgTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void strokeTest() {
 		Img.from(FileUtil.file("d:/test/公章3.png"))
 				.stroke(null, 2f)
@@ -96,7 +96,7 @@ public class ImgTest {
 	 * issue#I49FIU
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void scaleTest() {
 		final String downloadFile = "d:/test/1435859438434136064.JPG";
 		final File file = FileUtil.file(downloadFile);
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java
index 6136ed997..32e35ad8f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/ImgUtilTest.java
@@ -2,9 +2,9 @@ package cn.hutool.core.img;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.imageio.ImageIO;
 import java.awt.Color;
@@ -20,13 +20,13 @@ import java.net.URL;
 public class ImgUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scaleTest() {
 		ImgUtil.scale(FileUtil.file("e:/pic/test.jpg"), FileUtil.file("e:/pic/test_result.jpg"), 0.8f);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scaleTest2() {
 		ImgUtil.scale(
 				FileUtil.file("d:/test/2.png"),
@@ -34,19 +34,19 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scalePngTest() {
 		ImgUtil.scale(FileUtil.file("f:/test/test.png"), FileUtil.file("f:/test/test_result.png"), 0.5f);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scaleByWidthAndHeightTest() {
 		ImgUtil.scale(FileUtil.file("f:/test/aaa.jpg"), FileUtil.file("f:/test/aaa_result.jpg"), 100, 400, Color.BLUE);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cutTest() {
 		ImgUtil.cut(FileUtil.file("d:/test/hutool.png"),
 			FileUtil.file("d:/test/result.png"),
@@ -54,27 +54,27 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cutTest2() {
 		final Image cut = ImgUtil.cut(ImgUtil.read("d:/test/logo_small.jpg"), 0, 0, 50);
 		ImgUtil.write(cut, FileUtil.file("d:/test/target.jpg"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void rotateTest() throws IOException {
 		Image image = ImgUtil.rotate(ImageIO.read(FileUtil.file("e:/pic/366466.jpg")), 180);
 		ImgUtil.write(image, FileUtil.file("e:/pic/result.png"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void flipTest() {
 		ImgUtil.flip(FileUtil.file("d:/logo.png"), FileUtil.file("d:/result.png"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pressImgTest() {
 		ImgUtil.pressImage(
 				FileUtil.file("d:/test/1435859438434136064.jpg"),
@@ -83,7 +83,7 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pressTextTest() {
 		ImgUtil.pressText(//
 				FileUtil.file("d:/test/2.jpg"), //
@@ -96,13 +96,13 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sliceByRowsAndColsTest() {
 		ImgUtil.sliceByRowsAndCols(FileUtil.file("d:/temp/2.png"), FileUtil.file("d:/temp/slice/png"),ImgUtil.IMAGE_TYPE_PNG, 1, 5);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sliceByRowsAndColsTest2() {
 		ImgUtil.sliceByRowsAndCols(
 			FileUtil.file("d:/test/hutool.png"),
@@ -110,27 +110,27 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void convertTest() {
 		ImgUtil.convert(FileUtil.file("e:/test2.png"), FileUtil.file("e:/test2Convert.jpg"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final byte[] bytes = ImgUtil.toBytes(ImgUtil.read("d:/test/logo_484.png"), "png");
 		FileUtil.writeBytes(bytes, "d:/test/result.png");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void compressTest() {
 		ImgUtil.compress(FileUtil.file("d:/test/dest.png"),
 				FileUtil.file("d:/test/1111_target.jpg"), 0.1f);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyTest() {
 		BufferedImage image = ImgUtil.copyImage(ImgUtil.read("f:/pic/test.png"), BufferedImage.TYPE_INT_RGB);
 		ImgUtil.write(image, FileUtil.file("f:/pic/test_dest.jpg"));
@@ -139,11 +139,11 @@ public class ImgUtilTest {
 	@Test
 	public void toHexTest(){
 		final String s = ImgUtil.toHex(Color.RED);
-		Assert.assertEquals("#FF0000", s);
+		assertEquals("#FF0000", s);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void backgroundRemovalTest() {
 		// 图片 背景 换成 透明的
 		ImgUtil.backgroundRemoval(
@@ -165,7 +165,7 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void createImageTest() throws IORuntimeException, IOException {
 		ImgUtil.createImage(
 				"版权所有",
@@ -177,7 +177,7 @@ public class ImgUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void createTransparentImageTest() throws IORuntimeException, IOException {
 		ImgUtil.createTransparentImage(
 				"版权所有",
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/Issue2735Test.java b/hutool-core/src/test/java/cn/hutool/core/img/Issue2735Test.java
index a72e6fd1a..def1a7396 100755
--- a/hutool-core/src/test/java/cn/hutool/core/img/Issue2735Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/Issue2735Test.java
@@ -1,15 +1,15 @@
 package cn.hutool.core.img;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Image;
 
 public class Issue2735Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scaleTest() {
 		final Img img = Img.from(FileUtil.file("d:/test/hutool.png"))
 				.scale(200, 200, Image.SCALE_DEFAULT);
diff --git a/hutool-core/src/test/java/cn/hutool/core/img/IssueI8L8UATest.java b/hutool-core/src/test/java/cn/hutool/core/img/IssueI8L8UATest.java
index 70fcc059c..4ee395f20 100644
--- a/hutool-core/src/test/java/cn/hutool/core/img/IssueI8L8UATest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/img/IssueI8L8UATest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.img;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI8L8UATest {
 	@Test
-	@Ignore
+	@Disabled
 	public void convertTest() {
 		ImgUtil.convert(
 			FileUtil.file("d:/test/1.png"),
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
index 657e500a5..bc2755eea 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/BufferUtilTest.java
@@ -2,15 +2,15 @@ package cn.hutool.core.io;
 
 import java.nio.ByteBuffer;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
  * BufferUtil单元测试
- * 
+ *
  * @author looly
  *
  */
@@ -22,7 +22,7 @@ public class BufferUtilTest {
 		ByteBuffer buffer = ByteBuffer.wrap(bytes);
 
 		ByteBuffer buffer2 = BufferUtil.copy(buffer, ByteBuffer.allocate(5));
-		Assert.assertEquals("AAABB", StrUtil.utf8Str(buffer2));
+		assertEquals("AAABB", StrUtil.utf8Str(buffer2));
 	}
 
 	@Test
@@ -31,7 +31,7 @@ public class BufferUtilTest {
 		ByteBuffer buffer = ByteBuffer.wrap(bytes);
 
 		byte[] bs = BufferUtil.readBytes(buffer, 5);
-		Assert.assertEquals("AAABB", StrUtil.utf8Str(bs));
+		assertEquals("AAABB", StrUtil.utf8Str(bs));
 	}
 
 	@Test
@@ -40,7 +40,7 @@ public class BufferUtilTest {
 		ByteBuffer buffer = ByteBuffer.wrap(bytes);
 
 		byte[] bs = BufferUtil.readBytes(buffer, 5);
-		Assert.assertEquals("AAABB", StrUtil.utf8Str(bs));
+		assertEquals("AAABB", StrUtil.utf8Str(bs));
 	}
 
 	@Test
@@ -50,17 +50,17 @@ public class BufferUtilTest {
 
 		// 第一行
 		String line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("aa", line);
+		assertEquals("aa", line);
 
 		// 第二行
 		line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("bbb", line);
+		assertEquals("bbb", line);
 
 		// 第三行因为没有行结束标志，因此返回null
 		line = BufferUtil.readLine(buffer, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertNull(line);
+		assertNull(line);
 
 		// 读取剩余部分
-		Assert.assertEquals("cc", StrUtil.utf8Str(BufferUtil.readBytes(buffer)));
+		assertEquals("cc", StrUtil.utf8Str(BufferUtil.readBytes(buffer)));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
index 511adb4be..80138bed2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/CharsetDetectorTest.java
@@ -2,9 +2,9 @@ package cn.hutool.core.io;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.Charset;
 
@@ -15,14 +15,14 @@ public class CharsetDetectorTest {
 		// 测试多个Charset对同一个流的处理是否有问题
 		final Charset detect = CharsetDetector.detect(ResourceUtil.getStream("test.xml"),
 				CharsetUtil.CHARSET_GBK, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(CharsetUtil.CHARSET_UTF_8, detect);
+		assertEquals(CharsetUtil.CHARSET_UTF_8, detect);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue2547() {
 		final Charset detect = CharsetDetector.detect(IoUtil.DEFAULT_LARGE_BUFFER_SIZE,
 				ResourceUtil.getStream("d:/test/default.txt"));
-		Assert.assertEquals(CharsetUtil.CHARSET_UTF_8, detect);
+		assertEquals(CharsetUtil.CHARSET_UTF_8, detect);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java b/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
index 64a3a7c3b..dac83c698 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/ClassPathResourceTest.java
@@ -2,12 +2,13 @@ package cn.hutool.core.io;
 
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.util.Properties;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * ClassPath资源读取测试
  *
@@ -19,7 +20,7 @@ public class ClassPathResourceTest {
 	public void readStringTest() {
 		ClassPathResource resource = new ClassPathResource("test.properties");
 		String content = resource.readUtf8Str();
-		Assert.assertTrue(StrUtil.isNotEmpty(content));
+		assertTrue(StrUtil.isNotEmpty(content));
 	}
 
 	@Test
@@ -27,7 +28,7 @@ public class ClassPathResourceTest {
 		// 读取classpath根目录测试
 		ClassPathResource resource = new ClassPathResource("/");
 		String content = resource.readUtf8Str();
-		Assert.assertTrue(StrUtil.isNotEmpty(content));
+		assertTrue(StrUtil.isNotEmpty(content));
 	}
 
 	@Test
@@ -36,27 +37,28 @@ public class ClassPathResourceTest {
 		Properties properties = new Properties();
 		properties.load(resource.getStream());
 
-		Assert.assertEquals("1", properties.get("a"));
-		Assert.assertEquals("2", properties.get("b"));
+		assertEquals("1", properties.get("a"));
+		assertEquals("2", properties.get("b"));
 	}
 
 	@Test
 	public void readFromJarTest() {
-		//测试读取junit的jar包下的LICENSE-junit.txt文件
-		final ClassPathResource resource = new ClassPathResource("LICENSE-junit.txt");
+		//测试读取junit的jar包下的LICENSE.md文件
+		final ClassPathResource resource = new ClassPathResource("META-INF/LICENSE.md");
 
 		String result = resource.readUtf8Str();
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 
 		//二次读取测试，用于测试关闭流对再次读取的影响
 		result = resource.readUtf8Str();
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 	}
 
 	@Test
 	public void getAbsTest() {
-		final ClassPathResource resource = new ClassPathResource("LICENSE-junit.txt");
+		// lombok 文件
+		final ClassPathResource resource = new ClassPathResource("changelog.txt");
 		String absPath = resource.getAbsolutePath();
-		Assert.assertTrue(absPath.contains("LICENSE-junit.txt"));
+		assertTrue(absPath.contains("changelog.txt"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileCopierTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileCopierTest.java
index 8419ca29d..a07795f72 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileCopierTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileCopierTest.java
@@ -1,13 +1,14 @@
 package cn.hutool.core.io;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
 import cn.hutool.core.io.file.FileCopier;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * 文件拷贝单元测试
  *
@@ -16,14 +17,14 @@ import java.io.File;
 public class FileCopierTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dirCopyTest() {
 		FileCopier copier = FileCopier.create("D:\\Java", "e:/eclipse/eclipse2.zip");
 		copier.copy();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dirCopyTest2() {
 		//测试带.的文件夹复制
 		FileCopier copier = FileCopier.create("D:\\workspace\\java\\.metadata", "D:\\workspace\\java\\.metadata\\temp");
@@ -32,28 +33,30 @@ public class FileCopierTest {
 		FileUtil.copy("D:\\workspace\\java\\looly\\hutool\\.git", "D:\\workspace\\java\\temp", true);
 	}
 
-	@Test(expected = IORuntimeException.class)
+	@Test
 	public void dirCopySubTest() {
-		//测试父目录复制到子目录报错
-		FileCopier copier = FileCopier.create("D:\\workspace\\java\\.metadata", "D:\\workspace\\java\\.metadata\\temp");
-		copier.copy();
+		assertThrows(IORuntimeException.class, () -> {
+			//测试父目录复制到子目录报错
+			FileCopier copier = FileCopier.create("D:\\workspace\\java\\.metadata", "D:\\workspace\\java\\.metadata\\temp");
+			copier.copy();
+		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyFileToDirTest() {
 		FileCopier copier = FileCopier.create("d:/GReen_Soft/XshellXftpPortable.zip", "c:/hp/");
 		copier.copy();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyFileByRelativePath(){
 		// https://github.com/dromara/hutool/pull/2188
 		//  当复制的目标文件位置是相对路径的时候可以通过
 		FileCopier copier = FileCopier.create(new File("pom.xml"),new File("aaa.txt"));
 		copier.copy();
 		final boolean delete = new File("aaa.txt").delete();
-		Assert.assertTrue(delete);
+		assertTrue(delete);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java
index 4abe820dc..51303538e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileReaderTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.io;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.file.FileReader;
 
@@ -11,11 +11,11 @@ import cn.hutool.core.io.file.FileReader;
  *
  */
 public class FileReaderTest {
-	
+
 	@Test
 	public void fileReaderTest(){
 		FileReader fileReader = new FileReader("test.properties");
 		String result = fileReader.readString();
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
index 03b82e6d9..c410db3df 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileTypeUtilTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.core.io;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.*;
 
@@ -15,19 +15,19 @@ import java.io.*;
 public class FileTypeUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void fileTypeUtilTest() {
 		final File file = FileUtil.file("hutool.jpg");
 		final String type = FileTypeUtil.getType(file);
-		Assert.assertEquals("jpg", type);
+		assertEquals("jpg", type);
 
 		FileTypeUtil.putFileType("ffd8ffe000104a464946", "new_jpg");
 		final String newType = FileTypeUtil.getType(file);
-		Assert.assertEquals("new_jpg", newType);
+		assertEquals("new_jpg", newType);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void emptyTest() {
 		final File file = FileUtil.file("d:/empty.txt");
 		final String type = FileTypeUtil.getType(file);
@@ -35,7 +35,7 @@ public class FileTypeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void docTest() {
 		final File file = FileUtil.file("f:/test/test.doc");
 		final String type = FileTypeUtil.getType(file);
@@ -43,27 +43,27 @@ public class FileTypeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void ofdTest() {
 		final File file = FileUtil.file("e:/test.ofd");
 		final String hex = IoUtil.readHex64Upper(FileUtil.getInputStream(file));
 		Console.log(hex);
 		final String type = FileTypeUtil.getType(file);
 		Console.log(type);
-		Assert.assertEquals("ofd", type);
+		assertEquals("ofd", type);
 	}
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void inputStreamAndFilenameTest() {
 		final File file = FileUtil.file("e:/laboratory/test.xlsx");
 		final String type = FileTypeUtil.getType(file);
-		Assert.assertEquals("xlsx", type);
+		assertEquals("xlsx", type);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTypeFromInputStream() throws IOException {
 		final File file = FileUtil.file("d:/test/pic.jpg");
 		final BufferedInputStream inputStream = FileUtil.getInputStream(file);
@@ -74,7 +74,7 @@ public class FileTypeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void webpTest(){
 		// https://gitee.com/dromara/hutool/issues/I5BGTF
 		final File file = FileUtil.file("d:/test/a.webp");
@@ -87,11 +87,11 @@ public class FileTypeUtilTest {
 	public void issueI6MACITest() {
 		final File file = FileUtil.file("text.txt");
 		final String type = FileTypeUtil.getType(file);
-		Assert.assertEquals("txt", type);
+		assertEquals("txt", type);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue3024Test() {
 		String x = FileTypeUtil.getType(FileUtil.getInputStream("d:/test/TEST_WPS_DOC.doc"),true);
 		System.out.println(x);
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
index 913c62580..0374517e7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/FileUtilTest.java
@@ -4,15 +4,16 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.file.LineSeparator;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * {@link FileUtil} 单元测试类
  *
@@ -23,71 +24,73 @@ public class FileUtilTest {
 	@Test
 	public void fileTest1() {
 		final File file = FileUtil.file("d:/aaa", "bbb");
-		Assert.assertNotNull(file);
+		assertNotNull(file);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void fileTest2() {
-		final File file = FileUtil.file("d:/aaa", "bbb");
-		Assert.assertNotNull(file);
+		assertThrows(IllegalArgumentException.class, () -> {
+			final File file = FileUtil.file("d:/aaa", "bbb");
+			assertNotNull(file);
 
-		// 构建目录中出现非子目录抛出异常
-		FileUtil.file(file, "../ccc");
+			// 构建目录中出现非子目录抛出异常
+			FileUtil.file(file, "../ccc");
 
-		FileUtil.file("E:/");
+			FileUtil.file("E:/");
+		});
 	}
 
 	@Test
 	public void getAbsolutePathTest() {
 		final String absolutePath = FileUtil.getAbsolutePath("LICENSE-junit.txt");
-		Assert.assertNotNull(absolutePath);
+		assertNotNull(absolutePath);
 		final String absolutePath2 = FileUtil.getAbsolutePath(absolutePath);
-		Assert.assertNotNull(absolutePath2);
-		Assert.assertEquals(absolutePath, absolutePath2);
+		assertNotNull(absolutePath2);
+		assertEquals(absolutePath, absolutePath2);
 
 		String path = FileUtil.getAbsolutePath("中文.xml");
-		Assert.assertTrue(path.contains("中文.xml"));
+		assertTrue(path.contains("中文.xml"));
 
 		path = FileUtil.getAbsolutePath("d:");
-		Assert.assertEquals("d:", path);
+		assertEquals("d:", path);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void touchTest() {
 		FileUtil.touch("d:\\tea\\a.jpg");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void delTest() {
 		// 删除一个不存在的文件，应返回true
 		final boolean result = FileUtil.del("e:/Hutool_test_3434543533409843.txt");
-		Assert.assertTrue(result);
+		assertTrue(result);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void delTest2() {
 		// 删除一个不存在的文件，应返回true
 		final boolean result = FileUtil.del(Paths.get("e:/Hutool_test_3434543533409843.txt"));
-		Assert.assertTrue(result);
+		assertTrue(result);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renameTest() {
 		FileUtil.rename(FileUtil.file("d:/test/3.jpg"), "2.jpg", false);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renameTest2() {
 		FileUtil.move(FileUtil.file("d:/test/a"), FileUtil.file("d:/test/b"), false);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renameTest3() {
 		FileUtil.rename(FileUtil.file("d:/test/test2.xlsx"), "test3.xlsx", true);
 	}
@@ -99,12 +102,12 @@ public class FileUtilTest {
 
 		FileUtil.copy(srcFile, destFile, true);
 
-		Assert.assertTrue(destFile.exists());
-		Assert.assertEquals(srcFile.length(), destFile.length());
+		assertTrue(destFile.exists());
+		assertEquals(srcFile.length(), destFile.length());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyFilesFromDirTest() {
 		final File srcFile = FileUtil.file("D:\\驱动");
 		final File destFile = FileUtil.file("d:\\驱动备份");
@@ -113,7 +116,7 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyDirTest() {
 		final File srcFile = FileUtil.file("D:\\test");
 		final File destFile = FileUtil.file("E:\\");
@@ -122,7 +125,7 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void moveDirTest() {
 		final File srcFile = FileUtil.file("E:\\test2");
 		final File destFile = FileUtil.file("D:\\");
@@ -131,16 +134,16 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renameToSubTest() {
-		Assert.assertThrows(IllegalArgumentException.class, ()->{
+		assertThrows(IllegalArgumentException.class, ()->{
 			// 移动到子目录，报错
 			FileUtil.move(FileUtil.file("d:/test/a"), FileUtil.file("d:/test/a/c"), false);
 		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renameSameTest() {
 		// 目标和源相同，不处理
 		FileUtil.move(FileUtil.file("d:/test/a"), FileUtil.file("d:/test/a"), false);
@@ -153,81 +156,81 @@ public class FileUtilTest {
 		final File destFile = FileUtil.file("d:/hutool.jpg");
 
 		final boolean equals = FileUtil.equals(srcFile, destFile);
-		Assert.assertTrue(equals);
+		assertTrue(equals);
 
 		// 源文件存在，目标文件不存在
 		final File srcFile1 = FileUtil.file("hutool.jpg");
 		final File destFile1 = FileUtil.file("d:/hutool.jpg");
 
 		final boolean notEquals = FileUtil.equals(srcFile1, destFile1);
-		Assert.assertFalse(notEquals);
+		assertFalse(notEquals);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void convertLineSeparatorTest() {
 		FileUtil.convertLineSeparator(FileUtil.file("d:/aaa.txt"), CharsetUtil.CHARSET_UTF_8, LineSeparator.WINDOWS);
 	}
 
 	@Test
 	public void normalizeTest() {
-		Assert.assertEquals("/foo/", FileUtil.normalize("/foo//"));
-		Assert.assertEquals("/foo/", FileUtil.normalize("/foo/./"));
-		Assert.assertEquals("/bar", FileUtil.normalize("/foo/../bar"));
-		Assert.assertEquals("/bar/", FileUtil.normalize("/foo/../bar/"));
-		Assert.assertEquals("/baz", FileUtil.normalize("/foo/../bar/../baz"));
-		Assert.assertEquals("/", FileUtil.normalize("/../"));
-		Assert.assertEquals("foo", FileUtil.normalize("foo/bar/.."));
-		Assert.assertEquals("../bar", FileUtil.normalize("foo/../../bar"));
-		Assert.assertEquals("bar", FileUtil.normalize("foo/../bar"));
-		Assert.assertEquals("/server/bar", FileUtil.normalize("//server/foo/../bar"));
-		Assert.assertEquals("/bar", FileUtil.normalize("//server/../bar"));
-		Assert.assertEquals("C:/bar", FileUtil.normalize("C:\\foo\\..\\bar"));
+		assertEquals("/foo/", FileUtil.normalize("/foo//"));
+		assertEquals("/foo/", FileUtil.normalize("/foo/./"));
+		assertEquals("/bar", FileUtil.normalize("/foo/../bar"));
+		assertEquals("/bar/", FileUtil.normalize("/foo/../bar/"));
+		assertEquals("/baz", FileUtil.normalize("/foo/../bar/../baz"));
+		assertEquals("/", FileUtil.normalize("/../"));
+		assertEquals("foo", FileUtil.normalize("foo/bar/.."));
+		assertEquals("../bar", FileUtil.normalize("foo/../../bar"));
+		assertEquals("bar", FileUtil.normalize("foo/../bar"));
+		assertEquals("/server/bar", FileUtil.normalize("//server/foo/../bar"));
+		assertEquals("/bar", FileUtil.normalize("//server/../bar"));
+		assertEquals("C:/bar", FileUtil.normalize("C:\\foo\\..\\bar"));
 		//
-		Assert.assertEquals("C:/bar", FileUtil.normalize("C:\\..\\bar"));
-		Assert.assertEquals("../../bar", FileUtil.normalize("../../bar"));
-		Assert.assertEquals("C:/bar", FileUtil.normalize("/C:/bar"));
-		Assert.assertEquals("C:", FileUtil.normalize("C:"));
+		assertEquals("C:/bar", FileUtil.normalize("C:\\..\\bar"));
+		assertEquals("../../bar", FileUtil.normalize("../../bar"));
+		assertEquals("C:/bar", FileUtil.normalize("/C:/bar"));
+		assertEquals("C:", FileUtil.normalize("C:"));
 
 		// issue#3253，smb保留格式
-		Assert.assertEquals("\\\\192.168.1.1\\Share\\", FileUtil.normalize("\\\\192.168.1.1\\Share\\"));
+		assertEquals("\\\\192.168.1.1\\Share\\", FileUtil.normalize("\\\\192.168.1.1\\Share\\"));
 	}
 
 	@Test
 	public void normalizeBlankTest() {
-		Assert.assertEquals("C:/aaa ", FileUtil.normalize("C:\\aaa "));
+		assertEquals("C:/aaa ", FileUtil.normalize("C:\\aaa "));
 	}
 
 	@Test
 	public void normalizeHomePathTest() {
 		final String home = FileUtil.getUserHomePath().replace('\\', '/');
-		Assert.assertEquals(home + "/bar/", FileUtil.normalize("~/foo/../bar/"));
+		assertEquals(home + "/bar/", FileUtil.normalize("~/foo/../bar/"));
 	}
 
 	@Test
 	public void normalizeHomePathTest2() {
 		final String home = FileUtil.getUserHomePath().replace('\\', '/');
 		// 多个~应该只替换开头的
-		Assert.assertEquals(home + "/~bar/", FileUtil.normalize("~/foo/../~bar/"));
+		assertEquals(home + "/~bar/", FileUtil.normalize("~/foo/../~bar/"));
 	}
 
 	@Test
 	public void normalizeClassPathTest() {
-		Assert.assertEquals("", FileUtil.normalize("classpath:"));
+		assertEquals("", FileUtil.normalize("classpath:"));
 	}
 
 	@Test
 	public void normalizeClassPathTest2() {
-		Assert.assertEquals("../a/b.csv", FileUtil.normalize("../a/b.csv"));
-		Assert.assertEquals("../../../a/b.csv", FileUtil.normalize("../../../a/b.csv"));
+		assertEquals("../a/b.csv", FileUtil.normalize("../a/b.csv"));
+		assertEquals("../../../a/b.csv", FileUtil.normalize("../../../a/b.csv"));
 	}
 
 	@Test
 	public void doubleNormalizeTest() {
 		final String normalize = FileUtil.normalize("/aa/b:/c");
 		final String normalize2 = FileUtil.normalize(normalize);
-		Assert.assertEquals("/aa/b:/c", normalize);
-		Assert.assertEquals(normalize, normalize2);
+		assertEquals("/aa/b:/c", normalize);
+		assertEquals(normalize, normalize2);
 	}
 
 	@Test
@@ -235,45 +238,45 @@ public class FileUtilTest {
 		final Path path = Paths.get("/aaa/bbb/ccc/ddd/eee/fff");
 
 		Path subPath = FileUtil.subPath(path, 5, 4);
-		Assert.assertEquals("eee", subPath.toString());
+		assertEquals("eee", subPath.toString());
 		subPath = FileUtil.subPath(path, 0, 1);
-		Assert.assertEquals("aaa", subPath.toString());
+		assertEquals("aaa", subPath.toString());
 		subPath = FileUtil.subPath(path, 1, 0);
-		Assert.assertEquals("aaa", subPath.toString());
+		assertEquals("aaa", subPath.toString());
 
 		// 负数
 		subPath = FileUtil.subPath(path, -1, 0);
-		Assert.assertEquals("aaa/bbb/ccc/ddd/eee", subPath.toString().replace('\\', '/'));
+		assertEquals("aaa/bbb/ccc/ddd/eee", subPath.toString().replace('\\', '/'));
 		subPath = FileUtil.subPath(path, -1, Integer.MAX_VALUE);
-		Assert.assertEquals("fff", subPath.toString());
+		assertEquals("fff", subPath.toString());
 		subPath = FileUtil.subPath(path, -1, path.getNameCount());
-		Assert.assertEquals("fff", subPath.toString());
+		assertEquals("fff", subPath.toString());
 		subPath = FileUtil.subPath(path, -2, -3);
-		Assert.assertEquals("ddd", subPath.toString());
+		assertEquals("ddd", subPath.toString());
 	}
 
 	@Test
 	public void subPathTest2() {
 		String subPath = FileUtil.subPath("d:/aaa/bbb/", "d:/aaa/bbb/ccc/");
-		Assert.assertEquals("ccc/", subPath);
+		assertEquals("ccc/", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb", "d:/aaa/bbb/ccc/");
-		Assert.assertEquals("ccc/", subPath);
+		assertEquals("ccc/", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb", "d:/aaa/bbb/ccc/test.txt");
-		Assert.assertEquals("ccc/test.txt", subPath);
+		assertEquals("ccc/test.txt", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb/", "d:/aaa/bbb/ccc");
-		Assert.assertEquals("ccc", subPath);
+		assertEquals("ccc", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb", "d:/aaa/bbb/ccc");
-		Assert.assertEquals("ccc", subPath);
+		assertEquals("ccc", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb", "d:/aaa/bbb");
-		Assert.assertEquals("", subPath);
+		assertEquals("", subPath);
 
 		subPath = FileUtil.subPath("d:/aaa/bbb/", "d:/aaa/bbb");
-		Assert.assertEquals("", subPath);
+		assertEquals("", subPath);
 	}
 
 	@Test
@@ -281,29 +284,29 @@ public class FileUtilTest {
 		final Path path = Paths.get("/aaa/bbb/ccc/ddd/eee/fff");
 
 		Path ele = FileUtil.getPathEle(path, -1);
-		Assert.assertEquals("fff", ele.toString());
+		assertEquals("fff", ele.toString());
 		ele = FileUtil.getPathEle(path, 0);
-		Assert.assertEquals("aaa", ele.toString());
+		assertEquals("aaa", ele.toString());
 		ele = FileUtil.getPathEle(path, -5);
-		Assert.assertEquals("bbb", ele.toString());
+		assertEquals("bbb", ele.toString());
 		ele = FileUtil.getPathEle(path, -6);
-		Assert.assertEquals("aaa", ele.toString());
+		assertEquals("aaa", ele.toString());
 	}
 
 	@Test
 	public void listFileNamesTest() {
 		List<String> names = FileUtil.listFileNames("classpath:");
-		Assert.assertTrue(names.contains("hutool.jpg"));
+		assertTrue(names.contains("hutool.jpg"));
 
 		names = FileUtil.listFileNames("");
-		Assert.assertTrue(names.contains("hutool.jpg"));
+		assertTrue(names.contains("hutool.jpg"));
 
 		names = FileUtil.listFileNames(".");
-		Assert.assertTrue(names.contains("hutool.jpg"));
+		assertTrue(names.contains("hutool.jpg"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void listFileNamesInJarTest() {
 		final List<String> names = FileUtil.listFileNames("d:/test/hutool-core-5.1.0.jar!/cn/hutool/core/util ");
 		for (final String name : names) {
@@ -312,7 +315,7 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void listFileNamesTest2() {
 		final List<String> names = FileUtil.listFileNames("D:\\m2_repo\\commons-cli\\commons-cli\\1.0\\commons-cli-1.0.jar!org/apache/commons/cli/");
 		for (final String string : names) {
@@ -321,7 +324,7 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void loopFilesTest() {
 		final List<File> files = FileUtil.loopFiles("d:/");
 		for (final File file : files) {
@@ -330,13 +333,13 @@ public class FileUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void loopFilesTest2() {
 		FileUtil.loopFiles("").forEach(Console::log);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void loopFilesWithDepthTest() {
 		final List<File> files = FileUtil.loopFiles(FileUtil.file("d:/m2_repo"), 2, null);
 		for (final File file : files) {
@@ -349,22 +352,22 @@ public class FileUtilTest {
 		// 只在Windows下测试
 		if (FileUtil.isWindows()) {
 			File parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 0);
-			Assert.assertEquals(FileUtil.file("d:\\aaa\\bbb\\cc\\ddd"), parent);
+			assertEquals(FileUtil.file("d:\\aaa\\bbb\\cc\\ddd"), parent);
 
 			parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 1);
-			Assert.assertEquals(FileUtil.file("d:\\aaa\\bbb\\cc"), parent);
+			assertEquals(FileUtil.file("d:\\aaa\\bbb\\cc"), parent);
 
 			parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 2);
-			Assert.assertEquals(FileUtil.file("d:\\aaa\\bbb"), parent);
+			assertEquals(FileUtil.file("d:\\aaa\\bbb"), parent);
 
 			parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 4);
-			Assert.assertEquals(FileUtil.file("d:\\"), parent);
+			assertEquals(FileUtil.file("d:\\"), parent);
 
 			parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 5);
-			Assert.assertNull(parent);
+			assertNull(parent);
 
 			parent = FileUtil.getParent(FileUtil.file("d:/aaa/bbb/cc/ddd"), 10);
-			Assert.assertNull(parent);
+			assertNull(parent);
 		}
 	}
 
@@ -372,181 +375,181 @@ public class FileUtilTest {
 	public void lastIndexOfSeparatorTest() {
 		final String dir = "d:\\aaa\\bbb\\cc\\ddd";
 		final int index = FileUtil.lastIndexOfSeparator(dir);
-		Assert.assertEquals(13, index);
+		assertEquals(13, index);
 
 		final String file = "ddd.jpg";
 		final int index2 = FileUtil.lastIndexOfSeparator(file);
-		Assert.assertEquals(-1, index2);
+		assertEquals(-1, index2);
 	}
 
 	@Test
 	public void getNameTest() {
 		String path = "d:\\aaa\\bbb\\cc\\ddd\\";
 		String name = FileUtil.getName(path);
-		Assert.assertEquals("ddd", name);
+		assertEquals("ddd", name);
 
 		path = "d:\\aaa\\bbb\\cc\\ddd.jpg";
 		name = FileUtil.getName(path);
-		Assert.assertEquals("ddd.jpg", name);
+		assertEquals("ddd.jpg", name);
 	}
 
 	@Test
 	public void mainNameTest() {
 		String path = "d:\\aaa\\bbb\\cc\\ddd\\";
 		String mainName = FileUtil.mainName(path);
-		Assert.assertEquals("ddd", mainName);
+		assertEquals("ddd", mainName);
 
 		path = "d:\\aaa\\bbb\\cc\\ddd";
 		mainName = FileUtil.mainName(path);
-		Assert.assertEquals("ddd", mainName);
+		assertEquals("ddd", mainName);
 
 		path = "d:\\aaa\\bbb\\cc\\ddd.jpg";
 		mainName = FileUtil.mainName(path);
-		Assert.assertEquals("ddd", mainName);
+		assertEquals("ddd", mainName);
 	}
 
 	@Test
 	public void extNameTest() {
 		String path =  FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd\\" : "~/Desktop/hutool/ddd/";
 		String mainName = FileUtil.extName(path);
-		Assert.assertEquals("", mainName);
+		assertEquals("", mainName);
 
 		path =  FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd" : "~/Desktop/hutool/ddd";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("", mainName);
+		assertEquals("", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\ddd.jpg" : "~/Desktop/hutool/ddd.jpg";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("jpg", mainName);
+		assertEquals("jpg", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.xlsx" : "~/Desktop/hutool/fff.xlsx";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("xlsx", mainName);
+		assertEquals("xlsx", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.gz" : "~/Desktop/hutool/fff.tar.gz";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("tar.gz", mainName);
+		assertEquals("tar.gz", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.Z" : "~/Desktop/hutool/fff.tar.Z";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("tar.Z", mainName);
+		assertEquals("tar.Z", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.bz2" : "~/Desktop/hutool/fff.tar.bz2";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("tar.bz2", mainName);
+		assertEquals("tar.bz2", mainName);
 
 		path = FileUtil.isWindows() ? "d:\\aaa\\bbb\\cc\\fff.tar.xz" : "~/Desktop/hutool/fff.tar.xz";
 		mainName = FileUtil.extName(path);
-		Assert.assertEquals("tar.xz", mainName);
+		assertEquals("tar.xz", mainName);
 	}
 
 	@Test
 	public void getWebRootTest() {
 		final File webRoot = FileUtil.getWebRoot();
-		Assert.assertNotNull(webRoot);
-		Assert.assertEquals("hutool-core", webRoot.getName());
+		assertNotNull(webRoot);
+		assertEquals("hutool-core", webRoot.getName());
 	}
 
 	@Test
 	public void getMimeTypeTest() {
 		String mimeType = FileUtil.getMimeType("test2Write.jpg");
-		Assert.assertEquals("image/jpeg", mimeType);
+		assertEquals("image/jpeg", mimeType);
 
 		mimeType = FileUtil.getMimeType("test2Write.html");
-		Assert.assertEquals("text/html", mimeType);
+		assertEquals("text/html", mimeType);
 
 		mimeType = FileUtil.getMimeType("main.css");
-		Assert.assertEquals("text/css", mimeType);
+		assertEquals("text/css", mimeType);
 
 		mimeType = FileUtil.getMimeType("test.js");
 		// 在 jdk 11+ 会获取到 text/javascript,而非 自定义的 application/x-javascript
 		final List<String> list = ListUtil.of("text/javascript", "application/x-javascript");
-		Assert.assertTrue(list.contains(mimeType));
+		assertTrue(list.contains(mimeType));
 
 		// office03
 		mimeType = FileUtil.getMimeType("test.doc");
-		Assert.assertEquals("application/msword", mimeType);
+		assertEquals("application/msword", mimeType);
 		mimeType = FileUtil.getMimeType("test.xls");
-		Assert.assertEquals("application/vnd.ms-excel", mimeType);
+		assertEquals("application/vnd.ms-excel", mimeType);
 		mimeType = FileUtil.getMimeType("test.ppt");
-		Assert.assertEquals("application/vnd.ms-powerpoint", mimeType);
+		assertEquals("application/vnd.ms-powerpoint", mimeType);
 
 		// office07+
 		mimeType = FileUtil.getMimeType("test.docx");
-		Assert.assertEquals("application/vnd.openxmlformats-officedocument.wordprocessingml.document", mimeType);
+		assertEquals("application/vnd.openxmlformats-officedocument.wordprocessingml.document", mimeType);
 		mimeType = FileUtil.getMimeType("test.xlsx");
-		Assert.assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", mimeType);
+		assertEquals("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", mimeType);
 		mimeType = FileUtil.getMimeType("test.pptx");
-		Assert.assertEquals("application/vnd.openxmlformats-officedocument.presentationml.presentation", mimeType);
+		assertEquals("application/vnd.openxmlformats-officedocument.presentationml.presentation", mimeType);
 
 		// pr#2617@Github
 		mimeType = FileUtil.getMimeType("test.wgt");
-		Assert.assertEquals("application/widget", mimeType);
+		assertEquals("application/widget", mimeType);
 
 		// issue#3092
 		mimeType = FileUtil.getMimeType("https://xxx.oss-cn-hangzhou.aliyuncs.com/xxx.webp");
-		Assert.assertEquals("image/webp", mimeType);
+		assertEquals("image/webp", mimeType);
 	}
 
 	@Test
 	public void isSubTest() {
 		final File file = new File("d:/test");
 		final File file2 = new File("d:/test2/aaa");
-		Assert.assertFalse(FileUtil.isSub(file, file2));
+		assertFalse(FileUtil.isSub(file, file2));
 	}
 
 	@Test
 	public void isSubRelativeTest() {
 		final File file = new File("..");
 		final File file2 = new File(".");
-		Assert.assertTrue(FileUtil.isSub(file, file2));
+		assertTrue(FileUtil.isSub(file, file2));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void appendLinesTest(){
 		final List<String> list = ListUtil.toList("a", "b", "c");
 		FileUtil.appendLines(list, FileUtil.file("d:/test/appendLines.txt"), CharsetUtil.CHARSET_UTF_8);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void createTempFileTest(){
 		final File nullDirTempFile = FileUtil.createTempFile();
-		Assert.assertTrue(nullDirTempFile.exists());
+		assertTrue(nullDirTempFile.exists());
 
 		final File suffixDirTempFile = FileUtil.createTempFile(".xlsx",true);
-		Assert.assertEquals("xlsx", FileUtil.getSuffix(suffixDirTempFile));
+		assertEquals("xlsx", FileUtil.getSuffix(suffixDirTempFile));
 
 		final File prefixDirTempFile = FileUtil.createTempFile("prefix",".xlsx",true);
-		Assert.assertTrue(FileUtil.getPrefix(prefixDirTempFile).startsWith("prefix"));
+		assertTrue(FileUtil.getPrefix(prefixDirTempFile).startsWith("prefix"));
 	}
 
 	@Test
 	public void getTotalLinesTest() {
 		// 此文件最后一行有换行符，则最后的空行算作一行
 		final int totalLines = FileUtil.getTotalLines(FileUtil.file("test_lines.csv"));
-		Assert.assertEquals(8, totalLines);
+		assertEquals(8, totalLines);
 	}
 
 	@Test
 	public void issue3591Test() {
 		// 此文件最后一行末尾无换行符
 		final int totalLines = FileUtil.getTotalLines(FileUtil.file("1_psi_index_0.txt"));
-		Assert.assertEquals(11, totalLines);
+		assertEquals(11, totalLines);
 	}
 
 	@Test
 	public void isAbsolutePathTest(){
 		String path = "d:/test\\aaa.txt";
-		Assert.assertTrue(FileUtil.isAbsolutePath(path));
+		assertTrue(FileUtil.isAbsolutePath(path));
 
 		path = "test\\aaa.txt";
-		Assert.assertFalse(FileUtil.isAbsolutePath(path));
+		assertFalse(FileUtil.isAbsolutePath(path));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyTest2(){
 		final File copy = FileUtil.copy("d:/test/qrcodeCustom.png", "d:/test/pic", false);
 		// 当复制文件到目标目录的时候，返回复制的目标文件，而非目录
@@ -555,7 +558,7 @@ public class FileUtilTest {
 
 	@Test
 	public void checkSlipTest() {
-		Assert.assertThrows(IllegalArgumentException.class, ()->{
+		assertThrows(IllegalArgumentException.class, ()->{
 			FileUtil.checkSlip(FileUtil.file("test/a"), FileUtil.file("test/../a"));
 		});
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
index c0caa2500..d593fa2e6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/IoUtilTest.java
@@ -2,18 +2,20 @@ package cn.hutool.core.io;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class IoUtilTest {
 
 	@Test
 	public void readBytesTest() {
 		final byte[] bytes = IoUtil.readBytes(ResourceUtil.getStream("hutool.jpg"));
-		Assert.assertEquals(22807, bytes.length);
+		assertEquals(22807, bytes.length);
 	}
 
 	@Test
@@ -21,13 +23,13 @@ public class IoUtilTest {
 		// 读取固定长度
 		final int limit = RandomUtil.randomInt(22807);
 		final byte[] bytes = IoUtil.readBytes(ResourceUtil.getStream("hutool.jpg"), limit);
-		Assert.assertEquals(limit, bytes.length);
+		assertEquals(limit, bytes.length);
 	}
 
 	@Test
 	public void readLinesTest() {
 		try (BufferedReader reader = ResourceUtil.getUtf8Reader("test_lines.csv");) {
-			IoUtil.readLines(reader, (LineHandler) Assert::assertNotNull);
+			IoUtil.readLines(reader, (LineHandler) Assertions::assertNotNull);
 		} catch (IOException e) {
 			throw new IORuntimeException(e);
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java
index 86f90ad85..137e640ce 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/ManifestUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.io;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.jar.Manifest;
 
@@ -10,6 +10,6 @@ public class ManifestUtilTest {
 	@Test
 	public void getManiFestTest(){
 		final Manifest manifest = ManifestUtil.getManifest(Test.class);
-		Assert.assertNotNull(manifest);
+		assertNotNull(manifest);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java
index fb7fca4af..cdb5f9a91 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java
@@ -6,8 +6,8 @@ import cn.hutool.core.io.watch.Watcher;
 import cn.hutool.core.io.watch.watchers.DelayWatcher;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
 import java.nio.file.WatchEvent;
@@ -52,7 +52,7 @@ public class WatchMonitorTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testFile() {
 
 		monitor = WatchMonitor.createAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500));
@@ -62,14 +62,14 @@ public class WatchMonitorTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testDir() {
 		monitor = WatchMonitor.createAll("d:/", new DelayWatcher(watcher, 500));
 		monitor.run();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testDelay() {
 		monitor = WatchMonitor.createAll("d:/test", new DelayWatcher(new SimpleWatcher(){
 			@Override
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java
index 772a57a68..08e9c7eed 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CRC16Test.java
@@ -10,8 +10,8 @@ import cn.hutool.core.io.checksum.crc16.CRC16Modbus;
 import cn.hutool.core.io.checksum.crc16.CRC16USB;
 import cn.hutool.core.io.checksum.crc16.CRC16X25;
 import cn.hutool.core.io.checksum.crc16.CRC16XModem;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CRC16Test {
 
@@ -21,74 +21,74 @@ public class CRC16Test {
 	public void ccittTest(){
 		final CRC16CCITT crc16 = new CRC16CCITT();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("c852", crc16.getHexValue());
+		assertEquals("c852", crc16.getHexValue());
 	}
 
 	@Test
 	public void ccittFalseTest(){
 		final CRC16CCITTFalse crc16 = new CRC16CCITTFalse();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("a5e4", crc16.getHexValue());
+		assertEquals("a5e4", crc16.getHexValue());
 	}
 
 	@Test
 	public void xmodemTest(){
 		final CRC16XModem crc16 = new CRC16XModem();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("5a8d", crc16.getHexValue());
+		assertEquals("5a8d", crc16.getHexValue());
 	}
 
 	@Test
 	public void x25Test(){
 		final CRC16X25 crc16 = new CRC16X25();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("a152", crc16.getHexValue());
+		assertEquals("a152", crc16.getHexValue());
 	}
 
 	@Test
 	public void modbusTest(){
 		final CRC16Modbus crc16 = new CRC16Modbus();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("25fb", crc16.getHexValue());
+		assertEquals("25fb", crc16.getHexValue());
 	}
 
 	@Test
 	public void ibmTest(){
 		final CRC16IBM crc16 = new CRC16IBM();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("18c", crc16.getHexValue());
+		assertEquals("18c", crc16.getHexValue());
 	}
 
 	@Test
 	public void maximTest(){
 		final CRC16Maxim crc16 = new CRC16Maxim();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("fe73", crc16.getHexValue());
+		assertEquals("fe73", crc16.getHexValue());
 	}
 
 	@Test
 	public void usbTest(){
 		final CRC16USB crc16 = new CRC16USB();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("da04", crc16.getHexValue());
+		assertEquals("da04", crc16.getHexValue());
 	}
 
 	@Test
 	public void dnpTest(){
 		final CRC16DNP crc16 = new CRC16DNP();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("3d1a", crc16.getHexValue());
+		assertEquals("3d1a", crc16.getHexValue());
 	}
 
 	@Test
 	public void ansiTest(){
 		final CRC16Ansi crc16 = new CRC16Ansi();
 		crc16.update(data.getBytes());
-		Assert.assertEquals("1e00", crc16.getHexValue());
+		assertEquals("1e00", crc16.getHexValue());
 
 		crc16.reset();
 		String str2 = "QN=20160801085857223;ST=32;CN=1062;PW=100000;MN=010000A8900016F000169DC0;Flag=5;CP=&&RtdInterval=30&&";
 		crc16.update(str2.getBytes());
-		Assert.assertEquals("1c80", crc16.getHexValue());
+		assertEquals("1c80", crc16.getHexValue());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
index ccdcc6aba..a6f4d7b66 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/checksum/CrcTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.io.checksum;
 import cn.hutool.core.io.checksum.crc16.CRC16XModem;
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * CRC校验单元测试
@@ -23,7 +23,7 @@ public class CrcTest {
 				-46, -128, 4, 48, 52, 0, 0, 0, 0, 0, 0, 0, 0, 4, 1, 1, -32, -80, 0, 98, -5, 71, 0, 64, 0, 0, 0, 0, -116, 1, 104, 2 };
 		CRC8 crc8 = new CRC8(CRC_POLYNOM, CRC_INITIAL);
 		crc8.update(data, 0, data.length);
-		Assert.assertEquals(29, crc8.getValue());
+		assertEquals(29, crc8.getValue());
 	}
 
 	@Test
@@ -31,7 +31,7 @@ public class CrcTest {
 		CRC16 crc = new CRC16();
 		crc.update(12);
 		crc.update(16);
-		Assert.assertEquals("cc04", HexUtil.toHex(crc.getValue()));
+		assertEquals("cc04", HexUtil.toHex(crc.getValue()));
 	}
 
 	@Test
@@ -40,7 +40,7 @@ public class CrcTest {
 		CRC16 crc = new CRC16();
 		crc.update(str.getBytes(), 0, str.getBytes().length);
 		String crc16 = HexUtil.toHex(crc.getValue());
-		Assert.assertEquals("18c", crc16);
+		assertEquals("18c", crc16);
 	}
 
 	@Test
@@ -50,6 +50,6 @@ public class CrcTest {
 		CRC16XModem crc16 = new CRC16XModem();
 		crc16.update(StrUtil.bytes(text));
 		String hexValue = crc16.getHexValue(true);
-		Assert.assertEquals("0e04", hexValue);
+		assertEquals("0e04", hexValue);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java
index 915431766..b06245d06 100755
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/FileNameUtilTest.java
@@ -1,22 +1,22 @@
 package cn.hutool.core.io.file;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class FileNameUtilTest {
 
 	@Test
 	public void cleanInvalidTest(){
 		String name = FileNameUtil.cleanInvalid("1\n2\n");
-		Assert.assertEquals("12", name);
+		assertEquals("12", name);
 
 		name = FileNameUtil.cleanInvalid("\r1\r\n2\n");
-		Assert.assertEquals("12", name);
+		assertEquals("12", name);
 	}
 
 	@Test
 	public void mainNameTest() {
 		final String s = FileNameUtil.mainName("abc.tar.gz");
-		Assert.assertEquals("abc", s);
+		assertEquals("abc", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
index 130b400f8..f580cb9b4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/FileSystemUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.io.file;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.FileSystem;
 import java.nio.file.FileVisitResult;
@@ -14,7 +14,7 @@ import java.nio.file.attribute.BasicFileAttributes;
 public class FileSystemUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void listTest(){
 		final FileSystem fileSystem = FileSystemUtil.createZip("d:/test/test.zip",
 				CharsetUtil.CHARSET_GBK);
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/Issue3557Test.java b/hutool-core/src/test/java/cn/hutool/core/io/file/Issue3557Test.java
index d9f191098..9dbfa3ed0 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/Issue3557Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/Issue3557Test.java
@@ -1,15 +1,15 @@
 package cn.hutool.core.io.file;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.StandardCopyOption;
 
 public class Issue3557Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyFileTest() {
 		// 如果只是文件不存在，则不会报错
 		// 如果文件所在目录不存在，则会报错
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/IssueIAB65VTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/IssueIAB65VTest.java
index 0ad29b73c..1c0e47dde 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/IssueIAB65VTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/IssueIAB65VTest.java
@@ -1,11 +1,11 @@
 package cn.hutool.core.io.file;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * https://gitee.com/dromara/hutool/issues/IAB65V
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java
index 52e48109c..f032816de 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/PathUtilTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.core.io.file;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
@@ -11,7 +11,7 @@ import java.nio.file.StandardCopyOption;
 public class PathUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyFileTest(){
 		PathUtil.copyFile(
 				Paths.get("d:/test/1595232240113.jpg"),
@@ -22,7 +22,7 @@ public class PathUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyTest(){
 		PathUtil.copy(
 				Paths.get("d:/Red2_LYY"),
@@ -31,7 +31,7 @@ public class PathUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void copyContentTest(){
 		PathUtil.copyContent(
 				Paths.get("d:/Red2_LYY"),
@@ -40,56 +40,56 @@ public class PathUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void moveTest(){
 		PathUtil.move(Paths.get("d:/lombok.jar"), Paths.get("d:/test/"), false);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void moveDirTest(){
 		PathUtil.move(Paths.get("c:\\aaa"), Paths.get("d:/test/looly"), false);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void delDirTest(){
 		PathUtil.del(Paths.get("d:/test/looly"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getMimeTypeTest(){
 		String mimeType = PathUtil.getMimeType(Paths.get("d:/test/test.jpg"));
-		Assert.assertEquals("image/jpeg", mimeType);
+		assertEquals("image/jpeg", mimeType);
 
 		mimeType = PathUtil.getMimeType(Paths.get("d:/test/test.mov"));
-		Assert.assertEquals("video/quicktime", mimeType);
+		assertEquals("video/quicktime", mimeType);
 	}
 
 	@Test
 	public void getMimeOfRarTest(){
 		String contentType = FileUtil.getMimeType("a001.rar");
-		Assert.assertEquals("application/x-rar-compressed", contentType);
+		assertEquals("application/x-rar-compressed", contentType);
 	}
 
 	@Test
 	public void getMimeOf7zTest(){
 		String contentType = FileUtil.getMimeType("a001.7z");
-		Assert.assertEquals("application/x-7z-compressed", contentType);
+		assertEquals("application/x-7z-compressed", contentType);
 	}
 
 	@Test
 	public void issue3179Test() {
 		final String mimeType = PathUtil.getMimeType(Paths.get("xxxx.jpg"));
-		Assert.assertEquals("image/jpeg", mimeType);
+		assertEquals("image/jpeg", mimeType);
 	}
 
 	/**
 	 * issue#2893 target不存在空导致异常
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void moveTest2(){
 		PathUtil.move(Paths.get("D:\\project\\test1.txt"), Paths.get("D:\\project\\test2.txt"), false);
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
index de2bedd48..64845c6b0 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/file/TailerTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.io.file;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharsetUtil;
@@ -9,13 +9,13 @@ import cn.hutool.core.util.CharsetUtil;
 public class TailerTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void tailTest() {
 		FileUtil.tail(FileUtil.file("d:/test/tail.txt"), CharsetUtil.CHARSET_GBK);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void tailWithLinesTest() {
 		Tailer tailer = new Tailer(FileUtil.file("f:/test/test.log"), Tailer.CONSOLE_HANDLER, 2);
 		tailer.start();
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
index 552a8e40a..976dafb64 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/resource/ResourceUtilTest.java
@@ -3,34 +3,34 @@ package cn.hutool.core.io.resource;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ResourceUtilTest {
 
 	@Test
 	public void readXmlTest(){
 		final String str = ResourceUtil.readUtf8Str("test.xml");
-		Assert.assertNotNull(str);
+		assertNotNull(str);
 
 		Resource resource = new ClassPathResource("test.xml");
 		final String xmlStr = resource.readUtf8Str();
 
-		Assert.assertEquals(str, xmlStr);
+		assertEquals(str, xmlStr);
 	}
 
 	@Test
 	public void stringResourceTest(){
 		final StringResource stringResource = new StringResource("testData", "test");
-		Assert.assertEquals("test", stringResource.getName());
-		Assert.assertArrayEquals("testData".getBytes(), stringResource.readBytes());
-		Assert.assertArrayEquals("testData".getBytes(), IoUtil.readBytes(stringResource.getStream()));
+		assertEquals("test", stringResource.getName());
+		assertArrayEquals("testData".getBytes(), stringResource.readBytes());
+		assertArrayEquals("testData".getBytes(), IoUtil.readBytes(stringResource.getStream()));
 	}
 
 	@Test
 	public void fileResourceTest(){
 		final FileResource resource = new FileResource(FileUtil.file("test.xml"));
-		Assert.assertEquals("test.xml", resource.getName());
-		Assert.assertTrue(StrUtil.isNotEmpty(resource.readUtf8Str()));
+		assertEquals("test.xml", resource.getName());
+		assertTrue(StrUtil.isNotEmpty(resource.readUtf8Str()));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java
index feafb9a3a..fdf557539 100644
--- a/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java
@@ -1,49 +1,49 @@
 package cn.hutool.core.io.unit;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DataSizeUtilTest {
 
 	@Test
 	public void parseTest(){
 		long parse = DataSizeUtil.parse("3M");
-		Assert.assertEquals(3145728, parse);
+		assertEquals(3145728, parse);
 
 		parse = DataSizeUtil.parse("3m");
-		Assert.assertEquals(3145728, parse);
+		assertEquals(3145728, parse);
 
 		parse = DataSizeUtil.parse("3MB");
-		Assert.assertEquals(3145728, parse);
+		assertEquals(3145728, parse);
 
 		parse = DataSizeUtil.parse("3mb");
-		Assert.assertEquals(3145728, parse);
+		assertEquals(3145728, parse);
 
 		parse = DataSizeUtil.parse("3.1M");
-		Assert.assertEquals(3250585, parse);
+		assertEquals(3250585, parse);
 
 		parse = DataSizeUtil.parse("3.1m");
-		Assert.assertEquals(3250585, parse);
+		assertEquals(3250585, parse);
 
 		parse = DataSizeUtil.parse("3.1MB");
-		Assert.assertEquals(3250585, parse);
+		assertEquals(3250585, parse);
 
 		parse = DataSizeUtil.parse("-3.1MB");
-		Assert.assertEquals(-3250585, parse);
+		assertEquals(-3250585, parse);
 
 		parse = DataSizeUtil.parse("+3.1MB");
-		Assert.assertEquals(3250585, parse);
+		assertEquals(3250585, parse);
 
 		parse = DataSizeUtil.parse("3.1mb");
-		Assert.assertEquals(3250585, parse);
+		assertEquals(3250585, parse);
 
 		parse = DataSizeUtil.parse("3.1");
-		Assert.assertEquals(3, parse);
+		assertEquals(3, parse);
 
 		try {
 			DataSizeUtil.parse("3.1.3");
 		} catch (IllegalArgumentException ie) {
-			Assert.assertEquals("'3.1.3' is not a valid data size", ie.getMessage());
+			assertEquals("'3.1.3' is not a valid data size", ie.getMessage());
 		}
 
 
@@ -52,19 +52,19 @@ public class DataSizeUtilTest {
 	@Test
 	public void formatTest(){
 		String format = DataSizeUtil.format(Long.MAX_VALUE);
-		Assert.assertEquals("8 EB", format);
+		assertEquals("8 EB", format);
 
 		format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024 * 1024);
-		Assert.assertEquals("1 PB", format);
+		assertEquals("1 PB", format);
 
 		format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024);
-		Assert.assertEquals("1 TB", format);
+		assertEquals("1 TB", format);
 	}
 
 	@Test
 	public void issueI88Z4ZTest() {
 		final String size = DataSizeUtil.format(10240000);
 		final long bytes = DataSize.parse(size).toBytes();
-		Assert.assertEquals(10244587, bytes);
+		assertEquals(10244587, bytes);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java
index 7ddde8d47..63b73eb5a 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/AssertTest.java
@@ -1,40 +1,48 @@
 package cn.hutool.core.lang;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class AssertTest {
 
 	@Test
-	public void isNullTest(){
+	public void isNullTest() {
 		String a = null;
 		cn.hutool.core.lang.Assert.isNull(a);
 	}
+
 	@Test
-	public void notNullTest(){
+	public void notNullTest() {
 		String a = null;
 		cn.hutool.core.lang.Assert.isNull(a);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void isTrueTest() {
-		int i = 0;
-		//noinspection ConstantConditions
-		cn.hutool.core.lang.Assert.isTrue(i > 0, IllegalArgumentException::new);
+		Assertions.assertThrows(IllegalArgumentException.class, () -> {
+			int i = 0;
+			//noinspection ConstantConditions
+			cn.hutool.core.lang.Assert.isTrue(i > 0, IllegalArgumentException::new);
+		});
 	}
 
-	@Test(expected = IndexOutOfBoundsException.class)
+	@Test
 	public void isTrueTest2() {
-		int i = -1;
-		//noinspection ConstantConditions
-		cn.hutool.core.lang.Assert.isTrue(i >= 0, IndexOutOfBoundsException::new);
+		Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+			int i = -1;
+			//noinspection ConstantConditions
+			cn.hutool.core.lang.Assert.isTrue(i >= 0, IndexOutOfBoundsException::new);
+		});
 	}
 
-	@Test(expected = IndexOutOfBoundsException.class)
+	@Test
 	public void isTrueTest3() {
-		int i = -1;
-		//noinspection ConstantConditions
-		Assert.isTrue(i > 0, () -> new IndexOutOfBoundsException("relation message to return"));
+		Assertions.assertThrows(IndexOutOfBoundsException.class, () -> {
+			int i = -1;
+			//noinspection ConstantConditions
+			Assert.isTrue(i > 0, () -> new IndexOutOfBoundsException("relation message to return"));
+		});
 	}
 
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ClassScanerTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ClassScanerTest.java
index 64f28963a..ea5685fcc 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ClassScanerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ClassScanerTest.java
@@ -1,15 +1,15 @@
 package cn.hutool.core.lang;
 
 import cn.hutool.core.util.ClassUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
 public class ClassScanerTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scanTest() {
 		ClassScanner scaner = new ClassScanner("cn.hutool.core.util", null);
 		Set<Class<?>> set = scaner.scan();
@@ -19,7 +19,7 @@ public class ClassScanerTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scanPackageBySuperTest(){
 		// 扫描包，如果在classpath下找到，就不扫描JDK的jar了
 		final Set<Class<?>> classes = ClassScanner.scanPackageBySuper(null, Iterable.class);
@@ -27,7 +27,7 @@ public class ClassScanerTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scanAllPackageBySuperTest(){
 		// 扫描包，如果在classpath下找到，就不扫描JDK的jar了
 		final Set<Class<?>> classes = ClassScanner.scanAllPackageBySuper(null, Iterable.class);
@@ -36,7 +36,7 @@ public class ClassScanerTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scanAllPackageIgnoreLoadErrorTest(){
 		final ClassScanner classScanner = new ClassScanner(null, null);
 		classScanner.setIgnoreLoadError(true);
@@ -46,7 +46,7 @@ public class ClassScanerTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void scanJavaLang() {
 		final Set<Class<?>> classes = ClassUtil.scanPackage("java.lang");
 		for (final Class<?> aClass : classes) {
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java
index 0cc40bc5d..f5ea479ad 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.lang;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ConsoleTableTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void printSBCTest() {
 		ConsoleTable t = ConsoleTable.create();
 		t.addHeader("姓名", "年龄");
@@ -34,7 +34,7 @@ public class ConsoleTableTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void printDBCTest() {
 		ConsoleTable t = ConsoleTable.create().setSBCMode(false);
 		t.addHeader("姓名", "年龄");
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
index 01a92e70f..ae9f1f068 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.thread.ThreadUtil;
 
@@ -59,7 +59,7 @@ public class ConsoleTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void inputTest() {
 		Console.log("Please input something: ");
 		String input = Console.input();
@@ -67,7 +67,7 @@ public class ConsoleTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void printProgressTest() {
 		for(int i = 0; i < 100; i++) {
 			Console.printProgress('#', 100, i / 100D);
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
index 81d595708..6d7bb7042 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.lang;
 
 import cn.hutool.core.builder.GenericBuilder;
 import cn.hutool.core.date.DateTime;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class DictTest {
 				.set("key3", DateTime.now());//Date
 
 		Long v2 = dict.getLong("key2");
-		Assert.assertEquals(Long.valueOf(1000L), v2);
+		assertEquals(Long.valueOf(1000L), v2);
 	}
 
 	@Test
@@ -30,8 +30,8 @@ public class DictTest {
 
 		dict.putAll(map);
 
-		Assert.assertEquals(1, dict.get("A"));
-		Assert.assertEquals(1, dict.get("a"));
+		assertEquals(1, dict.get("A"));
+		assertEquals(1, dict.get("a"));
 	}
 
 	@Test
@@ -42,9 +42,9 @@ public class DictTest {
 				"BLUE", "#0000FF"
 		);
 
-		Assert.assertEquals("#FF0000", dict.get("RED"));
-		Assert.assertEquals("#00FF00", dict.get("GREEN"));
-		Assert.assertEquals("#0000FF", dict.get("BLUE"));
+		assertEquals("#FF0000", dict.get("RED"));
+		assertEquals("#00FF00", dict.get("GREEN"));
+		assertEquals("#0000FF", dict.get("BLUE"));
 	}
 
 	@Test
@@ -59,7 +59,7 @@ public class DictTest {
 
 		dict.removeEqual(dict2);
 
-		Assert.assertTrue(dict.isEmpty());
+		assertTrue(dict.isEmpty());
 	}
 
 	@Test
@@ -67,7 +67,7 @@ public class DictTest {
 		User user = GenericBuilder.of(User::new).with(User::setUsername, "hutool").build();
 		Dict dict = Dict.create();
 		dict.setFields(user::getNickname, user::getUsername);
-		Assert.assertEquals("hutool", dict.get("username"));
-		Assert.assertNull(dict.get("nickname"));
+		assertEquals("hutool", dict.get("username"));
+		assertNull(dict.get("nickname"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java
index bfac066f1..0517760c3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/NanoIdTest.java
@@ -1,17 +1,14 @@
 package cn.hutool.core.lang;
 
 import cn.hutool.core.lang.id.NanoId;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 import java.util.regex.Pattern;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Tests for NanoId.
  *
@@ -32,7 +29,7 @@ public class NanoIdTest {
 			if (ids.contains(id) == false) {
 				ids.add(id);
 			} else {
-				Assert.fail("Non-unique ID generated: " + id);
+				fail("Non-unique ID generated: " + id);
 			}
 		}
 
@@ -55,7 +52,7 @@ public class NanoIdTest {
 
 		for (final String expectedId : expectedIds) {
 			final String generatedId = NanoId.randomNanoId(random, alphabet, size);
-			Assert.assertEquals(expectedId, generatedId);
+			assertEquals(expectedId, generatedId);
 		}
 
 	}
@@ -82,7 +79,7 @@ public class NanoIdTest {
 			}
 			patternBuilder.append("]+$");
 
-			Assert.assertTrue(id.matches(patternBuilder.toString()));
+			assertTrue(id.matches(patternBuilder.toString()));
 		}
 
 	}
@@ -95,7 +92,7 @@ public class NanoIdTest {
 
 			final String id = NanoId.randomNanoId(size);
 
-			Assert.assertEquals(size, id.length());
+			assertEquals(size, id.length());
 		}
 
 	}
@@ -131,36 +128,42 @@ public class NanoIdTest {
 		//Verify the distribution of characters is pretty even
 		for (final Long charCount : charCounts.values()) {
 			final double distribution = (charCount * alphabet.length / (double) (idCount * idSize));
-			Assert.assertTrue(distribution >= 0.95 && distribution <= 1.05);
+			assertTrue(distribution >= 0.95 && distribution <= 1.05);
 		}
 
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void randomNanoIdEmptyAlphabetExceptionThrownTest() {
-		NanoId.randomNanoId(new SecureRandom(), new char[]{}, 10);
+		assertThrows(IllegalArgumentException.class, () -> {
+			NanoId.randomNanoId(new SecureRandom(), new char[]{}, 10);
+		});
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void randomNanoId256AlphabetExceptionThrownTest() {
+		assertThrows(IllegalArgumentException.class, () -> {
+			//The alphabet is composed of 256 unique characters
+			final char[] largeAlphabet = new char[256];
+			for (int i = 0; i < 256; i++) {
+				largeAlphabet[i] = (char) i;
+			}
 
-		//The alphabet is composed of 256 unique characters
-		final char[] largeAlphabet = new char[256];
-		for (int i = 0; i < 256; i++) {
-			largeAlphabet[i] = (char) i;
-		}
-
-		NanoId.randomNanoId(new SecureRandom(), largeAlphabet, 20);
-
+			NanoId.randomNanoId(new SecureRandom(), largeAlphabet, 20);
+		});
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void randomNanoIdNegativeSizeExceptionThrown() {
-		NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, -10);
+		assertThrows(IllegalArgumentException.class, () -> {
+			NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, -10);
+		});
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void randomNanoIdZeroSizeExceptionThrown() {
-		NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, 0);
+		assertThrows(IllegalArgumentException.class, () -> {
+			NanoId.randomNanoId(new SecureRandom(), new char[]{'a', 'b', 'c'}, 0);
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java
index c7abdc4b6..9c33bec60 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ObjectIdTest.java
@@ -2,18 +2,18 @@ package cn.hutool.core.lang;
 
 import java.util.HashSet;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * ObjectId单元测试
- * 
+ *
  * @author looly
  *
  */
 public class ObjectIdTest {
-	
+
 	@Test
 	public void distinctTest() {
 		//生成10000个id测试是否重复
@@ -21,12 +21,12 @@ public class ObjectIdTest {
 		for(int i = 0; i < 10000; i++) {
 			set.add(ObjectId.next());
 		}
-		
-		Assert.assertEquals(10000, set.size());
+
+		assertEquals(10000, set.size());
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void nextTest() {
 		Console.log(ObjectId.next());
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java
index 41d2d19c3..20299c609 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java
@@ -5,9 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -15,6 +14,8 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * {@link Opt}的单元测试
  *
@@ -26,7 +27,7 @@ public class OptTest {
 	public void ofBlankAbleTest() {
 		// ofBlankAble相对于ofNullable考虑了字符串为空串的情况
 		String hutool = Opt.ofBlankAble("").orElse("hutool");
-		Assert.assertEquals("hutool", hutool);
+		assertEquals("hutool", hutool);
 	}
 
 	@Test
@@ -34,7 +35,7 @@ public class OptTest {
 		// 和原版Optional有区别的是，get不会抛出NoSuchElementException
 		// 如果想使用原版Optional中的get这样，获取一个一定不为空的值，则应该使用orElseThrow
 		Object opt = Opt.ofNullable(null).get();
-		Assert.assertNull(opt);
+		assertNull(opt);
 	}
 
 	@Test
@@ -42,11 +43,11 @@ public class OptTest {
 		// 这是jdk11 Optional中的新函数，直接照搬了过来
 		// 判断包裹内元素是否为空，注意并没有判断空字符串的情况
 		boolean isEmpty = Opt.empty().isEmpty();
-		Assert.assertTrue(isEmpty);
+		assertTrue(isEmpty);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void ifPresentOrElseTest() {
 		// 存在就打印对应的值，不存在则用{@code System.err.println}打印另一句字符串
 		Opt.ofNullable("Hello Hutool!").ifPresentOrElse(Console::log, () -> Console.error("Ops!Something is wrong!"));
@@ -63,12 +64,12 @@ public class OptTest {
 		User user = new User();
 		// 相当于ifPresent的链式调用
 		Opt.ofNullable("hutool").peek(user::setUsername).peek(user::setNickname);
-		Assert.assertEquals("hutool", user.getNickname());
-		Assert.assertEquals("hutool", user.getUsername());
+		assertEquals("hutool", user.getNickname());
+		assertEquals("hutool", user.getUsername());
 
 		// 注意，传入的lambda中，对包裹内的元素执行赋值操作并不会影响到原来的元素
 		String name = Opt.ofNullable("hutool").peek(username -> username = "123").peek(username -> username = "456").get();
-		Assert.assertEquals("hutool", name);
+		assertEquals("hutool", name);
 	}
 
 	@Test
@@ -79,18 +80,18 @@ public class OptTest {
 		Opt.ofNullable("hutool").peeks(user::setUsername, user::setNickname);
 		// 也可以在适当的地方换行使得代码的可读性提高
 		Opt.of(user).peeks(
-				u -> Assert.assertEquals("hutool", u.getNickname()),
-				u -> Assert.assertEquals("hutool", u.getUsername())
+				u -> assertEquals("hutool", u.getNickname()),
+				u -> assertEquals("hutool", u.getUsername())
 		);
-		Assert.assertEquals("hutool", user.getNickname());
-		Assert.assertEquals("hutool", user.getUsername());
+		assertEquals("hutool", user.getNickname());
+		assertEquals("hutool", user.getUsername());
 
 		// 注意，传入的lambda中，对包裹内的元素执行赋值操作并不会影响到原来的元素,这是java语言的特性。。。
 		// 这也是为什么我们需要getter和setter而不直接给bean中的属性赋值中的其中一个原因
 		String name = Opt.ofNullable("hutool").peeks(
 				username -> username = "123", username -> username = "456",
-				n -> Assert.assertEquals("hutool", n)).get();
-		Assert.assertEquals("hutool", name);
+				n -> assertEquals("hutool", n)).get();
+		assertEquals("hutool", name);
 
 		// 当然，以下情况不会抛出NPE，但也没什么意义
 		Opt.ofNullable("hutool").peeks().peeks().peeks();
@@ -104,34 +105,40 @@ public class OptTest {
 		// 这是jdk9 Optional中的新函数，直接照搬了过来
 		// 给一个替代的Opt
 		String str = Opt.<String>ofNullable(null).or(() -> Opt.ofNullable("Hello hutool!")).map(String::toUpperCase).orElseThrow();
-		Assert.assertEquals("HELLO HUTOOL!", str);
+		assertEquals("HELLO HUTOOL!", str);
 
 		User user = User.builder().username("hutool").build();
 		Opt<User> userOpt = Opt.of(user);
 		// 获取昵称，获取不到则获取用户名
 		String name = userOpt.map(User::getNickname).or(() -> userOpt.map(User::getUsername)).get();
-		Assert.assertEquals("hutool", name);
+		assertEquals("hutool", name);
 	}
 
-	@Test(expected = NoSuchElementException.class)
+	@Test
 	public void orElseThrowTest() {
-		// 获取一个不可能为空的值，否则抛出NoSuchElementException异常
-		Object obj = Opt.ofNullable(null).orElseThrow();
-		Assert.assertNull(obj);
+		assertThrows(NoSuchElementException.class, () -> {
+			// 获取一个不可能为空的值，否则抛出NoSuchElementException异常
+			Object obj = Opt.ofNullable(null).orElseThrow();
+			assertNull(obj);
+		});
 	}
 
-	@Test(expected = IllegalStateException.class)
+	@Test
 	public void orElseThrowTest2() {
-		// 获取一个不可能为空的值，否则抛出自定义异常
-		Object assignException = Opt.ofNullable(null).orElseThrow(IllegalStateException::new);
-		Assert.assertNull(assignException);
+		assertThrows(IllegalStateException.class, () -> {
+			// 获取一个不可能为空的值，否则抛出自定义异常
+			Object assignException = Opt.ofNullable(null).orElseThrow(IllegalStateException::new);
+			assertNull(assignException);
+		});
 	}
 
-	@Test(expected = IllegalStateException.class)
+	@Test
 	public void orElseThrowTest3() {
-		// 获取一个不可能为空的值，否则抛出带自定义消息的自定义异常
-		Object exceptionWithMessage = Opt.empty().orElseThrow(IllegalStateException::new, "Ops!Something is wrong!");
-		Assert.assertNull(exceptionWithMessage);
+		assertThrows(IllegalStateException.class, () -> {
+			// 获取一个不可能为空的值，否则抛出带自定义消息的自定义异常
+			Object exceptionWithMessage = Opt.empty().orElseThrow(IllegalStateException::new, "Ops!Something is wrong!");
+			assertNull(exceptionWithMessage);
+		});
 	}
 
 	@Test
@@ -143,8 +150,8 @@ public class OptTest {
 		// 现在，兼容
 		User user = Opt.ofNullable(userList).map(List::stream)
 				.flattedMap(Stream::findFirst).orElseGet(User.builder()::build);
-		Assert.assertNull(user.getUsername());
-		Assert.assertNull(user.getNickname());
+		assertNull(user.getUsername());
+		assertNull(user.getNickname());
 	}
 
 	@Test
@@ -154,15 +161,15 @@ public class OptTest {
 		List<String> past = Opt.ofNullable(Collections.<String>emptyList()).filter(CollectionUtil::isNotEmpty).orElseGet(() -> Collections.singletonList("hutool"));
 		// 现在，一个ofEmptyAble搞定
 		List<String> hutool = Opt.ofEmptyAble(Collections.<String>emptyList()).orElseGet(() -> Collections.singletonList("hutool"));
-		Assert.assertEquals(past, hutool);
-		Assert.assertEquals(hutool, Collections.singletonList("hutool"));
+		assertEquals(past, hutool);
+		assertEquals(hutool, Collections.singletonList("hutool"));
 	}
 
 	@Test
 	public void mapOrElseTest() {
 		// 如果值存在就转换为大写，否则打印一句字符串，支持链式调用、转换为其他类型
 		String hutool = Opt.ofBlankAble("hutool").mapOrElse(String::toUpperCase, () -> Console.log("yes")).mapOrElse(String::intern, () -> Console.log("Value is not present~")).get();
-		Assert.assertEquals("HUTOOL", hutool);
+		assertEquals("HUTOOL", hutool);
 	}
 
 	@SuppressWarnings({"MismatchedQueryAndUpdateOfCollection", "ConstantConditions"})
@@ -183,10 +190,10 @@ public class OptTest {
 			// 你可以在里面写一长串调用链 list.get(0).getUser().getId()
 			return list.get(0);
 		}).exceptionOrElse("hutool");
-		Assert.assertEquals(npe, npeSituation);
-		Assert.assertEquals(indexOut, indexOutSituation);
-		Assert.assertEquals("hutool", npe);
-		Assert.assertEquals("hutool", indexOut);
+		assertEquals(npe, npeSituation);
+		assertEquals(indexOut, indexOutSituation);
+		assertEquals("hutool", npe);
+		assertEquals("hutool", indexOut);
 
 		// 多线程下情况测试
 		Stream.iterate(0, i -> ++i).limit(20000).parallel().forEach(i -> {
@@ -197,7 +204,7 @@ public class OptTest {
 					throw new NullPointerException(i + "");
 				}
 			});
-			Assert.assertTrue(
+			assertTrue(
 					(i % 2 == 0 && opt.getException() instanceof IllegalStateException) ||
 							(i % 2 != 0 && opt.getException() instanceof NullPointerException)
 			);
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
index b10b115eb..67a362179 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/RangeTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.date.DateRange;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.NoSuchElementException;
@@ -30,11 +30,11 @@ public class RangeTest {
 			return current.offsetNew(DateField.DAY_OF_YEAR, 1);
 		});
 
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(DateUtil.parse("2017-01-01"), range.next());
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(DateUtil.parse("2017-01-02"), range.next());
-		Assert.assertFalse(range.hasNext());
+		assertTrue(range.hasNext());
+		assertEquals(DateUtil.parse("2017-01-01"), range.next());
+		assertTrue(range.hasNext());
+		assertEquals(DateUtil.parse("2017-01-02"), range.next());
+		assertFalse(range.hasNext());
 	}
 
 	@Test
@@ -43,10 +43,10 @@ public class RangeTest {
 		DateTime end = DateUtil.parse("2021-01-03");
 
 		List<Integer> dayOfMonthList = DateUtil.rangeFunc(start, end, DateField.DAY_OF_YEAR, a -> DateTime.of(a).dayOfMonth());
-		Assert.assertArrayEquals(dayOfMonthList.toArray(new Integer[]{}), new Integer[]{1, 2, 3});
+		assertArrayEquals(dayOfMonthList.toArray(new Integer[]{}), new Integer[]{1, 2, 3});
 
 		List<Integer> dayOfMonthList2 = DateUtil.rangeFunc(null, null, DateField.DAY_OF_YEAR, a -> DateTime.of(a).dayOfMonth());
-		Assert.assertArrayEquals(dayOfMonthList2.toArray(new Integer[]{}), new Integer[]{});
+		assertArrayEquals(dayOfMonthList2.toArray(new Integer[]{}), new Integer[]{});
 	}
 
 	@Test
@@ -56,11 +56,11 @@ public class RangeTest {
 
 		StringBuilder sb = new StringBuilder();
 		DateUtil.rangeConsume(start, end, DateField.DAY_OF_YEAR, a -> sb.append(DateTime.of(a).dayOfMonth()).append("#"));
-		Assert.assertEquals(sb.toString(), "1#2#3#");
+		assertEquals(sb.toString(), "1#2#3#");
 
 		StringBuilder sb2 = new StringBuilder();
 		DateUtil.rangeConsume(null, null, DateField.DAY_OF_YEAR, a -> sb2.append(DateTime.of(a).dayOfMonth()).append("#"));
-		Assert.assertEquals(sb2.toString(), StrUtil.EMPTY);
+		assertEquals(sb2.toString(), StrUtil.EMPTY);
 	}
 
 	@Test
@@ -70,22 +70,22 @@ public class RangeTest {
 
 		final DateRange range = DateUtil.range(start, end, DateField.MONTH);
 
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(DateUtil.parse("2021-01-31"), range.next());
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(DateUtil.parse("2021-02-28"), range.next());
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(DateUtil.parse("2021-03-31"), range.next());
-		Assert.assertFalse(range.hasNext());
+		assertTrue(range.hasNext());
+		assertEquals(DateUtil.parse("2021-01-31"), range.next());
+		assertTrue(range.hasNext());
+		assertEquals(DateUtil.parse("2021-02-28"), range.next());
+		assertTrue(range.hasNext());
+		assertEquals(DateUtil.parse("2021-03-31"), range.next());
+		assertFalse(range.hasNext());
 	}
 
 	@Test
 	public void intRangeTest() {
 		final Range<Integer> range = new Range<>(1, 1, (current, end, index) -> current >= end ? null : current + 10);
 
-		Assert.assertTrue(range.hasNext());
-		Assert.assertEquals(Integer.valueOf(1), range.next());
-		Assert.assertFalse(range.hasNext());
+		assertTrue(range.hasNext());
+		assertEquals(Integer.valueOf(1), range.next());
+		assertFalse(range.hasNext());
 	}
 
 	@Test
@@ -95,19 +95,19 @@ public class RangeTest {
 
 		// 测试包含开始和结束情况下步进为1的情况
 		DateRange range = DateUtil.range(start, end, DateField.DAY_OF_YEAR);
-		Assert.assertEquals(range.next(), DateUtil.parse("2017-01-01"));
-		Assert.assertEquals(range.next(), DateUtil.parse("2017-01-02"));
-		Assert.assertEquals(range.next(), DateUtil.parse("2017-01-03"));
+		assertEquals(range.next(), DateUtil.parse("2017-01-01"));
+		assertEquals(range.next(), DateUtil.parse("2017-01-02"));
+		assertEquals(range.next(), DateUtil.parse("2017-01-03"));
 		try {
 			range.next();
-			Assert.fail("已超过边界，下一个元素不应该存在！");
+			fail("已超过边界，下一个元素不应该存在！");
 		} catch (NoSuchElementException ignored) {
 		}
 
 		// 测试多步进的情况
 		range = new DateRange(start, end, DateField.DAY_OF_YEAR, 2);
-		Assert.assertEquals(DateUtil.parse("2017-01-01"), range.next());
-		Assert.assertEquals(DateUtil.parse("2017-01-03"), range.next());
+		assertEquals(DateUtil.parse("2017-01-01"), range.next());
+		assertEquals(DateUtil.parse("2017-01-03"), range.next());
 	}
 
 	@Test
@@ -117,12 +117,12 @@ public class RangeTest {
 
 		// 测试不包含开始结束时间的情况
 		DateRange range = new DateRange(start, end, DateField.DAY_OF_YEAR, 1, false, false);
-		Assert.assertEquals(DateUtil.parse("2017-01-02"), range.next());
-		Assert.assertEquals(DateUtil.parse("2017-01-03"), range.next());
-		Assert.assertEquals(DateUtil.parse("2017-01-04"), range.next());
+		assertEquals(DateUtil.parse("2017-01-02"), range.next());
+		assertEquals(DateUtil.parse("2017-01-03"), range.next());
+		assertEquals(DateUtil.parse("2017-01-04"), range.next());
 		try {
 			range.next();
-			Assert.fail("不包含结束时间情况下，下一个元素不应该存在！");
+			fail("不包含结束时间情况下，下一个元素不应该存在！");
 		} catch (NoSuchElementException ignored) {
 		}
 	}
@@ -133,8 +133,8 @@ public class RangeTest {
 		DateTime end = DateUtil.parse("2017-01-31");
 
 		List<DateTime> rangeToList = DateUtil.rangeToList(start, end, DateField.DAY_OF_YEAR);
-		Assert.assertEquals(DateUtil.parse("2017-01-01"), rangeToList.get(0));
-		Assert.assertEquals(DateUtil.parse("2017-01-02"), rangeToList.get(1));
+		assertEquals(DateUtil.parse("2017-01-01"), rangeToList.get(0));
+		assertEquals(DateUtil.parse("2017-01-02"), rangeToList.get(1));
 	}
 
 
@@ -150,8 +150,8 @@ public class RangeTest {
 		DateRange endRange = DateUtil.range(start1, end1, DateField.DAY_OF_YEAR);
 		// 交集
 		List<DateTime> dateTimes = DateUtil.rangeContains(startRange, endRange);
-		Assert.assertEquals(1, dateTimes.size());
-		Assert.assertEquals(DateUtil.parse("2017-01-31"), dateTimes.get(0));
+		assertEquals(1, dateTimes.size());
+		assertEquals(DateUtil.parse("2017-01-31"), dateTimes.get(0));
 	}
 
 	@Test
@@ -167,8 +167,8 @@ public class RangeTest {
 		// 差集
 		List<DateTime> dateTimes1 = DateUtil.rangeNotContains(startRange, endRange);
 
-		Assert.assertEquals(1, dateTimes1.size());
-		Assert.assertEquals(DateUtil.parse("2017-01-31"), dateTimes1.get(0));
+		assertEquals(1, dateTimes1.size());
+		assertEquals(DateUtil.parse("2017-01-31"), dateTimes1.get(0));
 	}
 
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
index 6c6d4fe66..d70f59600 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SimhashTest.java
@@ -1,24 +1,24 @@
 package cn.hutool.core.lang;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.text.Simhash;
 import cn.hutool.core.util.StrUtil;
 
 public class SimhashTest {
-	
+
 	@Test
 	public void simTest() {
 		String text1 = "我是 一个 普通 字符串";
 		String text2 = "我是 一个 普通 字符串";
-		
+
 		Simhash simhash = new Simhash();
 		long hash = simhash.hash(StrUtil.split(text1, ' '));
-		Assert.assertTrue(hash != 0);
-		
+		assertTrue(hash != 0);
+
 		simhash.store(hash);
 		boolean duplicate = simhash.equals(StrUtil.split(text2, ' '));
-		Assert.assertTrue(duplicate);
+		assertTrue(duplicate);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
index 8b15d28e6..99a665f7a 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SimpleCacheTest.java
@@ -1,14 +1,17 @@
 package cn.hutool.core.lang;
 
+import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.thread.ConcurrencyTester;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class SimpleCacheTest {
 
-	@Before
+	@BeforeEach
 	public void putTest(){
 		final SimpleCache<String, String> cache = new SimpleCache<>();
 		ThreadUtil.execute(()->cache.put("key1", "value1"));
@@ -37,12 +40,12 @@ public class SimpleCacheTest {
 		cache.get("key4");
 		cache.get("key5", ()->"value5");
 
-		Assert.assertEquals("value1", cache.get("key1"));
-		Assert.assertEquals("value2", cache.get("key2"));
-		Assert.assertEquals("value3", cache.get("key3"));
-		Assert.assertEquals("value4", cache.get("key4"));
-		Assert.assertEquals("value5", cache.get("key5"));
-		Assert.assertEquals("value6", cache.get("key6", ()-> "value6"));
+		assertEquals("value1", cache.get("key1"));
+		assertEquals("value2", cache.get("key2"));
+		assertEquals("value3", cache.get("key3"));
+		assertEquals("value4", cache.get("key4"));
+		assertEquals("value5", cache.get("key5"));
+		assertEquals("value6", cache.get("key6", ()-> "value6"));
 	}
 
 	@Test
@@ -54,7 +57,8 @@ public class SimpleCacheTest {
 			return "aaaValue";
 		}));
 
-		Assert.assertTrue(tester.getInterval() > 0);
-		Assert.assertEquals("aaaValue", cache.get("aaa"));
+		assertTrue(tester.getInterval() > 0);
+		assertEquals("aaaValue", cache.get("aaa"));
+		IoUtil.close(tester);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java
index 0d7a30443..84c05ca64 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SingletonTest.java
@@ -3,8 +3,12 @@ package cn.hutool.core.lang;
 import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.thread.ThreadUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.time.Duration;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTimeout;
 
 public class SingletonTest {
 
@@ -33,10 +37,12 @@ public class SingletonTest {
 	 * 测试单例构建属性锁死问题
 	 * C构建单例时候，同时构建B，此时在SimpleCache中会有写锁竞争（写入C时获取了写锁，此时要写入B，也要获取写锁）
 	 */
-	@Test(timeout = 1000L)
+	@Test
 	public void reentrantTest(){
+		assertTimeout(Duration.ofMillis(1000L), ()->{
 		final C c = Singleton.get(C.class);
-		Assert.assertEquals("aaa", c.getB().getA());
+		assertEquals("aaa", c.getB().getA());
+		});
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
index 30af07072..83f6e2eef 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/SnowflakeTest.java
@@ -6,9 +6,9 @@ import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -40,7 +40,7 @@ public class SnowflakeTest {
 		final long trueOffSet = endId - startId;
 		// 忽略数据中心和工作机器时差值为22个1，否则为12个1
 		final long expectedOffSet = ignore ? ~(-1 << 22) : ~(-1 << 12);
-		Assert.assertEquals(trueOffSet, expectedOffSet);
+		assertEquals(trueOffSet, expectedOffSet);
 	}
 
 	@Test
@@ -48,7 +48,7 @@ public class SnowflakeTest {
 		//构建Snowflake，提供终端ID和数据中心ID
 		final Snowflake idWorker = new Snowflake(0, 0);
 		final long nextId = idWorker.nextId();
-		Assert.assertTrue(nextId > 0);
+		assertTrue(nextId > 0);
 	}
 
 	@Test
@@ -61,7 +61,7 @@ public class SnowflakeTest {
 			final long id = idWorker.nextId();
 			hashSet.add(id);
 		}
-		Assert.assertEquals(1000L, hashSet.size());
+		assertEquals(1000L, hashSet.size());
 	}
 
 	@Test
@@ -70,13 +70,13 @@ public class SnowflakeTest {
 		final Snowflake idWorker = new Snowflake(1, 2);
 		final long nextId = idWorker.nextId();
 
-		Assert.assertEquals(1, idWorker.getWorkerId(nextId));
-		Assert.assertEquals(2, idWorker.getDataCenterId(nextId));
-		Assert.assertTrue(idWorker.getGenerateDateTime(nextId) - System.currentTimeMillis() < 10);
+		assertEquals(1, idWorker.getWorkerId(nextId));
+		assertEquals(2, idWorker.getDataCenterId(nextId));
+		assertTrue(idWorker.getGenerateDateTime(nextId) - System.currentTimeMillis() < 10);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uniqueTest(){
 		// 测试并发环境下生成ID是否重复
 		final Snowflake snowflake = IdUtil.getSnowflake(0, 0);
@@ -95,12 +95,12 @@ public class SnowflakeTest {
 	public void getSnowflakeLengthTest(){
 		for (int i = 0; i < 1000; i++) {
 			final long l = IdUtil.getSnowflake(0, 0).nextId();
-			Assert.assertEquals(19, StrUtil.toString(l).length());
+			assertEquals(19, StrUtil.toString(l).length());
 		}
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void snowflakeRandomSequenceTest(){
 		final Snowflake snowflake = new Snowflake(null, 0, 0,
 				false, Snowflake.DEFAULT_TIME_OFFSET, 2);
@@ -112,7 +112,7 @@ public class SnowflakeTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uniqueOfRandomSequenceTest(){
 		// 测试并发环境下生成ID是否重复
 		final Snowflake snowflake = new Snowflake(null, 0, 0,
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java
index a2ad790c9..e8779eaab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/StrFormatterTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.text.StrFormatter;
 
@@ -11,44 +11,44 @@ public class StrFormatterTest {
 	public void formatTest() {
 		//通常使用
 		String result1 = StrFormatter.format("this is {} for {}", "a", "b");
-		Assert.assertEquals("this is a for b", result1);
+		assertEquals("this is a for b", result1);
 
 		//转义{}
 		String result2 = StrFormatter.format("this is \\{} for {}", "a", "b");
-		Assert.assertEquals("this is {} for a", result2);
+		assertEquals("this is {} for a", result2);
 
 		//转义\
 		String result3 = StrFormatter.format("this is \\\\{} for {}", "a", "b");
-		Assert.assertEquals("this is \\a for b", result3);
+		assertEquals("this is \\a for b", result3);
 	}
 
 	@Test
 	public void formatWithTest() {
 		//通常使用
 		String result1 = StrFormatter.formatWith("this is ? for ?", "?", "a", "b");
-		Assert.assertEquals("this is a for b", result1);
+		assertEquals("this is a for b", result1);
 
 		//转义?
 		String result2 = StrFormatter.formatWith("this is \\? for ?", "?", "a", "b");
-		Assert.assertEquals("this is ? for a", result2);
+		assertEquals("this is ? for a", result2);
 
 		//转义\
 		String result3 = StrFormatter.formatWith("this is \\\\? for ?", "?", "a", "b");
-		Assert.assertEquals("this is \\a for b", result3);
+		assertEquals("this is \\a for b", result3);
 	}
 
 	@Test
 	public void formatWithTest2() {
 		//通常使用
 		String result1 = StrFormatter.formatWith("this is $$$ for $$$", "$$$", "a", "b");
-		Assert.assertEquals("this is a for b", result1);
+		assertEquals("this is a for b", result1);
 
 		//转义?
 		String result2 = StrFormatter.formatWith("this is \\$$$ for $$$", "$$$", "a", "b");
-		Assert.assertEquals("this is $$$ for a", result2);
+		assertEquals("this is $$$ for a", result2);
 
 		//转义\
 		String result3 = StrFormatter.formatWith("this is \\\\$$$ for $$$", "$$$", "a", "b");
-		Assert.assertEquals("this is \\a for b", result3);
+		assertEquals("this is \\a for b", result3);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java
index c8508c298..1c19b14c5 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/TupleTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Locale;
 import java.util.TimeZone;
@@ -12,6 +12,6 @@ public class TupleTest {
 	public void hashCodeTest(){
 		final Tuple tuple = new Tuple(Locale.getDefault(), TimeZone.getDefault());
 		final Tuple tuple2 = new Tuple(Locale.getDefault(), TimeZone.getDefault());
-		Assert.assertEquals(tuple, tuple2);
+		assertEquals(tuple, tuple2);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java
index 2695b80f5..f1ce03c7c 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/UUIDTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.lang;
 
 import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 
@@ -16,6 +16,6 @@ public class UUIDTest {
 	public void fastUUIDTest(){
 		Set<String> set = new ConcurrentHashSet<>(100);
 		ThreadUtil.concurrencyTest(100, ()-> set.add(UUID.fastUUID().toString()));
-		Assert.assertEquals(100, set.size());
+		assertEquals(100, set.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
index 820800024..e87d48b06 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
@@ -2,8 +2,9 @@ package cn.hutool.core.lang;
 
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.util.IdUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * 验证器单元测试
@@ -14,10 +15,10 @@ public class ValidatorTest {
 
 	@Test
 	public void isNumberTest() {
-		Assert.assertTrue(Validator.isNumber("45345365465"));
-		Assert.assertTrue(Validator.isNumber("0004545435"));
-		Assert.assertTrue(Validator.isNumber("5.222"));
-		Assert.assertTrue(Validator.isNumber("0.33323"));
+		assertTrue(Validator.isNumber("45345365465"));
+		assertTrue(Validator.isNumber("0004545435"));
+		assertTrue(Validator.isNumber("5.222"));
+		assertTrue(Validator.isNumber("0.33323"));
 	}
 
 	@Test
@@ -26,221 +27,223 @@ public class ValidatorTest {
 		final String var2 = "str";
 		final String var3 = "180";
 		final String var4 = "身高180体重180";
-		Assert.assertFalse(Validator.hasNumber(var1));
-		Assert.assertFalse(Validator.hasNumber(var2));
-		Assert.assertTrue(Validator.hasNumber(var3));
-		Assert.assertTrue(Validator.hasNumber(var4));
+		assertFalse(Validator.hasNumber(var1));
+		assertFalse(Validator.hasNumber(var2));
+		assertTrue(Validator.hasNumber(var3));
+		assertTrue(Validator.hasNumber(var4));
 	}
 
 	@Test
 	public void isLetterTest() {
-		Assert.assertTrue(Validator.isLetter("asfdsdsfds"));
-		Assert.assertTrue(Validator.isLetter("asfdsdfdsfVCDFDFGdsfds"));
-		Assert.assertTrue(Validator.isLetter("asfdsdf你好dsfVCDFDFGdsfds"));
+		assertTrue(Validator.isLetter("asfdsdsfds"));
+		assertTrue(Validator.isLetter("asfdsdfdsfVCDFDFGdsfds"));
+		assertTrue(Validator.isLetter("asfdsdf你好dsfVCDFDFGdsfds"));
 	}
 
 	@Test
 	public void isUperCaseTest() {
-		Assert.assertTrue(Validator.isUpperCase("VCDFDFG"));
-		Assert.assertTrue(Validator.isUpperCase("ASSFD"));
+		assertTrue(Validator.isUpperCase("VCDFDFG"));
+		assertTrue(Validator.isUpperCase("ASSFD"));
 
-		Assert.assertFalse(Validator.isUpperCase("asfdsdsfds"));
-		Assert.assertFalse(Validator.isUpperCase("ASSFD你好"));
+		assertFalse(Validator.isUpperCase("asfdsdsfds"));
+		assertFalse(Validator.isUpperCase("ASSFD你好"));
 	}
 
 	@Test
 	public void isLowerCaseTest() {
-		Assert.assertTrue(Validator.isLowerCase("asfdsdsfds"));
+		assertTrue(Validator.isLowerCase("asfdsdsfds"));
 
-		Assert.assertFalse(Validator.isLowerCase("aaaa你好"));
-		Assert.assertFalse(Validator.isLowerCase("VCDFDFG"));
-		Assert.assertFalse(Validator.isLowerCase("ASSFD"));
-		Assert.assertFalse(Validator.isLowerCase("ASSFD你好"));
+		assertFalse(Validator.isLowerCase("aaaa你好"));
+		assertFalse(Validator.isLowerCase("VCDFDFG"));
+		assertFalse(Validator.isLowerCase("ASSFD"));
+		assertFalse(Validator.isLowerCase("ASSFD你好"));
 	}
 
 	@Test
 	public void isBirthdayTest() {
 		final boolean b = Validator.isBirthday("20150101");
-		Assert.assertTrue(b);
+		assertTrue(b);
 		final boolean b2 = Validator.isBirthday("2015-01-01");
-		Assert.assertTrue(b2);
+		assertTrue(b2);
 		final boolean b3 = Validator.isBirthday("2015.01.01");
-		Assert.assertTrue(b3);
+		assertTrue(b3);
 		final boolean b4 = Validator.isBirthday("2015年01月01日");
-		Assert.assertTrue(b4);
+		assertTrue(b4);
 		final boolean b5 = Validator.isBirthday("2015.01.01");
-		Assert.assertTrue(b5);
+		assertTrue(b5);
 		final boolean b6 = Validator.isBirthday("2018-08-15");
-		Assert.assertTrue(b6);
+		assertTrue(b6);
 
 		//验证年非法
-		Assert.assertFalse(Validator.isBirthday("2095.05.01"));
+		assertFalse(Validator.isBirthday("2095.05.01"));
 		//验证月非法
-		Assert.assertFalse(Validator.isBirthday("2015.13.01"));
+		assertFalse(Validator.isBirthday("2015.13.01"));
 		//验证日非法
-		Assert.assertFalse(Validator.isBirthday("2015.02.29"));
+		assertFalse(Validator.isBirthday("2015.02.29"));
 	}
 
 	@Test
 	public void isCitizenIdTest() {
 		// 18为身份证号码验证
 		final boolean b = Validator.isCitizenId("110101199003074477");
-		Assert.assertTrue(b);
+		assertTrue(b);
 
 		// 15位身份证号码验证
 		final boolean b1 = Validator.isCitizenId("410001910101123");
-		Assert.assertTrue(b1);
+		assertTrue(b1);
 
 		// 10位身份证号码验证
 		final boolean b2 = Validator.isCitizenId("U193683453");
-		Assert.assertTrue(b2);
+		assertTrue(b2);
 	}
 
-	@Test(expected = ValidateException.class)
+	@Test
 	public void validateTest() throws ValidateException {
-		Validator.validateChinese("我是一段zhongwen", "内容中包含非中文");
+		assertThrows(ValidateException.class, () -> {
+			Validator.validateChinese("我是一段zhongwen", "内容中包含非中文");
+		});
 	}
 
 	@Test
 	public void isEmailTest() {
 		final boolean email = Validator.isEmail("abc_cde@163.com");
-		Assert.assertTrue(email);
+		assertTrue(email);
 		final boolean email1 = Validator.isEmail("abc_%cde@163.com");
-		Assert.assertTrue(email1);
+		assertTrue(email1);
 		final boolean email2 = Validator.isEmail("abc_%cde@aaa.c");
-		Assert.assertTrue(email2);
+		assertTrue(email2);
 		final boolean email3 = Validator.isEmail("xiaolei.lu@aaa.b");
-		Assert.assertTrue(email3);
+		assertTrue(email3);
 		final boolean email4 = Validator.isEmail("xiaolei.Lu@aaa.b");
-		Assert.assertTrue(email4);
-		final boolean email5 = Validator.isEmail("luxiaolei_小磊@小磊.com",true);
-		Assert.assertTrue(email5);
+		assertTrue(email4);
+		final boolean email5 = Validator.isEmail("luxiaolei_小磊@小磊.com", true);
+		assertTrue(email5);
 	}
 
 	@Test
 	public void isMobileTest() {
 		final boolean m1 = Validator.isMobile("13900221432");
-		Assert.assertTrue(m1);
+		assertTrue(m1);
 		final boolean m2 = Validator.isMobile("015100221432");
-		Assert.assertTrue(m2);
+		assertTrue(m2);
 		final boolean m3 = Validator.isMobile("+8618600221432");
-		Assert.assertTrue(m3);
+		assertTrue(m3);
 		final boolean m4 = Validator.isMobile("19312341234");
-		Assert.assertTrue(m4);
+		assertTrue(m4);
 	}
 
 	@Test
 	public void isMatchTest() {
 		String url = "http://aaa-bbb.somthing.com/a.php?a=b&c=2";
-		Assert.assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
+		assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
 
 		url = "https://aaa-bbb.somthing.com/a.php?a=b&c=2";
-		Assert.assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
+		assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
 
 		url = "https://aaa-bbb.somthing.com:8080/a.php?a=b&c=2";
-		Assert.assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
+		assertTrue(Validator.isMatchRegex(PatternPool.URL_HTTP, url));
 	}
 
 	@Test
 	public void isGeneralTest() {
 		String str = "";
 		boolean general = Validator.isGeneral(str, -1, 5);
-		Assert.assertTrue(general);
+		assertTrue(general);
 
 		str = "123_abc_ccc";
 		general = Validator.isGeneral(str, -1, 100);
-		Assert.assertTrue(general);
+		assertTrue(general);
 
 		// 不允许中文
 		str = "123_abc_ccc中文";
 		general = Validator.isGeneral(str, -1, 100);
-		Assert.assertFalse(general);
+		assertFalse(general);
 	}
 
 	@Test
-	public void isPlateNumberTest(){
-		Assert.assertTrue(Validator.isPlateNumber("粤BA03205"));
-		Assert.assertTrue(Validator.isPlateNumber("闽20401领"));
+	public void isPlateNumberTest() {
+		assertTrue(Validator.isPlateNumber("粤BA03205"));
+		assertTrue(Validator.isPlateNumber("闽20401领"));
 	}
 
 	@Test
-	public void isChineseTest(){
-		Assert.assertTrue(Validator.isChinese("全都是中文"));
-		Assert.assertTrue(Validator.isChinese("㐓㐘"));
-		Assert.assertFalse(Validator.isChinese("not全都是中文"));
+	public void isChineseTest() {
+		assertTrue(Validator.isChinese("全都是中文"));
+		assertTrue(Validator.isChinese("㐓㐘"));
+		assertFalse(Validator.isChinese("not全都是中文"));
 	}
 
 	@Test
 	public void hasChineseTest() {
-		Assert.assertTrue(Validator.hasChinese("黄单桑米"));
-		Assert.assertTrue(Validator.hasChinese("Kn 四兄弟"));
-		Assert.assertTrue(Validator.hasChinese("\uD840\uDDA3"));
-		Assert.assertFalse(Validator.hasChinese("Abc"));
+		assertTrue(Validator.hasChinese("黄单桑米"));
+		assertTrue(Validator.hasChinese("Kn 四兄弟"));
+		assertTrue(Validator.hasChinese("\uD840\uDDA3"));
+		assertFalse(Validator.hasChinese("Abc"));
 	}
 
 	@Test
-	public void isUUIDTest(){
-		Assert.assertTrue(Validator.isUUID(IdUtil.randomUUID()));
-		Assert.assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID()));
+	public void isUUIDTest() {
+		assertTrue(Validator.isUUID(IdUtil.randomUUID()));
+		assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID()));
 
-		Assert.assertTrue(Validator.isUUID(IdUtil.randomUUID().toUpperCase()));
-		Assert.assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID().toUpperCase()));
+		assertTrue(Validator.isUUID(IdUtil.randomUUID().toUpperCase()));
+		assertTrue(Validator.isUUID(IdUtil.fastSimpleUUID().toUpperCase()));
 	}
 
 	@Test
-	public void isZipCodeTest(){
+	public void isZipCodeTest() {
 		// 港
 		boolean zipCode = Validator.isZipCode("999077");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 		// 澳
 		zipCode = Validator.isZipCode("999078");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 		// 台（2020年3月起改用6位邮编，3+3）
 		zipCode = Validator.isZipCode("822001");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 
 		// 内蒙
 		zipCode = Validator.isZipCode("016063");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 		// 山西
 		zipCode = Validator.isZipCode("045246");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 		// 河北
 		zipCode = Validator.isZipCode("066502");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 		// 北京
 		zipCode = Validator.isZipCode("102629");
-		Assert.assertTrue(zipCode);
+		assertTrue(zipCode);
 	}
 
 	@Test
 	public void isBetweenTest() {
-		Assert.assertTrue(Validator.isBetween(0, 0, 1));
-		Assert.assertTrue(Validator.isBetween(1L, 0L, 1L));
-		Assert.assertTrue(Validator.isBetween(0.19f, 0.1f, 0.2f));
-		Assert.assertTrue(Validator.isBetween(0.19, 0.1, 0.2));
+		assertTrue(Validator.isBetween(0, 0, 1));
+		assertTrue(Validator.isBetween(1L, 0L, 1L));
+		assertTrue(Validator.isBetween(0.19f, 0.1f, 0.2f));
+		assertTrue(Validator.isBetween(0.19, 0.1, 0.2));
 	}
 
 	@Test
-	public void isCarVinTest(){
-		Assert.assertTrue(Validator.isCarVin("LSJA24U62JG269225"));
-		Assert.assertTrue(Validator.isCarVin("LDC613P23A1305189"));
-		Assert.assertFalse(Validator.isCarVin("LOC613P23A1305189"));
+	public void isCarVinTest() {
+		assertTrue(Validator.isCarVin("LSJA24U62JG269225"));
+		assertTrue(Validator.isCarVin("LDC613P23A1305189"));
+		assertFalse(Validator.isCarVin("LOC613P23A1305189"));
 
-		Assert.assertTrue(Validator.isCarVin("LSJA24U62JG269225"));	//标准分类1
-		Assert.assertTrue(Validator.isCarVin("LDC613P23A1305189"));	//标准分类1
-		Assert.assertTrue(Validator.isCarVin("LBV5S3102ESJ25655"));	//标准分类1
-		Assert.assertTrue(Validator.isCarVin("LBV5S3102ESJPE655"));	//标准分类2
-		Assert.assertFalse(Validator.isCarVin("LOC613P23A1305189"));	//错误示例
+		assertTrue(Validator.isCarVin("LSJA24U62JG269225"));    //标准分类1
+		assertTrue(Validator.isCarVin("LDC613P23A1305189"));    //标准分类1
+		assertTrue(Validator.isCarVin("LBV5S3102ESJ25655"));    //标准分类1
+		assertTrue(Validator.isCarVin("LBV5S3102ESJPE655"));    //标准分类2
+		assertFalse(Validator.isCarVin("LOC613P23A1305189"));    //错误示例
 	}
 
 	@Test
-	public void isCarDrivingLicenceTest(){
-		Assert.assertTrue(Validator.isCarDrivingLicence("430101758218"));
+	public void isCarDrivingLicenceTest() {
+		assertTrue(Validator.isCarDrivingLicence("430101758218"));
 	}
 
 	@Test
-	public void validateIpv4Test(){
+	public void validateIpv4Test() {
 		Validator.validateIpv4("192.168.1.1", "Error ip");
 		Validator.validateIpv4("8.8.8.8", "Error ip");
 		Validator.validateIpv4("0.0.0.0", "Error ip");
@@ -249,22 +252,22 @@ public class ValidatorTest {
 	}
 
 	@Test
-	public void isUrlTest(){
+	public void isUrlTest() {
 		final String content = "https://detail.tmall.com/item.htm?" +
-				"id=639428931841&ali_refid=a3_430582_1006:1152464078:N:Sk5vwkMVsn5O6DcnvicELrFucL21A32m:0af8611e23c1d07697e";
+			"id=639428931841&ali_refid=a3_430582_1006:1152464078:N:Sk5vwkMVsn5O6DcnvicELrFucL21A32m:0af8611e23c1d07697e";
 
-		Assert.assertTrue(Validator.isMatchRegex(Validator.URL, content));
-		Assert.assertTrue(Validator.isMatchRegex(Validator.URL_HTTP, content));
+		assertTrue(Validator.isMatchRegex(Validator.URL, content));
+		assertTrue(Validator.isMatchRegex(Validator.URL_HTTP, content));
 	}
 
 	@Test
-	public void isChineseNameTest(){
-		Assert.assertTrue(Validator.isChineseName("阿卜杜尼亚孜·毛力尼亚孜"));
-		Assert.assertFalse(Validator.isChineseName("阿卜杜尼亚孜./毛力尼亚孜"));
-		Assert.assertTrue(Validator.isChineseName("段正淳"));
-		Assert.assertFalse(Validator.isChineseName("孟  伟"));
-		Assert.assertFalse(Validator.isChineseName("李"));
-		Assert.assertFalse(Validator.isChineseName("连逍遥0"));
-		Assert.assertFalse(Validator.isChineseName("SHE"));
+	public void isChineseNameTest() {
+		assertTrue(Validator.isChineseName("阿卜杜尼亚孜·毛力尼亚孜"));
+		assertFalse(Validator.isChineseName("阿卜杜尼亚孜./毛力尼亚孜"));
+		assertTrue(Validator.isChineseName("段正淳"));
+		assertFalse(Validator.isChineseName("孟  伟"));
+		assertFalse(Validator.isChineseName("李"));
+		assertFalse(Validator.isChineseName("连逍遥0"));
+		assertFalse(Validator.isChineseName("SHE"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java
index 7ef5ee38d..da4a7d9b5 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/WeightRandomTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.collection.CollUtil;
 
@@ -15,6 +15,6 @@ public class WeightRandomTest {
 		random.add("C", 100);
 
 		String result = random.next();
-		Assert.assertTrue(CollUtil.newArrayList("A", "B", "C").contains(result));
+		assertTrue(CollUtil.newArrayList("A", "B", "C").contains(result));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java
index 883bc2407..591006605 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/ansi/AnsiEncoderTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.core.lang.ansi;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 
@@ -12,11 +12,11 @@ public class AnsiEncoderTest {
 	@Test
 	public void encodeTest(){
 		final String encode = AnsiEncoder.encode(AnsiColor.GREEN, "Hutool test");
-		Assert.assertEquals("\u001B[32mHutool test\u001B[0;39m", encode);
+		assertEquals("\u001B[32mHutool test\u001B[0;39m", encode);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void colorfulEncodeTest(){
 		String text = "Hutool▀████▀";
 		final AnsiColors ansiColors = new AnsiColors(AnsiColors.BitDepth.EIGHT);
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java
index 80df6f955..4f0cc7b5f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang.caller;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * {@link CallerUtil} 单元测试
@@ -9,25 +9,25 @@ import org.junit.Test;
  *
  */
 public class CallerTest {
-	
+
 	@Test
 	public void getCallerTest() {
 		Class<?> caller = CallerUtil.getCaller();
-		Assert.assertEquals(this.getClass(), caller);
-		
+		assertEquals(this.getClass(), caller);
+
 		Class<?> caller0 = CallerUtil.getCaller(0);
-		Assert.assertEquals(CallerUtil.class, caller0);
-		
+		assertEquals(CallerUtil.class, caller0);
+
 		Class<?> caller1 = CallerUtil.getCaller(1);
-		Assert.assertEquals(this.getClass(), caller1);
+		assertEquals(this.getClass(), caller1);
 	}
-	
+
 	@Test
 	public void getCallerCallerTest() {
 		Class<?> callerCaller = CallerTestClass.getCaller();
-		Assert.assertEquals(this.getClass(), callerCaller);
+		assertEquals(this.getClass(), callerCaller);
 	}
-	
+
 	private static class CallerTestClass{
 		public static Class<?> getCaller(){
 			return CallerUtil.getCallerCaller();
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java
index 4ef3d44b5..7a1518707 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/caller/CallerUtilTest.java
@@ -1,16 +1,16 @@
 package cn.hutool.core.lang.caller;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CallerUtilTest {
 
 	@Test
 	public void getCallerMethodNameTest() {
 		final String callerMethodName = CallerUtil.getCallerMethodName(false);
-		Assert.assertEquals("getCallerMethodNameTest", callerMethodName);
+		assertEquals("getCallerMethodNameTest", callerMethodName);
 
 		final String fullCallerMethodName = CallerUtil.getCallerMethodName(true);
-		Assert.assertEquals("cn.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName);
+		assertEquals("cn.hutool.core.lang.caller.CallerUtilTest.getCallerMethodNameTest", fullCallerMethodName);
 	}
-}
\ No newline at end of file
+}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java
index 1c2d40f4e..c223d3298 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/func/LambdaUtilTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.lang.func;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandleInfo;
 
@@ -13,31 +13,31 @@ public class LambdaUtilTest {
 	@Test
 	public void getMethodNameTest() {
 		final String methodName = LambdaUtil.getMethodName(MyTeacher::getAge);
-		Assert.assertEquals("getAge", methodName);
+		assertEquals("getAge", methodName);
 	}
 
 	@Test
 	public void getFieldNameTest() {
 		final String fieldName = LambdaUtil.getFieldName(MyTeacher::getAge);
-		Assert.assertEquals("age", fieldName);
+		assertEquals("age", fieldName);
 	}
 
 	@Test
 	public void resolveTest() {
 		// 引用构造函数
-		Assert.assertEquals(MethodHandleInfo.REF_newInvokeSpecial,
+		assertEquals(MethodHandleInfo.REF_newInvokeSpecial,
 				LambdaUtil.resolve(MyTeacher::new).getImplMethodKind());
 		// 数组构造函数引用
-		Assert.assertEquals(MethodHandleInfo.REF_invokeStatic,
+		assertEquals(MethodHandleInfo.REF_invokeStatic,
 				LambdaUtil.resolve(MyTeacher[]::new).getImplMethodKind());
 		// 引用静态方法
-		Assert.assertEquals(MethodHandleInfo.REF_invokeStatic,
+		assertEquals(MethodHandleInfo.REF_invokeStatic,
 				LambdaUtil.resolve(MyTeacher::takeAge).getImplMethodKind());
 		// 引用特定对象的实例方法
-		Assert.assertEquals(MethodHandleInfo.REF_invokeVirtual,
+		assertEquals(MethodHandleInfo.REF_invokeVirtual,
 				LambdaUtil.resolve(new MyTeacher()::getAge).getImplMethodKind());
 		// 引用特定类型的任意对象的实例方法
-		Assert.assertEquals(MethodHandleInfo.REF_invokeVirtual,
+		assertEquals(MethodHandleInfo.REF_invokeVirtual,
 				LambdaUtil.resolve(MyTeacher::getAge).getImplMethodKind());
 	}
 
@@ -46,38 +46,38 @@ public class LambdaUtilTest {
 	public void getRealClassTest() {
 		// 引用特定类型的任意对象的实例方法
 		final Class<MyTeacher> functionClass = LambdaUtil.getRealClass(MyTeacher::getAge);
-		Assert.assertEquals(MyTeacher.class, functionClass);
+		assertEquals(MyTeacher.class, functionClass);
 		// 枚举测试，不会导致类型擦除
 		final Class<LambdaKindEnum> enumFunctionClass = LambdaUtil.getRealClass(LambdaKindEnum::ordinal);
-		Assert.assertEquals(LambdaKindEnum.class, enumFunctionClass);
+		assertEquals(LambdaKindEnum.class, enumFunctionClass);
 		// 调用父类方法，能获取到正确的子类类型
 		final Class<MyTeacher> superFunctionClass = LambdaUtil.getRealClass(MyTeacher::getId);
-		Assert.assertEquals(MyTeacher.class, superFunctionClass);
+		assertEquals(MyTeacher.class, superFunctionClass);
 
 		final MyTeacher myTeacher = new MyTeacher();
 		// 引用特定对象的实例方法
 		final Class<MyTeacher> supplierClass = LambdaUtil.getRealClass(myTeacher::getAge);
-		Assert.assertEquals(MyTeacher.class, supplierClass);
+		assertEquals(MyTeacher.class, supplierClass);
 		// 枚举测试，只能获取到枚举类型
 		final Class<Enum<?>> enumSupplierClass = LambdaUtil.getRealClass(LambdaKindEnum.REF_NONE::ordinal);
-		Assert.assertEquals(Enum.class, enumSupplierClass);
+		assertEquals(Enum.class, enumSupplierClass);
 		// 调用父类方法，只能获取到父类类型
 		final Class<Entity<?>> superSupplierClass = LambdaUtil.getRealClass(myTeacher::getId);
-		Assert.assertEquals(Entity.class, superSupplierClass);
+		assertEquals(Entity.class, superSupplierClass);
 
 		// 引用静态带参方法，能够获取到正确的参数类型
 		final Class<MyTeacher> staticFunctionClass = LambdaUtil.getRealClass(MyTeacher::takeAgeBy);
-		Assert.assertEquals(MyTeacher.class, staticFunctionClass);
+		assertEquals(MyTeacher.class, staticFunctionClass);
 		// 引用父类静态带参方法，只能获取到父类类型
 		final Class<Entity<?>> staticSuperFunctionClass = LambdaUtil.getRealClass(MyTeacher::takeId);
-		Assert.assertEquals(Entity.class, staticSuperFunctionClass);
+		assertEquals(Entity.class, staticSuperFunctionClass);
 
 		// 引用静态无参方法，能够获取到正确的类型
 		final Class<MyTeacher> staticSupplierClass = LambdaUtil.getRealClass(MyTeacher::takeAge);
-		Assert.assertEquals(MyTeacher.class, staticSupplierClass);
+		assertEquals(MyTeacher.class, staticSupplierClass);
 		// 引用父类静态无参方法，能够获取到正确的参数类型
 		final Class<MyTeacher> staticSuperSupplierClass = LambdaUtil.getRealClass(MyTeacher::takeIdBy);
-		Assert.assertEquals(MyTeacher.class, staticSuperSupplierClass);
+		assertEquals(MyTeacher.class, staticSuperSupplierClass);
 	}
 
 	@Data
@@ -137,7 +137,7 @@ public class LambdaUtilTest {
 	public void lambdaClassNameTest() {
 		final String lambdaClassName1 = LambdaUtilTestHelper.getLambdaClassName(MyTeacher::getAge);
 		final String lambdaClassName2 = LambdaUtilTestHelper.getLambdaClassName(MyTeacher::getAge);
-		Assert.assertNotEquals(lambdaClassName1, lambdaClassName2);
+		assertNotEquals(lambdaClassName1, lambdaClassName2);
 	}
 
 	static class LambdaUtilTestHelper {
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
index d253ffa2e..8a15153a7 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/CityHashTest.java
@@ -1,36 +1,36 @@
 package cn.hutool.core.lang.hash;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CityHashTest {
 
 	@Test
 	public void hash32Test() {
 		int hv = CityHash.hash32(StrUtil.utf8Bytes("你"));
-		Assert.assertEquals(1290029860, hv);
+		assertEquals(1290029860, hv);
 
 		hv = CityHash.hash32(StrUtil.utf8Bytes("你好"));
-		Assert.assertEquals(1374181357, hv);
+		assertEquals(1374181357, hv);
 
 		hv = CityHash.hash32(StrUtil.utf8Bytes("见到你很高兴"));
-		Assert.assertEquals(1475516842, hv);
+		assertEquals(1475516842, hv);
 		hv = CityHash.hash32(StrUtil.utf8Bytes("我们将通过生成一个大的文件的方式来检验各种方法的执行效率因为这种方式在结束的时候需要执行文件"));
-		Assert.assertEquals(0x51020cae, hv);
+		assertEquals(0x51020cae, hv);
 	}
 
 	@Test
 	public void hash64Test() {
 		long hv = CityHash.hash64(StrUtil.utf8Bytes("你"));
-		Assert.assertEquals(-4296898700418225525L, hv);
+		assertEquals(-4296898700418225525L, hv);
 
 		hv = CityHash.hash64(StrUtil.utf8Bytes("你好"));
-		Assert.assertEquals(-4294276205456761303L, hv);
+		assertEquals(-4294276205456761303L, hv);
 
 		hv = CityHash.hash64(StrUtil.utf8Bytes("见到你很高兴"));
-		Assert.assertEquals(272351505337503793L, hv);
+		assertEquals(272351505337503793L, hv);
 		hv = CityHash.hash64(StrUtil.utf8Bytes("我们将通过生成一个大的文件的方式来检验各种方法的执行效率因为这种方式在结束的时候需要执行文件"));
-		Assert.assertEquals(-8234735310919228703L, hv);
+		assertEquals(-8234735310919228703L, hv);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
index 5577a1bb5..fd19e4c73 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MetroHashTest.java
@@ -5,9 +5,9 @@ import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://gitee.com/dromara/hutool/pulls/532
@@ -16,29 +16,29 @@ public class MetroHashTest {
 
 	@Test
 	public void testEmpty() {
-		Assert.assertEquals("31290877cceaea29", HexUtil.toHex(MetroHash.hash64(StrUtil.utf8Bytes(""), 0)));
+		assertEquals("31290877cceaea29", HexUtil.toHex(MetroHash.hash64(StrUtil.utf8Bytes(""), 0)));
 	}
 
 	@Test
 	public void metroHash64Test() {
 		byte[] str = "我是一段测试123".getBytes(CharsetUtil.CHARSET_UTF_8);
 		final long hash64 = MetroHash.hash64(str);
-		Assert.assertEquals(62920234463891865L, hash64);
+		assertEquals(62920234463891865L, hash64);
 	}
 
 	@Test
 	public void metroHash128Test() {
 		byte[] str = "我是一段测试123".getBytes(CharsetUtil.CHARSET_UTF_8);
 		final long[] hash128 = MetroHash.hash128(str).getLongArray();
-		Assert.assertEquals(4956592424592439349L, hash128[0]);
-		Assert.assertEquals(6301214698325086246L, hash128[1]);
+		assertEquals(4956592424592439349L, hash128[0]);
+		assertEquals(6301214698325086246L, hash128[1]);
 	}
 
 	/**
 	 * 数据量越大 MetroHash 优势越明显，
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void bulkHashing64Test() {
 		String[] strArray = getRandomStringArray();
 		long startCity = System.currentTimeMillis();
@@ -62,7 +62,7 @@ public class MetroHashTest {
 	 * 数据量越大 MetroHash 优势越明显，
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void bulkHashing128Test() {
 		String[] strArray = getRandomStringArray();
 		long startCity = System.currentTimeMillis();
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurmurHashTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurmurHashTest.java
index ee3eadbac..d9c291675 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurmurHashTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/hash/MurmurHashTest.java
@@ -1,36 +1,36 @@
 package cn.hutool.core.lang.hash;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class MurmurHashTest {
 
 	@Test
 	public void hash32Test() {
 		int hv = MurmurHash.hash32(StrUtil.utf8Bytes("你"));
-		Assert.assertEquals(-1898877446, hv);
+		assertEquals(-1898877446, hv);
 
 		hv = MurmurHash.hash32(StrUtil.utf8Bytes("你好"));
-		Assert.assertEquals(337357348, hv);
+		assertEquals(337357348, hv);
 
 		hv = MurmurHash.hash32(StrUtil.utf8Bytes("见到你很高兴"));
-		Assert.assertEquals(1101306141, hv);
+		assertEquals(1101306141, hv);
 		hv = MurmurHash.hash32(StrUtil.utf8Bytes("我们将通过生成一个大的文件的方式来检验各种方法的执行效率因为这种方式在结束的时候需要执行文件"));
-		Assert.assertEquals(-785444229, hv);
+		assertEquals(-785444229, hv);
 	}
 
 	@Test
 	public void hash64Test() {
 		long hv = MurmurHash.hash64(StrUtil.utf8Bytes("你"));
-		Assert.assertEquals(-1349759534971957051L, hv);
+		assertEquals(-1349759534971957051L, hv);
 
 		hv = MurmurHash.hash64(StrUtil.utf8Bytes("你好"));
-		Assert.assertEquals(-7563732748897304996L, hv);
+		assertEquals(-7563732748897304996L, hv);
 
 		hv = MurmurHash.hash64(StrUtil.utf8Bytes("见到你很高兴"));
-		Assert.assertEquals(-766658210119995316L, hv);
+		assertEquals(-766658210119995316L, hv);
 		hv = MurmurHash.hash64(StrUtil.utf8Bytes("我们将通过生成一个大的文件的方式来检验各种方法的执行效率因为这种方式在结束的时候需要执行文件"));
-		Assert.assertEquals(-7469283059271653317L, hv);
+		assertEquals(-7469283059271653317L, hv);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java
index ea08e1afb..ae49a57ab 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/intern/InternUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.lang.intern;
 
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class InternUtilTest {
 
@@ -16,9 +16,9 @@ public class InternUtilTest {
 		String a1 = RandomUtil.randomString(RandomUtil.randomInt(100));
 		String a2 = new String(a1);
 
-		Assert.assertNotSame(a1, a2);
+		assertNotSame(a1, a2);
 
-		Assert.assertSame(interner.intern(a1), interner.intern(a2));
+		assertSame(interner.intern(a1), interner.intern(a2));
 	}
 
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java
index f8d9888cb..b086b2eec 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/loader/LazyFunLoaderTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang.loader;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class LazyFunLoaderTest {
 
@@ -19,13 +19,13 @@ public class LazyFunLoaderTest {
 
 		LazyFunLoader<BigObject> loader = new LazyFunLoader<>(BigObject::new);
 
-		Assert.assertNotNull(loader.get());
-		Assert.assertTrue(loader.isInitialize());
+		assertNotNull(loader.get());
+		assertTrue(loader.isInitialize());
 
 		// 对于某些对象，在程序关闭时，需要进行销毁操作
 		loader.ifInitialized(BigObject::destroy);
 
-		Assert.assertTrue(loader.get().isDestroy);
+		assertTrue(loader.get().isDestroy);
 	}
 
 	@Test
@@ -36,11 +36,11 @@ public class LazyFunLoaderTest {
 		// 若从未使用，则可以避免不必要的初始化
 		loader.ifInitialized(it -> {
 
-			Assert.fail();
+			fail();
 			it.destroy();
 		});
 
-		Assert.assertFalse(loader.isInitialize());
+		assertFalse(loader.isInitialize());
 	}
 
 	@Test
@@ -48,13 +48,13 @@ public class LazyFunLoaderTest {
 
 		LazyFunLoader<BigObject> loader = LazyFunLoader.on(BigObject::new);
 
-		Assert.assertNotNull(loader.get());
-		Assert.assertTrue(loader.isInitialize());
+		assertNotNull(loader.get());
+		assertTrue(loader.isInitialize());
 
 		// 对于某些对象，在程序关闭时，需要进行销毁操作
 		loader.ifInitialized(BigObject::destroy);
 
-		Assert.assertTrue(loader.get().isDestroy);
+		assertTrue(loader.get().isDestroy);
 	}
 
 	@Test
@@ -65,7 +65,7 @@ public class LazyFunLoaderTest {
 		// 若从未使用，则可以避免不必要的初始化
 		loader.ifInitialized(it -> {
 
-			Assert.fail();
+			fail();
 			it.destroy();
 		});
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
index 8ccd2087f..9cef55ce3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/ActualTypeMapperPoolTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang.reflect;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Type;
 import java.util.Map;
@@ -18,15 +18,15 @@ public class ActualTypeMapperPoolTest {
 		final Map<Type, Type> typeTypeMap = ActualTypeMapperPool.get(FinalClass.class);
 		typeTypeMap.forEach((key, value)->{
 			if("A".equals(key.getTypeName())){
-				Assert.assertEquals(Character.class, value);
+				assertEquals(Character.class, value);
 			} else if("B".equals(key.getTypeName())){
-				Assert.assertEquals(Boolean.class, value);
+				assertEquals(Boolean.class, value);
 			} else if("C".equals(key.getTypeName())){
-				Assert.assertEquals(String.class, value);
+				assertEquals(String.class, value);
 			} else if("D".equals(key.getTypeName())){
-				Assert.assertEquals(Double.class, value);
+				assertEquals(Double.class, value);
 			} else if("E".equals(key.getTypeName())){
-				Assert.assertEquals(Integer.class, value);
+				assertEquals(Integer.class, value);
 			}
 		});
 	}
@@ -36,15 +36,15 @@ public class ActualTypeMapperPoolTest {
 		final Map<String, Type> typeTypeMap = ActualTypeMapperPool.getStrKeyMap(FinalClass.class);
 		typeTypeMap.forEach((key, value)->{
 			if("A".equals(key)){
-				Assert.assertEquals(Character.class, value);
+				assertEquals(Character.class, value);
 			} else if("B".equals(key)){
-				Assert.assertEquals(Boolean.class, value);
+				assertEquals(Boolean.class, value);
 			} else if("C".equals(key)){
-				Assert.assertEquals(String.class, value);
+				assertEquals(String.class, value);
 			} else if("D".equals(key)){
-				Assert.assertEquals(Double.class, value);
+				assertEquals(Double.class, value);
 			} else if("E".equals(key)){
-				Assert.assertEquals(Integer.class, value);
+				assertEquals(Integer.class, value);
 			}
 		});
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
index 3eb2120ae..c0bb849d4 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/reflect/MethodHandleUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.lang.reflect;
 
 import cn.hutool.core.util.ClassLoaderUtil;
 import cn.hutool.core.util.ReflectUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodType;
@@ -19,16 +19,16 @@ public class MethodHandleUtilTest {
 				new Class[] { Duck.class },
 				MethodHandleUtil::invokeSpecial);
 
-		Assert.assertEquals("Quack", duck.quack());
+		assertEquals("Quack", duck.quack());
 
 		// 测试子类执行default方法
 		final Method quackMethod = ReflectUtil.getMethod(Duck.class, "quack");
 		String quack = MethodHandleUtil.invokeSpecial(new BigDuck(), quackMethod);
-		Assert.assertEquals("Quack", quack);
+		assertEquals("Quack", quack);
 
 		// 测试反射执行默认方法
 		quack = ReflectUtil.invoke(new Duck() {}, quackMethod);
-		Assert.assertEquals("Quack", quack);
+		assertEquals("Quack", quack);
 	}
 
 	@Test
@@ -38,7 +38,7 @@ public class MethodHandleUtilTest {
 				new Class[] { Duck.class },
 				ReflectUtil::invoke);
 
-		Assert.assertEquals("Quack", duck.quack());
+		assertEquals("Quack", duck.quack());
 	}
 
 	@Test
@@ -48,7 +48,7 @@ public class MethodHandleUtilTest {
 				new Class[] { Duck.class },
 				ReflectUtil::invoke);
 
-		Assert.assertEquals("Quack", duck.quack());
+		assertEquals("Quack", duck.quack());
 	}
 
 	@Test
@@ -56,7 +56,7 @@ public class MethodHandleUtilTest {
 		// 测试执行普通方法
 		final int size = MethodHandleUtil.invokeSpecial(new BigDuck(),
 				ReflectUtil.getMethod(BigDuck.class, "getSize"));
-		Assert.assertEquals(36, size);
+		assertEquals(36, size);
 	}
 
 	@Test
@@ -64,45 +64,45 @@ public class MethodHandleUtilTest {
 		// 测试执行普通方法
 		final String result = MethodHandleUtil.invoke(null,
 				ReflectUtil.getMethod(Duck.class, "getDuck", int.class), 78);
-		Assert.assertEquals("Duck 78", result);
+		assertEquals("Duck 78", result);
 	}
 
 	@Test
 	public void findMethodTest() throws Throwable {
 		MethodHandle handle = MethodHandleUtil.findMethod(Duck.class, "quack",
 				MethodType.methodType(String.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 		// 对象方法自行需要绑定对象或者传入对象参数
 		String invoke = (String) handle.invoke(new BigDuck());
-		Assert.assertEquals("Quack", invoke);
+		assertEquals("Quack", invoke);
 
 		// 对象的方法获取
 		handle = MethodHandleUtil.findMethod(BigDuck.class, "getSize",
 				MethodType.methodType(int.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 		int invokeInt = (int) handle.invoke(new BigDuck());
-		Assert.assertEquals(36, invokeInt);
+		assertEquals(36, invokeInt);
 	}
 
 	@Test
 	public void findStaticMethodTest() throws Throwable {
 		final MethodHandle handle = MethodHandleUtil.findMethod(Duck.class, "getDuck",
 				MethodType.methodType(String.class, int.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 
 		// static 方法执行不需要绑定或者传入对象，直接传入参数即可
 		final String invoke = (String) handle.invoke(12);
-		Assert.assertEquals("Duck 12", invoke);
+		assertEquals("Duck 12", invoke);
 	}
 
 	@Test
 	public void findPrivateMethodTest() throws Throwable {
 		final MethodHandle handle = MethodHandleUtil.findMethod(BigDuck.class, "getPrivateValue",
 				MethodType.methodType(String.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 
 		final String invoke = (String) handle.invoke(new BigDuck());
-		Assert.assertEquals("private value", invoke);
+		assertEquals("private value", invoke);
 	}
 
 	@Test
@@ -110,20 +110,20 @@ public class MethodHandleUtilTest {
 		// 查找父类的方法
 		final MethodHandle handle = MethodHandleUtil.findMethod(BigDuck.class, "quack",
 				MethodType.methodType(String.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 
 		final String invoke = (String) handle.invoke(new BigDuck());
-		Assert.assertEquals("Quack", invoke);
+		assertEquals("Quack", invoke);
 	}
 
 	@Test
 	public void findPrivateStaticMethodTest() throws Throwable {
 		final MethodHandle handle = MethodHandleUtil.findMethod(BigDuck.class, "getPrivateStaticValue",
 				MethodType.methodType(String.class));
-		Assert.assertNotNull(handle);
+		assertNotNull(handle);
 
 		final String invoke = (String) handle.invoke();
-		Assert.assertEquals("private static value", invoke);
+		assertEquals("private static value", invoke);
 	}
 
 	interface Duck {
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java
index ad4a63004..899bf8964 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issue2279Test.java
@@ -2,8 +2,8 @@ package cn.hutool.core.lang.tree;
 
 import cn.hutool.core.collection.ListUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -29,7 +29,7 @@ public class Issue2279Test {
 		);
 
 		final Tree<String> result = stringTree.get(0);
-		Assert.assertEquals(2, result.getChildren().size());
+		assertEquals(2, result.getChildren().size());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI795INTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI795INTest.java
index 4aeb29753..b41c87b60 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI795INTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI795INTest.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.core.lang.tree;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -41,6 +41,6 @@ public class IssueI795INTest {
 	public void getParentsNameTest() {
 		final Tree<Long> tree = TreeUtil.buildSingle(all_menu, 0L);
 		final Tree<Long> chid = tree.getChildren().get(0).getChildren().get(0).getChildren().get(0);
-		Assert.assertEquals("[module-A-menu-1, module-A, root]", chid.getParentsName(true).toString());
+		assertEquals("[module-A-menu-1, module-A, root]", chid.getParentsName(true).toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI9PDVFTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI9PDVFTest.java
index 192cbdc57..7a0547446 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI9PDVFTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/IssueI9PDVFTest.java
@@ -3,7 +3,7 @@ package cn.hutool.core.lang.tree;
 import cn.hutool.core.lang.Assert;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issues2538Test.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issues2538Test.java
index c046f71f5..357b871ef 100644
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issues2538Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/Issues2538Test.java
@@ -1,25 +1,28 @@
 package cn.hutool.core.lang.tree;
 
 import lombok.Data;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 public class Issues2538Test {
 
-	@org.junit.Test
+	@Test
 	public void issues2538Test() {
-		Test test1 = new Test();
+		TestBean test1 = new TestBean();
 		test1.setId(1);
 		test1.setParentId(0);
 		test1.setName("1");
-		Test test2 = new Test();
+		TestBean test2 = new TestBean();
 		test2.setId(2);
 		test2.setParentId(1);
 		test2.setName("1");
 
-		List<Test> list = new ArrayList<>();
+		List<TestBean> list = new ArrayList<>();
 
 		list.add(test1);
 		list.add(test2);
@@ -40,7 +43,7 @@ public class Issues2538Test {
 					tree.setWeight(null);
 				});
 
-		Assert.assertNotNull(treeNodes);
+		assertNotNull(treeNodes);
 
 		try {
 			// 转换器
@@ -53,12 +56,12 @@ public class Issues2538Test {
 						tree.setWeight(null);
 					});
 		}catch (Exception e) {
-			Assert.assertEquals(e.getClass(), IllegalArgumentException.class);
+			assertEquals(e.getClass(), IllegalArgumentException.class);
 		}
 	}
 
 	@Data
-	public static class Test {
+	public static class TestBean {
 		private long id;
 		private long parentId;
 		private String name;
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java
index 449f91503..b6be09746 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeBuilderTest.java
@@ -1,15 +1,19 @@
 package cn.hutool.core.lang.tree;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class TreeBuilderTest {
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void checkIsBuiltTest(){
-		final TreeBuilder<Integer> of = TreeBuilder.of(0);
-		of.build();
-		of.append(new ArrayList<>());
+		assertThrows(IllegalArgumentException.class, () -> {
+			final TreeBuilder<Integer> of = TreeBuilder.of(0);
+			of.build();
+			of.append(new ArrayList<>());
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java
index 7ef3bacc5..1591f8bd5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeSearchTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.lang.tree;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +32,6 @@ public class TreeSearchTest {
 		Tree<Long> tree=treeItems.get(0);
 		Tree<Long> searchResult=tree.getNode(3L);
 
-		Assert.assertEquals("module-B", searchResult.getName());
+		assertEquals("module-B", searchResult.getName());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java
index fc9131cc7..d4db2ec8e 100755
--- a/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java
@@ -1,12 +1,14 @@
 package cn.hutool.core.lang.tree;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 /**
  * 通用树测试
  *
@@ -32,15 +34,15 @@ public class TreeTest {
 	public void sampleTreeTest() {
 		List<Tree<String>> treeList = TreeUtil.build(nodeList, "0");
 		for (Tree<String> tree : treeList) {
-			Assert.assertNotNull(tree);
-			Assert.assertEquals("0", tree.getParentId());
+			assertNotNull(tree);
+			assertEquals("0", tree.getParentId());
 //			Console.log(tree);
 		}
 
 		// 测试通过子节点查找父节点
 		final Tree<String> rootNode0 = treeList.get(0);
 		final Tree<String> parent = rootNode0.getChildren().get(0).getParent();
-		Assert.assertEquals(rootNode0, parent);
+		assertEquals(rootNode0, parent);
 	}
 
 	@Test
@@ -55,69 +57,69 @@ public class TreeTest {
 
 		//转换器
 		List<Tree<String>> treeNodes = TreeUtil.build(nodeList, "0", treeNodeConfig,
-				(treeNode, tree) -> {
-					tree.setId(treeNode.getId());
-					tree.setParentId(treeNode.getParentId());
-					tree.setWeight(treeNode.getWeight());
-					tree.setName(treeNode.getName());
-					// 扩展属性 ...
-					tree.putExtra("extraField", 666);
-					tree.putExtra("other", new Object());
-				});
+			(treeNode, tree) -> {
+				tree.setId(treeNode.getId());
+				tree.setParentId(treeNode.getParentId());
+				tree.setWeight(treeNode.getWeight());
+				tree.setName(treeNode.getName());
+				// 扩展属性 ...
+				tree.putExtra("extraField", 666);
+				tree.putExtra("other", new Object());
+			});
 
-		Assert.assertEquals(treeNodes.size(), 2);
+		assertEquals(treeNodes.size(), 2);
 	}
 
 	@Test
-	public void walkTest(){
+	public void walkTest() {
 		List<String> ids = new ArrayList<>();
 		final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
-		tree.walk((tr)-> ids.add(tr.getId()));
+		tree.walk((tr) -> ids.add(tr.getId()));
 
-		Assert .assertEquals(7, ids.size());
+		assertEquals(7, ids.size());
 	}
 
 	@Test
-	public void cloneTreeTest(){
+	public void cloneTreeTest() {
 		final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
 		final Tree<String> cloneTree = tree.cloneTree();
 
 		List<String> ids = new ArrayList<>();
-		cloneTree.walk((tr)-> ids.add(tr.getId()));
+		cloneTree.walk((tr) -> ids.add(tr.getId()));
 
-		Assert .assertEquals(7, ids.size());
+		assertEquals(7, ids.size());
 	}
 
 	@Test
-	public void filterTest(){
+	public void filterTest() {
 		// 经过过滤，丢掉"用户添加"节点
 		final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
-		tree.filter((t)->{
+		tree.filter((t) -> {
 			final CharSequence name = t.getName();
 			return null != name && name.toString().contains("店铺");
 		});
 
 		List<String> ids = new ArrayList<>();
-		tree.walk((tr)-> ids.add(tr.getId()));
-		Assert .assertEquals(4, ids.size());
+		tree.walk((tr) -> ids.add(tr.getId()));
+		assertEquals(4, ids.size());
 	}
 
 	@Test
-	public void filterNewTest(){
+	public void filterNewTest() {
 		final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
 
 		// 经过过滤，生成新的树
-		Tree<String> newTree = tree.filterNew((t)->{
+		Tree<String> newTree = tree.filterNew((t) -> {
 			final CharSequence name = t.getName();
 			return null != name && name.toString().contains("店铺");
 		});
 
 		List<String> ids = new ArrayList<>();
-		newTree.walk((tr)-> ids.add(tr.getId()));
-		Assert .assertEquals(4, ids.size());
+		newTree.walk((tr) -> ids.add(tr.getId()));
+		assertEquals(4, ids.size());
 
 		List<String> ids2 = new ArrayList<>();
-		tree.walk((tr)-> ids2.add(tr.getId()));
-		Assert .assertEquals(7, ids2.size());
+		tree.walk((tr) -> ids2.add(tr.getId()));
+		assertEquals(7, ids2.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java
index a26816b64..7132a59d3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/BiMapTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 
@@ -13,11 +13,11 @@ public class BiMapTest {
 		biMap.put("aaa", 111);
 		biMap.put("bbb", 222);
 
-		Assert.assertEquals(new Integer(111), biMap.get("aaa"));
-		Assert.assertEquals(new Integer(222), biMap.get("bbb"));
+		assertEquals(new Integer(111), biMap.get("aaa"));
+		assertEquals(new Integer(222), biMap.get("bbb"));
 
-		Assert.assertEquals("aaa", biMap.getKey(111));
-		Assert.assertEquals("bbb", biMap.getKey(222));
+		assertEquals("aaa", biMap.getKey(111));
+		assertEquals("bbb", biMap.getKey(222));
 	}
 
 	@Test
@@ -27,8 +27,8 @@ public class BiMapTest {
 		biMap.put("bbb", 222);
 
 		biMap.computeIfAbsent("ccc", s -> 333);
-		Assert.assertEquals(new Integer(333), biMap.get("ccc"));
-		Assert.assertEquals("ccc", biMap.getKey(333));
+		assertEquals(new Integer(333), biMap.get("ccc"));
+		assertEquals("ccc", biMap.getKey(333));
 	}
 
 	@Test
@@ -38,7 +38,7 @@ public class BiMapTest {
 		biMap.put("bbb", 222);
 
 		biMap.putIfAbsent("ccc", 333);
-		Assert.assertEquals(new Integer(333), biMap.get("ccc"));
-		Assert.assertEquals("ccc", biMap.getKey(333));
+		assertEquals(new Integer(333), biMap.get("ccc"));
+		assertEquals("ccc", biMap.getKey(333));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java
index 9126c2238..555f46af3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/CamelCaseMapTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.map;
 
 import cn.hutool.core.util.SerializeUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CamelCaseMapTest {
 
@@ -10,16 +10,16 @@ public class CamelCaseMapTest {
 	public void caseInsensitiveMapTest() {
 		CamelCaseMap<String, String> map = new CamelCaseMap<>();
 		map.put("customKey", "OK");
-		Assert.assertEquals("OK", map.get("customKey"));
-		Assert.assertEquals("OK", map.get("custom_key"));
+		assertEquals("OK", map.get("customKey"));
+		assertEquals("OK", map.get("custom_key"));
 	}
 
 	@Test
 	public void caseInsensitiveLinkedMapTest() {
 		CamelCaseLinkedMap<String, String> map = new CamelCaseLinkedMap<>();
 		map.put("customKey", "OK");
-		Assert.assertEquals("OK", map.get("customKey"));
-		Assert.assertEquals("OK", map.get("custom_key"));
+		assertEquals("OK", map.get("customKey"));
+		assertEquals("OK", map.get("custom_key"));
 	}
 
 	@Test
@@ -27,11 +27,11 @@ public class CamelCaseMapTest {
 		CamelCaseMap<String, String> map = new CamelCaseMap<>();
 		map.put("serializable_key", "OK");
 		CamelCaseMap<String, String> deSerializableMap = SerializeUtil.deserialize(SerializeUtil.serialize(map));
-		Assert.assertEquals("OK", deSerializableMap.get("serializable_key"));
-		Assert.assertEquals("OK", deSerializableMap.get("serializableKey"));
+		assertEquals("OK", deSerializableMap.get("serializable_key"));
+		assertEquals("OK", deSerializableMap.get("serializableKey"));
 		deSerializableMap.put("serializable_func", "OK");
-		Assert.assertEquals("OK", deSerializableMap.get("serializable_func"));
-		Assert.assertEquals("OK", deSerializableMap.get("serializableFunc"));
+		assertEquals("OK", deSerializableMap.get("serializable_func"));
+		assertEquals("OK", deSerializableMap.get("serializableFunc"));
 	}
 
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
index 63fafea4d..1649d8f54 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/CaseInsensitiveMapTest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.map;
 
 import cn.hutool.core.lang.Pair;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class CaseInsensitiveMapTest {
 
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/CollValueMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/CollValueMapTest.java
index e193d3e69..329b88a1f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/CollValueMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/CollValueMapTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.multi.ListValueMap;
 import cn.hutool.core.map.multi.SetValueMap;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 
@@ -26,10 +26,10 @@ public class CollValueMapTest {
 
 		entries.removeValue("one","22");
 
-		Assert.assertEquals(ListUtil.of("11","33","22"), entries.get("one"));
+		assertEquals(ListUtil.of("11","33","22"), entries.get("one"));
 
 		entries.removeValues("two",ListUtil.of("44","55"));
-		Assert.assertEquals(ListUtil.empty(),entries.get("two"));
+		assertEquals(ListUtil.empty(),entries.get("two"));
 	}
 
 	@Test
@@ -46,10 +46,10 @@ public class CollValueMapTest {
 		entries.putValue("three","11");
 
 		entries.removeValue("one","22");
-		Assert.assertEquals(CollUtil.newHashSet("11","33"), entries.get("one"));
+		assertEquals(CollUtil.newHashSet("11","33"), entries.get("one"));
 
 		entries.removeValues("two",ListUtil.of("44","55"));
-		Assert.assertEquals(CollUtil.empty(HashSet.class),entries.get("two"));
+		assertEquals(CollUtil.empty(HashSet.class),entries.get("two"));
 	}
 
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java
index 1a26d127a..c50cc482f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/FuncMapTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 
@@ -16,7 +16,7 @@ public class FuncMapTest {
 		map.put("aaa", "b");
 		map.put("BBB", "c");
 
-		Assert.assertEquals("B", map.get("aaa"));
-		Assert.assertEquals("C", map.get("bbb"));
+		assertEquals("B", map.get("aaa"));
+		assertEquals("C", map.get("bbb"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/IssueI88R5MTest.java b/hutool-core/src/test/java/cn/hutool/core/map/IssueI88R5MTest.java
index aefb9f0fc..d0290660f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/IssueI88R5MTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/IssueI88R5MTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 
@@ -12,6 +12,6 @@ public class IssueI88R5MTest {
 		biMap.put("aaa", 111);
 		biMap.getKey(111);
 		biMap.put("aaa", 222);
-		Assert.assertNull(biMap.getKey(111));
+		assertNull(biMap.getKey(111));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java
index 40adea923..f3e153c0f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java
@@ -2,17 +2,18 @@ package cn.hutool.core.map;
 
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class LinkedForestMapTest {
 
 	private final ForestMap<String, String> treeNodeMap = new LinkedForestMap<>(false);
 
-	@Before
+	@BeforeEach
 	public void beforeTest() {
 		// a -> b -> c -> d
 		treeNodeMap.putLinkedNodes("a", "b", "bbb");
@@ -28,30 +29,30 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> child = treeNodeMap.get("d");
 
 		// Entry相关
-		Assert.assertEquals("c", treeEntry.getKey());
-		Assert.assertEquals("ccc", treeEntry.getValue());
+		assertEquals("c", treeEntry.getKey());
+		assertEquals("ccc", treeEntry.getValue());
 
 		// 父节点相关方法
-		Assert.assertEquals(2, treeEntry.getWeight());
-		Assert.assertEquals(treeNodeMap.get("a"), treeEntry.getRoot());
-		Assert.assertTrue(treeEntry.hasParent());
-		Assert.assertEquals(parent, treeEntry.getDeclaredParent());
-		Assert.assertEquals(treeNodeMap.get("a"), treeEntry.getParent("a"));
-		Assert.assertTrue(treeEntry.containsParent("a"));
+		assertEquals(2, treeEntry.getWeight());
+		assertEquals(treeNodeMap.get("a"), treeEntry.getRoot());
+		assertTrue(treeEntry.hasParent());
+		assertEquals(parent, treeEntry.getDeclaredParent());
+		assertEquals(treeNodeMap.get("a"), treeEntry.getParent("a"));
+		assertTrue(treeEntry.containsParent("a"));
 
 		// 子节点相关方法
 		final List<TreeEntry<String, String>> nodes = new ArrayList<>();
 		treeEntry.forEachChild(true, nodes::add);
-		Assert.assertEquals(CollUtil.newArrayList(treeEntry, child), nodes);
+		assertEquals(CollUtil.newArrayList(treeEntry, child), nodes);
 		nodes.clear();
 		treeEntry.forEachChild(false, nodes::add);
-		Assert.assertEquals(CollUtil.newArrayList(child), nodes);
+		assertEquals(CollUtil.newArrayList(child), nodes);
 
-		Assert.assertEquals(CollUtil.newLinkedHashSet(child), new LinkedHashSet<>(treeEntry.getDeclaredChildren().values()));
-		Assert.assertEquals(CollUtil.newLinkedHashSet(child), new LinkedHashSet<>(treeEntry.getChildren().values()));
-		Assert.assertTrue(treeEntry.hasChildren());
-		Assert.assertEquals(treeNodeMap.get("d"), treeEntry.getChild("d"));
-		Assert.assertTrue(treeEntry.containsChild("d"));
+		assertEquals(CollUtil.newLinkedHashSet(child), new LinkedHashSet<>(treeEntry.getDeclaredChildren().values()));
+		assertEquals(CollUtil.newLinkedHashSet(child), new LinkedHashSet<>(treeEntry.getChildren().values()));
+		assertTrue(treeEntry.hasChildren());
+		assertEquals(treeNodeMap.get("d"), treeEntry.getChild("d"));
+		assertTrue(treeEntry.containsChild("d"));
 	}
 
 	@Test
@@ -59,16 +60,16 @@ public class LinkedForestMapTest {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 
 		TreeEntry<String, String> treeEntry = new LinkedForestMap.TreeEntryNode<>(null, "a", "aaa");
-		Assert.assertNull(map.put("a", treeEntry));
-		Assert.assertNotEquals(map.get("a"), treeEntry);
-		Assert.assertEquals(map.get("a").getKey(), treeEntry.getKey());
-		Assert.assertEquals(map.get("a").getValue(), treeEntry.getValue());
+		assertNull(map.put("a", treeEntry));
+		assertNotEquals(map.get("a"), treeEntry);
+		assertEquals(map.get("a").getKey(), treeEntry.getKey());
+		assertEquals(map.get("a").getValue(), treeEntry.getValue());
 
 		treeEntry = new LinkedForestMap.TreeEntryNode<>(null, "a", "aaaa");
-		Assert.assertNotNull(map.put("a", treeEntry));
-		Assert.assertNotEquals(map.get("a"), treeEntry);
-		Assert.assertEquals(map.get("a").getKey(), treeEntry.getKey());
-		Assert.assertEquals(map.get("a").getValue(), treeEntry.getValue());
+		assertNotNull(map.put("a", treeEntry));
+		assertNotEquals(map.get("a"), treeEntry);
+		assertEquals(map.get("a").getKey(), treeEntry.getKey());
+		assertEquals(map.get("a").getValue(), treeEntry.getValue());
 	}
 
 	@Test
@@ -82,11 +83,11 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> c = map.get("c");
 
 		map.remove("b");
-		Assert.assertNull(map.get("b"));
-		Assert.assertFalse(b.hasChildren());
-		Assert.assertFalse(b.hasParent());
-		Assert.assertEquals(a, c.getDeclaredParent());
-		Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(a.getDeclaredChildren().values()));
+		assertNull(map.get("b"));
+		assertFalse(b.hasChildren());
+		assertFalse(b.hasParent());
+		assertEquals(a, c.getDeclaredParent());
+		assertEquals(CollUtil.newArrayList(c), new ArrayList<>(a.getDeclaredChildren().values()));
 	}
 
 	@Test
@@ -102,17 +103,17 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> b = target.get("b");
 		final TreeEntry<String, String> c = target.get("c");
 
-		Assert.assertNotNull(a);
-		Assert.assertEquals("a", a.getKey());
-		Assert.assertEquals(CollUtil.newArrayList(b, c), new ArrayList<>(a.getChildren().values()));
+		assertNotNull(a);
+		assertEquals("a", a.getKey());
+		assertEquals(CollUtil.newArrayList(b, c), new ArrayList<>(a.getChildren().values()));
 
-		Assert.assertNotNull(b);
-		Assert.assertEquals("b", b.getKey());
-		Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(b.getChildren().values()));
+		assertNotNull(b);
+		assertEquals("b", b.getKey());
+		assertEquals(CollUtil.newArrayList(c), new ArrayList<>(b.getChildren().values()));
 
-		Assert.assertNotNull(c);
-		Assert.assertEquals("c", c.getKey());
-		Assert.assertEquals(CollUtil.newArrayList(), new ArrayList<>(c.getChildren().values()));
+		assertNotNull(c);
+		assertEquals("c", c.getKey());
+		assertEquals(CollUtil.newArrayList(), new ArrayList<>(c.getChildren().values()));
 
 	}
 
@@ -125,29 +126,28 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> a = map.get("a");
 		final TreeEntry<String, String> b = map.get("b");
 		final TreeEntry<String, String> c = map.get("c");
-		Assert.assertFalse(a.hasParent());
-		Assert.assertTrue(a.hasChildren());
-		Assert.assertTrue(b.hasParent());
-		Assert.assertTrue(b.hasChildren());
-		Assert.assertTrue(c.hasParent());
-		Assert.assertFalse(c.hasChildren());
+		assertFalse(a.hasParent());
+		assertTrue(a.hasChildren());
+		assertTrue(b.hasParent());
+		assertTrue(b.hasChildren());
+		assertTrue(c.hasParent());
+		assertFalse(c.hasChildren());
 
 		map.clear();
-		Assert.assertTrue(map.isEmpty());
-		Assert.assertFalse(a.hasParent());
-		Assert.assertFalse(a.hasChildren());
-		Assert.assertFalse(b.hasParent());
-		Assert.assertFalse(b.hasChildren());
-		Assert.assertFalse(c.hasParent());
-		Assert.assertFalse(c.hasChildren());
+		assertFalse(a.hasParent());
+		assertFalse(a.hasChildren());
+		assertFalse(b.hasParent());
+		assertFalse(b.hasChildren());
+		assertFalse(c.hasParent());
+		assertFalse(c.hasChildren());
 	}
 
 	@Test
 	public void getNodeValueTest() {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 		map.putNode("a", "aaa");
-		Assert.assertEquals("aaa", map.getNodeValue("a"));
-		Assert.assertNull(map.getNodeValue("b"));
+		assertEquals("aaa", map.getNodeValue("a"));
+		assertNull(map.getNodeValue("b"));
 	}
 
 	@Test
@@ -169,74 +169,74 @@ public class LinkedForestMapTest {
 		map.putAllNode(Arrays.asList(aMap, bMap, cMap), m -> m.get("id"), m -> m.get("pid"), true);
 
 		final TreeEntry<String, Map<String, String>> a = map.get("a");
-		Assert.assertNotNull(a);
+		assertNotNull(a);
 		final TreeEntry<String, Map<String, String>> b = map.get("b");
-		Assert.assertNotNull(b);
+		assertNotNull(b);
 		final TreeEntry<String, Map<String, String>> c = map.get("c");
-		Assert.assertNotNull(c);
+		assertNotNull(c);
 
-		Assert.assertNull(a.getDeclaredParent());
-		Assert.assertEquals(a, b.getDeclaredParent());
-		Assert.assertEquals(b, c.getDeclaredParent());
+		assertNull(a.getDeclaredParent());
+		assertEquals(a, b.getDeclaredParent());
+		assertEquals(b, c.getDeclaredParent());
 
-		Assert.assertEquals(aMap, a.getValue());
-		Assert.assertEquals(bMap, b.getValue());
-		Assert.assertEquals(cMap, c.getValue());
+		assertEquals(aMap, a.getValue());
+		assertEquals(bMap, b.getValue());
+		assertEquals(cMap, c.getValue());
 	}
 
 	@Test
 	public void putNodeTest() {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 
-		Assert.assertNull(map.get("a"));
+		assertNull(map.get("a"));
 
 		map.putNode("a", "aaa");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertEquals("aaa", map.get("a").getValue());
+		assertNotNull(map.get("a"));
+		assertEquals("aaa", map.get("a").getValue());
 
 		map.putNode("a", "aaaa");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertEquals("aaaa", map.get("a").getValue());
+		assertNotNull(map.get("a"));
+		assertEquals("aaaa", map.get("a").getValue());
 	}
 
 	@Test
 	public void putLinkedNodesTest() {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 
-		Assert.assertNull(map.get("a"));
-		Assert.assertNull(map.get("b"));
+		assertNull(map.get("a"));
+		assertNull(map.get("b"));
 
 		map.putLinkedNodes("a", "b", "bbb");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertNull(map.get("a").getValue());
-		Assert.assertNotNull(map.get("b"));
-		Assert.assertEquals("bbb", map.get("b").getValue());
+		assertNotNull(map.get("a"));
+		assertNull(map.get("a").getValue());
+		assertNotNull(map.get("b"));
+		assertEquals("bbb", map.get("b").getValue());
 
 		map.putLinkedNodes("a", "b", "bbbb");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertNull(map.get("a").getValue());
-		Assert.assertNotNull(map.get("b"));
-		Assert.assertEquals("bbbb", map.get("b").getValue());
+		assertNotNull(map.get("a"));
+		assertNull(map.get("a").getValue());
+		assertNotNull(map.get("b"));
+		assertEquals("bbbb", map.get("b").getValue());
 	}
 
 	@Test
 	public void putLinkedNodesTest2() {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 
-		Assert.assertNull(map.get("a"));
-		Assert.assertNull(map.get("b"));
+		assertNull(map.get("a"));
+		assertNull(map.get("b"));
 
 		map.putLinkedNodes("a", "aaa", "b", "bbb");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertEquals("aaa", map.get("a").getValue());
-		Assert.assertNotNull(map.get("b"));
-		Assert.assertEquals("bbb", map.get("b").getValue());
+		assertNotNull(map.get("a"));
+		assertEquals("aaa", map.get("a").getValue());
+		assertNotNull(map.get("b"));
+		assertEquals("bbb", map.get("b").getValue());
 
 		map.putLinkedNodes("a", "aaaa", "b", "bbbb");
-		Assert.assertNotNull(map.get("a"));
-		Assert.assertEquals("aaaa", map.get("a").getValue());
-		Assert.assertNotNull(map.get("b"));
-		Assert.assertEquals("bbbb", map.get("b").getValue());
+		assertNotNull(map.get("a"));
+		assertEquals("aaaa", map.get("a").getValue());
+		assertNotNull(map.get("b"));
+		assertEquals("bbbb", map.get("b").getValue());
 	}
 
 	@Test
@@ -247,13 +247,13 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> parent = map.get("a");
 		final TreeEntry<String, String> child = map.get("b");
 
-		Assert.assertNotNull(parent);
-		Assert.assertEquals("a", parent.getKey());
-		Assert.assertEquals(child, parent.getChild("b"));
+		assertNotNull(parent);
+		assertEquals("a", parent.getKey());
+		assertEquals(child, parent.getChild("b"));
 
-		Assert.assertNotNull(child);
-		Assert.assertEquals("b", child.getKey());
-		Assert.assertEquals(parent, child.getDeclaredParent());
+		assertNotNull(child);
+		assertEquals("b", child.getKey());
+		assertEquals(parent, child.getDeclaredParent());
 	}
 
 	@Test
@@ -263,8 +263,8 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> parent = map.get("a");
 		final TreeEntry<String, String> child = map.get("b");
 		map.unlinkNode("a", "b");
-		Assert.assertFalse(child.hasParent());
-		Assert.assertFalse(parent.hasChildren());
+		assertFalse(child.hasParent());
+		assertFalse(parent.hasChildren());
 	}
 
 	@Test
@@ -275,11 +275,11 @@ public class LinkedForestMapTest {
 
 		final List<String> expected = CollUtil.newArrayList("a", "b", "c");
 		List<String> actual = CollStreamUtil.toList(map.getTreeNodes("a"), TreeEntry::getKey);
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 		actual = CollStreamUtil.toList(map.getTreeNodes("b"), TreeEntry::getKey);
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 		actual = CollStreamUtil.toList(map.getTreeNodes("c"), TreeEntry::getKey);
-		Assert.assertEquals(expected, actual);
+		assertEquals(expected, actual);
 	}
 
 	@Test
@@ -289,9 +289,9 @@ public class LinkedForestMapTest {
 		map.linkNodes("b", "c");
 
 		final TreeEntry<String, String> root = map.get("a");
-		Assert.assertEquals(root, map.getRootNode("a"));
-		Assert.assertEquals(root, map.getRootNode("b"));
-		Assert.assertEquals(root, map.getRootNode("c"));
+		assertEquals(root, map.getRootNode("a"));
+		assertEquals(root, map.getRootNode("b"));
+		assertEquals(root, map.getRootNode("c"));
 	}
 
 	@Test
@@ -301,8 +301,8 @@ public class LinkedForestMapTest {
 		map.linkNodes("b", "c");
 		final TreeEntry<String, String> a = map.get("a");
 		final TreeEntry<String, String> b = map.get("b");
-		Assert.assertEquals(a, map.getDeclaredParentNode("b"));
-		Assert.assertEquals(b, map.getDeclaredParentNode("c"));
+		assertEquals(a, map.getDeclaredParentNode("b"));
+		assertEquals(b, map.getDeclaredParentNode("c"));
 	}
 
 	@Test
@@ -313,10 +313,10 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> a = map.get("a");
 		final TreeEntry<String, String> b = map.get("b");
 
-		Assert.assertEquals(a, map.getParentNode("c", "a"));
-		Assert.assertEquals(b, map.getParentNode("c", "b"));
-		Assert.assertEquals(a, map.getParentNode("b", "a"));
-		Assert.assertNull(map.getParentNode("a", "a"));
+		assertEquals(a, map.getParentNode("c", "a"));
+		assertEquals(b, map.getParentNode("c", "b"));
+		assertEquals(a, map.getParentNode("b", "a"));
+		assertNull(map.getParentNode("a", "a"));
 	}
 
 	@Test
@@ -324,10 +324,10 @@ public class LinkedForestMapTest {
 		final ForestMap<String, String> map = new LinkedForestMap<>(false);
 		map.linkNodes("a", "b");
 		map.linkNodes("b", "c");
-		Assert.assertTrue(map.containsParentNode("c", "b"));
-		Assert.assertTrue(map.containsParentNode("c", "a"));
-		Assert.assertTrue(map.containsParentNode("b", "a"));
-		Assert.assertFalse(map.containsParentNode("a", "a"));
+		assertTrue(map.containsParentNode("c", "b"));
+		assertTrue(map.containsParentNode("c", "a"));
+		assertTrue(map.containsParentNode("b", "a"));
+		assertFalse(map.containsParentNode("a", "a"));
 	}
 
 	@Test
@@ -336,12 +336,14 @@ public class LinkedForestMapTest {
 		map.linkNodes("a", "b");
 		map.linkNodes("b", "c");
 		final TreeEntry<String, String> b = map.get("b");
+		assertNotNull(b);
 		final TreeEntry<String, String> c = map.get("c");
+		assertNotNull(c);
 
-		Assert.assertTrue(map.containsChildNode("a", "b"));
-		Assert.assertTrue(map.containsChildNode("a", "c"));
-		Assert.assertTrue(map.containsChildNode("b", "c"));
-		Assert.assertFalse(map.containsChildNode("c", "c"));
+		assertTrue(map.containsChildNode("a", "b"));
+		assertTrue(map.containsChildNode("a", "c"));
+		assertTrue(map.containsChildNode("b", "c"));
+		assertFalse(map.containsChildNode("c", "c"));
 	}
 
 	@Test
@@ -352,9 +354,9 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> b = map.get("b");
 		final TreeEntry<String, String> c = map.get("c");
 
-		Assert.assertEquals(CollUtil.newArrayList(b), new ArrayList<>(map.getDeclaredChildNodes("a")));
-		Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getDeclaredChildNodes("b")));
-		Assert.assertEquals(CollUtil.newArrayList(), new ArrayList<>(map.getDeclaredChildNodes("c")));
+		assertEquals(CollUtil.newArrayList(b), new ArrayList<>(map.getDeclaredChildNodes("a")));
+		assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getDeclaredChildNodes("b")));
+		assertEquals(CollUtil.newArrayList(), new ArrayList<>(map.getDeclaredChildNodes("c")));
 	}
 
 	@Test
@@ -365,9 +367,9 @@ public class LinkedForestMapTest {
 		final TreeEntry<String, String> b = map.get("b");
 		final TreeEntry<String, String> c = map.get("c");
 
-		Assert.assertEquals(CollUtil.newArrayList(b, c), new ArrayList<>(map.getChildNodes("a")));
-		Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getChildNodes("b")));
-		Assert.assertEquals(CollUtil.newArrayList(), new ArrayList<>(map.getChildNodes("c")));
+		assertEquals(CollUtil.newArrayList(b, c), new ArrayList<>(map.getChildNodes("a")));
+		assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getChildNodes("b")));
+		assertEquals(CollUtil.newArrayList(), new ArrayList<>(map.getChildNodes("c")));
 	}
 
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java
index 71e088950..26414a466 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -16,10 +16,10 @@ public class MapBuilderTest {
 				.put(false, "d", () -> getValue(4))
 				.build();
 
-		Assert.assertEquals(map.get("a"), "1");
-		Assert.assertFalse(map.containsKey("b"));
-		Assert.assertEquals(map.get("c"), "3");
-		Assert.assertFalse(map.containsKey("d"));
+		assertEquals(map.get("a"), "1");
+		assertFalse(map.containsKey("b"));
+		assertEquals(map.get("c"), "3");
+		assertFalse(map.containsKey("d"));
 	}
 
 	public String getValue(int value) {
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
index 1bea35c06..0a9500135 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
@@ -6,19 +6,15 @@ import cn.hutool.core.lang.Opt;
 import cn.hutool.core.util.StrUtil;
 import lombok.Builder;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class MapUtilTest {
 
 	enum PeopleEnum {GIRL, BOY, CHILD}
@@ -55,10 +51,10 @@ public class MapUtilTest {
 
 		final Map<String, String> map2 = MapUtil.filter(map, t -> Convert.toInt(t.getValue()) % 2 == 0);
 
-		Assert.assertEquals(2, map2.size());
+		assertEquals(2, map2.size());
 
-		Assert.assertEquals("2", map2.get("b"));
-		Assert.assertEquals("4", map2.get("d"));
+		assertEquals("2", map2.get("b"));
+		assertEquals("4", map2.get("d"));
 	}
 
 	@Test
@@ -72,9 +68,9 @@ public class MapUtilTest {
 
 		final Map<Integer, String> resultMap = MapUtil.map(adjectivesMap, (k, v) -> v + " " + PeopleEnum.values()[k].name().toLowerCase());
 
-		Assert.assertEquals("lovely girl", resultMap.get(0));
-		Assert.assertEquals("friendly boy", resultMap.get(1));
-		Assert.assertEquals("happily child", resultMap.get(2));
+		assertEquals("lovely girl", resultMap.get(0));
+		assertEquals("friendly boy", resultMap.get(1));
+		assertEquals("happily child", resultMap.get(2));
 
 		// 下单用户，Queue表示正在 .排队. 抢我抢不到的二次元周边！
 		final Queue<String> customers = new ArrayDeque<>(Arrays.asList("刑部尚书手工耿", "木瓜大盗大漠叔", "竹鼠发烧找华农", "朴实无华朱一旦"));
@@ -95,13 +91,13 @@ public class MapUtilTest {
 		// 下面是测试报告
 		groups.forEach(group -> {
 			final List<User> users = group.getUsers();
-			Assert.assertEquals("刑部尚书手工耿", users.get(0).getName());
-			Assert.assertEquals("木瓜大盗大漠叔", users.get(1).getName());
-			Assert.assertEquals("竹鼠发烧找华农", users.get(2).getName());
-			Assert.assertEquals("朴实无华朱一旦", users.get(3).getName());
+			assertEquals("刑部尚书手工耿", users.get(0).getName());
+			assertEquals("木瓜大盗大漠叔", users.get(1).getName());
+			assertEquals("竹鼠发烧找华农", users.get(2).getName());
+			assertEquals("朴实无华朱一旦", users.get(3).getName());
 		});
 		// 对null友好
-		MapUtil.map(MapUtil.of(0, 0), (k, v) -> null).forEach((k, v) -> Assert.assertNull(v));
+		MapUtil.map(MapUtil.of(0, 0), (k, v) -> null).forEach((k, v) -> assertNull(v));
 	}
 
 	@Test
@@ -116,10 +112,10 @@ public class MapUtilTest {
 
 		final Map<String, String> map2 = MapUtil.filter(camelCaseMap, t -> Convert.toInt(t.getValue()) % 2 == 0);
 
-		Assert.assertEquals(2, map2.size());
+		assertEquals(2, map2.size());
 
-		Assert.assertEquals("2", map2.get("b"));
-		Assert.assertEquals("4", map2.get("d"));
+		assertEquals("2", map2.get("b"));
+		assertEquals("4", map2.get("d"));
 	}
 
 	@Test
@@ -131,9 +127,9 @@ public class MapUtilTest {
 		map.put("fgh", "4");
 
 		final Map<String, String> map2 = MapUtil.filter(map, t -> StrUtil.contains(t.getKey(), "bc"));
-		Assert.assertEquals(2, map2.size());
-		Assert.assertEquals("1", map2.get("abc"));
-		Assert.assertEquals("2", map2.get("bcd"));
+		assertEquals(2, map2.size());
+		assertEquals("1", map2.get("abc"));
+		assertEquals("2", map2.get("bcd"));
 	}
 
 	@Test
@@ -150,12 +146,12 @@ public class MapUtilTest {
 			return t;
 		});
 
-		Assert.assertEquals(4, map2.size());
+		assertEquals(4, map2.size());
 
-		Assert.assertEquals("10", map2.get("a"));
-		Assert.assertEquals("20", map2.get("b"));
-		Assert.assertEquals("30", map2.get("c"));
-		Assert.assertEquals("40", map2.get("d"));
+		assertEquals("10", map2.get("a"));
+		assertEquals("20", map2.get("b"));
+		assertEquals("30", map2.get("c"));
+		assertEquals("40", map2.get("d"));
 	}
 
 	@Test
@@ -168,10 +164,10 @@ public class MapUtilTest {
 
 		final Map<String, String> map2 = MapUtil.reverse(map);
 
-		Assert.assertEquals("a", map2.get("1"));
-		Assert.assertEquals("b", map2.get("2"));
-		Assert.assertEquals("c", map2.get("3"));
-		Assert.assertEquals("d", map2.get("4"));
+		assertEquals("a", map2.get("1"));
+		assertEquals("b", map2.get("2"));
+		assertEquals("c", map2.get("3"));
+		assertEquals("d", map2.get("4"));
 	}
 
 	@Test
@@ -183,14 +179,14 @@ public class MapUtilTest {
 		map.put("d", "4");
 
 		final Object[][] objectArray = MapUtil.toObjectArray(map);
-		Assert.assertEquals("a", objectArray[0][0]);
-		Assert.assertEquals("1", objectArray[0][1]);
-		Assert.assertEquals("b", objectArray[1][0]);
-		Assert.assertEquals("2", objectArray[1][1]);
-		Assert.assertEquals("c", objectArray[2][0]);
-		Assert.assertEquals("3", objectArray[2][1]);
-		Assert.assertEquals("d", objectArray[3][0]);
-		Assert.assertEquals("4", objectArray[3][1]);
+		assertEquals("a", objectArray[0][0]);
+		assertEquals("1", objectArray[0][1]);
+		assertEquals("b", objectArray[1][0]);
+		assertEquals("2", objectArray[1][1]);
+		assertEquals("c", objectArray[2][0]);
+		assertEquals("3", objectArray[2][1]);
+		assertEquals("d", objectArray[3][0]);
+		assertEquals("4", objectArray[3][1]);
 	}
 
 	@Test
@@ -201,43 +197,45 @@ public class MapUtilTest {
 				.put("key2", "value2").build();
 
 		final String join1 = MapUtil.sortJoin(build, StrUtil.EMPTY, StrUtil.EMPTY, false);
-		Assert.assertEquals("key1value1key2value2key3value3", join1);
+		assertEquals("key1value1key2value2key3value3", join1);
 
 		final String join2 = MapUtil.sortJoin(build, StrUtil.EMPTY, StrUtil.EMPTY, false, "123");
-		Assert.assertEquals("key1value1key2value2key3value3123", join2);
+		assertEquals("key1value1key2value2key3value3123", join2);
 
 		final String join3 = MapUtil.sortJoin(build, StrUtil.EMPTY, StrUtil.EMPTY, false, "123", "abc");
-		Assert.assertEquals("key1value1key2value2key3value3123abc", join3);
+		assertEquals("key1value1key2value2key3value3123abc", join3);
 	}
 
 	@Test
 	public void ofEntriesTest(){
 		final Map<String, Integer> map = MapUtil.ofEntries(MapUtil.entry("a", 1), MapUtil.entry("b", 2));
-		Assert.assertEquals(2, map.size());
+		assertEquals(2, map.size());
 
-		Assert.assertEquals(Integer.valueOf(1), map.get("a"));
-		Assert.assertEquals(Integer.valueOf(2), map.get("b"));
+		assertEquals(Integer.valueOf(1), map.get("a"));
+		assertEquals(Integer.valueOf(2), map.get("b"));
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void getIntTest(){
-		final HashMap<String, String> map = MapUtil.of("age", "d");
-		final Integer age = MapUtil.getInt(map, "age");
-		Assert.assertNotNull(age);
+		assertThrows(NumberFormatException.class, () -> {
+			final HashMap<String, String> map = MapUtil.of("age", "d");
+			final Integer age = MapUtil.getInt(map, "age");
+			assertNotNull(age);
+		});
 	}
 
 	@Test
 	public void joinIgnoreNullTest() {
 		final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", null);
 		final String s = MapUtil.joinIgnoreNull(v1, ",", "=");
-		Assert.assertEquals("id=12,name=张三", s);
+		assertEquals("id=12,name=张三", s);
 	}
 
 	@Test
 	public void renameKeyTest() {
 		final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", null);
 		final Map<String, Object> map = MapUtil.renameKey(v1, "name", "newName");
-		Assert.assertEquals("张三", map.get("newName"));
+		assertEquals("张三", map.get("newName"));
 	}
 
 	@Test
@@ -250,8 +248,8 @@ public class MapUtilTest {
 			put("c", "3");
 		}};
 		final Map<String, Object> filtered = MapUtil.filter(map, "a", "b");
-		Assert.assertEquals(2, filtered.size());
-		Assert.assertEquals("1", filtered.get("a"));
-		Assert.assertEquals("2", filtered.get("b"));
+		assertEquals(2, filtered.size());
+		assertEquals("1", filtered.get("a"));
+		assertEquals("2", filtered.get("b"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java b/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java
index c16b747d2..d4115e87a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.map;
 
 import cn.hutool.core.map.multi.RowKeyTable;
 import cn.hutool.core.map.multi.Table;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -15,26 +15,26 @@ public class RowKeyTableTest {
 		table.put(1, 2, 3);
 		table.put(1, 6, 4);
 
-		Assert.assertEquals(new Integer(3), table.get(1, 2));
-		Assert.assertNull(table.get(1, 3));
+		assertEquals(new Integer(3), table.get(1, 2));
+		assertNull(table.get(1, 3));
 
 		//判断row和column确定的二维点是否存在
-		Assert.assertTrue(table.contains(1, 2));
-		Assert.assertFalse(table.contains(1, 3));
+		assertTrue(table.contains(1, 2));
+		assertFalse(table.contains(1, 3));
 
 		//判断列
-		Assert.assertTrue(table.containsColumn(2));
-		Assert.assertFalse(table.containsColumn(3));
+		assertTrue(table.containsColumn(2));
+		assertFalse(table.containsColumn(3));
 
 		// 判断行
-		Assert.assertTrue(table.containsRow(1));
-		Assert.assertFalse(table.containsRow(2));
+		assertTrue(table.containsRow(1));
+		assertFalse(table.containsRow(2));
 
 
 		// 获取列
 		Map<Integer, Integer> column = table.getColumn(6);
-		Assert.assertEquals(1, column.size());
-		Assert.assertEquals(new Integer(4), column.get(1));
+		assertEquals(1, column.size());
+		assertEquals(new Integer(4), column.get(1));
 	}
 
 	@Test
@@ -43,7 +43,7 @@ public class RowKeyTableTest {
 		table.put(1, 2, 3);
 		table.put(1, 6, 4);
 
-		Assert.assertNull(table.getRow(2));
-		Assert.assertFalse(table.contains(2, 3));
+		assertNull(table.getRow(2));
+		assertFalse(table.contains(2, 3));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java
index f13a720ea..c1b348805 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/TableMapTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class TableMapTest {
 
@@ -11,11 +11,11 @@ public class TableMapTest {
 		tableMap.put("aaa", 111);
 		tableMap.put("bbb", 222);
 
-		Assert.assertEquals(new Integer(111), tableMap.get("aaa"));
-		Assert.assertEquals(new Integer(222), tableMap.get("bbb"));
+		assertEquals(new Integer(111), tableMap.get("aaa"));
+		assertEquals(new Integer(222), tableMap.get("bbb"));
 
-		Assert.assertEquals("aaa", tableMap.getKey(111));
-		Assert.assertEquals("bbb", tableMap.getKey(222));
+		assertEquals("aaa", tableMap.getKey(111));
+		assertEquals("bbb", tableMap.getKey(222));
 	}
 
 	@SuppressWarnings("OverwrittenKey")
@@ -28,7 +28,7 @@ public class TableMapTest {
 
 		tableMap.remove("a");
 
-		Assert.assertEquals(0, tableMap.size());
+		assertEquals(0, tableMap.size());
 	}
 
 	@SuppressWarnings("OverwrittenKey")
@@ -41,6 +41,6 @@ public class TableMapTest {
 
 		tableMap.remove("a", 222);
 
-		Assert.assertEquals(1, tableMap.size());
+		assertEquals(1, tableMap.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
index b6ed7cbe2..523ec1acd 100644
--- a/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/TolerantMapTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.map;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 
@@ -11,7 +11,7 @@ public class TolerantMapTest {
 
 	private final TolerantMap<String, String> map = TolerantMap.of(new HashMap<>(), "default");
 
-	@Before
+	@BeforeEach
 	public void before() {
 		map.put("monday", "星期一");
 		map.put("tuesday", "星期二");
diff --git a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
index 7824d1918..0efc5d863 100755
--- a/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/map/WeakConcurrentMapTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.thread.ConcurrencyTester;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class WeakConcurrentMapTest {
 
@@ -22,10 +22,10 @@ public class WeakConcurrentMapTest {
 		map.put(key3, value3);
 		map.put(key4, value4);
 
-		Assert.assertEquals(value1, map.get(key1));
-		Assert.assertEquals(value2, map.get(key2));
-		Assert.assertEquals(value3, map.get(key3));
-		Assert.assertEquals(value4, map.get(key4));
+		assertEquals(value1, map.get(key1));
+		assertEquals(value2, map.get(key2));
+		assertEquals(value3, map.get(key3));
+		assertEquals(value4, map.get(key4));
 
 		// 清空引用
 		//noinspection UnusedAssignment
@@ -36,7 +36,7 @@ public class WeakConcurrentMapTest {
 		System.gc();
 		ThreadUtil.sleep(200L);
 
-		Assert.assertEquals(2, map.size());
+		assertEquals(2, map.size());
 	}
 
 	@Test
@@ -45,8 +45,8 @@ public class WeakConcurrentMapTest {
 		final ConcurrencyTester tester = new ConcurrencyTester(9000);
 		tester.test(()-> cache.computeIfAbsent("aaa" + RandomUtil.randomInt(2), (key)-> "aaaValue"));
 
-		Assert.assertTrue(tester.getInterval() > 0);
+		assertTrue(tester.getInterval() > 0);
 		String value = ObjectUtil.defaultIfNull(cache.get("aaa0"), cache.get("aaa1"));
-		Assert.assertEquals("aaaValue", value);
+		assertEquals("aaaValue", value);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java b/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java
index cf5112cc8..9819613d3 100755
--- a/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/math/ArrangementTest.java
@@ -2,9 +2,9 @@ package cn.hutool.core.math;
 
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.lang.Console;
 
@@ -14,49 +14,49 @@ import cn.hutool.core.lang.Console;
  *
  */
 public class ArrangementTest {
-	
+
 	@Test
 	public void arrangementTest() {
 		long result = Arrangement.count(4, 2);
-		Assert.assertEquals(12, result);
-		
+		assertEquals(12, result);
+
 		result = Arrangement.count(4, 1);
-		Assert.assertEquals(4, result);
-		
+		assertEquals(4, result);
+
 		result = Arrangement.count(4, 0);
-		Assert.assertEquals(1, result);
-		
+		assertEquals(1, result);
+
 		long resultAll = Arrangement.countAll(4);
-		Assert.assertEquals(64, resultAll);
+		assertEquals(64, resultAll);
 	}
-	
+
 	@Test
 	public void selectTest() {
 		Arrangement arrangement = new Arrangement(new String[] { "1", "2", "3", "4" });
 		List<String[]> list = arrangement.select(2);
-		Assert.assertEquals(Arrangement.count(4, 2), list.size());
-		Assert.assertArrayEquals(new String[] {"1", "2"}, list.get(0));
-		Assert.assertArrayEquals(new String[] {"1", "3"}, list.get(1));
-		Assert.assertArrayEquals(new String[] {"1", "4"}, list.get(2));
-		Assert.assertArrayEquals(new String[] {"2", "1"}, list.get(3));
-		Assert.assertArrayEquals(new String[] {"2", "3"}, list.get(4));
-		Assert.assertArrayEquals(new String[] {"2", "4"}, list.get(5));
-		Assert.assertArrayEquals(new String[] {"3", "1"}, list.get(6));
-		Assert.assertArrayEquals(new String[] {"3", "2"}, list.get(7));
-		Assert.assertArrayEquals(new String[] {"3", "4"}, list.get(8));
-		Assert.assertArrayEquals(new String[] {"4", "1"}, list.get(9));
-		Assert.assertArrayEquals(new String[] {"4", "2"}, list.get(10));
-		Assert.assertArrayEquals(new String[] {"4", "3"}, list.get(11));
-		
+		assertEquals(Arrangement.count(4, 2), list.size());
+		assertArrayEquals(new String[] {"1", "2"}, list.get(0));
+		assertArrayEquals(new String[] {"1", "3"}, list.get(1));
+		assertArrayEquals(new String[] {"1", "4"}, list.get(2));
+		assertArrayEquals(new String[] {"2", "1"}, list.get(3));
+		assertArrayEquals(new String[] {"2", "3"}, list.get(4));
+		assertArrayEquals(new String[] {"2", "4"}, list.get(5));
+		assertArrayEquals(new String[] {"3", "1"}, list.get(6));
+		assertArrayEquals(new String[] {"3", "2"}, list.get(7));
+		assertArrayEquals(new String[] {"3", "4"}, list.get(8));
+		assertArrayEquals(new String[] {"4", "1"}, list.get(9));
+		assertArrayEquals(new String[] {"4", "2"}, list.get(10));
+		assertArrayEquals(new String[] {"4", "3"}, list.get(11));
+
 		List<String[]> selectAll = arrangement.selectAll();
-		Assert.assertEquals(Arrangement.countAll(4), selectAll.size());
-		
+		assertEquals(Arrangement.countAll(4), selectAll.size());
+
 		List<String[]> list2 = arrangement.select(0);
-		Assert.assertEquals(1, list2.size());
+		assertEquals(1, list2.size());
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void selectTest2() {
 		List<String[]> list = MathUtil.arrangementSelect(new String[] { "1", "1", "3", "4" });
 		for (String[] strings : list) {
diff --git a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java b/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
index ab04e1685..f1e1a8387 100644
--- a/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
@@ -1,58 +1,58 @@
 package cn.hutool.core.math;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CalculatorTest {
 
 	@Test
 	public void conversationTest(){
 		final double conversion = Calculator.conversion("(0*1--3)-5/-4-(3*(-2.13))");
-		Assert.assertEquals(10.64, conversion, 0);
+		assertEquals(10.64, conversion, 0);
 	}
 
 	@Test
 	public void conversationTest2(){
 		final double conversion = Calculator.conversion("77 * 12");
-		Assert.assertEquals(924.0, conversion, 0);
+		assertEquals(924.0, conversion, 0);
 	}
 
 	@Test
 	public void conversationTest3(){
 		final double conversion = Calculator.conversion("1");
-		Assert.assertEquals(1, conversion, 0);
+		assertEquals(1, conversion, 0);
 	}
 
 	@Test
 	public void conversationTest4(){
 		final double conversion = Calculator.conversion("(88*66/23)%26+45%9");
-		Assert.assertEquals((88D * 66 / 23) % 26, conversion, 0.0000000001);
+		assertEquals((88D * 66 / 23) % 26, conversion, 0.0000000001);
 	}
 
 	@Test
 	public void conversationTest5(){
 		// https://github.com/dromara/hutool/issues/1984
 		final double conversion = Calculator.conversion("((1/1) / (1/1) -1) * 100");
-		Assert.assertEquals(0, conversion, 0);
+		assertEquals(0, conversion, 0);
 	}
 
 	@Test
 	public void conversationTest6() {
 		final double conversion = Calculator.conversion("-((2.12-2) * 100)");
-		Assert.assertEquals(-1D * (2.12 - 2) * 100, conversion, 0.01);
+		assertEquals(-1D * (2.12 - 2) * 100, conversion, 0.01);
 	}
 
 	@Test
 	public void conversationTest7() {
 		//https://gitee.com/dromara/hutool/issues/I4KONB
 		final double conversion = Calculator.conversion("((-2395+0) * 0.3+140.24+35+90)/30");
-		Assert.assertEquals(-15.11, conversion, 0.01);
+		assertEquals(-15.11, conversion, 0.01);
 	}
 
 	@Test
 	public void issue2964Test() {
 		// https://github.com/dromara/hutool/issues/2964
 		final double calcValue = Calculator.conversion("(11+2)12");
-		Assert.assertEquals(156D, calcValue, 0.001);
+		assertEquals(156D, calcValue, 0.001);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java b/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java
index fc677ddd4..3cc6d8461 100644
--- a/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/math/CombinationTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.core.math;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
 /**
  * 组合单元测试
- * 
+ *
  * @author looly
  *
  */
@@ -16,39 +16,39 @@ public class CombinationTest {
 	@Test
 	public void countTest() {
 		long result = Combination.count(5, 2);
-		Assert.assertEquals(10, result);
-		
+		assertEquals(10, result);
+
 		result = Combination.count(5, 5);
-		Assert.assertEquals(1, result);
-		
+		assertEquals(1, result);
+
 		result = Combination.count(5, 0);
-		Assert.assertEquals(1, result);
-		
+		assertEquals(1, result);
+
 		long resultAll = Combination.countAll(5);
-		Assert.assertEquals(31, resultAll);
+		assertEquals(31, resultAll);
 	}
 
 	@Test
 	public void selectTest() {
 		Combination combination = new Combination(new String[] { "1", "2", "3", "4", "5" });
 		List<String[]> list = combination.select(2);
-		Assert.assertEquals(Combination.count(5, 2), list.size());
-		
-		Assert.assertArrayEquals(new String[] {"1", "2"}, list.get(0));
-		Assert.assertArrayEquals(new String[] {"1", "3"}, list.get(1));
-		Assert.assertArrayEquals(new String[] {"1", "4"}, list.get(2));
-		Assert.assertArrayEquals(new String[] {"1", "5"}, list.get(3));
-		Assert.assertArrayEquals(new String[] {"2", "3"}, list.get(4));
-		Assert.assertArrayEquals(new String[] {"2", "4"}, list.get(5));
-		Assert.assertArrayEquals(new String[] {"2", "5"}, list.get(6));
-		Assert.assertArrayEquals(new String[] {"3", "4"}, list.get(7));
-		Assert.assertArrayEquals(new String[] {"3", "5"}, list.get(8));
-		Assert.assertArrayEquals(new String[] {"4", "5"}, list.get(9));
-		
+		assertEquals(Combination.count(5, 2), list.size());
+
+		assertArrayEquals(new String[] {"1", "2"}, list.get(0));
+		assertArrayEquals(new String[] {"1", "3"}, list.get(1));
+		assertArrayEquals(new String[] {"1", "4"}, list.get(2));
+		assertArrayEquals(new String[] {"1", "5"}, list.get(3));
+		assertArrayEquals(new String[] {"2", "3"}, list.get(4));
+		assertArrayEquals(new String[] {"2", "4"}, list.get(5));
+		assertArrayEquals(new String[] {"2", "5"}, list.get(6));
+		assertArrayEquals(new String[] {"3", "4"}, list.get(7));
+		assertArrayEquals(new String[] {"3", "5"}, list.get(8));
+		assertArrayEquals(new String[] {"4", "5"}, list.get(9));
+
 		List<String[]> selectAll = combination.selectAll();
-		Assert.assertEquals(Combination.countAll(5), selectAll.size());
-		
+		assertEquals(Combination.countAll(5), selectAll.size());
+
 		List<String[]> list2 = combination.select(0);
-		Assert.assertEquals(1, list2.size());
+		assertEquals(1, list2.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java b/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java
index c83389dfa..03a76aaeb 100644
--- a/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/math/MoneyTest.java
@@ -1,23 +1,23 @@
 package cn.hutool.core.math;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class MoneyTest {
 
 	@Test
 	public void yuanToCentTest() {
 		final Money money = new Money("1234.56");
-		Assert.assertEquals(123456, money.getCent());
+		assertEquals(123456, money.getCent());
 
-		Assert.assertEquals(123456, MathUtil.yuanToCent(1234.56));
+		assertEquals(123456, MathUtil.yuanToCent(1234.56));
 	}
 
 	@Test
 	public void centToYuanTest() {
 		final Money money = new Money(1234, 56);
-		Assert.assertEquals(1234.56D, money.getAmount().doubleValue(), 0);
+		assertEquals(1234.56D, money.getAmount().doubleValue(), 0);
 
-		Assert.assertEquals(1234.56D, MathUtil.centToYuan(123456), 0);
+		assertEquals(1234.56D, MathUtil.centToYuan(123456), 0);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java b/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
index 8006dbf9c..1ca9886d9 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
@@ -1,17 +1,17 @@
 package cn.hutool.core.net;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class FormUrlencodedTest {
 
 	@Test
 	public void encodeParamTest(){
 		String encode = FormUrlencoded.ALL.encode("a+b", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a%2Bb", encode);
+		assertEquals("a%2Bb", encode);
 
 		encode = FormUrlencoded.ALL.encode("a b", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a+b", encode);
+		assertEquals("a+b", encode);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java b/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java
index 0b9e8505c..fa5e87dbe 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java
@@ -1,29 +1,28 @@
 package cn.hutool.core.net;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class Ipv4UtilTest {
 
 	@Test
 	public void getMaskBitByMaskTest(){
 		final int maskBitByMask = Ipv4Util.getMaskBitByMask("255.255.255.0");
-		Assert.assertEquals(24, maskBitByMask);
+		assertEquals(24, maskBitByMask);
 	}
 
 	@Test
 	public void getMaskBitByIllegalMaskTest() {
-		final ThrowingRunnable getMaskBitByMaskRunnable = () -> Ipv4Util.getMaskBitByMask("255.255.0.255");
-		Assert.assertThrows("非法掩码测试", IllegalArgumentException.class, getMaskBitByMaskRunnable);
+		assertThrows(IllegalArgumentException.class, () -> Ipv4Util.getMaskBitByMask("255.255.0.255"));
 	}
 
 	@Test
 	public void getMaskByMaskBitTest(){
 		final String mask = Ipv4Util.getMaskByMaskBit(24);
-		Assert.assertEquals("255.255.255.0", mask);
+		assertEquals("255.255.255.0", mask);
 	}
 
 	@Test
@@ -31,7 +30,7 @@ public class Ipv4UtilTest {
 		final String ip = "192.168.1.255";
 		final long ipLong = Ipv4Util.ipv4ToLong(ip);
 		final String ipv4 = Ipv4Util.longToIpv4(ipLong);
-		Assert.assertEquals(ip, ipv4);
+		assertEquals(ip, ipv4);
 	}
 
 	@Test
@@ -39,14 +38,14 @@ public class Ipv4UtilTest {
 		final String ip = "192.168.1.1";
 		final int maskBitByMask = Ipv4Util.getMaskBitByMask("255.255.255.0");
 		final String endIpStr = Ipv4Util.getEndIpStr(ip, maskBitByMask);
-		Assert.assertEquals("192.168.1.255", endIpStr);
+		assertEquals("192.168.1.255", endIpStr);
 	}
 
 	@Test
 	public void listTest(){
 		final int maskBit = Ipv4Util.getMaskBitByMask("255.255.255.0");
 		final List<String> list = Ipv4Util.list("192.168.100.2", maskBit, false);
-		Assert.assertEquals(254, list.size());
+		assertEquals(254, list.size());
 
 		testGenerateIpList("10.1.0.1", "10.2.1.2");
 
@@ -74,8 +73,9 @@ public class Ipv4UtilTest {
 		testGenerateIpList("9.255.3.2", "10.2.1.2");
 	}
 
+	@SuppressWarnings("SameParameterValue")
 	private void testGenerateIpList(final String fromIp, final String toIp) {
-		Assert.assertEquals(
+		assertEquals(
 				Ipv4Util.countByIpRange(fromIp, toIp),
 				Ipv4Util.list(fromIp, toIp).size()
 		);
@@ -84,48 +84,48 @@ public class Ipv4UtilTest {
 	@Test
 	public void isMaskValidTest() {
 		final boolean maskValid = Ipv4Util.isMaskValid("255.255.255.0");
-		Assert.assertTrue("掩码合法检验", maskValid);
+		assertTrue(maskValid, "掩码合法检验");
 	}
 
 	@Test
 	public void isMaskInvalidTest() {
-		Assert.assertFalse("掩码非法检验 - 255.255.0.255", Ipv4Util.isMaskValid("255.255.0.255"));
-		Assert.assertFalse("掩码非法检验 - null值", Ipv4Util.isMaskValid(null));
-		Assert.assertFalse("掩码非法检验 - 空字符串", Ipv4Util.isMaskValid(""));
-		Assert.assertFalse("掩码非法检验 - 空白字符串", Ipv4Util.isMaskValid(" "));
+		assertFalse(Ipv4Util.isMaskValid("255.255.0.255"), "掩码非法检验 - 255.255.0.255");
+		assertFalse(Ipv4Util.isMaskValid(null), "掩码非法检验 - null值");
+		assertFalse(Ipv4Util.isMaskValid(""), "掩码非法检验 - 空字符串");
+		assertFalse(Ipv4Util.isMaskValid(" "), "掩码非法检验 - 空白字符串");
 	}
 
 	@Test
 	public void isMaskBitValidTest() {
 		final boolean maskBitValid = Ipv4Util.isMaskBitValid(32);
-		Assert.assertTrue("掩码位合法检验", maskBitValid);
+		assertTrue( maskBitValid);
 	}
 
 	@Test
 	public void isMaskBitInvalidTest() {
 		final boolean maskBitValid = Ipv4Util.isMaskBitValid(33);
-		Assert.assertFalse("掩码位非法检验", maskBitValid);
+		assertFalse(maskBitValid);
 	}
 
 	@Test
 	public void matchesTest() {
 		final boolean matches1 = Ipv4Util.matches("127.*.*.1", "127.0.0.1");
-		Assert.assertTrue("IP地址通配符匹配1", matches1);
+		assertTrue(matches1);
 
 		final boolean matches2 = Ipv4Util.matches("192.168.*.1", "127.0.0.1");
-		Assert.assertFalse("IP地址通配符匹配2", matches2);
+		assertFalse(matches2);
 	}
 
 	@Test
 	public void ipv4ToLongTest(){
 		long l = Ipv4Util.ipv4ToLong("127.0.0.1");
-		Assert.assertEquals(2130706433L, l);
+		assertEquals(2130706433L, l);
 		l = Ipv4Util.ipv4ToLong("114.114.114.114");
-		Assert.assertEquals(1920103026L, l);
+		assertEquals(1920103026L, l);
 		l = Ipv4Util.ipv4ToLong("0.0.0.0");
-		Assert.assertEquals(0L, l);
+		assertEquals(0L, l);
 		l = Ipv4Util.ipv4ToLong("255.255.255.255");
-		Assert.assertEquals(4294967295L, l);
+		assertEquals(4294967295L, l);
 	}
 
 	@Test
@@ -133,11 +133,11 @@ public class Ipv4UtilTest {
 		final String strIP = "不正确的 IP 地址";
 		final long defaultValue = 0L;
 		final long ipOfLong = Ipv4Util.ipv4ToLong(strIP, defaultValue);
-		Assert.assertEquals(ipOfLong, defaultValue);
+		assertEquals(ipOfLong, defaultValue);
 
 		final String strIP2 = "255.255.255.255";
 		final long defaultValue2 = 0L;
 		final long ipOfLong2 = Ipv4Util.ipv4ToLong(strIP2, defaultValue2);
-		Assert.assertEquals(ipOfLong2, 4294967295L);
+		assertEquals(ipOfLong2, 4294967295L);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/IssueI70UPUTest.java b/hutool-core/src/test/java/cn/hutool/core/net/IssueI70UPUTest.java
index 71c3fe98a..91e78b321 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/IssueI70UPUTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/IssueI70UPUTest.java
@@ -13,7 +13,7 @@
 package cn.hutool.core.net;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IssueI70UPUTest {
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java
index e99f1c60e..d64b567e5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java
@@ -3,9 +3,9 @@ package cn.hutool.core.net;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.PatternPool;
 import cn.hutool.core.util.ReUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.net.HttpCookie;
 import java.net.InetAddress;
@@ -21,88 +21,88 @@ import java.util.List;
 public class NetUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getLocalhostStrTest() {
 		final String localhost = NetUtil.getLocalhostStr();
-		Assert.assertNotNull(localhost);
+		assertNotNull(localhost);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getLocalhostTest() {
 		final InetAddress localhost = NetUtil.getLocalhost();
-		Assert.assertNotNull(localhost);
+		assertNotNull(localhost);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getLocalMacAddressTest() {
 		final String macAddress = NetUtil.getLocalMacAddress();
-		Assert.assertNotNull(macAddress);
+		assertNotNull(macAddress);
 
 		// 验证MAC地址正确
 		final boolean match = ReUtil.isMatch(PatternPool.MAC_ADDRESS, macAddress);
-		Assert.assertTrue(match);
+		assertTrue(match);
 	}
 
 	@Test
 	public void longToIpTest() {
 		final String ipv4 = NetUtil.longToIpv4(2130706433L);
-		Assert.assertEquals("127.0.0.1", ipv4);
+		assertEquals("127.0.0.1", ipv4);
 	}
 
 	@Test
 	public void ipToLongTest() {
 		final long ipLong = NetUtil.ipv4ToLong("127.0.0.1");
-		Assert.assertEquals(2130706433L, ipLong);
+		assertEquals(2130706433L, ipLong);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void isUsableLocalPortTest(){
-		Assert.assertTrue(NetUtil.isUsableLocalPort(80));
+		assertTrue(NetUtil.isUsableLocalPort(80));
 	}
 
 	@Test
 	public void parseCookiesTest(){
 		final String cookieStr = "cookieName=\"cookieValue\";Path=\"/\";Domain=\"cookiedomain.com\"";
 		final List<HttpCookie> httpCookies = NetUtil.parseCookies(cookieStr);
-		Assert.assertEquals(1, httpCookies.size());
+		assertEquals(1, httpCookies.size());
 
 		final HttpCookie httpCookie = httpCookies.get(0);
-		Assert.assertEquals(0, httpCookie.getVersion());
-		Assert.assertEquals("cookieName", httpCookie.getName());
-		Assert.assertEquals("cookieValue", httpCookie.getValue());
-		Assert.assertEquals("/", httpCookie.getPath());
-		Assert.assertEquals("cookiedomain.com", httpCookie.getDomain());
+		assertEquals(0, httpCookie.getVersion());
+		assertEquals("cookieName", httpCookie.getName());
+		assertEquals("cookieValue", httpCookie.getValue());
+		assertEquals("/", httpCookie.getPath());
+		assertEquals("cookiedomain.com", httpCookie.getDomain());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getLocalHostNameTest() {
 		// 注意此方法会触发反向DNS解析，导致阻塞，阻塞时间取决于网络！
-		Assert.assertNotNull(NetUtil.getLocalHostName());
+		assertNotNull(NetUtil.getLocalHostName());
 	}
 
 	@Test
 	public void getLocalHostTest() {
-		Assert.assertNotNull(NetUtil.getLocalhost());
+		assertNotNull(NetUtil.getLocalhost());
 	}
 
 	@Test
 	public void pingTest(){
-		Assert.assertTrue(NetUtil.ping("127.0.0.1"));
+		assertTrue(NetUtil.ping("127.0.0.1"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void isOpenTest(){
 		final InetSocketAddress address = new InetSocketAddress("www.hutool.cn", 443);
-		Assert.assertTrue(NetUtil.isOpen(address, 200));
+		assertTrue(NetUtil.isOpen(address, 200));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getDnsInfoTest(){
 		final List<String> txt = NetUtil.getDnsInfo("hutool.cn", "TXT");
 		Console.log(txt);
@@ -110,13 +110,13 @@ public class NetUtilTest {
 
 	@Test
 	public void isInRangeTest(){
-		Assert.assertTrue(NetUtil.isInRange("114.114.114.114","0.0.0.0/0"));
-		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.0.0.0/8"));
-		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.0.0/16"));
-		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.0/24"));
-		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.4/32"));
-		Assert.assertFalse(NetUtil.isInRange("8.8.8.8","192.0.0.0/8"));
-		Assert.assertFalse(NetUtil.isInRange("114.114.114.114","192.168.3.4/32"));
+		assertTrue(NetUtil.isInRange("114.114.114.114","0.0.0.0/0"));
+		assertTrue(NetUtil.isInRange("192.168.3.4","192.0.0.0/8"));
+		assertTrue(NetUtil.isInRange("192.168.3.4","192.168.0.0/16"));
+		assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.0/24"));
+		assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.4/32"));
+		assertFalse(NetUtil.isInRange("8.8.8.8","192.0.0.0/8"));
+		assertFalse(NetUtil.isInRange("114.114.114.114","192.168.3.4/32"));
 	}
 
 	@Test
@@ -124,6 +124,6 @@ public class NetUtilTest {
 		// 获取结果应该去掉空格
 		final String ips = "unknown, 12.34.56.78, 23.45.67.89";
 		final String ip = NetUtil.getMultistageReverseProxyIp(ips);
-		Assert.assertEquals("12.34.56.78", ip);
+		assertEquals("12.34.56.78", ip);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
index e549e9a9f..85be806e6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
@@ -2,8 +2,8 @@ package cn.hutool.core.net;
 
 import cn.hutool.core.codec.PercentCodec;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -13,22 +13,22 @@ public class RFC3986Test {
 	@Test
 	public void encodeQueryTest(){
 		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=b", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=b", encode);
+		assertEquals("a=b", encode);
 
 		encode = RFC3986.QUERY_PARAM_VALUE.encode("a+1=b", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a+1=b", encode);
+		assertEquals("a+1=b", encode);
 	}
 
 	@Test
 	public void encodeQueryPercentTest(){
 		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%b", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=%25b", encode);
+		assertEquals("a=%25b", encode);
 	}
 
 	@Test
 	public void encodeQueryWithSafeTest(){
 		String encode = RFC3986.QUERY_PARAM_VALUE.encode("a=%25", CharsetUtil.CHARSET_UTF_8, '%');
-		Assert.assertEquals("a=%25", encode);
+		assertEquals("a=%25", encode);
 	}
 
 	@Test
@@ -36,6 +36,6 @@ public class RFC3986Test {
 		String toVerifyText = "行吧行吧 cargo:1.0,\"Deta-ils:[{";
 		final String encode = PercentCodec.of(RFC3986.UNRESERVED).setEncodeSpaceAsPlus(true).encode(toVerifyText, CharsetUtil.CHARSET_UTF_8);
 		final String encodeJdk = URLEncoder.encode(toVerifyText, "UTF-8");
-		Assert.assertEquals(encode, encodeJdk);
+		assertEquals(encode, encodeJdk);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
index 2dfccdf95..7ddb9823c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
@@ -1,12 +1,10 @@
 package cn.hutool.core.net;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlPath;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -14,7 +12,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class UrlBuilderTest {
 
@@ -23,7 +21,7 @@ public class UrlBuilderTest {
 		UrlBuilder builder = UrlBuilder.of();
 		final String buildUrl = builder.setHost("www.hutool.cn").build();
 		assertEquals("http://www.hutool.cn/", buildUrl);
-		assertEquals(buildUrl, 80, builder.getPortWithDefault());
+		assertEquals(80, builder.getPortWithDefault());
 	}
 
 	@Test
@@ -36,7 +34,7 @@ public class UrlBuilderTest {
 		buildUrl = urlBuilder.setScheme("http").setHost("192.168.1.1").setPort(8080).addQuery("url", "http://192.168.1.1/test/1")
 				.setWithEndTag(false).build();
 		assertEquals("http://192.168.1.1:8080?url=http://192.168.1.1/test/1", buildUrl);
-		assertEquals(buildUrl, 8080, urlBuilder.getPortWithDefault());
+		assertEquals(8080, urlBuilder.getPortWithDefault());
 	}
 
 	@Test
@@ -161,8 +159,8 @@ public class UrlBuilderTest {
 	@Test
 	public void ofNullQueryTest() {
 		final UrlBuilder builder = UrlBuilder.of("http://www.hutool.cn/aaa/bbb", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertNotNull(builder.getQuery());
-		Assert.assertNull(builder.getQuery().get("a"));
+		assertNotNull(builder.getQuery());
+		assertNull(builder.getQuery().get("a"));
 	}
 
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
index 93d4bba65..8695955ad 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.net;
 
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.URLUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
@@ -11,13 +11,13 @@ import java.nio.charset.StandardCharsets;
 public class UrlDecoderTest {
 	@Test
 	public void decodeForPathTest(){
-		Assert.assertEquals("+", URLDecoder.decodeForPath("+", CharsetUtil.CHARSET_UTF_8));
+		assertEquals("+", URLDecoder.decodeForPath("+", CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
 	public void decodePlusTest() {
 		final String decode = URLDecoder.decode("+", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(" ", decode);
+		assertEquals(" ", decode);
 	}
 
 	@Test
@@ -28,19 +28,19 @@ public class UrlDecoderTest {
 		final String expectedDecode = "%FE%FF%6D%4B%8B%D5";
 
 		final String s1 = URLUtil.encode(s, StandardCharsets.UTF_16);
-		Assert.assertEquals(expectedDecode, s1);
+		assertEquals(expectedDecode, s1);
 		final String s2 = java.net.URLEncoder.encode(s, "UTF-16");
-		Assert.assertEquals(expectedDecode, s2);
+		assertEquals(expectedDecode, s2);
 
 		final String decode = URLDecoder.decode(s1, StandardCharsets.UTF_16);
-		Assert.assertEquals(s, decode);
+		assertEquals(s, decode);
 
 		// 测试编码字符串和非编码字符串混合
 		final String mixDecoded = expectedDecode + "你好";
 		final String decode2 = URLDecoder.decode(mixDecoded, StandardCharsets.UTF_16);
-		Assert.assertEquals("测试你好", decode2);
+		assertEquals("测试你好", decode2);
 
-		Assert.assertEquals(
+		assertEquals(
 			java.net.URLDecoder.decode(mixDecoded, "UTF-16"),
 			URLDecoder.decode(mixDecoded, StandardCharsets.UTF_16)
 		);
diff --git a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java b/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
index ec5f19a05..dd12c4a25 100644
--- a/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.net.url.UrlQuery;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.URLUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -21,8 +21,8 @@ public class UrlQueryTest {
 		String queryStr = "a=1&b=111==";
 		UrlQuery q = new UrlQuery();
 		UrlQuery parse = q.parse(queryStr, Charset.defaultCharset());
-		Assert.assertEquals("111==", parse.get("b"));
-		Assert.assertEquals("a=1&b=111==", parse.toString());
+		assertEquals("111==", parse.get("b"));
+		assertEquals("a=1&b=111==", parse.toString());
 	}
 
 	@Test
@@ -31,7 +31,7 @@ public class UrlQueryTest {
 		String url = "https://img-cloud.voc.com.cn/140/2020/09/03/c3d41b93e0d32138574af8e8b50928b376ca5ba61599127028157.png?imageMogr2/auto-orient/thumbnail/500&pid=259848";
 		final UrlBuilder urlBuilder = UrlBuilder.ofHttpWithoutEncode(url);
 		final String queryStr = urlBuilder.getQueryStr();
-		Assert.assertEquals("imageMogr2/auto-orient/thumbnail/500&pid=259848", queryStr);
+		assertEquals("imageMogr2/auto-orient/thumbnail/500&pid=259848", queryStr);
 	}
 
 	@Test
@@ -39,7 +39,7 @@ public class UrlQueryTest {
 		String requestUrl = "http://192.168.1.1:8080/pc?=d52i5837i4ed=o39-ap9e19s5--=72e54*ll0lodl-f338868d2";
 		UrlQuery q = new UrlQuery();
 		UrlQuery parse = q.parse(requestUrl, Charset.defaultCharset());
-		Assert.assertEquals("=d52i5837i4ed=o39-ap9e19s5--=72e54*ll0lodl-f338868d2", parse.toString());
+		assertEquals("=d52i5837i4ed=o39-ap9e19s5--=72e54*ll0lodl-f338868d2", parse.toString());
 	}
 
 	@Test
@@ -47,7 +47,7 @@ public class UrlQueryTest {
 		// issue#1688@Github
 		String u = "https://www.baidu.com/proxy";
 		final UrlQuery query = UrlQuery.of(URLUtil.url(u).getQuery(), Charset.defaultCharset());
-		Assert.assertTrue(MapUtil.isEmpty(query.getQueryMap()));
+		assertTrue(MapUtil.isEmpty(query.getQueryMap()));
 	}
 
 	@Test
@@ -55,7 +55,7 @@ public class UrlQueryTest {
 		// https://github.com/dromara/hutool/issues/1989
 		String queryStr = "imageMogr2/thumbnail/x800/format/jpg";
 		final UrlQuery query = UrlQuery.of(queryStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(queryStr, query.toString());
+		assertEquals(queryStr, query.toString());
 	}
 
 	@Test
@@ -64,13 +64,13 @@ public class UrlQueryTest {
 		map.put("username", "SSM");
 		map.put("password", "123456");
 		String query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("username=SSM&password=123456", query);
+		assertEquals("username=SSM&password=123456", query);
 
 		map = new TreeMap<>();
 		map.put("username", "SSM");
 		map.put("password", "123456");
 		query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("password=123456&username=SSM", query);
+		assertEquals("password=123456&username=SSM", query);
 	}
 
 	@Test
@@ -79,19 +79,19 @@ public class UrlQueryTest {
 		map.put(null, "SSM");
 		map.put("password", "123456");
 		String query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("password=123456", query);
+		assertEquals("password=123456", query);
 
 		map = new TreeMap<>();
 		map.put("username", "SSM");
 		map.put("password", "");
 		query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("password=&username=SSM", query);
+		assertEquals("password=&username=SSM", query);
 
 		map = new TreeMap<>();
 		map.put("username", "SSM");
 		map.put("password", null);
 		query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("password&username=SSM", query);
+		assertEquals("password&username=SSM", query);
 	}
 
 	@Test
@@ -100,20 +100,20 @@ public class UrlQueryTest {
 		map.put("key1&", "SSM");
 		map.put("key2", "123456&");
 		String query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("key1%26=SSM&key2=123456%26", query);
+		assertEquals("key1%26=SSM&key2=123456%26", query);
 
 		map = new TreeMap<>();
 		map.put("username=", "SSM");
 		map.put("password", "=");
 		query = URLUtil.buildQuery(map, StandardCharsets.UTF_8);
-		Assert.assertEquals("password==&username%3D=SSM", query);
+		assertEquals("password==&username%3D=SSM", query);
 	}
 
 	@Test
 	public void plusTest(){
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
 		final String a = UrlQuery.of(MapUtil.of("a+b", "1+2")).build(CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a+b=1+2", a);
+		assertEquals("a+b=1+2", a);
 	}
 
 	@Test
@@ -121,28 +121,28 @@ public class UrlQueryTest {
 		// 根据RFC3986，在URL中，+是安全字符，即此符号不转义
 		final String a = UrlQuery.of("a+b=1+2", CharsetUtil.CHARSET_UTF_8)
 				.build(CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a+b=1+2", a);
+		assertEquals("a+b=1+2", a);
 	}
 
 	@Test
 	public void spaceTest(){
 		// 根据RFC3986，在URL中，空格编码为"%20"
 		final String a = UrlQuery.of(MapUtil.of("a ", " ")).build(CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a%20=%20", a);
+		assertEquals("a%20=%20", a);
 	}
 
 	@Test
 	public void parsePercentTest(){
 		String queryStr = "a%2B=ccc";
 		final UrlQuery query = UrlQuery.of(queryStr, null);
-		Assert.assertEquals(queryStr, query.toString());
+		assertEquals(queryStr, query.toString());
 	}
 
 	@Test
 	public void parsePercentTest2(){
 		String queryStr = "signature=%2Br1ekUCGjXiu50Y%2Bk0MO4ovulK8%3D";
 		final UrlQuery query = UrlQuery.of(queryStr, null);
-		Assert.assertEquals(queryStr, query.toString());
+		assertEquals(queryStr, query.toString());
 	}
 
 	@Test
@@ -152,7 +152,7 @@ public class UrlQueryTest {
 		query.add(":/?#[]@!$&'()*+,;= ", ":/?#[]@!$&'()*+,;= ");
 
 		final String string = query.build(CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%20=" +
+		assertEquals("%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%20=" +
 			"%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2A%2B%2C%3B%3D%20", string);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java
index c79d7f494..348dcb3ad 100644
--- a/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/stream/CollectorUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.stream;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -27,7 +27,7 @@ public class CollectorUtilTest {
 		// 执行聚合
 		final Map<String, List<Integer>> nameScoresMap = nameScoreMapList.stream().collect(CollectorUtil.reduceListMap());
 
-		Assert.assertEquals(MapUtil.builder("苏格拉底", Arrays.asList(1, 2))
+		assertEquals(MapUtil.builder("苏格拉底", Arrays.asList(1, 2))
 						.put("特拉叙马霍斯", Arrays.asList(3, 1, 2)).build(),
 				nameScoresMap);
 
@@ -41,7 +41,7 @@ public class CollectorUtilTest {
 
 		Map<String, Map<String, List<String>>> nameMap = data.stream()
 			.collect(Collectors.groupingBy(e -> e.get("name"), CollectorUtil.reduceListMap()));
-		Assert.assertEquals(MapUtil.builder("jack", MapUtil.builder("name", Arrays.asList("jack", "jack"))
+		assertEquals(MapUtil.builder("jack", MapUtil.builder("name", Arrays.asList("jack", "jack"))
 				.put("count", Arrays.asList("80", "90")).build())
 			.put("sam", MapUtil.builder("name", Arrays.asList("sam", "sam", "sam"))
 				.put("count", Arrays.asList("80", "81", "82")).build())
@@ -54,20 +54,20 @@ public class CollectorUtilTest {
 		Map<Boolean, Set<String>> map = list.stream()
 				.collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf, LinkedHashSet::new, LinkedHashMap::new));
 
-		Assert.assertEquals(LinkedHashMap.class, map.getClass());
-		Assert.assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE));
-		Assert.assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE));
+		assertEquals(LinkedHashMap.class, map.getClass());
+		assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE));
+		assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE));
 
 		map = list.stream()
 				.collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf, LinkedHashSet::new));
-		Assert.assertEquals(HashMap.class, map.getClass());
-		Assert.assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE));
-		Assert.assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE));
+		assertEquals(HashMap.class, map.getClass());
+		assertEquals(new LinkedHashSet<>(Arrays.asList("2", "4")), map.get(Boolean.TRUE));
+		assertEquals(new LinkedHashSet<>(Arrays.asList("1", "3")), map.get(Boolean.FALSE));
 
 		final Map<Boolean, List<String>> map2 = list.stream()
 				.collect(CollectorUtil.groupingBy(t -> (t & 1) == 0, String::valueOf));
-		Assert.assertEquals(Arrays.asList("2", "2", "4"), map2.get(Boolean.TRUE));
-		Assert.assertEquals(Arrays.asList("1", "1", "3"), map2.get(Boolean.FALSE));
+		assertEquals(Arrays.asList("2", "2", "4"), map2.get(Boolean.TRUE));
+		assertEquals(Arrays.asList("1", "1", "3"), map2.get(Boolean.FALSE));
 
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java
index cb4d48dfe..76d95c77c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/stream/StreamUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.stream;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,13 +17,13 @@ public class StreamUtilTest {
 	public void ofTest(){
 		final Stream<Integer> stream = StreamUtil.of(2, x -> x * 2, 4);
 		final String result = stream.collect(CollectorUtil.joining(","));
-		Assert.assertEquals("2,4,8,16", result);
+		assertEquals("2,4,8,16", result);
 	}
 
 	// === iterator ===
 	@Test
 	public void streamTestNullIterator() {
-		Assert.assertThrows(IllegalArgumentException.class, () -> StreamUtil.of((Iterator<Object>) null));
+		assertThrows(IllegalArgumentException.class, () -> StreamUtil.of((Iterator<Object>) null));
 	}
 
 	@SuppressWarnings({"RedundantOperationOnEmptyContainer", "RedundantCollectionOperation"})
@@ -40,15 +40,15 @@ public class StreamUtilTest {
 	@Test
 	public void streamTestOrdinaryIterator() {
 		final ArrayList<Integer> arrayList = CollUtil.newArrayList(1, 2, 3);
-		Assert.assertArrayEquals(new Integer[]{1, 2, 3}, StreamUtil.of(arrayList.iterator()).toArray());
+		assertArrayEquals(new Integer[]{1, 2, 3}, StreamUtil.of(arrayList.iterator()).toArray());
 
 		final HashSet<Integer> hashSet = CollUtil.newHashSet(1, 2, 3);
-		Assert.assertEquals(hashSet, StreamUtil.of(hashSet.iterator()).collect(Collectors.toSet()));
+		assertEquals(hashSet, StreamUtil.of(hashSet.iterator()).collect(Collectors.toSet()));
 	}
 
 	void assertStreamIsEmpty(final Stream<?> stream) {
-		Assert.assertNotNull(stream);
-		Assert.assertEquals(0, stream.toArray().length);
+		assertNotNull(stream);
+		assertEquals(0, stream.toArray().length);
 	}
 	// ================ stream test end ================
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java
index 693b5e043..b00b723b0 100755
--- a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardMonitorTest.java
@@ -2,13 +2,13 @@ package cn.hutool.core.swing;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.swing.clipboard.ClipboardUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ClipboardMonitorTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void monitorTest() {
 		// 第一个监听
 		ClipboardUtil.listen((clipboard, contents) -> {
@@ -16,7 +16,7 @@ public class ClipboardMonitorTest {
 			Console.log("1# {}", object);
 			return contents;
 		}, false);
-		
+
 		// 第二个监听
 		ClipboardUtil.listen((clipboard, contents) -> {
 			Object object = ClipboardUtil.getStr(contents);
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java
index b9369b7f5..750c2279f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/swing/ClipboardUtilTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.core.swing;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.swing.clipboard.ClipboardUtil;
 
 /**
  * 剪贴板工具类单元测试
- * 
+ *
  * @author looly
  *
  */
@@ -19,7 +19,7 @@ public class ClipboardUtilTest {
 			ClipboardUtil.setStr("test");
 
 			String test = ClipboardUtil.getStr();
-			Assert.assertEquals("test", test);
+			assertEquals("test", test);
 		} catch (java.awt.HeadlessException e) {
 			// 忽略 No X11 DISPLAY variable was set, but this program performed an operation which requires it.
 			// ignore
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java
index ebcd222f6..0a056e9de 100755
--- a/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/swing/DesktopUtilTest.java
@@ -1,12 +1,12 @@
 package cn.hutool.core.swing;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class DesktopUtilTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void browseTest() {
 		DesktopUtil.browse("https://www.hutool.club");
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java
index e0c7f5574..3c91b09b3 100755
--- a/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/swing/RobotUtilTest.java
@@ -1,14 +1,14 @@
 package cn.hutool.core.swing;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.FileUtil;
 
 public class RobotUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void captureScreenTest() {
 		RobotUtil.captureScreen(FileUtil.file("e:/screen.jpg"));
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java b/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java
index 3b1db3b67..d64446649 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/AntPathMatcherTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 
@@ -11,7 +11,7 @@ public class AntPathMatcherTest {
 	public void matchesTest() {
 		AntPathMatcher antPathMatcher = new AntPathMatcher();
 		boolean matched = antPathMatcher.match("/api/org/organization/{orgId}", "/api/org/organization/999");
-		Assert.assertTrue(matched);
+		assertTrue(matched);
 	}
 
 	@Test
@@ -21,17 +21,17 @@ public class AntPathMatcherTest {
 		String pattern = "/**/*.xml*";
 		String path = "/WEB-INF/web.xml";
 		boolean isMatched = antPathMatcher.match(pattern, path);
-		Assert.assertTrue(isMatched);
+		assertTrue(isMatched);
 
 		pattern = "org/codelabor/*/**/*Service";
 		path = "org/codelabor/example/HelloWorldService";
 		isMatched = antPathMatcher.match(pattern, path);
-		Assert.assertTrue(isMatched);
+		assertTrue(isMatched);
 
 		pattern = "org/codelabor/*/**/*Service?";
 		path = "org/codelabor/example/HelloWorldServices";
 		isMatched = antPathMatcher.match(pattern, path);
-		Assert.assertTrue(isMatched);
+		assertTrue(isMatched);
 	}
 
 	@Test
@@ -42,13 +42,13 @@ public class AntPathMatcherTest {
 		pathMatcher.setPathSeparator("/");
 		pathMatcher.setTrimTokens(true);
 
-		Assert.assertTrue(pathMatcher.match("a", "a"));
-		Assert.assertTrue(pathMatcher.match("a*", "ab"));
-		Assert.assertTrue(pathMatcher.match("a*/**/a", "ab/asdsa/a"));
-		Assert.assertTrue(pathMatcher.match("a*/**/a", "ab/asdsa/asdasd/a"));
+		assertTrue(pathMatcher.match("a", "a"));
+		assertTrue(pathMatcher.match("a*", "ab"));
+		assertTrue(pathMatcher.match("a*/**/a", "ab/asdsa/a"));
+		assertTrue(pathMatcher.match("a*/**/a", "ab/asdsa/asdasd/a"));
 
-		Assert.assertTrue(pathMatcher.match("*", "a"));
-		Assert.assertTrue(pathMatcher.match("*/*", "a/a"));
+		assertTrue(pathMatcher.match("*", "a"));
+		assertTrue(pathMatcher.match("*/*", "a/a"));
 	}
 
 	/**
@@ -61,43 +61,43 @@ public class AntPathMatcherTest {
 		AntPathMatcher pathMatcher = new AntPathMatcher();
 
 		// 精确匹配
-		Assert.assertTrue(pathMatcher.match("/test", "/test"));
-		Assert.assertFalse(pathMatcher.match("test", "/test"));
+		assertTrue(pathMatcher.match("/test", "/test"));
+		assertFalse(pathMatcher.match("test", "/test"));
 
 		//测试通配符?
-		Assert.assertTrue(pathMatcher.match("t?st", "test"));
-		Assert.assertTrue(pathMatcher.match("te??", "test"));
-		Assert.assertFalse(pathMatcher.match("tes?", "tes"));
-		Assert.assertFalse(pathMatcher.match("tes?", "testt"));
+		assertTrue(pathMatcher.match("t?st", "test"));
+		assertTrue(pathMatcher.match("te??", "test"));
+		assertFalse(pathMatcher.match("tes?", "tes"));
+		assertFalse(pathMatcher.match("tes?", "testt"));
 
 		//测试通配符*
-		Assert.assertTrue(pathMatcher.match("*", "test"));
-		Assert.assertTrue(pathMatcher.match("test*", "test"));
-		Assert.assertTrue(pathMatcher.match("test/*", "test/Test"));
-		Assert.assertTrue(pathMatcher.match("*.*", "test."));
-		Assert.assertTrue(pathMatcher.match("*.*", "test.test.test"));
-		Assert.assertFalse(pathMatcher.match("test*", "test/")); //注意这里是false 因为路径不能用*匹配
-		Assert.assertFalse(pathMatcher.match("test*", "test/t")); //这同理
-		Assert.assertFalse(pathMatcher.match("test*aaa", "testblaaab")); //这个是false 因为最后一个b无法匹配了 前面都是能匹配成功的
+		assertTrue(pathMatcher.match("*", "test"));
+		assertTrue(pathMatcher.match("test*", "test"));
+		assertTrue(pathMatcher.match("test/*", "test/Test"));
+		assertTrue(pathMatcher.match("*.*", "test."));
+		assertTrue(pathMatcher.match("*.*", "test.test.test"));
+		assertFalse(pathMatcher.match("test*", "test/")); //注意这里是false 因为路径不能用*匹配
+		assertFalse(pathMatcher.match("test*", "test/t")); //这同理
+		assertFalse(pathMatcher.match("test*aaa", "testblaaab")); //这个是false 因为最后一个b无法匹配了 前面都是能匹配成功的
 
 		//测试通配符** 匹配多级URL
-		Assert.assertTrue(pathMatcher.match("/*/**", "/testing/testing"));
-		Assert.assertTrue(pathMatcher.match("/**/*", "/testing/testing"));
-		Assert.assertTrue(pathMatcher.match("/bla/**/bla", "/bla/testing/testing/bla/bla")); //这里也是true哦
-		Assert.assertFalse(pathMatcher.match("/bla*bla/test", "/blaXXXbl/test"));
+		assertTrue(pathMatcher.match("/*/**", "/testing/testing"));
+		assertTrue(pathMatcher.match("/**/*", "/testing/testing"));
+		assertTrue(pathMatcher.match("/bla/**/bla", "/bla/testing/testing/bla/bla")); //这里也是true哦
+		assertFalse(pathMatcher.match("/bla*bla/test", "/blaXXXbl/test"));
 
-		Assert.assertFalse(pathMatcher.match("/????", "/bala/bla"));
-		Assert.assertFalse(pathMatcher.match("/**/*bla", "/bla/bla/bla/bbb"));
+		assertFalse(pathMatcher.match("/????", "/bala/bla"));
+		assertFalse(pathMatcher.match("/**/*bla", "/bla/bla/bla/bbb"));
 
-		Assert.assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing/"));
-		Assert.assertTrue(pathMatcher.match("/*bla*/**/bla/*", "/XXXblaXXXX/testing/testing/bla/testing"));
-		Assert.assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing"));
-		Assert.assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing.jpg"));
-		Assert.assertTrue(pathMatcher.match("/foo/bar/**", "/foo/bar"));
+		assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing/"));
+		assertTrue(pathMatcher.match("/*bla*/**/bla/*", "/XXXblaXXXX/testing/testing/bla/testing"));
+		assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing"));
+		assertTrue(pathMatcher.match("/*bla*/**/bla/**", "/XXXblaXXXX/testing/testing/bla/testing/testing.jpg"));
+		assertTrue(pathMatcher.match("/foo/bar/**", "/foo/bar"));
 
 		//这个需要特别注意：{}里面的相当于Spring MVC里接受一个参数一样，所以任何东西都会匹配的
-		Assert.assertTrue(pathMatcher.match("/{bla}.*", "/testing.html"));
-		Assert.assertFalse(pathMatcher.match("/{bla}.htm", "/testing.html")); //这样就是false了
+		assertTrue(pathMatcher.match("/{bla}.*", "/testing.html"));
+		assertFalse(pathMatcher.match("/{bla}.htm", "/testing.html")); //这样就是false了
 	}
 
 	/**
@@ -110,6 +110,6 @@ public class AntPathMatcherTest {
 				"/api/org" +
 						"/organization" +
 						"/999");
-		Assert.assertEquals(1, map.size());
+		assertEquals(1, map.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
index 5bd1afe10..9273d89a5 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/CharSequenceUtilTest.java
@@ -1,12 +1,11 @@
 package cn.hutool.core.text;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.regex.Pattern;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CharSequenceUtilTest {
 
@@ -62,7 +61,7 @@ public class CharSequenceUtilTest {
 		String str1 = "\u00C1";
 		String str2 = "\u0041\u0301";
 
-		Assert.assertNotEquals(str1, str2);
+		assertNotEquals(str1, str2);
 
 		str1 = CharSequenceUtil.normalize(str1);
 		str2 = CharSequenceUtil.normalize(str2);
@@ -107,11 +106,11 @@ public class CharSequenceUtilTest {
 		assertFalse(CharSequenceUtil.startWith(null, null, false, true));
 		assertFalse(CharSequenceUtil.startWith("abc", "abc", true, true));
 
-		Assert.assertTrue(CharSequenceUtil.startWithIgnoreCase(null, null));
+		assertTrue(CharSequenceUtil.startWithIgnoreCase(null, null));
 		assertFalse(CharSequenceUtil.startWithIgnoreCase(null, "abc"));
 		assertFalse(CharSequenceUtil.startWithIgnoreCase("abcdef", null));
-		Assert.assertTrue(CharSequenceUtil.startWithIgnoreCase("abcdef", "abc"));
-		Assert.assertTrue(CharSequenceUtil.startWithIgnoreCase("ABCDEF", "abc"));
+		assertTrue(CharSequenceUtil.startWithIgnoreCase("abcdef", "abc"));
+		assertTrue(CharSequenceUtil.startWithIgnoreCase("ABCDEF", "abc"));
 	}
 
 	@Test
@@ -120,11 +119,11 @@ public class CharSequenceUtilTest {
 		assertFalse(CharSequenceUtil.endWith(null, null, false, true));
 		assertFalse(CharSequenceUtil.endWith("abc", "abc", true, true));
 
-		Assert.assertTrue(CharSequenceUtil.endWithIgnoreCase(null, null));
+		assertTrue(CharSequenceUtil.endWithIgnoreCase(null, null));
 		assertFalse(CharSequenceUtil.endWithIgnoreCase(null, "abc"));
 		assertFalse(CharSequenceUtil.endWithIgnoreCase("abcdef", null));
-		Assert.assertTrue(CharSequenceUtil.endWithIgnoreCase("abcdef", "def"));
-		Assert.assertTrue(CharSequenceUtil.endWithIgnoreCase("ABCDEF", "def"));
+		assertTrue(CharSequenceUtil.endWithIgnoreCase("abcdef", "def"));
+		assertTrue(CharSequenceUtil.endWithIgnoreCase("ABCDEF", "def"));
 	}
 
 	@Test
@@ -230,10 +229,10 @@ public class CharSequenceUtilTest {
 	@Test
 	public void testContainsOnly() {
 		// 测试空字符串
-		Assert.assertTrue(CharSequenceUtil.containsOnly("", 'a', 'b'));
+		assertTrue(CharSequenceUtil.containsOnly("", 'a', 'b'));
 
 		// 测试字符串只包含testChars中的字符
-		Assert.assertTrue(CharSequenceUtil.containsOnly("asdf", 'a', 's', 'd', 'f'));
+		assertTrue(CharSequenceUtil.containsOnly("asdf", 'a', 's', 'd', 'f'));
 
 		// 测试字符串包含testChars中的字符和其它字符
 		assertFalse(CharSequenceUtil.containsOnly("asdf123", 'a', 's', 'd', 'f'));
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/IssueI96LWHTest.java b/hutool-core/src/test/java/cn/hutool/core/text/IssueI96LWHTest.java
index bc3e6140a..848c73a47 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/IssueI96LWHTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/IssueI96LWHTest.java
@@ -2,7 +2,7 @@ package cn.hutool.core.text;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class IssueI96LWHTest {
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java
index 7ab8640ea..850ec2e22 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.text;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.CharUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class NamingCaseTest {
 
@@ -13,14 +13,14 @@ public class NamingCaseTest {
 				.set("Table_Test_Of_day","tableTestOfDay")
 				.set("TableTestOfDay","TableTestOfDay")
 				.set("abc_1d","abc1d")
-				.forEach((key, value) -> Assert.assertEquals(value, NamingCase.toCamelCase(key)));
+				.forEach((key, value) -> assertEquals(value, NamingCase.toCamelCase(key)));
 	}
 
 	@Test
 	public void toCamelCaseFromDashedTest() {
 		Dict.create()
 				.set("Table-Test-Of-day","tableTestOfDay")
-				.forEach((key, value) -> Assert.assertEquals(value, NamingCase.toCamelCase(key, CharUtil.DASHED)));
+				.forEach((key, value) -> assertEquals(value, NamingCase.toCamelCase(key, CharUtil.DASHED)));
 	}
 
 	@Test
@@ -39,15 +39,15 @@ public class NamingCaseTest {
 				.set("customerNickV2", "customer_nick_v2")
 				// https://gitee.com/dromara/hutool/issues/I4X9TT
 				.set("DEPT_NAME","DEPT_NAME")
-				.forEach((key, value) -> Assert.assertEquals(value, NamingCase.toUnderlineCase(key)));
+				.forEach((key, value) -> assertEquals(value, NamingCase.toUnderlineCase(key)));
 	}
 
 	@Test
 	public void issue3031Test() {
 		String camelCase = NamingCase.toCamelCase("user_name,BIRTHDAY");
-		Assert.assertEquals("userName,birthday", camelCase);
+		assertEquals("userName,birthday", camelCase);
 
 		camelCase = NamingCase.toCamelCase("user_name,BIRTHDAY", '_', false);
-		Assert.assertEquals("userName,BIRTHDAY", camelCase);
+		assertEquals("userName,BIRTHDAY", camelCase);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java b/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java
index edc863868..3cdecd97e 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/PasswdStrengthTest.java
@@ -1,18 +1,18 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PasswdStrengthTest {
 	@Test
 	public void strengthTest(){
 		String passwd = "2hAj5#mne-ix.86H";
-		Assert.assertEquals(13, PasswdStrength.check(passwd));
+		assertEquals(13, PasswdStrength.check(passwd));
 	}
 
 	@Test
 	public void strengthNumberTest(){
 		String passwd = "9999999999999";
-		Assert.assertEquals(0, PasswdStrength.check(passwd));
+		assertEquals(0, PasswdStrength.check(passwd));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrBuilderTest.java
index 17ebf89dc..25f602b7f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/StrBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/StrBuilderTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.TimeInterval;
@@ -19,7 +19,7 @@ public class StrBuilderTest {
 	 * StrBuilder的性能测试
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void benchTest() {
 		TimeInterval timer = DateUtil.timer();
 		StrBuilder builder = StrBuilder.create();
@@ -42,7 +42,7 @@ public class StrBuilderTest {
 	public void appendTest() {
 		StrBuilder builder = StrBuilder.create();
 		builder.append("aaa").append("你好").append('r');
-		Assert.assertEquals("aaa你好r", builder.toString());
+		assertEquals("aaa你好r", builder.toString());
 	}
 
 	@Test
@@ -50,7 +50,7 @@ public class StrBuilderTest {
 		StrBuilder builder = StrBuilder.create(1);
 		builder.append("aaa").append("你好").append('r');
 		builder.insert(3, "数据插入");
-		Assert.assertEquals("aaa数据插入你好r", builder.toString());
+		assertEquals("aaa数据插入你好r", builder.toString());
 	}
 
 	@Test
@@ -58,7 +58,7 @@ public class StrBuilderTest {
 		StrBuilder builder = StrBuilder.create(1);
 		builder.append("aaa").append("你好").append('r');
 		builder.insert(8, "数据插入");
-		Assert.assertEquals("aaa你好r  数据插入", builder.toString());
+		assertEquals("aaa你好r  数据插入", builder.toString());
 	}
 
 	@Test
@@ -67,7 +67,7 @@ public class StrBuilderTest {
 		builder.append("aaa").append("你好").append('r');
 		builder.insert(3, "数据插入");
 		builder.reset();
-		Assert.assertEquals("", builder.toString());
+		assertEquals("", builder.toString());
 	}
 
 	@Test
@@ -77,14 +77,14 @@ public class StrBuilderTest {
 		builder.insert(3, "数据插入");
 		builder.reset();
 		builder.append("bbb".toCharArray());
-		Assert.assertEquals("bbb", builder.toString());
+		assertEquals("bbb", builder.toString());
 	}
 
 	@Test
 	public void appendObjectTest() {
 		StrBuilder builder = StrBuilder.create(1);
 		builder.append(123).append(456.123D).append(true).append('\n');
-		Assert.assertEquals("123456.123true\n", builder.toString());
+		assertEquals("123456.123true\n", builder.toString());
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public class StrBuilderTest {
 		StrBuilder strBuilder = new StrBuilder("ABCDEFG");
 		int length = strBuilder.length();
 		StrBuilder builder = strBuilder.del(0, length);
-		Assert.assertEquals("", builder.toString());
+		assertEquals("", builder.toString());
 	}
 
 	@Test
@@ -101,7 +101,7 @@ public class StrBuilderTest {
 		// 删除中间部分测试
 		StrBuilder strBuilder = new StrBuilder("ABCDEFG");
 		StrBuilder builder = strBuilder.del(2,6);
-		Assert.assertEquals("ABG", builder.toString());
+		assertEquals("ABG", builder.toString());
 	}
 
 	@Test
@@ -110,10 +110,10 @@ public class StrBuilderTest {
 
 		// 不处理
 		StrBuilder builder = strBuilder.delTo(7);
-		Assert.assertEquals("ABCDEFG", builder.toString());
+		assertEquals("ABCDEFG", builder.toString());
 
 		// 删除全部
 		builder = strBuilder.delTo(0);
-		Assert.assertEquals("", builder.toString());
+		assertEquals("", builder.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java
index d7377b8fd..1e8682965 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/StrJoinerTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.text;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,20 +14,20 @@ public class StrJoinerTest {
 	public void joinIntArrayTest(){
 		int[] a = {1,2,3,4,5};
 		final StrJoiner append = StrJoiner.of(",").append(a);
-		Assert.assertEquals("1,2,3,4,5", append.toString());
+		assertEquals("1,2,3,4,5", append.toString());
 	}
 
 	@Test
 	public void joinEmptyTest(){
 		List<String> list = new ArrayList<>();
 		final StrJoiner append = StrJoiner.of(",").append(list);
-		Assert.assertEquals("", append.toString());
+		assertEquals("", append.toString());
 	}
 
 	@Test
 	public void noJoinTest(){
 		final StrJoiner append = StrJoiner.of(",");
-		Assert.assertEquals("", append.toString());
+		assertEquals("", append.toString());
 	}
 
 	@Test
@@ -36,7 +36,7 @@ public class StrJoinerTest {
 		append.append(new Object[]{ListUtil.of("1", "2"),
 				CollUtil.newLinkedHashSet("3", "4")
 		});
-		Assert.assertEquals("1,2,3,4", append.toString());
+		assertEquals("1,2,3,4", append.toString());
 	}
 
 	@Test
@@ -46,21 +46,21 @@ public class StrJoinerTest {
 				.append("1")
 				.append((Object)null)
 				.append("3");
-		Assert.assertEquals("1,3", append.toString());
+		assertEquals("1,3", append.toString());
 
 		append = StrJoiner.of(",")
 				.setNullMode(StrJoiner.NullMode.TO_EMPTY)
 				.append("1")
 				.append((Object)null)
 				.append("3");
-		Assert.assertEquals("1,,3", append.toString());
+		assertEquals("1,,3", append.toString());
 
 		append = StrJoiner.of(",")
 				.setNullMode(StrJoiner.NullMode.NULL_STRING)
 				.append("1")
 				.append((Object)null)
 				.append("3");
-		Assert.assertEquals("1,null,3", append.toString());
+		assertEquals("1,null,3", append.toString());
 	}
 
 	@Test
@@ -69,23 +69,23 @@ public class StrJoinerTest {
 				.append("1")
 				.append("2")
 				.append("3");
-		Assert.assertEquals("[1,2,3]", append.toString());
+		assertEquals("[1,2,3]", append.toString());
 
 		append = StrJoiner.of(",", "[", "]")
 				.setWrapElement(true)
 				.append("1")
 				.append("2")
 				.append("3");
-		Assert.assertEquals("[1],[2],[3]", append.toString());
+		assertEquals("[1],[2],[3]", append.toString());
 	}
 
 	@Test
 	public void lengthTest(){
 		StrJoiner joiner = StrJoiner.of(",", "[", "]");
-		Assert.assertEquals(joiner.toString().length(), joiner.length());
+		assertEquals(joiner.toString().length(), joiner.length());
 
 		joiner.append("123");
-		Assert.assertEquals(joiner.toString().length(), joiner.length());
+		assertEquals(joiner.toString().length(), joiner.length());
 	}
 
 	@Test
@@ -97,15 +97,15 @@ public class StrJoinerTest {
 		joiner1.append("789");
 
 		final StrJoiner merge = joiner1.merge(joiner2);
-		Assert.assertEquals("[123,456,789]", merge.toString());
+		assertEquals("[123,456,789]", merge.toString());
 	}
 
 	@Test
 	public void issue3444Test() {
 		final StrJoiner strJoinerEmpty = StrJoiner.of(",");
-		Assert.assertEquals(0, strJoinerEmpty.length());
+		assertEquals(0, strJoinerEmpty.length());
 
 		final StrJoiner strJoinerWithContent = StrJoiner.of(",").append("haha");
-		Assert.assertEquals(4, strJoinerWithContent.length());
+		assertEquals(4, strJoinerWithContent.length());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
index d5f88f953..74aaf6f19 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/StrMatcherTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -11,13 +11,13 @@ public class StrMatcherTest {
 	public void matcherTest(){
 		final StrMatcher strMatcher = new StrMatcher("${name}-${age}-${gender}-${country}-${province}-${city}-${status}");
 		final Map<String, String> match = strMatcher.match("小明-19-男-中国-河南-郑州-已婚");
-		Assert.assertEquals("小明", match.get("name"));
-		Assert.assertEquals("19", match.get("age"));
-		Assert.assertEquals("男", match.get("gender"));
-		Assert.assertEquals("中国", match.get("country"));
-		Assert.assertEquals("河南", match.get("province"));
-		Assert.assertEquals("郑州", match.get("city"));
-		Assert.assertEquals("已婚", match.get("status"));
+		assertEquals("小明", match.get("name"));
+		assertEquals("19", match.get("age"));
+		assertEquals("男", match.get("gender"));
+		assertEquals("中国", match.get("country"));
+		assertEquals("河南", match.get("province"));
+		assertEquals("郑州", match.get("city"));
+		assertEquals("已婚", match.get("status"));
 	}
 
 	@Test
@@ -25,7 +25,7 @@ public class StrMatcherTest {
 		// 当有无匹配项的时候，按照全不匹配对待
 		final StrMatcher strMatcher = new StrMatcher("${name}-${age}-${gender}-${country}-${province}-${city}-${status}");
 		final Map<String, String> match = strMatcher.match("小明-19-男-中国-河南-郑州");
-		Assert.assertEquals(0, match.size());
+		assertEquals(0, match.size());
 	}
 
 	@Test
@@ -34,7 +34,7 @@ public class StrMatcherTest {
 		final StrMatcher strMatcher = new StrMatcher("${name}经过${year}年");
 		final Map<String, String> match = strMatcher.match("小明经过20年，成长为一个大人。");
 		//Console.log(match);
-		Assert.assertEquals("小明", match.get("name"));
-		Assert.assertEquals("20", match.get("year"));
+		assertEquals("小明", match.get("name"));
+		assertEquals("20", match.get("year"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java b/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java
index 3fca5620a..e5a6ed038 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/TextSimilarityTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 文本相似度计算工具类单元测试
@@ -16,10 +16,10 @@ public class TextSimilarityTest {
 		String b = "一个文本，独一无二的文本";
 
 		double degree = TextSimilarity.similar(a, b);
-		Assert.assertEquals(0.8461538462D, degree, 0.01);
+		assertEquals(0.8461538462D, degree, 0.01);
 
 		String similarPercent = TextSimilarity.similar(a, b, 2);
-		Assert.assertEquals("84.62%", similarPercent);
+		assertEquals("84.62%", similarPercent);
 	}
 
 	@Test
@@ -28,15 +28,15 @@ public class TextSimilarityTest {
 		String b = "一个文本，独一无二的文本,#,>>?#$%^%$&^&^%";
 
 		double degree = TextSimilarity.similar(a, b);
-		Assert.assertEquals(0.8461538462D, degree, 0.01);
+		assertEquals(0.8461538462D, degree, 0.01);
 
 		String similarPercent = TextSimilarity.similar(a, b, 2);
-		Assert.assertEquals("84.62%", similarPercent);
+		assertEquals("84.62%", similarPercent);
 	}
 
 	@Test
 	public void similarTest(){
 		final double abd = TextSimilarity.similar("abd", "1111");
-		Assert.assertEquals(0, abd, 0);
+		assertEquals(0, abd, 0);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java
index 7b8cfd513..d1b0a278a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/UnicodeUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.text;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * UnicodeUtil 单元测试
@@ -13,43 +13,43 @@ public class UnicodeUtilTest {
 	@Test
 	public void convertTest() {
 		String s = UnicodeUtil.toUnicode("aaa123中文", true);
-		Assert.assertEquals("aaa123\\u4e2d\\u6587", s);
+		assertEquals("aaa123\\u4e2d\\u6587", s);
 
 		String s1 = UnicodeUtil.toString(s);
-		Assert.assertEquals("aaa123中文", s1);
+		assertEquals("aaa123中文", s1);
 	}
 
 	@Test
 	public void convertTest2() {
 		String str = "aaaa\\u0026bbbb\\u0026cccc";
 		String unicode = UnicodeUtil.toString(str);
-		Assert.assertEquals("aaaa&bbbb&cccc", unicode);
+		assertEquals("aaaa&bbbb&cccc", unicode);
 	}
 
 	@Test
 	public void convertTest3() {
 		String str = "aaa\\u111";
 		String res = UnicodeUtil.toString(str);
-		Assert.assertEquals("aaa\\u111", res);
+		assertEquals("aaa\\u111", res);
 	}
 
 	@Test
 	public void convertTest4() {
 		String str = "aaa\\U4e2d\\u6587\\u111\\urtyu\\u0026";
 		String res = UnicodeUtil.toString(str);
-		Assert.assertEquals("aaa中文\\u111\\urtyu&", res);
+		assertEquals("aaa中文\\u111\\urtyu&", res);
 	}
 
 	@Test
 	public void convertTest5() {
 		String str = "{\"code\":403,\"enmsg\":\"Product not found\",\"cnmsg\":\"\\u4ea7\\u54c1\\u4e0d\\u5b58\\u5728\\uff0c\\u6216\\u5df2\\u5220\\u9664\",\"data\":null}";
 		String res = UnicodeUtil.toString(str);
-		Assert.assertEquals("{\"code\":403,\"enmsg\":\"Product not found\",\"cnmsg\":\"产品不存在，或已删除\",\"data\":null}", res);
+		assertEquals("{\"code\":403,\"enmsg\":\"Product not found\",\"cnmsg\":\"产品不存在，或已删除\",\"data\":null}", res);
 	}
 
 	@Test
 	public void issueI50MI6Test(){
 		String s = UnicodeUtil.toUnicode("烟", true);
-		Assert.assertEquals("\\u70df", s);
+		assertEquals("\\u70df", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java
index e8fc851e8..59c824d56 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvParserTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.text.csv;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 
@@ -15,7 +15,7 @@ public class CsvParserTest {
 		CsvParser parser = new CsvParser(reader, null);
 		CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("b\"bba\"", row.getRawList().get(1));
+		assertEquals("b\"bba\"", row.getRawList().get(1));
 		IoUtil.close(parser);
 	}
 
@@ -25,7 +25,7 @@ public class CsvParserTest {
 		CsvParser parser = new CsvParser(reader, null);
 		CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("\"bba\"bbb", row.getRawList().get(1));
+		assertEquals("\"bba\"bbb", row.getRawList().get(1));
 		IoUtil.close(parser);
 	}
 
@@ -35,7 +35,7 @@ public class CsvParserTest {
 		CsvParser parser = new CsvParser(reader, null);
 		CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("bba", row.getRawList().get(1));
+		assertEquals("bba", row.getRawList().get(1));
 		IoUtil.close(parser);
 	}
 
@@ -45,7 +45,7 @@ public class CsvParserTest {
 		CsvParser parser = new CsvParser(reader, null);
 		CsvRow row = parser.nextRow();
 		//noinspection ConstantConditions
-		Assert.assertEquals("", row.getRawList().get(1));
+		assertEquals("", row.getRawList().get(1));
 		IoUtil.close(parser);
 	}
 
@@ -56,8 +56,8 @@ public class CsvParserTest {
 		StringReader reader = StrUtil.getReader("\"b\"\"bb\"");
 		CsvParser parser = new CsvParser(reader, null);
 		CsvRow row = parser.nextRow();
-		Assert.assertNotNull(row);
-		Assert.assertEquals(1, row.size());
-		Assert.assertEquals("b\"bb", row.get(0));
+		assertNotNull(row);
+		assertEquals(1, row.size());
+		assertEquals("b\"bb", row.get(0));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java
index 291f8b26f..b454bcdf0 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvReaderTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.Ignore;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.List;
 import java.util.Map;
@@ -20,10 +20,10 @@ public class CsvReaderTest {
 	public void readTest() {
 		CsvReader reader = new CsvReader();
 		CsvData data = reader.read(ResourceUtil.getReader("test.csv", CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("sss,sss", data.getRow(0).get(0));
-		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("性别", data.getRow(0).get(2));
-		Assert.assertEquals("关注\"对象\"", data.getRow(0).get(3));
+		assertEquals("sss,sss", data.getRow(0).get(0));
+		assertEquals(1, data.getRow(0).getOriginalLineNumber());
+		assertEquals("性别", data.getRow(0).get(2));
+		assertEquals("关注\"对象\"", data.getRow(0).get(3));
 	}
 
 	@Test
@@ -32,20 +32,20 @@ public class CsvReaderTest {
 		final List<Map<String, String>> result = reader.readMapList(
 				ResourceUtil.getUtf8Reader("test_bean.csv"));
 
-		Assert.assertEquals("张三", result.get(0).get("姓名"));
-		Assert.assertEquals("男", result.get(0).get("gender"));
-		Assert.assertEquals("无", result.get(0).get("focus"));
-		Assert.assertEquals("33", result.get(0).get("age"));
+		assertEquals("张三", result.get(0).get("姓名"));
+		assertEquals("男", result.get(0).get("gender"));
+		assertEquals("无", result.get(0).get("focus"));
+		assertEquals("33", result.get(0).get("age"));
 
-		Assert.assertEquals("李四", result.get(1).get("姓名"));
-		Assert.assertEquals("男", result.get(1).get("gender"));
-		Assert.assertEquals("好对象", result.get(1).get("focus"));
-		Assert.assertEquals("23", result.get(1).get("age"));
+		assertEquals("李四", result.get(1).get("姓名"));
+		assertEquals("男", result.get(1).get("gender"));
+		assertEquals("好对象", result.get(1).get("focus"));
+		assertEquals("23", result.get(1).get("age"));
 
-		Assert.assertEquals("王妹妹", result.get(2).get("姓名"));
-		Assert.assertEquals("女", result.get(2).get("gender"));
-		Assert.assertEquals("特别关注", result.get(2).get("focus"));
-		Assert.assertEquals("22", result.get(2).get("age"));
+		assertEquals("王妹妹", result.get(2).get("姓名"));
+		assertEquals("女", result.get(2).get("gender"));
+		assertEquals("特别关注", result.get(2).get("focus"));
+		assertEquals("22", result.get(2).get("age"));
 	}
 
 	@Test
@@ -57,20 +57,20 @@ public class CsvReaderTest {
 		final List<Map<String, String>> result = reader.readMapList(
 				ResourceUtil.getUtf8Reader("test_bean.csv"));
 
-		Assert.assertEquals("张三", result.get(0).get("name"));
-		Assert.assertEquals("男", result.get(0).get("gender"));
-		Assert.assertEquals("无", result.get(0).get("focus"));
-		Assert.assertEquals("33", result.get(0).get("age"));
+		assertEquals("张三", result.get(0).get("name"));
+		assertEquals("男", result.get(0).get("gender"));
+		assertEquals("无", result.get(0).get("focus"));
+		assertEquals("33", result.get(0).get("age"));
 
-		Assert.assertEquals("李四", result.get(1).get("name"));
-		Assert.assertEquals("男", result.get(1).get("gender"));
-		Assert.assertEquals("好对象", result.get(1).get("focus"));
-		Assert.assertEquals("23", result.get(1).get("age"));
+		assertEquals("李四", result.get(1).get("name"));
+		assertEquals("男", result.get(1).get("gender"));
+		assertEquals("好对象", result.get(1).get("focus"));
+		assertEquals("23", result.get(1).get("age"));
 
-		Assert.assertEquals("王妹妹", result.get(2).get("name"));
-		Assert.assertEquals("女", result.get(2).get("gender"));
-		Assert.assertEquals("特别关注", result.get(2).get("focus"));
-		Assert.assertEquals("22", result.get(2).get("age"));
+		assertEquals("王妹妹", result.get(2).get("name"));
+		assertEquals("女", result.get(2).get("gender"));
+		assertEquals("特别关注", result.get(2).get("focus"));
+		assertEquals("22", result.get(2).get("age"));
 	}
 
 	@Test
@@ -79,20 +79,20 @@ public class CsvReaderTest {
 		final List<TestBean> result = reader.read(
 				ResourceUtil.getUtf8Reader("test_bean.csv"), TestBean.class);
 
-		Assert.assertEquals("张三", result.get(0).getName());
-		Assert.assertEquals("男", result.get(0).getGender());
-		Assert.assertEquals("无", result.get(0).getFocus());
-		Assert.assertEquals(Integer.valueOf(33), result.get(0).getAge());
+		assertEquals("张三", result.get(0).getName());
+		assertEquals("男", result.get(0).getGender());
+		assertEquals("无", result.get(0).getFocus());
+		assertEquals(Integer.valueOf(33), result.get(0).getAge());
 
-		Assert.assertEquals("李四", result.get(1).getName());
-		Assert.assertEquals("男", result.get(1).getGender());
-		Assert.assertEquals("好对象", result.get(1).getFocus());
-		Assert.assertEquals(Integer.valueOf(23), result.get(1).getAge());
+		assertEquals("李四", result.get(1).getName());
+		assertEquals("男", result.get(1).getGender());
+		assertEquals("好对象", result.get(1).getFocus());
+		assertEquals(Integer.valueOf(23), result.get(1).getAge());
 
-		Assert.assertEquals("王妹妹", result.get(2).getName());
-		Assert.assertEquals("女", result.get(2).getGender());
-		Assert.assertEquals("特别关注", result.get(2).getFocus());
-		Assert.assertEquals(Integer.valueOf(22), result.get(2).getAge());
+		assertEquals("王妹妹", result.get(2).getName());
+		assertEquals("女", result.get(2).getGender());
+		assertEquals("特别关注", result.get(2).getFocus());
+		assertEquals(Integer.valueOf(22), result.get(2).getAge());
 	}
 
 	@Data
@@ -105,7 +105,7 @@ public class CsvReaderTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest2() {
 		final CsvReader reader = CsvUtil.getReader();
 		final CsvData read = reader.read(FileUtil.file("d:/test/test.csv"));
@@ -115,7 +115,7 @@ public class CsvReaderTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest3() {
 		final CsvReadConfig csvReadConfig = CsvReadConfig.defaultConfig();
 		csvReadConfig.setContainsHeader(true);
@@ -130,16 +130,16 @@ public class CsvReaderTest {
 	public void lineNoTest() {
 		CsvReader reader = new CsvReader();
 		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals(1, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("a,b,c,d", CollUtil.join(data.getRow(0), ","));
+		assertEquals(1, data.getRow(0).getOriginalLineNumber());
+		assertEquals("a,b,c,d", CollUtil.join(data.getRow(0), ","));
 
-		Assert.assertEquals(4, data.getRow(2).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		assertEquals(4, data.getRow(2).getOriginalLineNumber());
+		assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(2), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(3).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(3), ","));
+		assertEquals(6, data.getRow(3).getOriginalLineNumber());
+		assertEquals("a,s,d,f", CollUtil.join(data.getRow(3), ","));
 	}
 
 	@Test
@@ -148,16 +148,16 @@ public class CsvReaderTest {
 		CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2));
 		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
 
-		Assert.assertEquals(2, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("1,2,3,4", CollUtil.join(data.getRow(0), ","));
+		assertEquals(2, data.getRow(0).getOriginalLineNumber());
+		assertEquals("1,2,3,4", CollUtil.join(data.getRow(0), ","));
 
-		Assert.assertEquals(4, data.getRow(1).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		assertEquals(4, data.getRow(1).getOriginalLineNumber());
+		assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(1), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(2).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(2), ","));
+		assertEquals(6, data.getRow(2).getOriginalLineNumber());
+		assertEquals("a,s,d,f", CollUtil.join(data.getRow(2), ","));
 	}
 
 	@Test
@@ -166,13 +166,13 @@ public class CsvReaderTest {
 		CsvReader reader = new CsvReader(CsvReadConfig.defaultConfig().setBeginLineNo(2).setContainsHeader(true));
 		CsvData data = reader.read(ResourceUtil.getReader("test_lines.csv", CharsetUtil.CHARSET_UTF_8));
 
-		Assert.assertEquals(4, data.getRow(0).getOriginalLineNumber());
-		Assert.assertEquals("q,w,e,r,我是一段\n带换行的内容",
+		assertEquals(4, data.getRow(0).getOriginalLineNumber());
+		assertEquals("q,w,e,r,我是一段\n带换行的内容",
 				CollUtil.join(data.getRow(0), ",").replace("\r", ""));
 
 		// 文件中第3行数据，对应原始行号是6（从0开始）
-		Assert.assertEquals(6, data.getRow(1).getOriginalLineNumber());
-		Assert.assertEquals("a,s,d,f", CollUtil.join(data.getRow(1), ","));
+		assertEquals(6, data.getRow(1).getOriginalLineNumber());
+		assertEquals("a,s,d,f", CollUtil.join(data.getRow(1), ","));
 	}
 
 	@Test
@@ -183,9 +183,9 @@ public class CsvReaderTest {
 						.setFieldSeparator(';'));
 		final CsvData csvRows = reader.readFromStr("123;456;'789;0'abc;");
 		final CsvRow row = csvRows.getRow(0);
-		Assert.assertEquals("123", row.get(0));
-		Assert.assertEquals("456", row.get(1));
-		Assert.assertEquals("'789;0'abc", row.get(2));
+		assertEquals("123", row.get(0));
+		assertEquals("456", row.get(1));
+		assertEquals("'789;0'abc", row.get(2));
 	}
 
 	@Test
@@ -193,11 +193,11 @@ public class CsvReaderTest {
 		final CsvReader reader = CsvUtil.getReader(CsvReadConfig.defaultConfig().disableComment());
 		final CsvData read = reader.read(ResourceUtil.getUtf8Reader("test.csv"));
 		final CsvRow row = read.getRow(0);
-		Assert.assertEquals("# 这是一行注释，读取时应忽略", row.get(0));
+		assertEquals("# 这是一行注释，读取时应忽略", row.get(0));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void streamTest() {
 		final CsvReader reader = CsvUtil.getReader(ResourceUtil.getUtf8Reader("test_bean.csv"));
 		reader.stream().limit(2).forEach(Console::log);
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
index 24438045a..9f75cc208 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,13 +26,13 @@ public class CsvUtilTest {
 		CsvData data = reader.read(FileUtil.file("test.csv"));
 		List<CsvRow> rows = data.getRows();
 		final CsvRow row0 = rows.get(0);
-		Assert.assertEquals("sss,sss", row0.get(0));
-		Assert.assertEquals("姓名", row0.get(1));
-		Assert.assertEquals("性别", row0.get(2));
-		Assert.assertEquals("关注\"对象\"", row0.get(3));
-		Assert.assertEquals("年龄", row0.get(4));
-		Assert.assertEquals("", row0.get(5));
-		Assert.assertEquals("\"", row0.get(6));
+		assertEquals("sss,sss", row0.get(0));
+		assertEquals("姓名", row0.get(1));
+		assertEquals("性别", row0.get(2));
+		assertEquals("关注\"对象\"", row0.get(3));
+		assertEquals("年龄", row0.get(4));
+		assertEquals("", row0.get(5));
+		assertEquals("\"", row0.get(6));
 	}
 
 	@Test
@@ -40,18 +40,18 @@ public class CsvUtilTest {
 		CsvReader reader = CsvUtil.getReader();
 		reader.read(FileUtil.getUtf8Reader("test.csv"), (csvRow)-> {
 			// 只有一行，所以直接判断
-			Assert.assertEquals("sss,sss", csvRow.get(0));
-			Assert.assertEquals("姓名", csvRow.get(1));
-			Assert.assertEquals("性别", csvRow.get(2));
-			Assert.assertEquals("关注\"对象\"", csvRow.get(3));
-			Assert.assertEquals("年龄", csvRow.get(4));
-			Assert.assertEquals("", csvRow.get(5));
-			Assert.assertEquals("\"", csvRow.get(6));
+			assertEquals("sss,sss", csvRow.get(0));
+			assertEquals("姓名", csvRow.get(1));
+			assertEquals("性别", csvRow.get(2));
+			assertEquals("关注\"对象\"", csvRow.get(3));
+			assertEquals("年龄", csvRow.get(4));
+			assertEquals("", csvRow.get(5));
+			assertEquals("\"", csvRow.get(6));
 		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest3() {
 		CsvReader reader = CsvUtil.getReader();
 		String path = FileUtil.isWindows() ? "d:/test/test.csv" : "~/test/test.csv";
@@ -64,13 +64,13 @@ public class CsvUtilTest {
 				"\"sss,sss\",姓名,\"性别\",关注\"对象\",年龄,\"\",\"\"\"\n");
 		List<CsvRow> rows = data.getRows();
 		final CsvRow row0 = rows.get(0);
-		Assert.assertEquals("sss,sss", row0.get(0));
-		Assert.assertEquals("姓名", row0.get(1));
-		Assert.assertEquals("性别", row0.get(2));
-		Assert.assertEquals("关注\"对象\"", row0.get(3));
-		Assert.assertEquals("年龄", row0.get(4));
-		Assert.assertEquals("", row0.get(5));
-		Assert.assertEquals("\"", row0.get(6));
+		assertEquals("sss,sss", row0.get(0));
+		assertEquals("姓名", row0.get(1));
+		assertEquals("性别", row0.get(2));
+		assertEquals("关注\"对象\"", row0.get(3));
+		assertEquals("年龄", row0.get(4));
+		assertEquals("", row0.get(5));
+		assertEquals("\"", row0.get(6));
 	}
 
 	@Test
@@ -78,18 +78,18 @@ public class CsvUtilTest {
 		CsvUtil.getReader().readFromStr("# 这是一行注释，读取时应忽略\n" +
 				"\"sss,sss\",姓名,\"性别\",关注\"对象\",年龄,\"\",\"\"\"\n",(csvRow)-> {
 			// 只有一行，所以直接判断
-			Assert.assertEquals("sss,sss", csvRow.get(0));
-			Assert.assertEquals("姓名", csvRow.get(1));
-			Assert.assertEquals("性别", csvRow.get(2));
-			Assert.assertEquals("关注\"对象\"", csvRow.get(3));
-			Assert.assertEquals("年龄", csvRow.get(4));
-			Assert.assertEquals("", csvRow.get(5));
-			Assert.assertEquals("\"", csvRow.get(6));
+			assertEquals("sss,sss", csvRow.get(0));
+			assertEquals("姓名", csvRow.get(1));
+			assertEquals("性别", csvRow.get(2));
+			assertEquals("关注\"对象\"", csvRow.get(3));
+			assertEquals("年龄", csvRow.get(4));
+			assertEquals("", csvRow.get(5));
+			assertEquals("\"", csvRow.get(6));
 		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		String path = FileUtil.isWindows() ? "d:/test/testWrite.csv" : "~/test/testWrite.csv";
 		CsvWriter writer = CsvUtil.getWriter(path, CharsetUtil.CHARSET_UTF_8);
@@ -101,7 +101,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeansTest() {
 
 		@Data
@@ -137,7 +137,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeansWithPropertiesTest() {
 
 		@Data
@@ -172,7 +172,7 @@ public class CsvUtilTest {
 		writer.close();
 	}
 	@Test
-	@Ignore
+	@Disabled
 	public void readLfTest(){
 		final CsvReader reader = CsvUtil.getReader();
 		String path = FileUtil.isWindows() ? "d:/test/rw_test.csv" : "~/test/rw_test.csv";
@@ -183,7 +183,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWrapTest(){
 		List<List<Object>> resultList=new ArrayList<>();
 		List<Object> list =new ArrayList<>();
@@ -202,7 +202,7 @@ public class CsvUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDataTest(){
 		@Data
 		@AllArgsConstructor
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
index 980a33749..cce341c42 100755
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/CsvWriterTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.text.csv;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,7 +13,7 @@ import java.util.Random;
 public class CsvWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithAliasTest(){
 		final CsvWriteConfig csvWriteConfig = CsvWriteConfig.defaultConfig()
 				.addHeaderAlias("name", "姓名")
@@ -30,7 +30,7 @@ public class CsvWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue2255Test(){
 		String fileName = "D:/test/" + new Random().nextInt(100) + "-a.csv";
 		CsvWriter writer = CsvUtil.getWriter(fileName, CharsetUtil.CHARSET_UTF_8);
@@ -46,7 +46,7 @@ public class CsvWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeAppendTest(){
 		final CsvWriter writer = CsvUtil.getWriter(
 				FileUtil.file("d:/test/writeAppendTest.csv"),
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueI91VF1Test.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueI91VF1Test.java
index 10d7ace80..2b8a31f1c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueI91VF1Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueI91VF1Test.java
@@ -3,8 +3,8 @@ package cn.hutool.core.text.csv;
 import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.io.FileUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -14,9 +14,9 @@ public class IssueI91VF1Test {
 		final CsvReader reader = CsvUtil.getReader();
 		final List<DeviceVO> read = reader.read(FileUtil.getUtf8Reader("issueI91VF1.csv"), DeviceVO.class);
 		final DeviceVO deviceVO = read.get(0);
-		Assert.assertEquals("192.168.1.1", deviceVO.getDeviceIp());
-		Assert.assertEquals("admin", deviceVO.getUsername());
-		Assert.assertEquals("123", deviceVO.getPassword());
+		assertEquals("192.168.1.1", deviceVO.getDeviceIp());
+		assertEquals("admin", deviceVO.getUsername());
+		assertEquals("123", deviceVO.getPassword());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueIA8WE0Test.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueIA8WE0Test.java
index 82ae14dbf..5eb1fbab6 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueIA8WE0Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/IssueIA8WE0Test.java
@@ -2,11 +2,11 @@ package cn.hutool.core.text.csv;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * https://gitee.com/dromara/hutool/issues/IA8WE0
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/csv/Pr1244Test.java b/hutool-core/src/test/java/cn/hutool/core/text/csv/Pr1244Test.java
index 5255cb4bf..377f1a0f8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/csv/Pr1244Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/csv/Pr1244Test.java
@@ -1,10 +1,10 @@
 package cn.hutool.core.text.csv;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.StringReader;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * 按照 https://datatracker.ietf.org/doc/html/rfc4180#section-2<br>
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java b/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java
index 4a2cba983..e739d22a4 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/finder/CharFinderTest.java
@@ -1,30 +1,30 @@
 package cn.hutool.core.text.finder;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CharFinderTest {
 
 	@Test
 	public void startTest(){
 		int start = new CharFinder('a').setText("cba123").start(2);
-		Assert.assertEquals(2, start);
+		assertEquals(2, start);
 
 		start = new CharFinder('c').setText("cba123").start(2);
-		Assert.assertEquals(-1, start);
+		assertEquals(-1, start);
 
 		start = new CharFinder('3').setText("cba123").start(2);
-		Assert.assertEquals(5, start);
+		assertEquals(5, start);
 	}
 	@Test
 	public void negativeStartTest(){
 		int start = new CharFinder('a').setText("cba123").setNegative(true).start(2);
-		Assert.assertEquals(2, start);
+		assertEquals(2, start);
 
 		start = new CharFinder('2').setText("cba123").setNegative(true).start(2);
-		Assert.assertEquals(-1, start);
+		assertEquals(-1, start);
 
 		start = new CharFinder('c').setText("cba123").setNegative(true).start(2);
-		Assert.assertEquals(0, start);
+		assertEquals(0, start);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java
index 18050df58..01ad2d157 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/split/SplitIterTest.java
@@ -4,12 +4,14 @@ import cn.hutool.core.text.finder.CharFinder;
 import cn.hutool.core.text.finder.LengthFinder;
 import cn.hutool.core.text.finder.PatternFinder;
 import cn.hutool.core.text.finder.StrFinder;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.regex.Pattern;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class SplitIterTest {
 
 	@Test
@@ -22,7 +24,7 @@ public class SplitIterTest {
 				Integer.MAX_VALUE,
 				false
 		);
-		Assert.assertEquals(6, splitIter.toList(false).size());
+		assertEquals(6, splitIter.toList(false).size());
 	}
 
 	@Test
@@ -35,7 +37,7 @@ public class SplitIterTest {
 				Integer.MAX_VALUE,
 				false
 		);
-		Assert.assertEquals(4, splitIter.toList(false).size());
+		assertEquals(4, splitIter.toList(false).size());
 	}
 
 	@Test
@@ -49,7 +51,7 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(4, strings.size());
+		assertEquals(4, strings.size());
 	}
 
 	@Test
@@ -63,10 +65,10 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(true);
-		Assert.assertEquals(3, strings.size());
-		Assert.assertEquals("a", strings.get(0));
-		Assert.assertEquals("efedsfs", strings.get(1));
-		Assert.assertEquals("ddf", strings.get(2));
+		assertEquals(3, strings.size());
+		assertEquals("a", strings.get(0));
+		assertEquals("efedsfs", strings.get(1));
+		assertEquals("ddf", strings.get(2));
 	}
 
 	@Test
@@ -80,7 +82,7 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(3, strings.size());
+		assertEquals(3, strings.size());
 	}
 
 	@Test
@@ -94,7 +96,7 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(3, strings.size());
+		assertEquals(3, strings.size());
 	}
 
 	@Test
@@ -107,7 +109,7 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(4, strings.size());
+		assertEquals(4, strings.size());
 	}
 
 	@Test
@@ -120,7 +122,7 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(3, strings.size());
+		assertEquals(3, strings.size());
 	}
 
 	@Test
@@ -133,20 +135,22 @@ public class SplitIterTest {
 		);
 
 		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(1, strings.size());
+		assertEquals(1, strings.size());
 	}
 
 	// 切割字符串是空字符串时报错
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void splitByEmptyTest(){
-		String text = "aa,bb,cc";
-		SplitIter splitIter = new SplitIter(text,
+		assertThrows(IllegalArgumentException.class, () -> {
+			String text = "aa,bb,cc";
+			SplitIter splitIter = new SplitIter(text,
 				new StrFinder("", false),
 				3,
 				false
-		);
+			);
 
-		final List<String> strings = splitIter.toList(false);
-		Assert.assertEquals(1, strings.size());
+			final List<String> strings = splitIter.toList(false);
+			assertEquals(1, strings.size());
+		});
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java b/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java
index 8498bf479..4253a56b9 100644
--- a/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/text/split/StrSplitterTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.text.split;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.text.StrSplitter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -19,41 +19,41 @@ public class StrSplitterTest {
 		final String str1 = "a, ,efedsfs,   ddf";
 		final List<String> split = StrSplitter.split(str1, ',', 0, true, true);
 
-		Assert.assertEquals("ddf", split.get(2));
-		Assert.assertEquals(3, split.size());
+		assertEquals("ddf", split.get(2));
+		assertEquals(3, split.size());
 	}
 
 	@Test
 	public void splitByStrTest(){
 		final String str1 = "aabbccaaddaaee";
 		final List<String> split = StrSplitter.split(str1, "aa", 0, true, true);
-		Assert.assertEquals("ee", split.get(2));
-		Assert.assertEquals(3, split.size());
+		assertEquals("ee", split.get(2));
+		assertEquals(3, split.size());
 	}
 
 	@Test
 	public void splitByBlankTest(){
 		final String str1 = "aa bbccaa     ddaaee";
 		final List<String> split = StrSplitter.split(str1, 0);
-		Assert.assertEquals("ddaaee", split.get(2));
-		Assert.assertEquals(3, split.size());
+		assertEquals("ddaaee", split.get(2));
+		assertEquals(3, split.size());
 	}
 
 	@Test
 	public void splitPathTest(){
 		final String str1 = "/use/local/bin";
 		final List<String> split = StrSplitter.splitPath(str1, 0);
-		Assert.assertEquals("bin", split.get(2));
-		Assert.assertEquals(3, split.size());
+		assertEquals("bin", split.get(2));
+		assertEquals(3, split.size());
 	}
 
 	@Test
 	public void splitMappingTest() {
 		final String str = "1.2.";
 		final List<Long> split = StrSplitter.split(str, '.', 0, true, true, Long::parseLong);
-		Assert.assertEquals(2, split.size());
-		Assert.assertEquals(Long.valueOf(1L), split.get(0));
-		Assert.assertEquals(Long.valueOf(2L), split.get(1));
+		assertEquals(2, split.size());
+		assertEquals(Long.valueOf(1L), split.get(0));
+		assertEquals(Long.valueOf(2L), split.get(1));
 	}
 
 	@Test
@@ -61,16 +61,16 @@ public class StrSplitterTest {
 		final String str = "";
 		final String[] split = str.split(",");
 		final String[] strings = StrSplitter.splitToArray(str, ",", -1, false, false);
-		Assert.assertNotNull(strings);
-		Assert.assertArrayEquals(split, strings);
+		assertNotNull(strings);
+		assertArrayEquals(split, strings);
 	}
 
 	@Test
 	public void splitNullTest(){
 		final String str = null;
 		final String[] strings = StrSplitter.splitToArray(str, ",", -1, false, false);
-		Assert.assertNotNull(strings);
-		Assert.assertEquals(0, strings.length);
+		assertNotNull(strings);
+		assertEquals(0, strings.length);
 	}
 
 	/**
@@ -80,29 +80,29 @@ public class StrSplitterTest {
 	public void splitByRegexTest(){
 		final String text = "01  821   34567890182345617821";
 		List<String> strings = StrSplitter.splitByRegex(text, "21", 0, false, true);
-		Assert.assertEquals(2, strings.size());
-		Assert.assertEquals("01  8", strings.get(0));
-		Assert.assertEquals("   345678901823456178", strings.get(1));
+		assertEquals(2, strings.size());
+		assertEquals("01  8", strings.get(0));
+		assertEquals("   345678901823456178", strings.get(1));
 
 		strings = StrSplitter.splitByRegex(text, "21", 0, false, false);
-		Assert.assertEquals(3, strings.size());
-		Assert.assertEquals("01  8", strings.get(0));
-		Assert.assertEquals("   345678901823456178", strings.get(1));
-		Assert.assertEquals("", strings.get(2));
+		assertEquals(3, strings.size());
+		assertEquals("01  8", strings.get(0));
+		assertEquals("   345678901823456178", strings.get(1));
+		assertEquals("", strings.get(2));
 	}
 
 	@Test
 	public void issue3421Test() {
 		List<String> strings = StrSplitter.splitByRegex("", "", 0, false, false);
-		Assert.assertEquals(ListUtil.of(""), strings);
+		assertEquals(ListUtil.of(""), strings);
 
 		strings = StrSplitter.splitByRegex("aaa", "", 0, false, false);
-		Assert.assertEquals(ListUtil.of("aaa"), strings);
+		assertEquals(ListUtil.of("aaa"), strings);
 
 		strings = StrSplitter.splitByRegex("", "aaa", 0, false, false);
-		Assert.assertEquals(ListUtil.of(""), strings);
+		assertEquals(ListUtil.of(""), strings);
 
 		strings = StrSplitter.splitByRegex("", "", 0, false, true);
-		Assert.assertEquals(ListUtil.of(), strings);
+		assertEquals(ListUtil.of(), strings);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java
index 89d6640d2..109a2e7db 100644
--- a/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/thread/AsyncUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.thread;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit;
 public class AsyncUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void waitAndGetTest() {
 		CompletableFuture<String> hutool = CompletableFuture.supplyAsync(() -> {
 			ThreadUtil.sleep(1, TimeUnit.SECONDS);
@@ -33,6 +33,6 @@ public class AsyncUtilTest {
 		// 等待完成
 		AsyncUtil.waitAll(hutool, sweater, warm);
 		// 获取结果
-		Assert.assertEquals("hutool卫衣真暖和", AsyncUtil.get(hutool) + AsyncUtil.get(sweater) + AsyncUtil.get(warm));
+		assertEquals("hutool卫衣真暖和", AsyncUtil.get(hutool) + AsyncUtil.get(sweater) + AsyncUtil.get(warm));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java
index d6d1a0f20..c71bc2647 100755
--- a/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/thread/ConcurrencyTesterTest.java
@@ -3,13 +3,13 @@ package cn.hutool.core.thread;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ConcurrencyTesterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void concurrencyTesterTest() {
 		ConcurrencyTester tester = ThreadUtil.concurrencyTest(100, () -> {
 			long delay = RandomUtil.randomLong(100, 1000);
@@ -20,7 +20,7 @@ public class ConcurrencyTesterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void multiTest(){
 		ConcurrencyTester ct = new ConcurrencyTester(5);
 		for(int i=0;i<3;i++){
diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ExecutorBuilderTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/ExecutorBuilderTest.java
index 9da9d587b..ce1177463 100644
--- a/hutool-core/src/test/java/cn/hutool/core/thread/ExecutorBuilderTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/thread/ExecutorBuilderTest.java
@@ -1,15 +1,15 @@
 package cn.hutool.core.thread;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ThreadPoolExecutor;
 
 public class ExecutorBuilderTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void CallerRunsPolicyTest(){
 		// https://gitee.com/dromara/hutool/pulls/660
 		final ThreadPoolExecutor executor = ExecutorBuilder.create().setCorePoolSize(1).setMaxPoolSize(1).setHandler(RejectPolicy.BLOCK.getValue()).build();
diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/SyncFinisherTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/SyncFinisherTest.java
index 602048e7f..54913bcb3 100755
--- a/hutool-core/src/test/java/cn/hutool/core/thread/SyncFinisherTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/thread/SyncFinisherTest.java
@@ -14,8 +14,8 @@ package cn.hutool.core.thread;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -34,13 +34,13 @@ public class SyncFinisherTest {
 
 		syncFinisher.setExceptionHandler((t, e) -> {
 			hasException.set(true);
-			Assert.assertEquals("For input string: \"XYZ\"", e.getMessage());
+			assertEquals("For input string: \"XYZ\"", e.getMessage());
 		});
 
 		syncFinisher.start();
 		IoUtil.close(syncFinisher);
 		ThreadUtil.sleep(300);
-		Assert.assertTrue(hasException.get());
+		assertTrue(hasException.get());
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java
index 395a9ed17..b4913501d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/thread/ThreadUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.thread;
 
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -14,14 +14,14 @@ public class ThreadUtilTest {
 	public void newExecutorTest(){
 		ThreadPoolExecutor executor = ThreadUtil.newExecutor(5);
 		// 查询线程池 线程数
-		Assert.assertEquals(5, executor.getCorePoolSize());
+		assertEquals(5, executor.getCorePoolSize());
 	}
 
 	@Test
 	public void executeTest() {
 		final boolean isValid = true;
 
-		ThreadUtil.execute(() -> Assert.assertTrue(isValid));
+		ThreadUtil.execute(() -> assertTrue(isValid));
 	}
 
 	@Test
@@ -30,6 +30,6 @@ public class ThreadUtilTest {
 		// 随机sleep时长，确保sleep时间足够
 		final long l = System.currentTimeMillis();
 		ThreadUtil.safeSleep(sleepMillis);
-		Assert.assertTrue(System.currentTimeMillis() - l >= sleepMillis);
+		assertTrue(System.currentTimeMillis() - l >= sleepMillis);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
index 9e47997b2..aa7f04b5f 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java
@@ -1,8 +1,7 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -10,6 +9,8 @@ import java.util.Comparator;
 import java.util.Map;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * {@link ArrayUtil} 数组工具单元测试
  *
@@ -20,134 +21,134 @@ public class ArrayUtilTest {
 	@Test
 	public void isEmptyTest() {
 		int[] a = {};
-		Assert.assertTrue(ArrayUtil.isEmpty(a));
-		Assert.assertTrue(ArrayUtil.isEmpty((Object) a));
+		assertTrue(ArrayUtil.isEmpty(a));
+		assertTrue(ArrayUtil.isEmpty((Object) a));
 		int[] b = null;
 		//noinspection ConstantConditions
-		Assert.assertTrue(ArrayUtil.isEmpty(b));
+		assertTrue(ArrayUtil.isEmpty(b));
 		Object c = null;
 		//noinspection ConstantConditions
-		Assert.assertTrue(ArrayUtil.isEmpty(c));
+		assertTrue(ArrayUtil.isEmpty(c));
 
 		Object d = new Object[]{"1", "2", 3, 4D};
 		boolean isEmpty = ArrayUtil.isEmpty(d);
-		Assert.assertFalse(isEmpty);
+		assertFalse(isEmpty);
 		d = new Object[0];
 		isEmpty = ArrayUtil.isEmpty(d);
-		Assert.assertTrue(isEmpty);
+		assertTrue(isEmpty);
 		d = null;
 		//noinspection ConstantConditions
 		isEmpty = ArrayUtil.isEmpty(d);
 		//noinspection ConstantConditions
-		Assert.assertTrue(isEmpty);
+		assertTrue(isEmpty);
 
 		// Object数组
 		Object[] e = new Object[]{"1", "2", 3, 4D};
 		final boolean empty = ArrayUtil.isEmpty(e);
-		Assert.assertFalse(empty);
+		assertFalse(empty);
 	}
 
 	@Test
 	public void isNotEmptyTest() {
 		int[] a = {1, 2};
-		Assert.assertTrue(ArrayUtil.isNotEmpty(a));
+		assertTrue(ArrayUtil.isNotEmpty(a));
 
 		String[] b = {"a", "b", "c"};
-		Assert.assertTrue(ArrayUtil.isNotEmpty(b));
+		assertTrue(ArrayUtil.isNotEmpty(b));
 
 		Object c = new Object[]{"1", "2", 3, 4D};
-		Assert.assertTrue(ArrayUtil.isNotEmpty(c));
+		assertTrue(ArrayUtil.isNotEmpty(c));
 	}
 
 	@Test
 	public void newArrayTest() {
 		String[] newArray = ArrayUtil.newArray(String.class, 3);
-		Assert.assertEquals(3, newArray.length);
+		assertEquals(3, newArray.length);
 	}
 
 	@Test
 	public void cloneTest() {
 		Integer[] b = {1, 2, 3};
 		Integer[] cloneB = ArrayUtil.clone(b);
-		Assert.assertArrayEquals(b, cloneB);
+		assertArrayEquals(b, cloneB);
 
 		int[] a = {1, 2, 3};
 		int[] clone = ArrayUtil.clone(a);
-		Assert.assertArrayEquals(a, clone);
+		assertArrayEquals(a, clone);
 	}
 
 	@Test
 	public void filterEditTest() {
 		Integer[] a = {1, 2, 3, 4, 5, 6};
 		Integer[] filter = ArrayUtil.edit(a, t -> (t % 2 == 0) ? t : null);
-		Assert.assertArrayEquals(filter, new Integer[]{2, 4, 6});
+		assertArrayEquals(filter, new Integer[]{2, 4, 6});
 	}
 
 	@Test
 	public void filterTestForFilter() {
 		Integer[] a = {1, 2, 3, 4, 5, 6};
 		Integer[] filter = ArrayUtil.filter(a, t -> t % 2 == 0);
-		Assert.assertArrayEquals(filter, new Integer[]{2, 4, 6});
+		assertArrayEquals(filter, new Integer[]{2, 4, 6});
 	}
 
 	@Test
 	public void editTest() {
 		Integer[] a = {1, 2, 3, 4, 5, 6};
 		Integer[] filter = ArrayUtil.edit(a, t -> (t % 2 == 0) ? t * 10 : t);
-		Assert.assertArrayEquals(filter, new Integer[]{1, 20, 3, 40, 5, 60});
+		assertArrayEquals(filter, new Integer[]{1, 20, 3, 40, 5, 60});
 	}
 
 	@Test
 	public void indexOfTest() {
 		Integer[] a = {1, 2, 3, 4, 5, 6};
 		int index = ArrayUtil.indexOf(a, 3);
-		Assert.assertEquals(2, index);
+		assertEquals(2, index);
 
 		long[] b = {1, 2, 3, 4, 5, 6};
 		int index2 = ArrayUtil.indexOf(b, 3);
-		Assert.assertEquals(2, index2);
+		assertEquals(2, index2);
 	}
 
 	@Test
 	public void lastIndexOfTest() {
 		Integer[] a = {1, 2, 3, 4, 3, 6};
 		int index = ArrayUtil.lastIndexOf(a, 3);
-		Assert.assertEquals(4, index);
+		assertEquals(4, index);
 
 		long[] b = {1, 2, 3, 4, 3, 6};
 		int index2 = ArrayUtil.lastIndexOf(b, 3);
-		Assert.assertEquals(4, index2);
+		assertEquals(4, index2);
 	}
 
 	@Test
 	public void containsTest() {
 		Integer[] a = {1, 2, 3, 4, 3, 6};
 		boolean contains = ArrayUtil.contains(a, 3);
-		Assert.assertTrue(contains);
+		assertTrue(contains);
 
 		long[] b = {1, 2, 3, 4, 3, 6};
 		boolean contains2 = ArrayUtil.contains(b, 3);
-		Assert.assertTrue(contains2);
+		assertTrue(contains2);
 	}
 
 	@Test
 	public void containsAnyTest() {
 		Integer[] a = {1, 2, 3, 4, 3, 6};
 		boolean contains = ArrayUtil.containsAny(a, 4, 10, 40);
-		Assert.assertTrue(contains);
+		assertTrue(contains);
 
 		contains = ArrayUtil.containsAny(a, 10, 40);
-		Assert.assertFalse(contains);
+		assertFalse(contains);
 	}
 
 	@Test
 	public void containsAllTest() {
 		Integer[] a = {1, 2, 3, 4, 3, 6};
 		boolean contains = ArrayUtil.containsAll(a, 4, 2, 6);
-		Assert.assertTrue(contains);
+		assertTrue(contains);
 
 		contains = ArrayUtil.containsAll(a, 1, 2, 3, 5);
-		Assert.assertFalse(contains);
+		assertFalse(contains);
 	}
 
 	@Test
@@ -155,49 +156,50 @@ public class ArrayUtilTest {
 		String[] keys = {"a", "b", "c"};
 		Integer[] values = {1, 2, 3};
 		Map<String, Integer> map = ArrayUtil.zip(keys, values, true);
-		Assert.assertEquals(Objects.requireNonNull(map).toString(), "{a=1, b=2, c=3}");
+		assertEquals(Objects.requireNonNull(map).toString(), "{a=1, b=2, c=3}");
 	}
 
 	@Test
 	public void castTest() {
 		Object[] values = {"1", "2", "3"};
 		String[] cast = (String[]) ArrayUtil.cast(String.class, values);
-		Assert.assertEquals(values[0], cast[0]);
-		Assert.assertEquals(values[1], cast[1]);
-		Assert.assertEquals(values[2], cast[2]);
+		assertEquals(values[0], cast[0]);
+		assertEquals(values[1], cast[1]);
+		assertEquals(values[2], cast[2]);
 	}
 
 	@Test
 	public void rangeTest() {
 		int[] range = ArrayUtil.range(0, 10);
-		Assert.assertEquals(0, range[0]);
-		Assert.assertEquals(1, range[1]);
-		Assert.assertEquals(2, range[2]);
-		Assert.assertEquals(3, range[3]);
-		Assert.assertEquals(4, range[4]);
-		Assert.assertEquals(5, range[5]);
-		Assert.assertEquals(6, range[6]);
-		Assert.assertEquals(7, range[7]);
-		Assert.assertEquals(8, range[8]);
-		Assert.assertEquals(9, range[9]);
+		assertEquals(0, range[0]);
+		assertEquals(1, range[1]);
+		assertEquals(2, range[2]);
+		assertEquals(3, range[3]);
+		assertEquals(4, range[4]);
+		assertEquals(5, range[5]);
+		assertEquals(6, range[6]);
+		assertEquals(7, range[7]);
+		assertEquals(8, range[8]);
+		assertEquals(9, range[9]);
 	}
 
-	@Test(expected = NegativeArraySizeException.class)
+	@Test
 	public void rangeMinTest() {
-		//noinspection ResultOfMethodCallIgnored
-		ArrayUtil.range(0, Integer.MIN_VALUE);
+		assertThrows(NegativeArraySizeException.class, () -> {
+			ArrayUtil.range(0, Integer.MIN_VALUE);
+		});
 	}
 
 	@Test
 	public void maxTest() {
 		int max = ArrayUtil.max(1, 2, 13, 4, 5);
-		Assert.assertEquals(13, max);
+		assertEquals(13, max);
 
 		long maxLong = ArrayUtil.max(1L, 2L, 13L, 4L, 5L);
-		Assert.assertEquals(13, maxLong);
+		assertEquals(13, maxLong);
 
 		double maxDouble = ArrayUtil.max(1D, 2.4D, 13.0D, 4.55D, 5D);
-		Assert.assertEquals(13.0, maxDouble, 0);
+		assertEquals(13.0, maxDouble, 0);
 
 		BigDecimal one = new BigDecimal("1.00");
 		BigDecimal two = new BigDecimal("2.0");
@@ -205,22 +207,22 @@ public class ArrayUtilTest {
 		BigDecimal[] bigDecimals = {two, one, three};
 
 		BigDecimal minAccuracy = ArrayUtil.min(bigDecimals, Comparator.comparingInt(BigDecimal::scale));
-		Assert.assertEquals(minAccuracy, three);
+		assertEquals(minAccuracy, three);
 
 		BigDecimal maxAccuracy = ArrayUtil.max(bigDecimals, Comparator.comparingInt(BigDecimal::scale));
-		Assert.assertEquals(maxAccuracy, one);
+		assertEquals(maxAccuracy, one);
 	}
 
 	@Test
 	public void minTest() {
 		int min = ArrayUtil.min(1, 2, 13, 4, 5);
-		Assert.assertEquals(1, min);
+		assertEquals(1, min);
 
 		long minLong = ArrayUtil.min(1L, 2L, 13L, 4L, 5L);
-		Assert.assertEquals(1, minLong);
+		assertEquals(1, minLong);
 
 		double minDouble = ArrayUtil.min(1D, 2.4D, 13.0D, 4.55D, 5D);
-		Assert.assertEquals(1.0, minDouble, 0);
+		assertEquals(1.0, minDouble, 0);
 	}
 
 	@Test
@@ -229,7 +231,7 @@ public class ArrayUtilTest {
 		String[] b = {"a", "b", "c"};
 
 		String[] result = ArrayUtil.append(a, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
 	}
 
 	@Test
@@ -239,50 +241,50 @@ public class ArrayUtilTest {
 
 		// 在-1位置插入，相当于在3位置插入
 		String[] result = ArrayUtil.insert(a, -1, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "a", "b", "c", "4"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "a", "b", "c", "4"}, result);
 
 		// 在第0个位置插入，即在数组前追加
 		result = ArrayUtil.insert(a, 0, b);
-		Assert.assertArrayEquals(new String[]{"a", "b", "c", "1", "2", "3", "4"}, result);
+		assertArrayEquals(new String[]{"a", "b", "c", "1", "2", "3", "4"}, result);
 
 		// 在第2个位置插入，即"3"之前
 		result = ArrayUtil.insert(a, 2, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "a", "b", "c", "3", "4"}, result);
+		assertArrayEquals(new String[]{"1", "2", "a", "b", "c", "3", "4"}, result);
 
 		// 在第4个位置插入，即"4"之后，相当于追加
 		result = ArrayUtil.insert(a, 4, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
 
 		// 在第5个位置插入，由于数组长度为4，因此补null
 		result = ArrayUtil.insert(a, 5, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "4", null, "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "4", null, "a", "b", "c"}, result);
 	}
 
 	@Test
 	public void joinTest() {
 		String[] array = {"aa", "bb", "cc", "dd"};
 		String join = ArrayUtil.join(array, ",", "[", "]");
-		Assert.assertEquals("[aa],[bb],[cc],[dd]", join);
+		assertEquals("[aa],[bb],[cc],[dd]", join);
 
 		Object array2 = new String[]{"aa", "bb", "cc", "dd"};
 		String join2 = ArrayUtil.join(array2, ",");
-		Assert.assertEquals("aa,bb,cc,dd", join2);
+		assertEquals("aa,bb,cc,dd", join2);
 	}
 
 	@Test
 	public void getArrayTypeTest() {
 		Class<?> arrayType = ArrayUtil.getArrayType(int.class);
-		Assert.assertSame(int[].class, arrayType);
+		assertSame(int[].class, arrayType);
 
 		arrayType = ArrayUtil.getArrayType(String.class);
-		Assert.assertSame(String[].class, arrayType);
+		assertSame(String[].class, arrayType);
 	}
 
 	@Test
 	public void distinctTest() {
 		String[] array = {"aa", "bb", "cc", "dd", "bb", "dd"};
 		String[] distinct = ArrayUtil.distinct(array);
-		Assert.assertArrayEquals(new String[]{"aa", "bb", "cc", "dd"}, distinct);
+		assertArrayEquals(new String[]{"aa", "bb", "cc", "dd"}, distinct);
 	}
 
 	@Test
@@ -291,58 +293,58 @@ public class ArrayUtilTest {
 
 		// 覆盖模式下，保留最后加入的两个元素
 		String[] distinct = ArrayUtil.distinct(array, String::toLowerCase, true);
-		Assert.assertArrayEquals(new String[]{"Aa", "bb"}, distinct);
+		assertArrayEquals(new String[]{"Aa", "bb"}, distinct);
 
 		// 忽略模式下，保留最早加入的两个元素
 		distinct = ArrayUtil.distinct(array, String::toLowerCase, false);
-		Assert.assertArrayEquals(new String[]{"aa", "BB"}, distinct);
+		assertArrayEquals(new String[]{"aa", "BB"}, distinct);
 	}
 
 	@Test
 	public void toStingTest() {
 		int[] a = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(a));
+		assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(a));
 		long[] b = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(b));
+		assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(b));
 		short[] c = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(c));
+		assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(c));
 		double[] d = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1.0, 3.0, 56.0, 6.0, 7.0]", ArrayUtil.toString(d));
+		assertEquals("[1.0, 3.0, 56.0, 6.0, 7.0]", ArrayUtil.toString(d));
 		byte[] e = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(e));
+		assertEquals("[1, 3, 56, 6, 7]", ArrayUtil.toString(e));
 		boolean[] f = {true, false, true, true, true};
-		Assert.assertEquals("[true, false, true, true, true]", ArrayUtil.toString(f));
+		assertEquals("[true, false, true, true, true]", ArrayUtil.toString(f));
 		float[] g = {1, 3, 56, 6, 7};
-		Assert.assertEquals("[1.0, 3.0, 56.0, 6.0, 7.0]", ArrayUtil.toString(g));
+		assertEquals("[1.0, 3.0, 56.0, 6.0, 7.0]", ArrayUtil.toString(g));
 		char[] h = {'a', 'b', '你', '好', '1'};
-		Assert.assertEquals("[a, b, 你, 好, 1]", ArrayUtil.toString(h));
+		assertEquals("[a, b, 你, 好, 1]", ArrayUtil.toString(h));
 
 		String[] array = {"aa", "bb", "cc", "dd", "bb", "dd"};
-		Assert.assertEquals("[aa, bb, cc, dd, bb, dd]", ArrayUtil.toString(array));
+		assertEquals("[aa, bb, cc, dd, bb, dd]", ArrayUtil.toString(array));
 	}
 
 	@Test
 	public void toArrayTest() {
 		final ArrayList<String> list = CollUtil.newArrayList("A", "B", "C", "D");
 		final String[] array = ArrayUtil.toArray(list, String.class);
-		Assert.assertEquals("A", array[0]);
-		Assert.assertEquals("B", array[1]);
-		Assert.assertEquals("C", array[2]);
-		Assert.assertEquals("D", array[3]);
+		assertEquals("A", array[0]);
+		assertEquals("B", array[1]);
+		assertEquals("C", array[2]);
+		assertEquals("D", array[3]);
 	}
 
 	@Test
 	public void addAllTest() {
 		final int[] ints = ArrayUtil.addAll(new int[]{1, 2, 3}, new int[]{4, 5, 6});
-		Assert.assertArrayEquals(new int[]{1, 2, 3, 4, 5, 6}, ints);
+		assertArrayEquals(new int[]{1, 2, 3, 4, 5, 6}, ints);
 	}
 
 	@Test
 	public void isAllNotNullTest() {
 		String[] allNotNull = {"aa", "bb", "cc", "dd", "bb", "dd"};
-		Assert.assertTrue(ArrayUtil.isAllNotNull(allNotNull));
+		assertTrue(ArrayUtil.isAllNotNull(allNotNull));
 		String[] hasNull = {"aa", "bb", "cc", null, "bb", "dd"};
-		Assert.assertFalse(ArrayUtil.isAllNotNull(hasNull));
+		assertFalse(ArrayUtil.isAllNotNull(hasNull));
 	}
 
 	@Test
@@ -354,25 +356,25 @@ public class ArrayUtilTest {
 		Integer[] e = {0x78, 0x9A, 0x10};
 
 		int i = ArrayUtil.indexOfSub(a, b);
-		Assert.assertEquals(2, i);
+		assertEquals(2, i);
 
 		i = ArrayUtil.indexOfSub(a, c);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.indexOfSub(a, d);
-		Assert.assertEquals(3, i);
+		assertEquals(3, i);
 
 		i = ArrayUtil.indexOfSub(a, e);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.indexOfSub(a, null);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.indexOfSub(null, null);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.indexOfSub(null, b);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 	}
 
 	@Test
@@ -380,7 +382,7 @@ public class ArrayUtilTest {
 		Integer[] a = {0x12, 0x56, 0x34, 0x56, 0x78, 0x9A};
 		Integer[] b = {0x56, 0x78};
 		int i = ArrayUtil.indexOfSub(a, b);
-		Assert.assertEquals(3, i);
+		assertEquals(3, i);
 	}
 
 	@Test
@@ -392,25 +394,25 @@ public class ArrayUtilTest {
 		Integer[] e = {0x78, 0x9A, 0x10};
 
 		int i = ArrayUtil.lastIndexOfSub(a, b);
-		Assert.assertEquals(2, i);
+		assertEquals(2, i);
 
 		i = ArrayUtil.lastIndexOfSub(a, c);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.lastIndexOfSub(a, d);
-		Assert.assertEquals(3, i);
+		assertEquals(3, i);
 
 		i = ArrayUtil.lastIndexOfSub(a, e);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.lastIndexOfSub(a, null);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.lastIndexOfSub(null, null);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 
 		i = ArrayUtil.lastIndexOfSub(null, b);
-		Assert.assertEquals(-1, i);
+		assertEquals(-1, i);
 	}
 
 	@Test
@@ -418,42 +420,42 @@ public class ArrayUtilTest {
 		Integer[] a = {0x12, 0x56, 0x78, 0x56, 0x21, 0x9A};
 		Integer[] b = {0x56, 0x78};
 		int i = ArrayUtil.indexOfSub(a, b);
-		Assert.assertEquals(1, i);
+		assertEquals(1, i);
 	}
 
 	@Test
 	public void reverseTest() {
 		int[] a = {1, 2, 3, 4};
 		final int[] reverse = ArrayUtil.reverse(a);
-		Assert.assertArrayEquals(new int[]{4, 3, 2, 1}, reverse);
+		assertArrayEquals(new int[]{4, 3, 2, 1}, reverse);
 	}
 
 	@Test
 	public void reverseTest2s() {
 		Object[] a = {"1", '2', "3", 4};
 		final Object[] reverse = ArrayUtil.reverse(a);
-		Assert.assertArrayEquals(new Object[]{4, "3", '2', "1"}, reverse);
+		assertArrayEquals(new Object[]{4, "3", '2', "1"}, reverse);
 	}
 
 	@Test
 	public void removeEmptyTest() {
 		String[] a = {"a", "b", "", null, " ", "c"};
 		String[] resultA = {"a", "b", " ", "c"};
-		Assert.assertArrayEquals(ArrayUtil.removeEmpty(a), resultA);
+		assertArrayEquals(ArrayUtil.removeEmpty(a), resultA);
 	}
 
 	@Test
 	public void removeBlankTest() {
 		String[] a = {"a", "b", "", null, " ", "c"};
 		String[] resultA = {"a", "b", "c"};
-		Assert.assertArrayEquals(ArrayUtil.removeBlank(a), resultA);
+		assertArrayEquals(ArrayUtil.removeBlank(a), resultA);
 	}
 
 	@Test
 	public void nullToEmptyTest() {
 		String[] a = {"a", "b", "", null, " ", "c"};
 		String[] resultA = {"a", "b", "", "", " ", "c"};
-		Assert.assertArrayEquals(ArrayUtil.nullToEmpty(a), resultA);
+		assertArrayEquals(ArrayUtil.nullToEmpty(a), resultA);
 	}
 
 	@Test
@@ -461,7 +463,7 @@ public class ArrayUtilTest {
 		Object a = new int[]{1, 2, 3, 4};
 		Object[] wrapA = ArrayUtil.wrap(a);
 		for (Object o : wrapA) {
-			Assert.assertTrue(o instanceof Integer);
+			assertInstanceOf(Integer.class, o);
 		}
 	}
 
@@ -469,15 +471,15 @@ public class ArrayUtilTest {
 	public void splitTest() {
 		byte[] array = new byte[1024];
 		byte[][] arrayAfterSplit = ArrayUtil.split(array, 500);
-		Assert.assertEquals(3, arrayAfterSplit.length);
-		Assert.assertEquals(24, arrayAfterSplit[2].length);
+		assertEquals(3, arrayAfterSplit.length);
+		assertEquals(24, arrayAfterSplit[2].length);
 	}
 
 	@Test
 	public void getTest() {
 		String[] a = {"a", "b", "c"};
 		final Object o = ArrayUtil.get(a, -1);
-		Assert.assertEquals("c", o);
+		assertEquals("c", o);
 	}
 
 	@Test
@@ -487,52 +489,52 @@ public class ArrayUtilTest {
 
 		// 在小于0的位置，-1位置插入，返回b+a，新数组
 		String[] result = ArrayUtil.replace(a, -1, b);
-		Assert.assertArrayEquals(new String[]{"a", "b", "c", "1", "2", "3", "4"}, result);
+		assertArrayEquals(new String[]{"a", "b", "c", "1", "2", "3", "4"}, result);
 
 		// 在第0个位置开始替换，返回a
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 0, b);
-		Assert.assertArrayEquals(new String[]{"a", "b", "c", "4"}, result);
+		assertArrayEquals(new String[]{"a", "b", "c", "4"}, result);
 
 		// 在第1个位置替换，即"2"开始
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 1, b);
-		Assert.assertArrayEquals(new String[]{"1", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "a", "b", "c"}, result);
 
 		// 在第2个位置插入，即"3"之后
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 2, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "a", "b", "c"}, result);
 
 		// 在第3个位置插入，即"4"之后
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 3, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "a", "b", "c"}, result);
 
 		// 在第4个位置插入，数组长度为4，在索引4出替换即两个数组相加
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 4, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
 
 		// 在大于3个位置插入，数组长度为4，即两个数组相加
 		result = ArrayUtil.replace(ArrayUtil.clone(a), 5, b);
-		Assert.assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
+		assertArrayEquals(new String[]{"1", "2", "3", "4", "a", "b", "c"}, result);
 
 		String[] e = null;
 		String[] f = {"a", "b", "c"};
 
 		// e为null 返回 f
 		result = ArrayUtil.replace(e, -1, f);
-		Assert.assertArrayEquals(f, result);
+		assertArrayEquals(f, result);
 
 		String[] g = {"a", "b", "c"};
 		String[] h = null;
 
 		// h为null 返回 g
 		result = ArrayUtil.replace(g, 0, h);
-		Assert.assertArrayEquals(g, result);
+		assertArrayEquals(g, result);
 	}
 
 	@Test
 	public void setOrAppendTest(){
 		String[] arr = new String[0];
 		String[] newArr = ArrayUtil.setOrAppend(arr, 0, "Good");// ClassCastException
-		Assert.assertArrayEquals(new String[]{"Good"}, newArr);
+		assertArrayEquals(new String[]{"Good"}, newArr);
 	}
 
 	@Test
@@ -541,7 +543,7 @@ public class ArrayUtilTest {
 		final Object o = ArrayUtil.getAny(a, 3, 4);
 		final String[] resultO = (String[]) o;
 		final String[] c = {"d", "e"};
-		Assert.assertTrue(ArrayUtil.containsAll(c, resultO[0], resultO[1]));
+		assertTrue(ArrayUtil.containsAll(c, resultO[0], resultO[1]));
 	}
 
 	@Test
@@ -556,20 +558,20 @@ public class ArrayUtilTest {
 		final double[] doubles = new double[10];
 
 		final boolean[] insert1 = (boolean[]) ArrayUtil.insert(booleans, 0, 0, 1, 2);
-		Assert.assertNotNull(insert1);
+		assertNotNull(insert1);
 		final byte[] insert2 = (byte[]) ArrayUtil.insert(bytes, 0, 1, 2, 3);
-		Assert.assertNotNull(insert2);
+		assertNotNull(insert2);
 		final char[] insert3 = (char[]) ArrayUtil.insert(chars, 0, 1, 2, 3);
-		Assert.assertNotNull(insert3);
+		assertNotNull(insert3);
 		final short[] insert4 = (short[]) ArrayUtil.insert(shorts, 0, 1, 2, 3);
-		Assert.assertNotNull(insert4);
+		assertNotNull(insert4);
 		final int[] insert5 = (int[]) ArrayUtil.insert(ints, 0, 1, 2, 3);
-		Assert.assertNotNull(insert5);
+		assertNotNull(insert5);
 		final long[] insert6 = (long[]) ArrayUtil.insert(longs, 0, 1, 2, 3);
-		Assert.assertNotNull(insert6);
+		assertNotNull(insert6);
 		final float[] insert7 = (float[]) ArrayUtil.insert(floats, 0, 1, 2, 3);
-		Assert.assertNotNull(insert7);
+		assertNotNull(insert7);
 		final double[] insert8 = (double[]) ArrayUtil.insert(doubles, 0, 1, 2, 3);
-		Assert.assertNotNull(insert8);
+		assertNotNull(insert8);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java
index 2420cebde..07151f31a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/BooleanUtilTest.java
@@ -1,76 +1,76 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BooleanUtilTest {
 
 	@Test
 	public void toBooleanTest() {
-		Assert.assertTrue(BooleanUtil.toBoolean("true"));
-		Assert.assertTrue(BooleanUtil.toBoolean("yes"));
-		Assert.assertTrue(BooleanUtil.toBoolean("t"));
-		Assert.assertTrue(BooleanUtil.toBoolean("OK"));
-		Assert.assertTrue(BooleanUtil.toBoolean("1"));
-		Assert.assertTrue(BooleanUtil.toBoolean("On"));
-		Assert.assertTrue(BooleanUtil.toBoolean("是"));
-		Assert.assertTrue(BooleanUtil.toBoolean("对"));
-		Assert.assertTrue(BooleanUtil.toBoolean("真"));
+		assertTrue(BooleanUtil.toBoolean("true"));
+		assertTrue(BooleanUtil.toBoolean("yes"));
+		assertTrue(BooleanUtil.toBoolean("t"));
+		assertTrue(BooleanUtil.toBoolean("OK"));
+		assertTrue(BooleanUtil.toBoolean("1"));
+		assertTrue(BooleanUtil.toBoolean("On"));
+		assertTrue(BooleanUtil.toBoolean("是"));
+		assertTrue(BooleanUtil.toBoolean("对"));
+		assertTrue(BooleanUtil.toBoolean("真"));
 
-		Assert.assertFalse(BooleanUtil.toBoolean("false"));
-		Assert.assertFalse(BooleanUtil.toBoolean("6455434"));
-		Assert.assertFalse(BooleanUtil.toBoolean(""));
+		assertFalse(BooleanUtil.toBoolean("false"));
+		assertFalse(BooleanUtil.toBoolean("6455434"));
+		assertFalse(BooleanUtil.toBoolean(""));
 	}
 
 	@Test
 	public void andTest(){
-		Assert.assertFalse(BooleanUtil.and(true,false));
-		Assert.assertFalse(BooleanUtil.andOfWrap(true,false));
+		assertFalse(BooleanUtil.and(true,false));
+		assertFalse(BooleanUtil.andOfWrap(true,false));
 	}
 
 	@Test
 	public void orTest(){
-		Assert.assertTrue(BooleanUtil.or(true,false));
-		Assert.assertTrue(BooleanUtil.orOfWrap(true,false));
+		assertTrue(BooleanUtil.or(true,false));
+		assertTrue(BooleanUtil.orOfWrap(true,false));
 	}
 
 	@Test
 	public void xorTest(){
-		Assert.assertTrue(BooleanUtil.xor(true,false));
-		Assert.assertTrue(BooleanUtil.xorOfWrap(true,false));
+		assertTrue(BooleanUtil.xor(true,false));
+		assertTrue(BooleanUtil.xorOfWrap(true,false));
 	}
 
 	public void orOfWrapTest() {
-		Assert.assertFalse(BooleanUtil.orOfWrap(Boolean.FALSE, null));
-		Assert.assertTrue(BooleanUtil.orOfWrap(Boolean.TRUE, null));
+		assertFalse(BooleanUtil.orOfWrap(Boolean.FALSE, null));
+		assertTrue(BooleanUtil.orOfWrap(Boolean.TRUE, null));
 	}
 
 	@SuppressWarnings("ConstantConditions")
 	@Test
 	public void isTrueIsFalseTest() {
-		Assert.assertFalse(BooleanUtil.isTrue(null));
-		Assert.assertFalse(BooleanUtil.isFalse(null));
+		assertFalse(BooleanUtil.isTrue(null));
+		assertFalse(BooleanUtil.isFalse(null));
 	}
 
 	@SuppressWarnings("ConstantConditions")
 	public void negateTest() {
-		Assert.assertFalse(BooleanUtil.negate(Boolean.TRUE));
-		Assert.assertTrue(BooleanUtil.negate(Boolean.FALSE));
+		assertFalse(BooleanUtil.negate(Boolean.TRUE));
+		assertTrue(BooleanUtil.negate(Boolean.FALSE));
 
-		Assert.assertFalse(BooleanUtil.negate(Boolean.TRUE.booleanValue()));
-		Assert.assertTrue(BooleanUtil.negate(Boolean.FALSE.booleanValue()));
+		assertFalse(BooleanUtil.negate(Boolean.TRUE.booleanValue()));
+		assertTrue(BooleanUtil.negate(Boolean.FALSE.booleanValue()));
 	}
 
 	@Test
 	public void toStringTest() {
-		Assert.assertEquals("true", BooleanUtil.toStringTrueFalse(true));
-		Assert.assertEquals("false", BooleanUtil.toStringTrueFalse(false));
+		assertEquals("true", BooleanUtil.toStringTrueFalse(true));
+		assertEquals("false", BooleanUtil.toStringTrueFalse(false));
 
-		Assert.assertEquals("yes", BooleanUtil.toStringYesNo(true));
-		Assert.assertEquals("no", BooleanUtil.toStringYesNo(false));
+		assertEquals("yes", BooleanUtil.toStringYesNo(true));
+		assertEquals("no", BooleanUtil.toStringYesNo(false));
 
-		Assert.assertEquals("on", BooleanUtil.toStringOnOff(true));
-		Assert.assertEquals("off", BooleanUtil.toStringOnOff(false));
+		assertEquals("on", BooleanUtil.toStringOnOff(true));
+		assertEquals("off", BooleanUtil.toStringOnOff(false));
 	}
 
 	@Test
@@ -78,6 +78,6 @@ public class BooleanUtilTest {
 		Boolean boolean1 = true;
 		Boolean boolean2 = null;
 		Boolean result = BooleanUtil.andOfWrap(boolean1, boolean2);
-		Assert.assertFalse(result);
+		assertFalse(result);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java
index 27f063f88..c8e7c1327 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ByteUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -18,18 +18,18 @@ public class ByteUtilTest {
 		byte[] bytesIntFromBuffer = buffer.array();
 
 		byte[] bytesInt = ByteUtil.intToBytes(int1, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertArrayEquals(bytesIntFromBuffer, bytesInt);
+		assertArrayEquals(bytesIntFromBuffer, bytesInt);
 
 		int int2 = ByteUtil.bytesToInt(bytesInt, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(int1, int2);
+		assertEquals(int1, int2);
 
 		byte[] bytesInt2 = ByteUtil.intToBytes(int1, ByteOrder.LITTLE_ENDIAN);
 		int int3 = ByteUtil.bytesToInt(bytesInt2, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(int1, int3);
+		assertEquals(int1, int3);
 
 		byte[] bytesInt3 = ByteUtil.intToBytes(int1, ByteOrder.LITTLE_ENDIAN);
 		int int4 = ByteUtil.bytesToInt(bytesInt3, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(int1, int4);
+		assertEquals(int1, int4);
 	}
 
 	@Test
@@ -42,11 +42,11 @@ public class ByteUtilTest {
 		byte[] bytesIntFromBuffer = buffer.array();
 
 		byte[] bytesInt = ByteUtil.intToBytes(int2, ByteOrder.BIG_ENDIAN);
-		Assert.assertArrayEquals(bytesIntFromBuffer, bytesInt);
+		assertArrayEquals(bytesIntFromBuffer, bytesInt);
 
 		// 测试大端序 byte 数组转 int
 		int int3 = ByteUtil.bytesToInt(bytesInt, ByteOrder.BIG_ENDIAN);
-		Assert.assertEquals(int2, int3);
+		assertEquals(int2, int3);
 	}
 
 	@Test
@@ -60,18 +60,18 @@ public class ByteUtilTest {
 		byte[] bytesLongFromBuffer = buffer.array();
 
 		byte[] bytesLong = ByteUtil.longToBytes(long1, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertArrayEquals(bytesLongFromBuffer, bytesLong);
+		assertArrayEquals(bytesLongFromBuffer, bytesLong);
 
 		long long2 = ByteUtil.bytesToLong(bytesLong, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(long1, long2);
+		assertEquals(long1, long2);
 
 		byte[] bytesLong2 = ByteUtil.longToBytes(long1);
 		long long3 = ByteUtil.bytesToLong(bytesLong2, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(long1, long3);
+		assertEquals(long1, long3);
 
 		byte[] bytesLong3 = ByteUtil.longToBytes(long1, ByteOrder.LITTLE_ENDIAN);
 		long long4 = ByteUtil.bytesToLong(bytesLong3);
-		Assert.assertEquals(long1, long4);
+		assertEquals(long1, long4);
 	}
 
 	@Test
@@ -84,10 +84,10 @@ public class ByteUtilTest {
 		byte[] bytesLongFromBuffer = buffer.array();
 
 		byte[] bytesLong = ByteUtil.longToBytes(long1, ByteOrder.BIG_ENDIAN);
-		Assert.assertArrayEquals(bytesLongFromBuffer, bytesLong);
+		assertArrayEquals(bytesLongFromBuffer, bytesLong);
 
 		long long2 = ByteUtil.bytesToLong(bytesLong, ByteOrder.BIG_ENDIAN);
-		Assert.assertEquals(long1, long2);
+		assertEquals(long1, long2);
 	}
 
 	@Test
@@ -97,7 +97,7 @@ public class ByteUtilTest {
 
 		byte[] bytesLong = ByteUtil.floatToBytes(f1, ByteOrder.LITTLE_ENDIAN);
 		float f2 = ByteUtil.bytesToFloat(bytesLong, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(f1, f2, 0);
+		assertEquals(f1, f2, 0);
 	}
 
 	@Test
@@ -108,7 +108,7 @@ public class ByteUtilTest {
 		byte[] bytesLong = ByteUtil.floatToBytes(f1, ByteOrder.BIG_ENDIAN);
 		float f2 = ByteUtil.bytesToFloat(bytesLong, ByteOrder.BIG_ENDIAN);
 
-		Assert.assertEquals(f1, f2, 0);
+		assertEquals(f1, f2, 0);
 	}
 
 	@Test
@@ -117,15 +117,15 @@ public class ByteUtilTest {
 
 		byte[] bytes = ByteUtil.shortToBytes(short1, ByteOrder.LITTLE_ENDIAN);
 		short short2 = ByteUtil.bytesToShort(bytes, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(short2, short1);
+		assertEquals(short2, short1);
 
 		byte[] bytes2 = ByteUtil.shortToBytes(short1);
 		short short3 = ByteUtil.bytesToShort(bytes2, ByteOrder.LITTLE_ENDIAN);
-		Assert.assertEquals(short3, short1);
+		assertEquals(short3, short1);
 
 		byte[] bytes3 = ByteUtil.shortToBytes(short1, ByteOrder.LITTLE_ENDIAN);
 		short short4 = ByteUtil.bytesToShort(bytes3);
-		Assert.assertEquals(short4, short1);
+		assertEquals(short4, short1);
 	}
 
 	@Test
@@ -134,7 +134,7 @@ public class ByteUtilTest {
 		byte[] bytes = ByteUtil.shortToBytes(short1, ByteOrder.BIG_ENDIAN);
 		short short2 = ByteUtil.bytesToShort(bytes, ByteOrder.BIG_ENDIAN);
 
-		Assert.assertEquals(short2, short1);
+		assertEquals(short2, short1);
 	}
 
 	@Test
@@ -143,12 +143,12 @@ public class ByteUtilTest {
 		ByteBuffer wrap = ByteBuffer.wrap(ByteUtil.longToBytes(a));
 		wrap.order(ByteOrder.LITTLE_ENDIAN);
 		long aLong = wrap.getLong();
-		Assert.assertEquals(a, aLong);
+		assertEquals(a, aLong);
 
 		wrap = ByteBuffer.wrap(ByteUtil.longToBytes(a, ByteOrder.BIG_ENDIAN));
 		wrap.order(ByteOrder.BIG_ENDIAN);
 		aLong = wrap.getLong();
-		Assert.assertEquals(a, aLong);
+		assertEquals(a, aLong);
 	}
 
 	@Test
@@ -157,12 +157,12 @@ public class ByteUtilTest {
 		ByteBuffer wrap = ByteBuffer.wrap(ByteUtil.intToBytes(a));
 		wrap.order(ByteOrder.LITTLE_ENDIAN);
 		int aInt = wrap.getInt();
-		Assert.assertEquals(a, aInt);
+		assertEquals(a, aInt);
 
 		wrap = ByteBuffer.wrap(ByteUtil.intToBytes(a, ByteOrder.BIG_ENDIAN));
 		wrap.order(ByteOrder.BIG_ENDIAN);
 		aInt = wrap.getInt();
-		Assert.assertEquals(a, aInt);
+		assertEquals(a, aInt);
 	}
 
 	@Test
@@ -172,11 +172,11 @@ public class ByteUtilTest {
 		ByteBuffer wrap = ByteBuffer.wrap(ByteUtil.shortToBytes(a));
 		wrap.order(ByteOrder.LITTLE_ENDIAN);
 		short aShort = wrap.getShort();
-		Assert.assertEquals(a, aShort);
+		assertEquals(a, aShort);
 
 		wrap = ByteBuffer.wrap(ByteUtil.shortToBytes(a, ByteOrder.BIG_ENDIAN));
 		wrap.order(ByteOrder.BIG_ENDIAN);
 		aShort = wrap.getShort();
-		Assert.assertEquals(a, aShort);
+		assertEquals(a, aShort);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
index db8768319..05889e9d9 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/CharUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CharUtilTest {
 
@@ -9,62 +9,62 @@ public class CharUtilTest {
 	public void trimTest() {
 		//此字符串中的第一个字符为不可见字符: '\u202a'
 		final String str = "‪C:/Users/maple/Desktop/tone.txt";
-		Assert.assertEquals('\u202a', str.charAt(0));
-		Assert.assertTrue(CharUtil.isBlankChar(str.charAt(0)));
+		assertEquals('\u202a', str.charAt(0));
+		assertTrue(CharUtil.isBlankChar(str.charAt(0)));
 	}
 
 	@Test
 	public void isEmojiTest() {
 		final String a = "莉🌹";
-		Assert.assertFalse(CharUtil.isEmoji(a.charAt(0)));
-		Assert.assertTrue(CharUtil.isEmoji(a.charAt(1)));
+		assertFalse(CharUtil.isEmoji(a.charAt(0)));
+		assertTrue(CharUtil.isEmoji(a.charAt(1)));
 
 	}
 
 	@Test
 	public void isCharTest(){
 		final char a = 'a';
-		Assert.assertTrue(CharUtil.isChar(a));
+		assertTrue(CharUtil.isChar(a));
 	}
 
 	@Test
 	public void isBlankCharTest(){
 		final char a = '\u00A0';
-		Assert.assertTrue(CharUtil.isBlankChar(a));
+		assertTrue(CharUtil.isBlankChar(a));
 
 		final char a2 = '\u0020';
-		Assert.assertTrue(CharUtil.isBlankChar(a2));
+		assertTrue(CharUtil.isBlankChar(a2));
 
 		final char a3 = '\u3000';
-		Assert.assertTrue(CharUtil.isBlankChar(a3));
+		assertTrue(CharUtil.isBlankChar(a3));
 
 		final char a4 = '\u0000';
-		Assert.assertTrue(CharUtil.isBlankChar(a4));
+		assertTrue(CharUtil.isBlankChar(a4));
 
 		final char a5 = ' ';
-		Assert.assertTrue(CharUtil.isBlankChar(a5));
+		assertTrue(CharUtil.isBlankChar(a5));
 	}
 
 	@Test
 	public void toCloseCharTest(){
-		Assert.assertEquals('②', CharUtil.toCloseChar('2'));
-		Assert.assertEquals('Ⓜ', CharUtil.toCloseChar('M'));
-		Assert.assertEquals('ⓡ', CharUtil.toCloseChar('r'));
+		assertEquals('②', CharUtil.toCloseChar('2'));
+		assertEquals('Ⓜ', CharUtil.toCloseChar('M'));
+		assertEquals('ⓡ', CharUtil.toCloseChar('r'));
 	}
 
 	@Test
 	public void toCloseByNumberTest(){
-		Assert.assertEquals('②', CharUtil.toCloseByNumber(2));
-		Assert.assertEquals('⑫', CharUtil.toCloseByNumber(12));
-		Assert.assertEquals('⑳', CharUtil.toCloseByNumber(20));
+		assertEquals('②', CharUtil.toCloseByNumber(2));
+		assertEquals('⑫', CharUtil.toCloseByNumber(12));
+		assertEquals('⑳', CharUtil.toCloseByNumber(20));
 	}
 
 	@Test
 	public void issueI5UGSQTest(){
 		char c = '\u3164';
-		Assert.assertTrue(CharUtil.isBlankChar(c));
+		assertTrue(CharUtil.isBlankChar(c));
 
 		c = '\u2800';
-		Assert.assertTrue(CharUtil.isBlankChar(c));
+		assertTrue(CharUtil.isBlankChar(c));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ClassLoaderUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ClassLoaderUtilTest.java
index 079e731d1..bb1877a06 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ClassLoaderUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ClassLoaderUtilTest.java
@@ -1,16 +1,16 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ClassLoaderUtilTest {
 
 	@Test
 	public void loadClassTest() {
 		String name = ClassLoaderUtil.loadClass("java.lang.Thread.State").getName();
-		Assert.assertEquals("java.lang.Thread$State", name);
+		assertEquals("java.lang.Thread$State", name);
 
 		name = ClassLoaderUtil.loadClass("java.lang.Thread$State").getName();
-		Assert.assertEquals("java.lang.Thread$State", name);
+		assertEquals("java.lang.Thread$State", name);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
index 89c0c33cc..2a502b820 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ClassUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -9,19 +9,19 @@ import java.util.Objects;
 
 /**
  * {@link ClassUtil} 单元测试
- * 
+ *
  * @author Looly
  *
  */
 public class ClassUtilTest {
-	
+
 	@Test
 	public void getClassNameTest() {
 		String className = ClassUtil.getClassName(ClassUtil.class, false);
-		Assert.assertEquals("cn.hutool.core.util.ClassUtil", className);
+		assertEquals("cn.hutool.core.util.ClassUtil", className);
 
 		String simpleClassName = ClassUtil.getClassName(ClassUtil.class, true);
-		Assert.assertEquals("ClassUtil", simpleClassName);
+		assertEquals("ClassUtil", simpleClassName);
 	}
 
 	@SuppressWarnings("unused")
@@ -39,7 +39,7 @@ public class ClassUtilTest {
 	@SuppressWarnings({"unused", "InnerClassMayBeStatic"})
 	class TestSubClass extends TestClass {
 		private String subField;
-		
+
 		private void privateSubMethod() {
 		}
 
@@ -51,62 +51,62 @@ public class ClassUtilTest {
 	@Test
 	public void getPublicMethod() {
 		Method superPublicMethod = ClassUtil.getPublicMethod(TestSubClass.class, "publicMethod");
-		Assert.assertNotNull(superPublicMethod);
+		assertNotNull(superPublicMethod);
 		Method superPrivateMethod = ClassUtil.getPublicMethod(TestSubClass.class, "privateMethod");
-		Assert.assertNull(superPrivateMethod);
+		assertNull(superPrivateMethod);
 
 		Method publicMethod = ClassUtil.getPublicMethod(TestSubClass.class, "publicSubMethod");
-		Assert.assertNotNull(publicMethod);
+		assertNotNull(publicMethod);
 		Method privateMethod = ClassUtil.getPublicMethod(TestSubClass.class, "privateSubMethod");
-		Assert.assertNull(privateMethod);
+		assertNull(privateMethod);
 	}
 
 	@Test
 	public void getDeclaredMethod() {
 		Method noMethod = ClassUtil.getDeclaredMethod(TestSubClass.class, "noMethod");
-		Assert.assertNull(noMethod);
+		assertNull(noMethod);
 
 		Method privateMethod = ClassUtil.getDeclaredMethod(TestSubClass.class, "privateMethod");
-		Assert.assertNotNull(privateMethod);
+		assertNotNull(privateMethod);
 		Method publicMethod = ClassUtil.getDeclaredMethod(TestSubClass.class, "publicMethod");
-		Assert.assertNotNull(publicMethod);
+		assertNotNull(publicMethod);
 
 		Method publicSubMethod = ClassUtil.getDeclaredMethod(TestSubClass.class, "publicSubMethod");
-		Assert.assertNotNull(publicSubMethod);
+		assertNotNull(publicSubMethod);
 		Method privateSubMethod = ClassUtil.getDeclaredMethod(TestSubClass.class, "privateSubMethod");
-		Assert.assertNotNull(privateSubMethod);
+		assertNotNull(privateSubMethod);
 
 	}
 
 	@Test
 	public void getDeclaredField() {
 		Field noField = ClassUtil.getDeclaredField(TestSubClass.class, "noField");
-		Assert.assertNull(noField);
+		assertNull(noField);
 
 		// 获取不到父类字段
 		Field field = ClassUtil.getDeclaredField(TestSubClass.class, "field");
-		Assert.assertNull(field);
+		assertNull(field);
 
 		Field subField = ClassUtil.getDeclaredField(TestSubClass.class, "subField");
-		Assert.assertNotNull(subField);
+		assertNotNull(subField);
 	}
-	
+
 	@Test
 	public void getClassPathTest() {
 		String classPath = ClassUtil.getClassPath();
-		Assert.assertNotNull(classPath);
+		assertNotNull(classPath);
 	}
-	
+
 	@Test
 	public void getShortClassNameTest() {
 		String className = "cn.hutool.core.util.StrUtil";
 		String result = ClassUtil.getShortClassName(className);
-		Assert.assertEquals("c.h.c.u.StrUtil", result);
+		assertEquals("c.h.c.u.StrUtil", result);
 	}
 
 	@Test
 	public void getLocationPathTest(){
 		final String classDir = ClassUtil.getLocationPath(ClassUtilTest.class);
-		Assert.assertTrue(Objects.requireNonNull(classDir).endsWith("/hutool-core/target/test-classes/"));
+		assertTrue(Objects.requireNonNull(classDir).endsWith("/hutool-core/target/test-classes/"));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java
index ba0a7a16c..6b2ca9fa2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/CoordinateUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 坐标转换工具类单元测试<br>
@@ -14,52 +14,52 @@ public class CoordinateUtilTest {
 	@Test
 	public void wgs84ToGcj02Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToGcj02(116.404, 39.915);
-		Assert.assertEquals(116.41024449916938D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.91640428150164D, coordinate.getLat(), 0);
+		assertEquals(116.41024449916938D, coordinate.getLng(), 0);
+		assertEquals(39.91640428150164D, coordinate.getLat(), 0);
 	}
 
 	@Test
 	public void gcj02ToWgs84Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.gcj02ToWgs84(116.404, 39.915);
-		Assert.assertEquals(116.39775550083061D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.91359571849836D, coordinate.getLat(), 0);
+		assertEquals(116.39775550083061D, coordinate.getLng(), 0);
+		assertEquals(39.91359571849836D, coordinate.getLat(), 0);
 	}
 
 	@Test
 	public void wgs84toBd09Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToBd09(116.404, 39.915);
-		Assert.assertEquals(116.41662724378733D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.922699552216216D, coordinate.getLat(), 0);
+		assertEquals(116.41662724378733D, coordinate.getLng(), 0);
+		assertEquals(39.922699552216216D, coordinate.getLat(), 0);
 	}
 
 	@Test
 	public void wgs84toBd09Test2() {
 		// https://tool.lu/coordinate/
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToBd09(122.99395597D, 44.99804071D);
-		Assert.assertEquals(123.00636516028885D, coordinate.getLng(), 0.00000000000001D);
+		assertEquals(123.00636516028885D, coordinate.getLng(), 0.00000000000001D);
 		// 不同jdk版本、不同架构jdk, 精度有差异，数值不完全相等，这里增加精度控制delta
 		// 参考：从Java Math底层实现看Arm与x86的差异：https://yikun.github.io/2020/04/10/%E4%BB%8EJava-Math%E5%BA%95%E5%B1%82%E5%AE%9E%E7%8E%B0%E7%9C%8BArm%E4%B8%8Ex86%E7%9A%84%E5%B7%AE%E5%BC%82/
-		Assert.assertEquals(45.00636909189589D, coordinate.getLat(), 0.00000000000001D);
+		assertEquals(45.00636909189589D, coordinate.getLat(), 0.00000000000001D);
 	}
 
 	@Test
 	public void bd09toWgs84Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.bd09toWgs84(116.404, 39.915);
-		Assert.assertEquals(116.3913836995125D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.907253214522164D, coordinate.getLat(), 0);
+		assertEquals(116.3913836995125D, coordinate.getLng(), 0);
+		assertEquals(39.907253214522164D, coordinate.getLat(), 0);
 	}
 
 	@Test
 	public void gcj02ToBd09Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.gcj02ToBd09(116.404, 39.915);
-		Assert.assertEquals(116.41036949371029D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.92133699351022D, coordinate.getLat(), 0);
+		assertEquals(116.41036949371029D, coordinate.getLng(), 0);
+		assertEquals(39.92133699351022D, coordinate.getLat(), 0);
 	}
 
 	@Test
 	public void bd09toGcj02Test() {
 		final CoordinateUtil.Coordinate coordinate = CoordinateUtil.bd09ToGcj02(116.404, 39.915);
-		Assert.assertEquals(116.39762729119315D, coordinate.getLng(), 0);
-		Assert.assertEquals(39.90865673957631D, coordinate.getLat(), 0);
+		assertEquals(116.39762729119315D, coordinate.getLng(), 0);
+		assertEquals(39.90865673957631D, coordinate.getLat(), 0);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java
index 9263feb66..bbab50eea 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/CreditCodeUtilTest.java
@@ -1,20 +1,20 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CreditCodeUtilTest {
 
 	@Test
 	public void isCreditCodeBySimple() {
 		String testCreditCode = "91310115591693856A";
-		Assert.assertTrue(CreditCodeUtil.isCreditCodeSimple(testCreditCode));
+		assertTrue(CreditCodeUtil.isCreditCodeSimple(testCreditCode));
 	}
 
 	@Test
 	public void isCreditCode() {
 		String testCreditCode = "91310110666007217T";
-		Assert.assertTrue(CreditCodeUtil.isCreditCode(testCreditCode));
+		assertTrue(CreditCodeUtil.isCreditCode(testCreditCode));
 	}
 
 	@Test
@@ -22,12 +22,12 @@ public class CreditCodeUtilTest {
 		// 由于早期部分试点地区推行 法人和其他组织统一社会信用代码 较早，会存在部分代码不符合国家标准的情况。
 		// 见：https://github.com/bluesky335/IDCheck
 		String testCreditCode = "91350211M00013FA1N";
-		Assert.assertFalse(CreditCodeUtil.isCreditCode(testCreditCode));
+		assertFalse(CreditCodeUtil.isCreditCode(testCreditCode));
 	}
 
 	@Test
 	public void randomCreditCode() {
 		final String s = CreditCodeUtil.randomCreditCode();
-		Assert.assertTrue(CreditCodeUtil.isCreditCode(s));
+		assertTrue(CreditCodeUtil.isCreditCode(s));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
index e534461f3..b6ada5ad2 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/DesensitizedUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 脱敏工具类 DesensitizedUtils 安全测试
@@ -13,93 +13,93 @@ public class DesensitizedUtilTest {
 
 	@Test
 	public void desensitizedTest() {
-		Assert.assertEquals("0", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.USER_ID));
-		Assert.assertEquals("", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.CLEAR_TO_EMPTY));
-		Assert.assertNull(DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.CLEAR_TO_NULL));
-		Assert.assertEquals("段**", DesensitizedUtil.desensitized("段正淳", DesensitizedUtil.DesensitizedType.CHINESE_NAME));
-		Assert.assertEquals("5***************1X", DesensitizedUtil.desensitized("51343620000320711X", DesensitizedUtil.DesensitizedType.ID_CARD));
-		Assert.assertEquals("0915*****79", DesensitizedUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE));
-		Assert.assertEquals("180****1999", DesensitizedUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE));
-		Assert.assertEquals("北京市海淀区马********", DesensitizedUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS));
-		Assert.assertEquals("d*************@gmail.com.cn", DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL));
-		Assert.assertEquals("**********", DesensitizedUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD));
+		assertEquals("0", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.USER_ID));
+		assertEquals("", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.CLEAR_TO_EMPTY));
+		assertNull(DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.CLEAR_TO_NULL));
+		assertEquals("段**", DesensitizedUtil.desensitized("段正淳", DesensitizedUtil.DesensitizedType.CHINESE_NAME));
+		assertEquals("5***************1X", DesensitizedUtil.desensitized("51343620000320711X", DesensitizedUtil.DesensitizedType.ID_CARD));
+		assertEquals("0915*****79", DesensitizedUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE));
+		assertEquals("180****1999", DesensitizedUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE));
+		assertEquals("北京市海淀区马********", DesensitizedUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS));
+		assertEquals("d*************@gmail.com.cn", DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL));
+		assertEquals("**********", DesensitizedUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD));
 
-		Assert.assertEquals("0", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.USER_ID));
-		Assert.assertEquals("段**", DesensitizedUtil.desensitized("段正淳", DesensitizedUtil.DesensitizedType.CHINESE_NAME));
-		Assert.assertEquals("5***************1X", DesensitizedUtil.desensitized("51343620000320711X", DesensitizedUtil.DesensitizedType.ID_CARD));
-		Assert.assertEquals("0915*****79", DesensitizedUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE));
-		Assert.assertEquals("180****1999", DesensitizedUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE));
-		Assert.assertEquals("北京市海淀区马********", DesensitizedUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS));
-		Assert.assertEquals("d*************@gmail.com.cn", DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL));
-		Assert.assertEquals("**********", DesensitizedUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD));
-		Assert.assertEquals("1101 **** **** **** 3256", DesensitizedUtil.desensitized("11011111222233333256", DesensitizedUtil.DesensitizedType.BANK_CARD));
-		Assert.assertEquals("6227 **** **** **** 123", DesensitizedUtil.desensitized("6227880100100105123", DesensitizedUtil.DesensitizedType.BANK_CARD));
-		Assert.assertEquals("192.*.*.*", DesensitizedUtil.desensitized("192.168.1.1", DesensitizedUtil.DesensitizedType.IPV4));
-		Assert.assertEquals("2001:*:*:*:*:*:*:*", DesensitizedUtil.desensitized("2001:0db8:86a3:08d3:1319:8a2e:0370:7344", DesensitizedUtil.DesensitizedType.IPV6));
+		assertEquals("0", DesensitizedUtil.desensitized("100", DesensitizedUtil.DesensitizedType.USER_ID));
+		assertEquals("段**", DesensitizedUtil.desensitized("段正淳", DesensitizedUtil.DesensitizedType.CHINESE_NAME));
+		assertEquals("5***************1X", DesensitizedUtil.desensitized("51343620000320711X", DesensitizedUtil.DesensitizedType.ID_CARD));
+		assertEquals("0915*****79", DesensitizedUtil.desensitized("09157518479", DesensitizedUtil.DesensitizedType.FIXED_PHONE));
+		assertEquals("180****1999", DesensitizedUtil.desensitized("18049531999", DesensitizedUtil.DesensitizedType.MOBILE_PHONE));
+		assertEquals("北京市海淀区马********", DesensitizedUtil.desensitized("北京市海淀区马连洼街道289号", DesensitizedUtil.DesensitizedType.ADDRESS));
+		assertEquals("d*************@gmail.com.cn", DesensitizedUtil.desensitized("duandazhi-jack@gmail.com.cn", DesensitizedUtil.DesensitizedType.EMAIL));
+		assertEquals("**********", DesensitizedUtil.desensitized("1234567890", DesensitizedUtil.DesensitizedType.PASSWORD));
+		assertEquals("1101 **** **** **** 3256", DesensitizedUtil.desensitized("11011111222233333256", DesensitizedUtil.DesensitizedType.BANK_CARD));
+		assertEquals("6227 **** **** **** 123", DesensitizedUtil.desensitized("6227880100100105123", DesensitizedUtil.DesensitizedType.BANK_CARD));
+		assertEquals("192.*.*.*", DesensitizedUtil.desensitized("192.168.1.1", DesensitizedUtil.DesensitizedType.IPV4));
+		assertEquals("2001:*:*:*:*:*:*:*", DesensitizedUtil.desensitized("2001:0db8:86a3:08d3:1319:8a2e:0370:7344", DesensitizedUtil.DesensitizedType.IPV6));
 	}
 
 	@Test
 	public void userIdTest() {
-		Assert.assertEquals(Long.valueOf(0L), DesensitizedUtil.userId());
+		assertEquals(Long.valueOf(0L), DesensitizedUtil.userId());
 	}
 
 	@Test
 	public void chineseNameTest() {
-		Assert.assertEquals("段**", DesensitizedUtil.chineseName("段正淳"));
+		assertEquals("段**", DesensitizedUtil.chineseName("段正淳"));
 	}
 
 	@Test
 	public void idCardNumTest() {
-		Assert.assertEquals("5***************1X", DesensitizedUtil.idCardNum("51343620000320711X", 1, 2));
+		assertEquals("5***************1X", DesensitizedUtil.idCardNum("51343620000320711X", 1, 2));
 	}
 
 	@Test
 	public void fixedPhoneTest() {
-		Assert.assertEquals("0915*****79", DesensitizedUtil.fixedPhone("09157518479"));
+		assertEquals("0915*****79", DesensitizedUtil.fixedPhone("09157518479"));
 	}
 
 	@Test
 	public void mobilePhoneTest() {
-		Assert.assertEquals("180****1999", DesensitizedUtil.mobilePhone("18049531999"));
+		assertEquals("180****1999", DesensitizedUtil.mobilePhone("18049531999"));
 	}
 
 	@Test
 	public void addressTest() {
-		Assert.assertEquals("北京市海淀区马连洼街*****", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 5));
-		Assert.assertEquals("***************", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 50));
-		Assert.assertEquals("北京市海淀区马连洼街道289号", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 0));
-		Assert.assertEquals("北京市海淀区马连洼街道289号", DesensitizedUtil.address("北京市海淀区马连洼街道289号", -1));
+		assertEquals("北京市海淀区马连洼街*****", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 5));
+		assertEquals("***************", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 50));
+		assertEquals("北京市海淀区马连洼街道289号", DesensitizedUtil.address("北京市海淀区马连洼街道289号", 0));
+		assertEquals("北京市海淀区马连洼街道289号", DesensitizedUtil.address("北京市海淀区马连洼街道289号", -1));
 	}
 
 	@Test
 	public void emailTest() {
-		Assert.assertEquals("d********@126.com", DesensitizedUtil.email("duandazhi@126.com"));
-		Assert.assertEquals("d********@gmail.com.cn", DesensitizedUtil.email("duandazhi@gmail.com.cn"));
-		Assert.assertEquals("d*************@gmail.com.cn", DesensitizedUtil.email("duandazhi-jack@gmail.com.cn"));
+		assertEquals("d********@126.com", DesensitizedUtil.email("duandazhi@126.com"));
+		assertEquals("d********@gmail.com.cn", DesensitizedUtil.email("duandazhi@gmail.com.cn"));
+		assertEquals("d*************@gmail.com.cn", DesensitizedUtil.email("duandazhi-jack@gmail.com.cn"));
 	}
 
 	@Test
 	public void passwordTest() {
-		Assert.assertEquals("**********", DesensitizedUtil.password("1234567890"));
+		assertEquals("**********", DesensitizedUtil.password("1234567890"));
 	}
 
 	@Test
 	public void carLicenseTest() {
-		Assert.assertEquals("", DesensitizedUtil.carLicense(null));
-		Assert.assertEquals("", DesensitizedUtil.carLicense(""));
-		Assert.assertEquals("苏D4***0", DesensitizedUtil.carLicense("苏D40000"));
-		Assert.assertEquals("陕A1****D", DesensitizedUtil.carLicense("陕A12345D"));
-		Assert.assertEquals("京A123", DesensitizedUtil.carLicense("京A123"));
+		assertEquals("", DesensitizedUtil.carLicense(null));
+		assertEquals("", DesensitizedUtil.carLicense(""));
+		assertEquals("苏D4***0", DesensitizedUtil.carLicense("苏D40000"));
+		assertEquals("陕A1****D", DesensitizedUtil.carLicense("陕A12345D"));
+		assertEquals("京A123", DesensitizedUtil.carLicense("京A123"));
 	}
 
 	@Test
 	public void bankCardTest(){
-		Assert.assertEquals(null, DesensitizedUtil.bankCard(null));
-		Assert.assertEquals("", DesensitizedUtil.bankCard(""));
-		Assert.assertEquals("1234 **** **** **** **** 9", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789 9"));
-		Assert.assertEquals("1234 **** **** **** **** 91", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789 91"));
-		Assert.assertEquals("1234 **** **** **** 6789", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789"));
-		Assert.assertEquals("1234 **** **** **** 678", DesensitizedUtil.bankCard("1234 2222 3333 4444 678"));
+		assertEquals(null, DesensitizedUtil.bankCard(null));
+		assertEquals("", DesensitizedUtil.bankCard(""));
+		assertEquals("1234 **** **** **** **** 9", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789 9"));
+		assertEquals("1234 **** **** **** **** 91", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789 91"));
+		assertEquals("1234 **** **** **** 6789", DesensitizedUtil.bankCard("1234 2222 3333 4444 6789"));
+		assertEquals("1234 **** **** **** 678", DesensitizedUtil.bankCard("1234 2222 3333 4444 678"));
 
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java
index a085204cd..0fdc634ac 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/EnumUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -18,56 +18,56 @@ public class EnumUtilTest {
 	@Test
 	public void getNamesTest() {
 		List<String> names = EnumUtil.getNames(TestEnum.class);
-		Assert.assertEquals(CollUtil.newArrayList("TEST1", "TEST2", "TEST3"), names);
+		assertEquals(CollUtil.newArrayList("TEST1", "TEST2", "TEST3"), names);
 	}
 
 	@Test
 	public void getFieldValuesTest() {
 		List<Object> types = EnumUtil.getFieldValues(TestEnum.class, "type");
-		Assert.assertEquals(CollUtil.newArrayList("type1", "type2", "type3"), types);
+		assertEquals(CollUtil.newArrayList("type1", "type2", "type3"), types);
 	}
 
 	@Test
 	public void getFieldNamesTest() {
 		List<String> names = EnumUtil.getFieldNames(TestEnum.class);
-		Assert.assertTrue(names.contains("type"));
-		Assert.assertTrue(names.contains("name"));
+		assertTrue(names.contains("type"));
+		assertTrue(names.contains("name"));
 	}
 
 	@Test
 	public void getByTest() {
 		// 枚举中字段互相映射使用
 		TestEnum testEnum = EnumUtil.getBy(TestEnum::ordinal, 1);
-		Assert.assertEquals("TEST2", testEnum.name());
+		assertEquals("TEST2", testEnum.name());
 	}
 
 	@Test
 	public void getFieldByTest() {
 		// 枚举中字段互相映射使用
 		String type = EnumUtil.getFieldBy(TestEnum::getType, Enum::ordinal, 1);
-		Assert.assertEquals("type2", type);
+		assertEquals("type2", type);
 
 		int ordinal = EnumUtil.getFieldBy(TestEnum::ordinal, Enum::ordinal, 1);
-		Assert.assertEquals(1, ordinal);
+		assertEquals(1, ordinal);
 	}
 
 	@Test
 	public void likeValueOfTest() {
 		TestEnum value = EnumUtil.likeValueOf(TestEnum.class, "type2");
-		Assert.assertEquals(TestEnum.TEST2, value);
+		assertEquals(TestEnum.TEST2, value);
 	}
 
 	@Test
 	public void getEnumMapTest() {
 		Map<String,TestEnum> enumMap = EnumUtil.getEnumMap(TestEnum.class);
-		Assert.assertEquals(TestEnum.TEST1, enumMap.get("TEST1"));
+		assertEquals(TestEnum.TEST1, enumMap.get("TEST1"));
 	}
 
 	@Test
 	public void getNameFieldMapTest() {
 		Map<String, Object> enumMap = EnumUtil.getNameFieldMap(TestEnum.class, "type");
 		assert enumMap != null;
-		Assert.assertEquals("type1", enumMap.get("TEST1"));
+		assertEquals("type1", enumMap.get("TEST1"));
 	}
 
 	public enum TestEnum{
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
index 23e1c7fc4..3c4ef93ed 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/EscapeUtilTest.java
@@ -1,30 +1,30 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class EscapeUtilTest {
 
 	@Test
 	public void escapeHtml4Test() {
 		String escapeHtml4 = EscapeUtil.escapeHtml4("<a>你好</a>");
-		Assert.assertEquals("&lt;a&gt;你好&lt;/a&gt;", escapeHtml4);
+		assertEquals("&lt;a&gt;你好&lt;/a&gt;", escapeHtml4);
 
 		String result = EscapeUtil.unescapeHtml4("&#25391;&#33633;&#22120;&#31867;&#22411;");
-		Assert.assertEquals("振荡器类型", result);
+		assertEquals("振荡器类型", result);
 
 		String escape = EscapeUtil.escapeHtml4("*@-_+./(123你好)");
-		Assert.assertEquals("*@-_+./(123你好)", escape);
+		assertEquals("*@-_+./(123你好)", escape);
 	}
 
 	@Test
 	public void escapeTest(){
 		String str = "*@-_+./(123你好)ABCabc";
 		String escape = EscapeUtil.escape(str);
-		Assert.assertEquals("*@-_+./%28123%u4f60%u597d%29ABCabc", escape);
+		assertEquals("*@-_+./%28123%u4f60%u597d%29ABCabc", escape);
 
 		String unescape = EscapeUtil.unescape(escape);
-		Assert.assertEquals(str, unescape);
+		assertEquals(str, unescape);
 	}
 
 	@Test
@@ -32,10 +32,10 @@ public class EscapeUtilTest {
 		String str = "*@-_+./(123你好)ABCabc";
 
 		String escape = EscapeUtil.escapeAll(str);
-		Assert.assertEquals("%2a%40%2d%5f%2b%2e%2f%28%31%32%33%u4f60%u597d%29%41%42%43%61%62%63", escape);
+		assertEquals("%2a%40%2d%5f%2b%2e%2f%28%31%32%33%u4f60%u597d%29%41%42%43%61%62%63", escape);
 
 		String unescape = EscapeUtil.unescape(escape);
-		Assert.assertEquals(str, unescape);
+		assertEquals(str, unescape);
 	}
 
 	/**
@@ -46,10 +46,10 @@ public class EscapeUtilTest {
 		String str = "٩";
 
 		String escape = EscapeUtil.escapeAll(str);
-		Assert.assertEquals("%u0669", escape);
+		assertEquals("%u0669", escape);
 
 		String unescape = EscapeUtil.unescape(escape);
-		Assert.assertEquals(str, unescape);
+		assertEquals(str, unescape);
 	}
 
 	@Test
@@ -57,13 +57,13 @@ public class EscapeUtilTest {
 		// 单引号不做转义
 		String str = "'some text with single quotes'";
 		final String s = EscapeUtil.escapeHtml4(str);
-		Assert.assertEquals("'some text with single quotes'", s);
+		assertEquals("'some text with single quotes'", s);
 	}
 
 	@Test
 	public void unescapeSingleQuotesTest(){
 		String str = "&apos;some text with single quotes&apos;";
 		final String s = EscapeUtil.unescapeHtml4(str);
-		Assert.assertEquals("'some text with single quotes'", s);
+		assertEquals("'some text with single quotes'", s);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
index f76678de8..cb3b331cb 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/HashUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HashUtilTest {
 
@@ -9,21 +9,21 @@ public class HashUtilTest {
 	public void cityHash128Test(){
 		String s="Google发布的Hash计算算法：CityHash64 与 CityHash128";
 		final long[] hash = HashUtil.cityHash128(StrUtil.utf8Bytes(s));
-		Assert.assertEquals(0x5944f1e788a18db0L, hash[0]);
-		Assert.assertEquals(0xc2f68d8b2bf4a5cfL, hash[1]);
+		assertEquals(0x5944f1e788a18db0L, hash[0]);
+		assertEquals(0xc2f68d8b2bf4a5cfL, hash[1]);
 	}
 
 	@Test
 	public void cityHash64Test(){
 		String s="Google发布的Hash计算算法：CityHash64 与 CityHash128";
 		final long hash = HashUtil.cityHash64(StrUtil.utf8Bytes(s));
-		Assert.assertEquals(0x1d408f2bbf967e2aL, hash);
+		assertEquals(0x1d408f2bbf967e2aL, hash);
 	}
 
 	@Test
 	public void cityHash32Test(){
 		String s="Google发布的Hash计算算法：CityHash64 与 CityHash128";
 		final int hash = HashUtil.cityHash32(StrUtil.utf8Bytes(s));
-		Assert.assertEquals(0xa8944fbe, hash);
+		assertEquals(0xa8944fbe, hash);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
index 98c76a45e..615bcdb90 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/HexUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 
@@ -19,49 +19,49 @@ public class HexUtilTest {
 		final String hex = HexUtil.encodeHexStr(str, CharsetUtil.CHARSET_UTF_8);
 		final String decodedStr = HexUtil.decodeHexStr(hex);
 
-		Assert.assertEquals(str, decodedStr);
+		assertEquals(str, decodedStr);
 	}
 
 	@Test
 	public void issueI50MI6Test(){
 		final String s = HexUtil.encodeHexStr("烟".getBytes(StandardCharsets.UTF_16BE));
-		Assert.assertEquals("70df", s);
+		assertEquals("70df", s);
 	}
 
 	@Test
 	public void toUnicodeHexTest() {
 		String unicodeHex = HexUtil.toUnicodeHex('\u2001');
-		Assert.assertEquals("\\u2001", unicodeHex);
+		assertEquals("\\u2001", unicodeHex);
 
 		unicodeHex = HexUtil.toUnicodeHex('你');
-		Assert.assertEquals("\\u4f60", unicodeHex);
+		assertEquals("\\u4f60", unicodeHex);
 	}
 
 	@Test
 	public void isHexNumberTest() {
-		Assert.assertTrue(HexUtil.isHexNumber("0"));
-		Assert.assertTrue(HexUtil.isHexNumber("002c"));
+		assertTrue(HexUtil.isHexNumber("0"));
+		assertTrue(HexUtil.isHexNumber("002c"));
 
 		String a = "0x3544534F444";
-		Assert.assertTrue(HexUtil.isHexNumber(a));
+		assertTrue(HexUtil.isHexNumber(a));
 
 		// https://gitee.com/dromara/hutool/issues/I62H7K
 		a = "0x0000000000000001158e460913d00000";
-		Assert.assertTrue(HexUtil.isHexNumber(a));
+		assertTrue(HexUtil.isHexNumber(a));
 
 		// 错误的
 		a = "0x0000001000T00001158e460913d00000";
-		Assert.assertFalse(HexUtil.isHexNumber(a));
+		assertFalse(HexUtil.isHexNumber(a));
 
 		// 错误的,https://github.com/dromara/hutool/issues/2857
 		a = "-1";
-		Assert.assertFalse(HexUtil.isHexNumber(a));
+		assertFalse(HexUtil.isHexNumber(a));
 	}
 
 	@Test
 	public void decodeTest(){
 		final String str = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d";
-		Assert.assertArrayEquals(HexUtil.decodeHex(str),
+		assertArrayEquals(HexUtil.decodeHex(str),
 				HexUtil.decodeHex(str.toUpperCase()));
 	}
 
@@ -69,20 +69,20 @@ public class HexUtilTest {
 	public void formatHexTest(){
 		final String hex = "e8c670380cb220095268f40221fc748fa6ac39d6e930e63c30da68bad97f885d";
 		final String formatHex = HexUtil.format(hex);
-		Assert.assertEquals("e8 c6 70 38 0c b2 20 09 52 68 f4 02 21 fc 74 8f a6 ac 39 d6 e9 30 e6 3c 30 da 68 ba d9 7f 88 5d", formatHex);
+		assertEquals("e8 c6 70 38 0c b2 20 09 52 68 f4 02 21 fc 74 8f a6 ac 39 d6 e9 30 e6 3c 30 da 68 ba d9 7f 88 5d", formatHex);
 	}
 
 	@Test
 	public void formatHexTest2(){
 		final String hex = "e8c670380cb220095268f40221fc748fa6";
 		final String formatHex = HexUtil.format(hex, "0x");
-		Assert.assertEquals("0xe8 0xc6 0x70 0x38 0x0c 0xb2 0x20 0x09 0x52 0x68 0xf4 0x02 0x21 0xfc 0x74 0x8f 0xa6", formatHex);
+		assertEquals("0xe8 0xc6 0x70 0x38 0x0c 0xb2 0x20 0x09 0x52 0x68 0xf4 0x02 0x21 0xfc 0x74 0x8f 0xa6", formatHex);
 	}
 
 	@Test
 	public void decodeHexTest(){
 		final String s = HexUtil.encodeHexStr("6");
 		final String s1 = HexUtil.decodeHexStr(s);
-		Assert.assertEquals("6", s1);
+		assertEquals("6", s1);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java
index f0dd9c5ab..6667caad9 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IdUtilTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.exceptions.UtilException;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Set;
 import java.util.UUID;
@@ -26,26 +26,26 @@ public class IdUtilTest {
 	@Test
 	public void randomUUIDTest() {
 		String simpleUUID = IdUtil.simpleUUID();
-		Assert.assertEquals(32, simpleUUID.length());
+		assertEquals(32, simpleUUID.length());
 
 		String randomUUID = IdUtil.randomUUID();
-		Assert.assertEquals(36, randomUUID.length());
+		assertEquals(36, randomUUID.length());
 	}
 
 	@Test
 	public void fastUUIDTest() {
 		String simpleUUID = IdUtil.fastSimpleUUID();
-		Assert.assertEquals(32, simpleUUID.length());
+		assertEquals(32, simpleUUID.length());
 
 		String randomUUID = IdUtil.fastUUID();
-		Assert.assertEquals(36, randomUUID.length());
+		assertEquals(36, randomUUID.length());
 	}
 
 	/**
 	 * UUID的性能测试
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void benchTest() {
 		TimeInterval timer = DateUtil.timer();
 		for (int i = 0; i < 1000000; i++) {
@@ -64,18 +64,18 @@ public class IdUtilTest {
 	@Test
 	public void objectIdTest() {
 		String id = IdUtil.objectId();
-		Assert.assertEquals(24, id.length());
+		assertEquals(24, id.length());
 	}
 
 	@Test
 	public void getSnowflakeTest() {
 		Snowflake snowflake = IdUtil.getSnowflake(1, 1);
 		long id = snowflake.nextId();
-		Assert.assertTrue(id > 0);
+		assertTrue(id > 0);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void snowflakeBenchTest() {
 		final Set<Long> set = new ConcurrentHashSet<>();
 		final Snowflake snowflake = IdUtil.getSnowflake(1, 1);
@@ -102,11 +102,11 @@ public class IdUtilTest {
 		} catch (InterruptedException e) {
 			throw new UtilException(e);
 		}
-		Assert.assertEquals(threadCount * idCountPerThread, set.size());
+		assertEquals(threadCount * idCountPerThread, set.size());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void snowflakeBenchTest2() {
 		final Set<Long> set = new ConcurrentHashSet<>();
 
@@ -132,13 +132,13 @@ public class IdUtilTest {
 		} catch (InterruptedException e) {
 			throw new UtilException(e);
 		}
-		Assert.assertEquals(threadCount * idCountPerThread, set.size());
+		assertEquals(threadCount * idCountPerThread, set.size());
 	}
 
 	@Test
 	public void getDataCenterIdTest(){
 		//按照mac地址算法拼接的算法，maxDatacenterId应该是0xffffffffL>>6-1此处暂时按照0x7fffffffffffffffL-1，防止最后取模溢出
 		final long dataCenterId = IdUtil.getDataCenterId(Long.MAX_VALUE);
-		Assert.assertTrue(dataCenterId >= 0);
+		assertTrue(dataCenterId >= 0);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
index e21151cb8..ce84ea17d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IdcardUtilTest.java
@@ -2,11 +2,9 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * 身份证单元测试
@@ -26,24 +24,24 @@ public class IdcardUtilTest {
 	@Test
 	public void isValidCardTest() {
 		boolean valid = IdcardUtil.isValidCard(ID_18);
-		Assert.assertTrue(valid);
+		assertTrue(valid);
 
 		boolean valid15 = IdcardUtil.isValidCard(ID_15);
-		Assert.assertTrue(valid15);
+		assertTrue(valid15);
 
-		Assert.assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18));
+		assertTrue(IdcardUtil.isValidCard(FOREIGN_ID_18));
 
 		// 无效
 		String idCard = "360198910283844";
-		Assert.assertFalse(IdcardUtil.isValidCard(idCard));
+		assertFalse(IdcardUtil.isValidCard(idCard));
 
 		// 生日无效
 		idCard = "201511221897205960";
-		Assert.assertFalse(IdcardUtil.isValidCard(idCard));
+		assertFalse(IdcardUtil.isValidCard(idCard));
 
 		// 生日无效
 		idCard = "815727834224151";
-		Assert.assertFalse(IdcardUtil.isValidCard(idCard));
+		assertFalse(IdcardUtil.isValidCard(idCard));
 	}
 
 	@Test
@@ -123,67 +121,67 @@ public class IdcardUtilTest {
 	@Test
 	public void isValidCard18Test(){
 		boolean isValidCard18 = IdcardUtil.isValidCard18("3301022011022000D6");
-		Assert.assertFalse(isValidCard18);
+		assertFalse(isValidCard18);
 
 		// 不忽略大小写情况下，X严格校验必须大写
 		isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x", false);
-		Assert.assertFalse(isValidCard18);
+		assertFalse(isValidCard18);
 		isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X", false);
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 
 		// 非严格校验下大小写皆可
 		isValidCard18 = IdcardUtil.isValidCard18("33010219200403064x");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 		isValidCard18 = IdcardUtil.isValidCard18("33010219200403064X");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 
 		// 香港人在大陆身份证
 		isValidCard18 = IdcardUtil.isValidCard18("81000019980902013X");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 
 		// 澳门人在大陆身份证
 		isValidCard18 = IdcardUtil.isValidCard18("820000200009100032");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 
 		// 台湾人在大陆身份证
 		isValidCard18 = IdcardUtil.isValidCard18("830000200209060065");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 
 		// 新版外国人永久居留身份证
 		isValidCard18 = IdcardUtil.isValidCard18("932682198501010017");
-		Assert.assertTrue(isValidCard18);
+		assertTrue(isValidCard18);
 	}
 
 	@Test
 	public void isValidHKCardIdTest(){
 		String hkCard="P174468(6)";
 		boolean flag=IdcardUtil.isValidHKCard(hkCard);
-		Assert.assertTrue(flag);
+		assertTrue(flag);
 	}
 
 	@Test
 	public void isValidTWCardIdTest() {
 		String twCard = "B221690311";
 		boolean flag = IdcardUtil.isValidTWCard(twCard);
-		Assert.assertTrue(flag);
+		assertTrue(flag);
 		String errTwCard1 = "M517086311";
 		flag = IdcardUtil.isValidTWCard(errTwCard1);
-		Assert.assertFalse(flag);
+		assertFalse(flag);
 		String errTwCard2 = "B2216903112";
 		flag = IdcardUtil.isValidTWCard(errTwCard2);
-		Assert.assertFalse(flag);
+		assertFalse(flag);
 	}
 
 	@Test
 	public void issueI88YKMTest() {
-		Assert.assertTrue(IdcardUtil.isValidCard("111111111111111"));
+		assertTrue(IdcardUtil.isValidCard("111111111111111"));
 	}
 
 	@Test
 	public void issueIAFOLITest() {
 		String idcard = "H01487002";
-		Assert.assertFalse(IdcardUtil.isValidHKCard(idcard));
-		Assert.assertNull(IdcardUtil.isValidCard10(idcard));
-		Assert.assertFalse(IdcardUtil.isValidCard(idcard));
+		assertFalse(IdcardUtil.isValidHKCard(idcard));
+		assertNull(IdcardUtil.isValidCard10(idcard));
+		assertFalse(IdcardUtil.isValidCard(idcard));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/Issue3136Test.java b/hutool-core/src/test/java/cn/hutool/core/util/Issue3136Test.java
index e3adac333..30d7169cf 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/Issue3136Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/Issue3136Test.java
@@ -13,8 +13,8 @@
 package cn.hutool.core.util;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,9 +32,9 @@ public class Issue3136Test {
 		final String xmlStr = "<?xml version=\"1.0\" encoding=\"gbk\" ?><response><code>02</code><message></message></response>";
 		final SmsRes smsRes = XmlUtil.xmlToBean(XmlUtil.parseXml(xmlStr).getDocumentElement(), SmsRes.class);
 
-		Assert.assertEquals("02", smsRes.getCode());
-		Assert.assertNotNull(smsRes.getMessage());
-		Assert.assertEquals(new Message(), smsRes.getMessage());
+		assertEquals("02", smsRes.getCode());
+		assertNotNull(smsRes.getMessage());
+		assertEquals(new Message(), smsRes.getMessage());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/Issue3423Test.java b/hutool-core/src/test/java/cn/hutool/core/util/Issue3423Test.java
index e9322598f..64d24247b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/Issue3423Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/Issue3423Test.java
@@ -1,22 +1,26 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class Issue3423Test {
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void toBigDecimalOfNaNTest() {
-		NumberUtil.toBigDecimal("NaN");
+		assertThrows(IllegalArgumentException.class, () -> {
+			NumberUtil.toBigDecimal("NaN");
+		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toBigDecimalOfNaNTest2() throws ParseException {
 		final NumberFormat format = NumberFormat.getInstance();
 		((DecimalFormat) format).setParseBigDecimal(true);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/Issue3516Test.java b/hutool-core/src/test/java/cn/hutool/core/util/Issue3516Test.java
index b8bf8fc1c..4097c1a2d 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/Issue3516Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/Issue3516Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Type;
 import java.util.function.Function;
@@ -11,7 +11,7 @@ public class Issue3516Test {
 	@Test
 	public void getTypeArgumentTest() {
 		final Type typeArgument = TypeUtil.getTypeArgument(Demo.class, 0);
-		Assert.assertEquals(B.class, typeArgument);
+		assertEquals(B.class, typeArgument);
 	}
 
 	static class Demo implements A2B{
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/Issue3660Test.java b/hutool-core/src/test/java/cn/hutool/core/util/Issue3660Test.java
index ce788b56d..6d80921c8 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/Issue3660Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/Issue3660Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -9,9 +9,9 @@ public class Issue3660Test {
 	@Test
 	public void splitTest() {
 		List<String> split = StrUtil.split("", ',');
-		Assert.assertEquals(1, split.size());
+		assertEquals(1, split.size());
 
 		split = StrUtil.splitTrim("", ',');
-		Assert.assertEquals(0, split.size());
+		assertEquals(0, split.size());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IssueI7CRIWTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IssueI7CRIWTest.java
index c94e943c8..a145b7cee 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/IssueI7CRIWTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IssueI7CRIWTest.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Type;
 
@@ -22,11 +22,11 @@ public class IssueI7CRIWTest {
 	public void getTypeArgumentsTest() {
 		// 无法从继承获取泛型，则从接口获取
 		Type type = TypeUtil.getTypeArgument(C.class);
-		Assert.assertEquals(type, String.class);
+		assertEquals(type, String.class);
 
 		// 继承和第一个接口都非泛型接口，则从找到的第一个泛型接口获取
 		type = TypeUtil.getTypeArgument(D.class);
-		Assert.assertEquals(type, String.class);
+		assertEquals(type, String.class);
 	}
 
 	static class A{
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9IDAGTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9IDAGTest.java
index d9d282102..6e6f94e7f 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9IDAGTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9IDAGTest.java
@@ -2,15 +2,15 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
 
 public class IssueI9IDAGTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void loopFilesTest() {
 		final List<File> files = FileUtil.loopFiles("d:/m2_repo");
 		files.forEach(Console::log);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9K494Test.java b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9K494Test.java
index 6381366ba..69577b714 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9K494Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9K494Test.java
@@ -2,22 +2,22 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileInputStream;
 import java.nio.charset.StandardCharsets;
 
 public class IssueI9K494Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipTest() {
 		FileInputStream inputStream = IoUtil.toStream(FileUtil.file("d:/test/unzip5616889482468994725.zip"));
 		ZipUtil.unzip(inputStream, FileUtil.file("d:/test/"), StandardCharsets.UTF_8);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipTest2() {
 		FileInputStream inputStream = IoUtil.toStream(FileUtil.file("d:/test/test.zip"));
 		ZipUtil.unzip(inputStream, FileUtil.file("d:/test/"), StandardCharsets.UTF_8);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9NSZ4Test.java b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9NSZ4Test.java
index 59b669831..bcfb4fc3b 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9NSZ4Test.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9NSZ4Test.java
@@ -3,8 +3,8 @@ package cn.hutool.core.util;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI9NSZ4Test {
 
@@ -12,13 +12,13 @@ public class IssueI9NSZ4Test {
 	public void getByTest() {
 		// AnimalKindInZoo所有枚举结果的getMappedValue结果值中都无AnimalKind.DOG，返回null
 		final AnimalKindInZoo by = EnumUtil.getBy(AnimalKindInZoo::getMappedValue, AnimalKind.DOG);
-		Assert.assertNull(by);
+		assertNull(by);
 	}
 
 	@Test
 	public void getByTest2() {
 		final AnimalKindInZoo by = EnumUtil.getBy(AnimalKindInZoo::getMappedValue, AnimalKind.BIRD);
-		Assert.assertEquals(AnimalKindInZoo.BIRD, by);
+		assertEquals(AnimalKindInZoo.BIRD, by);
 	}
 
 	/**
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9UK5VTest.java b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9UK5VTest.java
index 95d64fd70..4fa48fd19 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/IssueI9UK5VTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/IssueI9UK5VTest.java
@@ -1,10 +1,10 @@
 package cn.hutool.core.util;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class IssueI9UK5VTest {
 	@Test
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/JAXBUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/JAXBUtilTest.java
index dea40e1df..2e7497e10 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/JAXBUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/JAXBUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.xml.bind.annotation.*;
 
@@ -34,18 +34,18 @@ public class JAXBUtilTest {
 		roomVo.setRoomNo("101");
 		schoolVo.setRoom(roomVo);
 
-		Assert.assertEquals(xmlStr, JAXBUtil.beanToXml(schoolVo));
+		assertEquals(xmlStr, JAXBUtil.beanToXml(schoolVo));
 	}
 
 	@Test
 	public void xmlToBeanTest() {
 		final SchoolVo schoolVo = JAXBUtil.xmlToBean(xmlStr, SchoolVo.class);
-		Assert.assertNotNull(schoolVo);
-		Assert.assertEquals("西安市第一中学", schoolVo.getSchoolName());
-		Assert.assertEquals("西安市雁塔区长安堡一号", schoolVo.getSchoolAddress());
+		assertNotNull(schoolVo);
+		assertEquals("西安市第一中学", schoolVo.getSchoolName());
+		assertEquals("西安市雁塔区长安堡一号", schoolVo.getSchoolAddress());
 
-		Assert.assertEquals("101教室", schoolVo.getRoom().getRoomName());
-		Assert.assertEquals("101", schoolVo.getRoom().getRoomNo());
+		assertEquals("101教室", schoolVo.getRoom().getRoomName());
+		assertEquals("101", schoolVo.getRoom().getRoomNo());
 	}
 
 	@XmlRootElement(name = "school")
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java
index 232492f10..0d8de995d 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/JNDIUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.collection.EnumerationIter;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -12,7 +12,7 @@ import javax.naming.directory.Attributes;
 public class JNDIUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getDnsTest() throws NamingException {
 		final Attributes attributes = JNDIUtil.getAttributes("dns:paypal.com", "TXT");
 		for (Attribute attribute: new EnumerationIter<>(attributes.getAll())){
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
index a2f64945c..f7315e5c3 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ModifierUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 
@@ -10,8 +10,8 @@ public class ModifierUtilTest {
 	@Test
 	public void hasModifierTest() throws NoSuchMethodException {
 		Method method = ModifierUtilTest.class.getDeclaredMethod("ddd");
-		Assert.assertTrue(ModifierUtil.hasModifier(method, ModifierUtil.ModifierType.PRIVATE));
-		Assert.assertTrue(ModifierUtil.hasModifier(method,
+		assertTrue(ModifierUtil.hasModifier(method, ModifierUtil.ModifierType.PRIVATE));
+		assertTrue(ModifierUtil.hasModifier(method,
 				ModifierUtil.ModifierType.PRIVATE,
 				ModifierUtil.ModifierType.STATIC)
 		);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java
index bfdc9c04c..848799bf7 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java
@@ -2,20 +2,15 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.util.Set;
 
-import static cn.hutool.core.util.NumberUtil.parseDouble;
-import static cn.hutool.core.util.NumberUtil.parseFloat;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * {@link NumberUtil} 单元测试类
@@ -69,35 +64,35 @@ public class NumberUtilTest {
 
 	@Test
 	public void isIntegerTest() {
-		Assert.assertTrue(NumberUtil.isInteger("-12"));
-		Assert.assertTrue(NumberUtil.isInteger("256"));
-		Assert.assertTrue(NumberUtil.isInteger("0256"));
-		Assert.assertTrue(NumberUtil.isInteger("0"));
-		Assert.assertFalse(NumberUtil.isInteger("23.4"));
-		Assert.assertFalse(NumberUtil.isInteger(null));
-		Assert.assertFalse(NumberUtil.isInteger(""));
-		Assert.assertFalse(NumberUtil.isInteger(" "));
+		assertTrue(NumberUtil.isInteger("-12"));
+		assertTrue(NumberUtil.isInteger("256"));
+		assertTrue(NumberUtil.isInteger("0256"));
+		assertTrue(NumberUtil.isInteger("0"));
+		assertFalse(NumberUtil.isInteger("23.4"));
+		assertFalse(NumberUtil.isInteger(null));
+		assertFalse(NumberUtil.isInteger(""));
+		assertFalse(NumberUtil.isInteger(" "));
 	}
 
 	@Test
 	public void isLongTest() {
-		Assert.assertTrue(NumberUtil.isLong("-12"));
-		Assert.assertTrue(NumberUtil.isLong("256"));
-		Assert.assertTrue(NumberUtil.isLong("0256"));
-		Assert.assertTrue(NumberUtil.isLong("0"));
-		Assert.assertFalse(NumberUtil.isLong("23.4"));
-		Assert.assertFalse(NumberUtil.isLong(null));
-		Assert.assertFalse(NumberUtil.isLong(""));
-		Assert.assertFalse(NumberUtil.isLong(" "));
+		assertTrue(NumberUtil.isLong("-12"));
+		assertTrue(NumberUtil.isLong("256"));
+		assertTrue(NumberUtil.isLong("0256"));
+		assertTrue(NumberUtil.isLong("0"));
+		assertFalse(NumberUtil.isLong("23.4"));
+		assertFalse(NumberUtil.isLong(null));
+		assertFalse(NumberUtil.isLong(""));
+		assertFalse(NumberUtil.isLong(" "));
 	}
 
 	@Test
 	public void isNumberTest() {
-		Assert.assertTrue(NumberUtil.isNumber("28.55"));
-		Assert.assertTrue(NumberUtil.isNumber("0"));
-		Assert.assertTrue(NumberUtil.isNumber("+100.10"));
-		Assert.assertTrue(NumberUtil.isNumber("-22.022"));
-		Assert.assertTrue(NumberUtil.isNumber("0X22"));
+		assertTrue(NumberUtil.isNumber("28.55"));
+		assertTrue(NumberUtil.isNumber("0"));
+		assertTrue(NumberUtil.isNumber("+100.10"));
+		assertTrue(NumberUtil.isNumber("-22.022"));
+		assertTrue(NumberUtil.isNumber("0X22"));
 	}
 
 	@Test
@@ -196,21 +191,25 @@ public class NumberUtilTest {
 		assertEquals("299,792,458", format);
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void decimalFormatNaNTest(){
-		final Double a = 0D;
-		final Double b = 0D;
+	@Test
+	public void decimalFormatNaNTest() {
+		assertThrows(IllegalArgumentException.class, ()->{
+			final Double a = 0D;
+			final Double b = 0D;
 
-		final Double c = a / b;
-		Console.log(NumberUtil.decimalFormat("#%", c));
+			final Double c = a / b;
+			Console.log(NumberUtil.decimalFormat("#%", c));
+		});
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void decimalFormatNaNTest2(){
-		final Double a = 0D;
-		final Double b = 0D;
+	@Test
+	public void decimalFormatNaNTest2() {
+		assertThrows(IllegalArgumentException.class, ()->{
+			final Double a = 0D;
+			final Double b = 0D;
 
-		Console.log(NumberUtil.decimalFormat("#%", a / b));
+			Console.log(NumberUtil.decimalFormat("#%", a / b));
+		});
 	}
 
 	@Test
@@ -224,7 +223,7 @@ public class NumberUtilTest {
 	@Test
 	public void isValidNumberTest() {
 		boolean validNumber = NumberUtil.isValidNumber(1);
-        Assert.assertTrue(validNumber);
+        assertTrue(validNumber);
 	}
 
 	@Test
@@ -241,7 +240,7 @@ public class NumberUtilTest {
 
 	@Test
 	public void equalsTest() {
-		Assert.assertTrue(NumberUtil.equals(new BigDecimal("0.00"), BigDecimal.ZERO));
+		assertTrue(NumberUtil.equals(new BigDecimal("0.00"), BigDecimal.ZERO));
 	}
 
 	@Test
@@ -311,10 +310,12 @@ public class NumberUtilTest {
 		assertEquals(1482, v1);
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void parseIntTest3() {
-		final int v1 = NumberUtil.parseInt("d");
-		assertEquals(0, v1);
+		assertThrows(NumberFormatException.class, ()->{
+			final int v1 = NumberUtil.parseInt("d");
+			assertEquals(0, v1);
+		});
 	}
 
 	@Test
@@ -322,24 +323,26 @@ public class NumberUtilTest {
 
 		// -------------------------- Parse failed -----------------------
 
-		assertThat(NumberUtil.parseInt("abc", null), nullValue());
+		Assertions.assertNull(NumberUtil.parseInt("abc", null));
 
-		assertThat(NumberUtil.parseInt("abc", 456), equalTo(456));
+		assertEquals(456, NumberUtil.parseInt("abc", 456));
 
 		// -------------------------- Parse success -----------------------
 
-		assertThat(NumberUtil.parseInt("123.abc", 789), equalTo(123));
+		assertEquals(123, NumberUtil.parseInt("123.abc", 789));
 
-		assertThat(NumberUtil.parseInt("123.3", null), equalTo(123));
+		assertEquals(123, NumberUtil.parseInt("123.3", null));
 
 	}
 
-	@Test(expected = NumberFormatException.class)
+	@Test
 	public void parseNumberTest4(){
-		// issue#I5M55F
-		// 科学计数法忽略支持，科学计数法一般用于表示非常小和非常大的数字，这类数字转换为int后精度丢失，没有意义。
-		final String numberStr = "429900013E20220812163344551";
-		NumberUtil.parseInt(numberStr);
+		assertThrows(NumberFormatException.class, () -> {
+			// issue#I5M55F
+			// 科学计数法忽略支持，科学计数法一般用于表示非常小和非常大的数字，这类数字转换为int后精度丢失，没有意义。
+			final String numberStr = "429900013E20220812163344551";
+			NumberUtil.parseInt(numberStr);
+		});
 	}
 
 	@Test
@@ -358,8 +361,8 @@ public class NumberUtilTest {
 		// issue#I5M55F
 		final String numberStr = "429900013E20220812163344551";
 		final Number number = NumberUtil.parseNumber(numberStr);
-		Assert.assertNotNull(number);
-		Assert.assertTrue(number instanceof BigDecimal);
+		assertNotNull(number);
+		assertInstanceOf(BigDecimal.class, number);
 	}
 
 	@Test
@@ -367,21 +370,21 @@ public class NumberUtilTest {
 
 		// -------------------------- Parse failed -----------------------
 
-		assertThat(NumberUtil.parseNumber("abc", null), nullValue());
+		assertNull(NumberUtil.parseNumber("abc", (Number) null));
 
-		assertThat(NumberUtil.parseNumber(StrUtil.EMPTY, null), nullValue());
+		assertNull(NumberUtil.parseNumber(StrUtil.EMPTY, (Number) null));
 
-		assertThat(NumberUtil.parseNumber(StrUtil.repeat(StrUtil.SPACE, 10), null), nullValue());
+		assertNull(NumberUtil.parseNumber(StrUtil.repeat(StrUtil.SPACE, 10), (Number) null));
 
-		assertThat(NumberUtil.parseNumber("abc", 456).intValue(), equalTo(456));
+		assertEquals(456, NumberUtil.parseNumber("abc", 456).intValue());
 
 		// -------------------------- Parse success -----------------------
 
-		assertThat(NumberUtil.parseNumber("123.abc", 789).intValue(), equalTo(123));
+		assertEquals(123, NumberUtil.parseNumber("123.abc", 789).intValue());
 
-		assertThat(NumberUtil.parseNumber("123.3", null).doubleValue(), equalTo(123.3D));
+		assertEquals(123.3D, NumberUtil.parseNumber("123.3", (Number) null).doubleValue());
 
-		assertThat(NumberUtil.parseNumber("0.123.3", null).doubleValue(), equalTo(0.123D));
+		assertEquals(0.123D, NumberUtil.parseNumber("0.123.3", (Number) null).doubleValue());
 
 	}
 
@@ -429,61 +432,56 @@ public class NumberUtilTest {
 		// -------------------------- Parse failed -----------------------
 
 		final Long v1 = NumberUtil.parseLong(null, null);
-		assertThat(v1, nullValue());
+		assertNull(v1);
 
 		final Long v2 = NumberUtil.parseLong(StrUtil.EMPTY, null);
-		assertThat(v2, nullValue());
+		assertNull(v2);
 
 		final Long v3 = NumberUtil.parseLong("L3221", 1233L);
-		assertThat(v3, equalTo(1233L));
+		assertEquals(1233L, v3);
 
 		// -------------------------- Parse success -----------------------
 
 		final Long v4 = NumberUtil.parseLong("1233L", null);
-		assertThat(v4, equalTo(1233L));
+		assertEquals(1233L, v4);
 
 	}
 
 	@Test
-	public void parseFloatTest() throws Exception {
+	public void parseFloatTest() {
 
 		// -------------------------- Parse failed -----------------------
 
-		assertThat(parseFloat("abc", null), nullValue());
+		assertNull(NumberUtil.parseFloat("abc", null));
 
-		assertThat(parseFloat("a123.33", null), nullValue());
+		assertNull(NumberUtil.parseFloat("a123.33", null));
 
-		assertThat(parseFloat("..123", null), nullValue());
+		assertNull(NumberUtil.parseFloat("..123", null));
 
-		assertThat(parseFloat(StrUtil.EMPTY, 1233F), equalTo(1233F));
+		assertEquals(1233F, NumberUtil.parseFloat(StrUtil.EMPTY, 1233F));
 
 		// -------------------------- Parse success -----------------------
 
-		assertThat(parseFloat("123.33a", null), equalTo(123.33F));
+		assertEquals(123.33F, NumberUtil.parseFloat("123.33a", null));
 
-		assertThat(parseFloat(".123", null), equalTo(0.123F));
+		assertEquals(0.123F, NumberUtil.parseFloat(".123", null));
 
 	}
 
 	@Test
-	public void parseDoubleTest() throws Exception {
+	public void parseDoubleTest() {
 
 		// -------------------------- Parse failed -----------------------
 
-		assertThat(parseDouble("abc", null), nullValue());
-
-		assertThat(parseDouble("a123.33", null), nullValue());
-
-		assertThat(parseDouble("..123", null), nullValue());
-
-		assertThat(parseDouble(StrUtil.EMPTY, 1233D), equalTo(1233D));
+		assertNull(NumberUtil.parseDouble("abc", null));
+		assertNull(NumberUtil.parseDouble("a123.33", null));
+		assertNull(NumberUtil.parseDouble("..123", null));
+		assertEquals(1233D, NumberUtil.parseDouble(StrUtil.EMPTY, 1233D));
 
 		// -------------------------- Parse success -----------------------
 
-		assertThat(parseDouble("123.33a", null), equalTo(123.33D));
-
-		assertThat(parseDouble(".123", null), equalTo(0.123D));
-
+		assertEquals(123.33D, NumberUtil.parseDouble("123.33a", null));
+		assertEquals(0.123D, NumberUtil.parseDouble(".123", null));
 	}
 
 	@Test
@@ -531,11 +529,11 @@ public class NumberUtilTest {
 
 	@Test
 	public void isPowerOfTwoTest() {
-		Assert.assertFalse(NumberUtil.isPowerOfTwo(-1));
-		Assert.assertTrue(NumberUtil.isPowerOfTwo(16));
-		Assert.assertTrue(NumberUtil.isPowerOfTwo(65536));
-		Assert.assertTrue(NumberUtil.isPowerOfTwo(1));
-		Assert.assertFalse(NumberUtil.isPowerOfTwo(17));
+		assertFalse(NumberUtil.isPowerOfTwo(-1));
+		assertTrue(NumberUtil.isPowerOfTwo(16));
+		assertTrue(NumberUtil.isPowerOfTwo(65536));
+		assertTrue(NumberUtil.isPowerOfTwo(1));
+		assertFalse(NumberUtil.isPowerOfTwo(17));
 	}
 
 	@Test
@@ -579,20 +577,20 @@ public class NumberUtilTest {
 	@Test
 	public void isOddOrEvenTest(){
 		final int[] a = { 0, 32, -32, 123, -123 };
-		Assert.assertFalse(NumberUtil.isOdd(a[0]));
-		Assert.assertTrue(NumberUtil.isEven(a[0]));
+		assertFalse(NumberUtil.isOdd(a[0]));
+		assertTrue(NumberUtil.isEven(a[0]));
 
-		Assert.assertFalse(NumberUtil.isOdd(a[1]));
-		Assert.assertTrue(NumberUtil.isEven(a[1]));
+		assertFalse(NumberUtil.isOdd(a[1]));
+		assertTrue(NumberUtil.isEven(a[1]));
 
-		Assert.assertFalse(NumberUtil.isOdd(a[2]));
-		Assert.assertTrue(NumberUtil.isEven(a[2]));
+		assertFalse(NumberUtil.isOdd(a[2]));
+		assertTrue(NumberUtil.isEven(a[2]));
 
-		Assert.assertTrue(NumberUtil.isOdd(a[3]));
-		Assert.assertFalse(NumberUtil.isEven(a[3]));
+		assertTrue(NumberUtil.isOdd(a[3]));
+		assertFalse(NumberUtil.isEven(a[3]));
 
-		Assert.assertTrue(NumberUtil.isOdd(a[4]));
-		Assert.assertFalse(NumberUtil.isEven(a[4]));
+		assertTrue(NumberUtil.isOdd(a[4]));
+		assertFalse(NumberUtil.isEven(a[4]));
 	}
 
 	@Test
@@ -602,18 +600,18 @@ public class NumberUtilTest {
 
 	@Test
 	public void isDoubleTest(){
-		Assert.assertFalse(NumberUtil.isDouble(null));
-		Assert.assertFalse(NumberUtil.isDouble(""));
-		Assert.assertFalse(NumberUtil.isDouble("  "));
+		assertFalse(NumberUtil.isDouble(null));
+		assertFalse(NumberUtil.isDouble(""));
+		assertFalse(NumberUtil.isDouble("  "));
 	}
 
 	@Test
 	public void range(){
-		Assert.assertFalse(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("2"),new BigDecimal("12")));
-		Assert.assertTrue(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("1"),new BigDecimal("2")));
-		Assert.assertTrue(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("0"),new BigDecimal("2")));
-		Assert.assertFalse(NumberUtil.isIn(new BigDecimal("0.23"),new BigDecimal("0.12"),new BigDecimal("0.22")));
-		Assert.assertTrue(NumberUtil.isIn(new BigDecimal("-0.12"),new BigDecimal("-0.3"),new BigDecimal("0")));
+		assertFalse(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("2"),new BigDecimal("12")));
+		assertTrue(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("1"),new BigDecimal("2")));
+		assertTrue(NumberUtil.isIn(new BigDecimal("1"),new BigDecimal("0"),new BigDecimal("2")));
+		assertFalse(NumberUtil.isIn(new BigDecimal("0.23"),new BigDecimal("0.12"),new BigDecimal("0.22")));
+		assertTrue(NumberUtil.isIn(new BigDecimal("-0.12"),new BigDecimal("-0.3"),new BigDecimal("0")));
 	}
 
 	@Test
@@ -665,6 +663,6 @@ public class NumberUtilTest {
 	@Test
 	public void issue3636Test() {
 		final Number number = NumberUtil.parseNumber("12,234,456");
-		Assert.assertEquals(new BigDecimal(12234456), number);
+		assertEquals(new BigDecimal(12234456), number);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
index 9d37da6dd..1fd750e38 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ObjectUtilTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.clone.CloneSupport;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -18,21 +18,21 @@ public class ObjectUtilTest {
 	public void equalsTest() {
 		Object a = null;
 		Object b = null;
-		Assert.assertTrue(ObjectUtil.equals(a, b));
+		assertTrue(ObjectUtil.equals(a, b));
 	}
 
 	@Test
 	public void lengthTest() {
 		int[] array = new int[]{1, 2, 3, 4, 5};
 		int length = ObjectUtil.length(array);
-		Assert.assertEquals(5, length);
+		assertEquals(5, length);
 
 		Map<String, String> map = new HashMap<>();
 		map.put("a", "a1");
 		map.put("b", "b1");
 		map.put("c", "c1");
 		length = ObjectUtil.length(map);
-		Assert.assertEquals(3, length);
+		assertEquals(3, length);
 	}
 
 	@Test
@@ -40,14 +40,14 @@ public class ObjectUtilTest {
 		int[] array = new int[]{1, 2, 3, 4, 5};
 
 		final boolean contains = ObjectUtil.contains(array, 1);
-		Assert.assertTrue(contains);
+		assertTrue(contains);
 	}
 
 	@Test
 	public void cloneTest() {
 		Obj obj = new Obj();
 		Obj obj2 = ObjectUtil.clone(obj);
-		Assert.assertEquals("OK", obj2.doSomeThing());
+		assertEquals("OK", obj2.doSomeThing());
 	}
 
 	static class Obj extends CloneSupport<Obj> {
@@ -60,7 +60,7 @@ public class ObjectUtilTest {
 	public void toStringTest() {
 		ArrayList<String> strings = CollUtil.newArrayList("1", "2");
 		String result = ObjectUtil.toString(strings);
-		Assert.assertEquals("[1, 2]", result);
+		assertEquals("[1, 2]", result);
 	}
 
 	@Test
@@ -69,18 +69,18 @@ public class ObjectUtilTest {
 		final String dateStr = "2020-10-23 15:12:30";
 		Instant result1 = ObjectUtil.defaultIfNull(dateStr,
 				(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
-		Assert.assertNotNull(result1);
+		assertNotNull(result1);
 		Instant result2 = ObjectUtil.defaultIfNull(nullValue,
 				(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
-		Assert.assertNotNull(result2);
+		assertNotNull(result2);
 
 		Obj obj = new Obj();
 		Obj objNull = null;
 		String result3 = ObjectUtil.defaultIfNull(obj, (a) -> obj.doSomeThing(), "fail");
-		Assert.assertNotNull(result3);
+		assertNotNull(result3);
 
 		String result4 = ObjectUtil.defaultIfNull(objNull, Obj::doSomeThing, "fail");
-		Assert.assertNotNull(result4);
+		assertNotNull(result4);
 	}
 
 	@Test
@@ -89,23 +89,23 @@ public class ObjectUtilTest {
 		final String dateStr = "2020-10-23 15:12:30";
 		Instant result1 = ObjectUtil.defaultIfEmpty(emptyValue,
 				(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
-		Assert.assertNotNull(result1);
+		assertNotNull(result1);
 		Instant result2 = ObjectUtil.defaultIfEmpty(dateStr,
 				(source) -> DateUtil.parse(source, DatePattern.NORM_DATETIME_PATTERN).toInstant(), Instant.now());
-		Assert.assertNotNull(result2);
+		assertNotNull(result2);
 	}
 
 	@Test
 	public void isBasicTypeTest() {
 		int a = 1;
 		final boolean basicType = ObjectUtil.isBasicType(a);
-		Assert.assertTrue(basicType);
+		assertTrue(basicType);
 	}
 
 	@SuppressWarnings("ConstantConditions")
 	@Test
 	public void isNotNullTest() {
 		String a = null;
-		Assert.assertFalse(ObjectUtil.isNotNull(a));
+		assertFalse(ObjectUtil.isNotNull(a));
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java
index 10ec440db..b3c91f99e 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/PageUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 分页单元测试
@@ -13,23 +13,23 @@ public class PageUtilTest {
 	@Test
 	public void transToStartEndTest() {
 		final int[] startEnd1 = PageUtil.transToStartEnd(0, 10);
-		Assert.assertEquals(0, startEnd1[0]);
-		Assert.assertEquals(10, startEnd1[1]);
+		assertEquals(0, startEnd1[0]);
+		assertEquals(10, startEnd1[1]);
 
 		final int[] startEnd2 = PageUtil.transToStartEnd(1, 10);
-		Assert.assertEquals(10, startEnd2[0]);
-		Assert.assertEquals(20, startEnd2[1]);
+		assertEquals(10, startEnd2[0]);
+		assertEquals(20, startEnd2[1]);
 	}
 
 	@Test
 	public void totalPage() {
 		final int totalPage = PageUtil.totalPage(20, 3);
-		Assert.assertEquals(7, totalPage);
+		assertEquals(7, totalPage);
 	}
 
 	@Test
 	public void rainbowTest() {
 		final int[] rainbow = PageUtil.rainbow(5, 20, 6);
-		Assert.assertArrayEquals(new int[]{3, 4, 5, 6, 7, 8}, rainbow);
+		assertArrayEquals(new int[]{3, 4, 5, 6, 7, 8}, rainbow);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java
index fde5a3ad3..9b0bd2d28 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/PhoneUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 
@@ -19,15 +19,15 @@ public class PhoneUtilTest {
 		final String errMobile = "136123456781";
 		final String errTel = "010-889931081";
 
-		Assert.assertTrue(PhoneUtil.isMobile(mobile));
-		Assert.assertTrue(PhoneUtil.isTel(tel));
-		Assert.assertTrue(PhoneUtil.isPhone(mobile));
-		Assert.assertTrue(PhoneUtil.isPhone(tel));
+		assertTrue(PhoneUtil.isMobile(mobile));
+		assertTrue(PhoneUtil.isTel(tel));
+		assertTrue(PhoneUtil.isPhone(mobile));
+		assertTrue(PhoneUtil.isPhone(tel));
 
-		Assert.assertFalse(PhoneUtil.isMobile(errMobile));
-		Assert.assertFalse(PhoneUtil.isTel(errTel));
-		Assert.assertFalse(PhoneUtil.isPhone(errMobile));
-		Assert.assertFalse(PhoneUtil.isPhone(errTel));
+		assertFalse(PhoneUtil.isMobile(errMobile));
+		assertFalse(PhoneUtil.isTel(errTel));
+		assertFalse(PhoneUtil.isPhone(errMobile));
+		assertFalse(PhoneUtil.isPhone(errTel));
 	}
 
 	@Test
@@ -42,10 +42,10 @@ public class PhoneUtilTest {
 		errTels.add("0755-7654.321");
 		errTels.add("13619887123");
 		for (final String s : tels) {
-			Assert.assertTrue(PhoneUtil.isTel(s));
+			assertTrue(PhoneUtil.isTel(s));
 		}
 		for (final String s : errTels) {
-			Assert.assertFalse(PhoneUtil.isTel(s));
+			assertFalse(PhoneUtil.isTel(s));
 		}
 	}
 
@@ -53,17 +53,17 @@ public class PhoneUtilTest {
 	public void testHide() {
 		final String mobile = "13612345678";
 
-		Assert.assertEquals("*******5678", PhoneUtil.hideBefore(mobile));
-		Assert.assertEquals("136****5678", PhoneUtil.hideBetween(mobile));
-		Assert.assertEquals("1361234****", PhoneUtil.hideAfter(mobile));
+		assertEquals("*******5678", PhoneUtil.hideBefore(mobile));
+		assertEquals("136****5678", PhoneUtil.hideBetween(mobile));
+		assertEquals("1361234****", PhoneUtil.hideAfter(mobile));
 	}
 
 	@Test
 	public void testSubString() {
 		final String mobile = "13612345678";
-		Assert.assertEquals("136", PhoneUtil.subBefore(mobile));
-		Assert.assertEquals("1234", PhoneUtil.subBetween(mobile));
-		Assert.assertEquals("5678", PhoneUtil.subAfter(mobile));
+		assertEquals("136", PhoneUtil.subBefore(mobile));
+		assertEquals("1234", PhoneUtil.subBetween(mobile));
+		assertEquals("5678", PhoneUtil.subAfter(mobile));
 	}
 
 	@Test
@@ -81,28 +81,28 @@ public class PhoneUtilTest {
 		errTels.add("0755-7654.321");
 		errTels.add("13619887123");
 		for (final String s : tels) {
-			Assert.assertTrue(PhoneUtil.isTel(s));
+			assertTrue(PhoneUtil.isTel(s));
 		}
 		for (final String s : errTels) {
-			Assert.assertFalse(PhoneUtil.isTel(s));
+			assertFalse(PhoneUtil.isTel(s));
 		}
-		Assert.assertEquals("010", PhoneUtil.subTelBefore("010-12345678"));
-		Assert.assertEquals("010", PhoneUtil.subTelBefore("01012345678"));
-		Assert.assertEquals("12345678", PhoneUtil.subTelAfter("010-12345678"));
-		Assert.assertEquals("12345678", PhoneUtil.subTelAfter("01012345678"));
+		assertEquals("010", PhoneUtil.subTelBefore("010-12345678"));
+		assertEquals("010", PhoneUtil.subTelBefore("01012345678"));
+		assertEquals("12345678", PhoneUtil.subTelAfter("010-12345678"));
+		assertEquals("12345678", PhoneUtil.subTelAfter("01012345678"));
 
-		Assert.assertEquals("0755", PhoneUtil.subTelBefore("0755-7654321"));
-		Assert.assertEquals("0755", PhoneUtil.subTelBefore("07557654321"));
-		Assert.assertEquals("7654321", PhoneUtil.subTelAfter("0755-7654321"));
-		Assert.assertEquals("7654321", PhoneUtil.subTelAfter("07557654321"));
+		assertEquals("0755", PhoneUtil.subTelBefore("0755-7654321"));
+		assertEquals("0755", PhoneUtil.subTelBefore("07557654321"));
+		assertEquals("7654321", PhoneUtil.subTelAfter("0755-7654321"));
+		assertEquals("7654321", PhoneUtil.subTelAfter("07557654321"));
 	}
 
 	@Test
 	public void isTel400800Test() {
 		boolean tel400800 = PhoneUtil.isTel400800("400-860-8608");//800-830-3811
-		Assert.assertTrue(tel400800);
+		assertTrue(tel400800);
 
 		tel400800 = PhoneUtil.isTel400800("400-8608608");//800-830-3811
-		Assert.assertTrue(tel400800);
+		assertTrue(tel400800);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java
index e61e5bcbf..fceea3b19 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/RandomUtilTest.java
@@ -2,9 +2,9 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.RoundingMode;
 import java.util.List;
@@ -16,23 +16,23 @@ public class RandomUtilTest {
 	@Test
 	public void randomEleSetTest(){
 		Set<Integer> set = RandomUtil.randomEleSet(CollUtil.newArrayList(1, 2, 3, 4, 5, 6), 2);
-		Assert.assertEquals(set.size(), 2);
+		assertEquals(set.size(), 2);
 	}
 
 	@Test
 	public void randomElesTest(){
 		List<Integer> result = RandomUtil.randomEles(CollUtil.newArrayList(1, 2, 3, 4, 5, 6), 2);
-		Assert.assertEquals(result.size(), 2);
+		assertEquals(result.size(), 2);
 	}
 
 	@Test
 	public void randomDoubleTest() {
 		double randomDouble = RandomUtil.randomDouble(0, 1, 0, RoundingMode.HALF_UP);
-		Assert.assertTrue(randomDouble <= 1);
+		assertTrue(randomDouble <= 1);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void randomBooleanTest() {
 		Console.log(RandomUtil.randomBoolean());
 	}
@@ -40,35 +40,35 @@ public class RandomUtilTest {
 	@Test
 	public void randomNumberTest() {
 		final char c = RandomUtil.randomNumber();
-		Assert.assertTrue(c <= '9');
+		assertTrue(c <= '9');
 	}
 
 	@Test
 	public void randomIntTest() {
 		final int c = RandomUtil.randomInt(10, 100);
-		Assert.assertTrue(c >= 10 && c < 100);
+		assertTrue(c >= 10 && c < 100);
 	}
 
 	@Test
 	public void randomBytesTest() {
 		final byte[] c = RandomUtil.randomBytes(10);
-		Assert.assertNotNull(c);
+		assertNotNull(c);
 	}
 
 	@Test
 	public void randomChineseTest(){
 		char c = RandomUtil.randomChinese();
-		Assert.assertTrue(c > 0);
+		assertTrue(c > 0);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void randomStringWithoutStrTest() {
 		for (int i = 0; i < 100; i++) {
 			final String s = RandomUtil.randomStringWithoutStr(8, "0IPOL");
 			System.out.println(s);
 			for (char c : "0IPOL".toCharArray()) {
-				Assert.assertFalse(s.contains((String.valueOf(c).toLowerCase(Locale.ROOT))));
+				assertFalse(s.contains((String.valueOf(c).toLowerCase(Locale.ROOT))));
 			}
 		}
 	}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
index bad363018..bde09e37b 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
@@ -3,8 +3,8 @@ package cn.hutool.core.util;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.PatternPool;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,28 +17,28 @@ public class ReUtilTest {
 	@Test
 	public void getTest() {
 		final String resultGet = ReUtil.get("\\w{2}", content, 0);
-		Assert.assertEquals("ZZ", resultGet);
+		assertEquals("ZZ", resultGet);
 	}
 
 	@Test
 	public void extractMultiTest() {
 		// 抽取多个分组然后把它们拼接起来
 		final String resultExtractMulti = ReUtil.extractMulti("(\\w)aa(\\w)", content, "$1-$2");
-		Assert.assertEquals("Z-a", resultExtractMulti);
+		assertEquals("Z-a", resultExtractMulti);
 	}
 
 	@Test
 	public void extractMultiTest2() {
 		// 抽取多个分组然后把它们拼接起来
 		final String resultExtractMulti = ReUtil.extractMulti("(\\w)(\\w)(\\w)(\\w)(\\w)(\\w)(\\w)(\\w)(\\w)(\\w)", content, "$1-$2-$3-$4-$5-$6-$7-$8-$9-$10");
-		Assert.assertEquals("Z-Z-Z-a-a-a-b-b-b-c", resultExtractMulti);
+		assertEquals("Z-Z-Z-a-a-a-b-b-b-c", resultExtractMulti);
 	}
 
 	@Test
 	public void delFirstTest() {
 		// 删除第一个匹配到的内容
 		final String resultDelFirst = ReUtil.delFirst("(\\w)aa(\\w)", content);
-		Assert.assertEquals("ZZbbbccc中文1234", resultDelFirst);
+		assertEquals("ZZbbbccc中文1234", resultDelFirst);
 	}
 
 	@Test
@@ -47,25 +47,25 @@ public class ReUtilTest {
 		final String word = "180公斤";
 		final String sentence = "10.商品KLS100021型号xxl适合身高180体重130斤的用户";
 		//空字符串兼容
-		Assert.assertEquals(blank,ReUtil.delLast("\\d+", blank));
-		Assert.assertEquals(blank,ReUtil.delLast(PatternPool.NUMBERS, blank));
+		assertEquals(blank,ReUtil.delLast("\\d+", blank));
+		assertEquals(blank,ReUtil.delLast(PatternPool.NUMBERS, blank));
 
 		//去除数字
-		Assert.assertEquals("公斤",ReUtil.delLast("\\d+", word));
-		Assert.assertEquals("公斤",ReUtil.delLast(PatternPool.NUMBERS, word));
+		assertEquals("公斤",ReUtil.delLast("\\d+", word));
+		assertEquals("公斤",ReUtil.delLast(PatternPool.NUMBERS, word));
 		//去除汉字
-		Assert.assertEquals("180",ReUtil.delLast("[\u4E00-\u9FFF]+", word));
-		Assert.assertEquals("180",ReUtil.delLast(PatternPool.CHINESES, word));
+		assertEquals("180",ReUtil.delLast("[\u4E00-\u9FFF]+", word));
+		assertEquals("180",ReUtil.delLast(PatternPool.CHINESES, word));
 
 		//多个匹配删除最后一个 判断是否不在包含最后的数字
 		String s = ReUtil.delLast("\\d+", sentence);
-		Assert.assertEquals("10.商品KLS100021型号xxl适合身高180体重斤的用户", s);
+		assertEquals("10.商品KLS100021型号xxl适合身高180体重斤的用户", s);
 		s = ReUtil.delLast(PatternPool.NUMBERS, sentence);
-		Assert.assertEquals("10.商品KLS100021型号xxl适合身高180体重斤的用户", s);
+		assertEquals("10.商品KLS100021型号xxl适合身高180体重斤的用户", s);
 
 		//多个匹配删除最后一个 判断是否不在包含最后的数字
-		Assert.assertFalse(ReUtil.delLast("[\u4E00-\u9FFF]+", sentence).contains("斤的用户"));
-		Assert.assertFalse(ReUtil.delLast(PatternPool.CHINESES, sentence).contains("斤的用户"));
+		assertFalse(ReUtil.delLast("[\u4E00-\u9FFF]+", sentence).contains("斤的用户"));
+		assertFalse(ReUtil.delLast(PatternPool.CHINESES, sentence).contains("斤的用户"));
 	}
 
 	@Test
@@ -73,7 +73,7 @@ public class ReUtilTest {
 		// 删除所有匹配到的内容
 		final String content = "发东方大厦eee![images]http://abc.com/2.gpg]好机会eee![images]http://abc.com/2.gpg]好机会";
 		final String resultDelAll = ReUtil.delAll("!\\[images\\][^\\u4e00-\\u9fa5\\\\s]*", content);
-		Assert.assertEquals("发东方大厦eee好机会eee好机会", resultDelAll);
+		assertEquals("发东方大厦eee好机会eee好机会", resultDelAll);
 	}
 
 	@Test
@@ -81,21 +81,21 @@ public class ReUtilTest {
 		// 查找所有匹配文本
 		final List<String> resultFindAll = ReUtil.findAll("\\w{2}", content, 0, new ArrayList<>());
 		final ArrayList<String> expected = CollectionUtil.newArrayList("ZZ", "Za", "aa", "bb", "bc", "cc", "12", "34");
-		Assert.assertEquals(expected, resultFindAll);
+		assertEquals(expected, resultFindAll);
 	}
 
 	@Test
 	public void getFirstNumberTest() {
 		// 找到匹配的第一个数字
 		final Integer resultGetFirstNumber = ReUtil.getFirstNumber(content);
-		Assert.assertEquals(Integer.valueOf(1234), resultGetFirstNumber);
+		assertEquals(Integer.valueOf(1234), resultGetFirstNumber);
 	}
 
 	@Test
 	public void isMatchTest() {
 		// 给定字符串是否匹配给定正则
 		final boolean isMatch = ReUtil.isMatch("\\w+[\u4E00-\u9FFF]+\\d+", content);
-		Assert.assertTrue(isMatch);
+		assertTrue(isMatch);
 	}
 
 	@Test
@@ -103,43 +103,43 @@ public class ReUtilTest {
 		//通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
 		//此处把1234替换为 ->1234<-
 		final String replaceAll = ReUtil.replaceAll(content, "(\\d+)", "->$1<-");
-		Assert.assertEquals("ZZZaaabbbccc中文->1234<-", replaceAll);
+		assertEquals("ZZZaaabbbccc中文->1234<-", replaceAll);
 	}
 
 	@Test
 	public void replaceAllTest2() {
 		//此处把1234替换为 ->1234<-
 		final String replaceAll = ReUtil.replaceAll(this.content, "(\\d+)", parameters -> "->" + parameters.group(1) + "<-");
-		Assert.assertEquals("ZZZaaabbbccc中文->1234<-", replaceAll);
+		assertEquals("ZZZaaabbbccc中文->1234<-", replaceAll);
 	}
 
 	@Test
 	public void replaceTest() {
 		final String str = "AAABBCCCBBDDDBB";
 		String replace = StrUtil.replace(str, 0, "BB", "22", false);
-		Assert.assertEquals("AAA22CCC22DDD22", replace);
+		assertEquals("AAA22CCC22DDD22", replace);
 
 		replace = StrUtil.replace(str, 3, "BB", "22", false);
-		Assert.assertEquals("AAA22CCC22DDD22", replace);
+		assertEquals("AAA22CCC22DDD22", replace);
 
 		replace = StrUtil.replace(str, 4, "BB", "22", false);
-		Assert.assertEquals("AAABBCCC22DDD22", replace);
+		assertEquals("AAABBCCC22DDD22", replace);
 
 		replace = StrUtil.replace(str, 4, "bb", "22", true);
-		Assert.assertEquals("AAABBCCC22DDD22", replace);
+		assertEquals("AAABBCCC22DDD22", replace);
 
 		replace = StrUtil.replace(str, 4, "bb", "", true);
-		Assert.assertEquals("AAABBCCCDDD", replace);
+		assertEquals("AAABBCCCDDD", replace);
 
 		replace = StrUtil.replace(str, 4, "bb", null, true);
-		Assert.assertEquals("AAABBCCCDDD", replace);
+		assertEquals("AAABBCCCDDD", replace);
 	}
 
 	@Test
 	public void escapeTest() {
 		//转义给定字符串，为正则相关的特殊符号转义
 		final String escape = ReUtil.escape("我有个$符号{}");
-		Assert.assertEquals("我有个\\$符号\\{\\}", escape);
+		assertEquals("我有个\\$符号\\{\\}", escape);
 	}
 
 	@Test
@@ -147,7 +147,7 @@ public class ReUtilTest {
 		final String str = "a[bbbc";
 		final String re = "[";
 		final String s = ReUtil.get(ReUtil.escape(re), str, 0);
-		Assert.assertEquals("[", s);
+		assertEquals("[", s);
 	}
 
 	@Test
@@ -155,7 +155,7 @@ public class ReUtilTest {
 		final String context = "{prefix}_";
 		final String regex = "{prefix}_";
 		final boolean b = ReUtil.isMatch(ReUtil.escape(regex), context);
-		Assert.assertTrue(b);
+		assertTrue(b);
 	}
 
 	@Test
@@ -163,15 +163,15 @@ public class ReUtilTest {
 		//转义给定字符串，为正则相关的特殊符号转义
 		final Pattern pattern = Pattern.compile("(\\d+)-(\\d+)-(\\d+)");
 		List<String> allGroups = ReUtil.getAllGroups(pattern, "192-168-1-1");
-		Assert.assertEquals("192-168-1", allGroups.get(0));
-		Assert.assertEquals("192", allGroups.get(1));
-		Assert.assertEquals("168", allGroups.get(2));
-		Assert.assertEquals("1", allGroups.get(3));
+		assertEquals("192-168-1", allGroups.get(0));
+		assertEquals("192", allGroups.get(1));
+		assertEquals("168", allGroups.get(2));
+		assertEquals("1", allGroups.get(3));
 
 		allGroups = ReUtil.getAllGroups(pattern, "192-168-1-1", false);
-		Assert.assertEquals("192", allGroups.get(0));
-		Assert.assertEquals("168", allGroups.get(1));
-		Assert.assertEquals("1", allGroups.get(2));
+		assertEquals("192", allGroups.get(0));
+		assertEquals("168", allGroups.get(1));
+		assertEquals("1", allGroups.get(2));
 	}
 
 	@Test
@@ -186,11 +186,11 @@ public class ReUtilTest {
 		final String content = "2021-10-11";
 		final String regex = "(?<year>\\d+)-(?<month>\\d+)-(?<day>\\d+)";
 		final String year = ReUtil.get(regex, content, "year");
-		Assert.assertEquals("2021", year);
+		assertEquals("2021", year);
 		final String month = ReUtil.get(regex, content, "month");
-		Assert.assertEquals("10", month);
+		assertEquals("10", month);
 		final String day = ReUtil.get(regex, content, "day");
-		Assert.assertEquals("11", day);
+		assertEquals("11", day);
 	}
 
 	@Test
@@ -198,9 +198,9 @@ public class ReUtilTest {
 		final String content = "2021-10-11";
 		final String regex = "(?<year>\\d+)-(?<month>\\d+)-(?<day>\\d+)";
 		final Map<String, String> map = ReUtil.getAllGroupNames(PatternPool.get(regex, Pattern.DOTALL), content);
-		Assert.assertEquals(map.get("year"), "2021");
-		Assert.assertEquals(map.get("month"), "10");
-		Assert.assertEquals(map.get("day"), "11");
+		assertEquals(map.get("year"), "2021");
+		assertEquals(map.get("month"), "10");
+		assertEquals(map.get("day"), "11");
 	}
 
 	@Test
@@ -208,12 +208,12 @@ public class ReUtilTest {
 		final Pattern patternIp = Pattern.compile("((2(5[0-5]|[0-4]\\d))|[0-1]?\\d{1,2})\\.((2(5[0-5]|[0-4]\\d))|[0-1]?\\d{1,2})\\.((2(5[0-5]|[0-4]\\d))"
 				+ "|[0-1]?\\d{1,2})\\.((2(5[0-5]|[0-4]\\d))|[0-1]?\\d{1,2})");
 		final String s = ReUtil.replaceAll("1.2.3.4", patternIp, "$1.**.**.$10");
-		Assert.assertEquals("1.**.**.4", s);
+		assertEquals("1.**.**.4", s);
 	}
 
 	@Test
 	public void issueI6GIMTTest(){
-		Assert.assertEquals(StrUtil.EMPTY, ReUtil.delAll("[\\s]*", " "));
+		assertEquals(StrUtil.EMPTY, ReUtil.delAll("[\\s]*", " "));
 	}
 
 	@Test
@@ -221,11 +221,11 @@ public class ReUtilTest {
 		String regex = "^model";
 		String content = "model-v";
 		String result = ReUtil.get(regex, content, 0);
-		Assert.assertEquals("model", result);
+		assertEquals("model", result);
 
 		regex = "^model.*?";
 		content = "model-v";
 		boolean match = ReUtil.isMatch(regex, content);
-		Assert.assertTrue(match);
+		assertTrue(match);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java
index c1aed085d..1f0ca9586 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java
@@ -2,9 +2,9 @@ package cn.hutool.core.util;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.mutable.MutableObj;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
@@ -16,27 +16,27 @@ public class ReferenceUtilTest {
 	@Test
 	public void createWeakTest(){
 		final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.WEAK, 1);
-		Assert.assertTrue(integerReference instanceof WeakReference);
-		Assert.assertEquals(new Integer(1), integerReference.get());
+		assertTrue(integerReference instanceof WeakReference);
+		assertEquals(new Integer(1), integerReference.get());
 	}
 
 	@Test
 	public void createSoftTest(){
 		final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.SOFT, 1);
-		Assert.assertTrue(integerReference instanceof SoftReference);
-		Assert.assertEquals(new Integer(1), integerReference.get());
+		assertTrue(integerReference instanceof SoftReference);
+		assertEquals(new Integer(1), integerReference.get());
 	}
 
 	@Test
 	public void createPhantomTest(){
 		final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.PHANTOM, 1);
-		Assert.assertTrue(integerReference instanceof PhantomReference);
+		assertTrue(integerReference instanceof PhantomReference);
 		// get方法永远都返回null，PhantomReference只能用来监控对象的GC状况
-		Assert.assertNull(integerReference.get());
+		assertNull(integerReference.get());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void gcTest(){
 		// https://blog.csdn.net/zmx729618/article/details/54093532
 		// 弱引用的对象必须使用可变对象，不能使用常量对象（比如String）
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
index e7f242213..51c06ae57 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ReflectUtilTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.test.bean.ExamInfoDict;
 import cn.hutool.core.util.ClassUtilTest.TestSubClass;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -29,75 +29,75 @@ public class ReflectUtilTest {
 	@Test
 	public void getMethodsTest() {
 		Method[] methods = ReflectUtil.getMethods(ExamInfoDict.class);
-		Assert.assertEquals(20, methods.length);
+		assertEquals(20, methods.length);
 
 		//过滤器测试
 		methods = ReflectUtil.getMethods(ExamInfoDict.class, t -> Integer.class.equals(t.getReturnType()));
 
-		Assert.assertEquals(4, methods.length);
+		assertEquals(4, methods.length);
 		final Method method = methods[0];
-		Assert.assertNotNull(method);
+		assertNotNull(method);
 
 		//null过滤器测试
 		methods = ReflectUtil.getMethods(ExamInfoDict.class, null);
 
-		Assert.assertEquals(20, methods.length);
+		assertEquals(20, methods.length);
 		final Method method2 = methods[0];
-		Assert.assertNotNull(method2);
+		assertNotNull(method2);
 	}
 
 	@Test
 	public void getMethodTest() {
 		Method method = ReflectUtil.getMethod(ExamInfoDict.class, "getId");
-		Assert.assertEquals("getId", method.getName());
-		Assert.assertEquals(0, method.getParameterTypes().length);
+		assertEquals("getId", method.getName());
+		assertEquals(0, method.getParameterTypes().length);
 
 		method = ReflectUtil.getMethod(ExamInfoDict.class, "getId", Integer.class);
-		Assert.assertEquals("getId", method.getName());
-		Assert.assertEquals(1, method.getParameterTypes().length);
+		assertEquals("getId", method.getName());
+		assertEquals(1, method.getParameterTypes().length);
 	}
 
 	@Test
 	public void getMethodIgnoreCaseTest() {
 		Method method = ReflectUtil.getMethodIgnoreCase(ExamInfoDict.class, "getId");
-		Assert.assertEquals("getId", method.getName());
-		Assert.assertEquals(0, method.getParameterTypes().length);
+		assertEquals("getId", method.getName());
+		assertEquals(0, method.getParameterTypes().length);
 
 		method = ReflectUtil.getMethodIgnoreCase(ExamInfoDict.class, "GetId");
-		Assert.assertEquals("getId", method.getName());
-		Assert.assertEquals(0, method.getParameterTypes().length);
+		assertEquals("getId", method.getName());
+		assertEquals(0, method.getParameterTypes().length);
 
 		method = ReflectUtil.getMethodIgnoreCase(ExamInfoDict.class, "setanswerIs", Integer.class);
-		Assert.assertEquals("setAnswerIs", method.getName());
-		Assert.assertEquals(1, method.getParameterTypes().length);
+		assertEquals("setAnswerIs", method.getName());
+		assertEquals(1, method.getParameterTypes().length);
 	}
 
 	@Test
 	public void getFieldTest() {
 		// 能够获取到父类字段
 		final Field privateField = ReflectUtil.getField(TestSubClass.class, "privateField");
-		Assert.assertNotNull(privateField);
+		assertNotNull(privateField);
 	}
 
 	@Test
 	public void getFieldsTest() {
 		// 能够获取到父类字段
 		final Field[] fields = ReflectUtil.getFields(TestSubClass.class);
-		Assert.assertEquals(4, fields.length);
+		assertEquals(4, fields.length);
 	}
 
 	@Test
 	public void setFieldTest() {
 		final TestClass testClass = new TestClass();
 		ReflectUtil.setFieldValue(testClass, "a", "111");
-		Assert.assertEquals(111, testClass.getA());
+		assertEquals(111, testClass.getA());
 	}
 
 	@Test
 	public void invokeTest() {
 		final TestClass testClass = new TestClass();
 		ReflectUtil.invoke(testClass, "setA", 10);
-		Assert.assertEquals(10, testClass.getA());
+		assertEquals(10, testClass.getA());
 	}
 
 	@Test
@@ -105,7 +105,7 @@ public class ReflectUtilTest {
 		final TestClass testClass = new TestClass();
 		final Method method = ReflectUtil.getMethod(TestClass.class, "setA", int.class);
 		ReflectUtil.invoke(testClass, method, 10);
-		Assert.assertEquals(10, testClass.getA());
+		assertEquals(10, testClass.getA());
 	}
 
 	@Test
@@ -113,22 +113,22 @@ public class ReflectUtilTest {
 		final TestClass testClass = new TestClass();
 		final Method method = ReflectUtil.getMethod(TestClass.class, "setA", int.class);
 		ReflectUtil.invoke(testClass, method, "10");
-		Assert.assertEquals(10, testClass.getA());
+		assertEquals(10, testClass.getA());
 	}
 
 	@Test
 	public void invokeMethodWithParamConvertFailedTest() {
 		final TestClass testClass = new TestClass();
 		final Method method = ReflectUtil.getMethod(TestClass.class, "setA", int.class);
-		Assert.assertThrows(IllegalArgumentException.class,
+		assertThrows(IllegalArgumentException.class,
 				() -> ReflectUtil.invoke(testClass, method, "NaN"));
 	}
 
 	@Test
 	public void noneStaticInnerClassTest() {
 		final NoneStaticClass testAClass = ReflectUtil.newInstanceIfPossible(NoneStaticClass.class);
-		Assert.assertNotNull(testAClass);
-		Assert.assertEquals(2, testAClass.getA());
+		assertNotNull(testAClass);
+		assertEquals(2, testAClass.getA());
 	}
 
 	@Data
@@ -143,7 +143,7 @@ public class ReflectUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getMethodBenchTest() {
 		// 预热
 		getMethodWithReturnTypeCheck(TestBenchClass.class, false, "getH");
@@ -204,19 +204,19 @@ public class ReflectUtilTest {
 	public void getMethodsFromClassExtends() {
 		// 继承情况下，需解决方法去重问题
 		Method[] methods = ReflectUtil.getMethods(C2.class);
-		Assert.assertEquals(15, methods.length);
+		assertEquals(15, methods.length);
 
 		// 排除Object中的方法
 		// 3个方法包括类
 		methods = ReflectUtil.getMethodsDirectly(C2.class, true, false);
-		Assert.assertEquals(3, methods.length);
+		assertEquals(3, methods.length);
 
 		// getA属于本类
-		Assert.assertEquals("public void cn.hutool.core.util.ReflectUtilTest$C2.getA()", methods[0].toString());
+		assertEquals("public void cn.hutool.core.util.ReflectUtilTest$C2.getA()", methods[0].toString());
 		// getB属于父类
-		Assert.assertEquals("public void cn.hutool.core.util.ReflectUtilTest$C1.getB()", methods[1].toString());
+		assertEquals("public void cn.hutool.core.util.ReflectUtilTest$C1.getB()", methods[1].toString());
 		// getC属于接口中的默认方法
-		Assert.assertEquals("public default void cn.hutool.core.util.ReflectUtilTest$TestInterface1.getC()", methods[2].toString());
+		assertEquals("public default void cn.hutool.core.util.ReflectUtilTest$TestInterface1.getC()", methods[2].toString());
 	}
 
 	@Test
@@ -224,13 +224,13 @@ public class ReflectUtilTest {
 		// 对于接口，直接调用Class.getMethods方法获取所有方法，因为接口都是public方法
 		// 因此此处得到包括TestInterface1、TestInterface2、TestInterface3中一共4个方法
 		final Method[] methods = ReflectUtil.getMethods(TestInterface3.class);
-		Assert.assertEquals(4, methods.length);
+		assertEquals(4, methods.length);
 
 		Arrays.sort(methods, Comparator.comparing(Method::toString));
 		// 接口里，调用getMethods和getPublicMethods效果相同
 		final Method[] publicMethods = ReflectUtil.getPublicMethods(TestInterface3.class);
 		Arrays.sort(publicMethods, Comparator.comparing(Method::toString));
-		Assert.assertArrayEquals(methods, publicMethods);
+		assertArrayEquals(methods, publicMethods);
 	}
 
 	interface TestInterface1 {
@@ -280,22 +280,22 @@ public class ReflectUtilTest {
 	public void newInstanceIfPossibleTest(){
 		//noinspection ConstantConditions
 		final int intValue = ReflectUtil.newInstanceIfPossible(int.class);
-		Assert.assertEquals(0, intValue);
+		assertEquals(0, intValue);
 
 		final Integer integer = ReflectUtil.newInstanceIfPossible(Integer.class);
-		Assert.assertEquals(new Integer(0), integer);
+		assertEquals(new Integer(0), integer);
 
 		final Map<?, ?> map = ReflectUtil.newInstanceIfPossible(Map.class);
-		Assert.assertNotNull(map);
+		assertNotNull(map);
 
 		final Collection<?> collection = ReflectUtil.newInstanceIfPossible(Collection.class);
-		Assert.assertNotNull(collection);
+		assertNotNull(collection);
 
 		final Week week = ReflectUtil.newInstanceIfPossible(Week.class);
-		Assert.assertEquals(Week.SUNDAY, week);
+		assertEquals(Week.SUNDAY, week);
 
 		final int[] intArray = ReflectUtil.newInstanceIfPossible(int[].class);
-		Assert.assertArrayEquals(new int[0], intArray);
+		assertArrayEquals(new int[0], intArray);
 	}
 
 	public static class JdbcDialects {
@@ -317,14 +317,14 @@ public class ReflectUtilTest {
 		ReflectUtil.removeFinalModify(field);
 		ReflectUtil.setFieldValue(JdbcDialects.class, fieldName, dialects);
 
-		Assert.assertEquals(dialects, ReflectUtil.getFieldValue(JdbcDialects.class, fieldName));
+		assertEquals(dialects, ReflectUtil.getFieldValue(JdbcDialects.class, fieldName));
 	}
 
 	@Test
 	public void issue2625Test(){
 		// 内部类继承的情况下父类方法会被定义为桥接方法，因此按照pr#1965@Github判断返回值的继承关系来代替判断桥接。
 		final Method getThis = ReflectUtil.getMethod(A.C.class, "getThis");
-		Assert.assertTrue(getThis.isBridge());
+		assertTrue(getThis.isBridge());
 	}
 
 	@SuppressWarnings("InnerClassMayBeStatic")
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java
index 8da6871a3..75d99a79c 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/RuntimeUtilTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * 命令行单元测试
@@ -13,21 +13,21 @@ import org.junit.Test;
 public class RuntimeUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void execTest() {
 		String str = RuntimeUtil.execForStr("ipconfig");
 		Console.log(str);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void execCmdTest() {
 		String str = RuntimeUtil.execForStr("cmd /c dir");
 		Console.log(str);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void execCmdTest2() {
 		String str = RuntimeUtil.execForStr("cmd /c", "cd \"C:\\Program Files (x86)\"", "chdir");
 		Console.log(str);
@@ -35,24 +35,24 @@ public class RuntimeUtilTest {
 
 	@Test
 	public void getUsableMemoryTest(){
-		Assert.assertTrue(RuntimeUtil.getUsableMemory() > 0);
+		assertTrue(RuntimeUtil.getUsableMemory() > 0);
 	}
 
 	@Test
 	public void getPidTest(){
 		int pid = RuntimeUtil.getPid();
-		Assert.assertTrue(pid > 0);
+		assertTrue(pid > 0);
 	}
 
 	@Test
 	public void getProcessorCountTest(){
 		int cpu = RuntimeUtil.getProcessorCount();
 		Console.log("cpu个数：{}", cpu);
-		Assert.assertTrue(cpu > 0);
+		assertTrue(cpu > 0);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueIAB5LWTest() {
 		final String s = RuntimeUtil.execForStr("cmd /c netstat -aon | findstr 8080");
 		Console.log(s);
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index 1108846e2..aa064655a 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -1,12 +1,13 @@
 package cn.hutool.core.util;
 
 import cn.hutool.core.lang.Dict;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * 字符串工具类单元测试
  *
@@ -17,32 +18,32 @@ public class StrUtilTest {
 	@Test
 	public void isBlankTest() {
 		final String blank = "	  　";
-		Assert.assertTrue(StrUtil.isBlank(blank));
+		assertTrue(StrUtil.isBlank(blank));
 	}
 
 	@Test
 	public void trimTest() {
 		final String blank = "	 哈哈 　";
 		final String trim = StrUtil.trim(blank);
-		Assert.assertEquals("哈哈", trim);
+		assertEquals("哈哈", trim);
 	}
 
 	@Test
 	public void trimNewLineTest() {
 		String str = "\r\naaa";
-		Assert.assertEquals("aaa", StrUtil.trim(str));
+		assertEquals("aaa", StrUtil.trim(str));
 		str = "\raaa";
-		Assert.assertEquals("aaa", StrUtil.trim(str));
+		assertEquals("aaa", StrUtil.trim(str));
 		str = "\naaa";
-		Assert.assertEquals("aaa", StrUtil.trim(str));
+		assertEquals("aaa", StrUtil.trim(str));
 		str = "\r\n\r\naaa";
-		Assert.assertEquals("aaa", StrUtil.trim(str));
+		assertEquals("aaa", StrUtil.trim(str));
 	}
 
 	@Test
 	public void trimTabTest() {
 		final String str = "\taaa";
-		Assert.assertEquals("aaa", StrUtil.trim(str));
+		assertEquals("aaa", StrUtil.trim(str));
 	}
 
 	@Test
@@ -50,14 +51,14 @@ public class StrUtilTest {
 		// 包含：制表符、英文空格、不间断空白符、全角空格
 		final String str = "	 你 好　";
 		final String cleanBlank = StrUtil.cleanBlank(str);
-		Assert.assertEquals("你好", cleanBlank);
+		assertEquals("你好", cleanBlank);
 	}
 
 	@Test
 	public void cutTest() {
 		final String str = "aaabbbcccdddaadfdfsdfsdf0";
 		final String[] cut = StrUtil.cut(str, 4);
-		Assert.assertArrayEquals(new String[]{"aaab", "bbcc", "cddd", "aadf", "dfsd", "fsdf", "0"}, cut);
+		assertArrayEquals(new String[]{"aaab", "bbcc", "cddd", "aadf", "dfsd", "fsdf", "0"}, cut);
 	}
 
 	@Test
@@ -65,15 +66,15 @@ public class StrUtilTest {
 		final String str = "a,b ,c,d,,e";
 		final List<String> split = StrUtil.split(str, ',', -1, true, true);
 		// 测试空是否被去掉
-		Assert.assertEquals(5, split.size());
+		assertEquals(5, split.size());
 		// 测试去掉两边空白符是否生效
-		Assert.assertEquals("b", split.get(1));
+		assertEquals("b", split.get(1));
 
 		final String[] strings = StrUtil.splitToArray("abc/", '/');
-		Assert.assertEquals(2, strings.length);
+		assertEquals(2, strings.length);
 
 		// issue:I6FKSI
-		Assert.assertThrows(IllegalArgumentException.class, () -> StrUtil.split("test length 0", 0));
+		assertThrows(IllegalArgumentException.class, () -> StrUtil.split("test length 0", 0));
 	}
 
 	@Test
@@ -81,202 +82,204 @@ public class StrUtilTest {
 		final String str = "";
 		final List<String> split = StrUtil.split(str, ',', -1, true, true);
 		// 测试空是否被去掉
-		Assert.assertEquals(0, split.size());
+		assertEquals(0, split.size());
 	}
 
 	@Test
 	public void splitTest2() {
 		final String str = "a.b.";
 		final List<String> split = StrUtil.split(str, '.');
-		Assert.assertEquals(3, split.size());
-		Assert.assertEquals("b", split.get(1));
-		Assert.assertEquals("", split.get(2));
+		assertEquals(3, split.size());
+		assertEquals("b", split.get(1));
+		assertEquals("", split.get(2));
 	}
 
 	@Test
 	public void splitNullTest() {
-		Assert.assertEquals(0, StrUtil.split(null, '.').size());
+		assertEquals(0, StrUtil.split(null, '.').size());
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void splitToArrayNullTest() {
-		StrUtil.splitToArray(null, '.');
+		assertThrows(IllegalArgumentException.class, () -> {
+			StrUtil.splitToArray(null, '.');
+		});
 	}
 
 	@Test
 	public void splitToLongTest() {
 		final String str = "1,2,3,4, 5";
 		long[] longArray = StrUtil.splitToLong(str, ',');
-		Assert.assertArrayEquals(new long[]{1, 2, 3, 4, 5}, longArray);
+		assertArrayEquals(new long[]{1, 2, 3, 4, 5}, longArray);
 
 		longArray = StrUtil.splitToLong(str, ",");
-		Assert.assertArrayEquals(new long[]{1, 2, 3, 4, 5}, longArray);
+		assertArrayEquals(new long[]{1, 2, 3, 4, 5}, longArray);
 	}
 
 	@Test
 	public void splitToIntTest() {
 		final String str = "1,2,3,4, 5";
 		int[] intArray = StrUtil.splitToInt(str, ',');
-		Assert.assertArrayEquals(new int[]{1, 2, 3, 4, 5}, intArray);
+		assertArrayEquals(new int[]{1, 2, 3, 4, 5}, intArray);
 
 		intArray = StrUtil.splitToInt(str, ",");
-		Assert.assertArrayEquals(new int[]{1, 2, 3, 4, 5}, intArray);
+		assertArrayEquals(new int[]{1, 2, 3, 4, 5}, intArray);
 	}
 
 	@Test
 	public void formatTest() {
 		final String template = "你好，我是{name}，我的电话是：{phone}";
 		final String result = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", "13888881111"));
-		Assert.assertEquals("你好，我是张三，我的电话是：13888881111", result);
+		assertEquals("你好，我是张三，我的电话是：13888881111", result);
 
 		final String result2 = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", null));
-		Assert.assertEquals("你好，我是张三，我的电话是：{phone}", result2);
+		assertEquals("你好，我是张三，我的电话是：{phone}", result2);
 	}
 
 	@Test
 	public void stripTest() {
 		String str = "abcd123";
 		String strip = StrUtil.strip(str, "ab", "23");
-		Assert.assertEquals("cd1", strip);
+		assertEquals("cd1", strip);
 
 		str = "abcd123";
 		strip = StrUtil.strip(str, "ab", "");
-		Assert.assertEquals("cd123", strip);
+		assertEquals("cd123", strip);
 
 		str = "abcd123";
 		strip = StrUtil.strip(str, null, "");
-		Assert.assertEquals("abcd123", strip);
+		assertEquals("abcd123", strip);
 
 		str = "abcd123";
 		strip = StrUtil.strip(str, null, "567");
-		Assert.assertEquals("abcd123", strip);
+		assertEquals("abcd123", strip);
 
-		Assert.assertEquals("", StrUtil.strip("a", "a"));
-		Assert.assertEquals("", StrUtil.strip("a", "a", "b"));
+		assertEquals("", StrUtil.strip("a", "a"));
+		assertEquals("", StrUtil.strip("a", "a", "b"));
 	}
 
 	@Test
 	public void stripIgnoreCaseTest() {
 		String str = "abcd123";
 		String strip = StrUtil.stripIgnoreCase(str, "Ab", "23");
-		Assert.assertEquals("cd1", strip);
+		assertEquals("cd1", strip);
 
 		str = "abcd123";
 		strip = StrUtil.stripIgnoreCase(str, "AB", "");
-		Assert.assertEquals("cd123", strip);
+		assertEquals("cd123", strip);
 
 		str = "abcd123";
 		strip = StrUtil.stripIgnoreCase(str, "ab", "");
-		Assert.assertEquals("cd123", strip);
+		assertEquals("cd123", strip);
 
 		str = "abcd123";
 		strip = StrUtil.stripIgnoreCase(str, null, "");
-		Assert.assertEquals("abcd123", strip);
+		assertEquals("abcd123", strip);
 
 		str = "abcd123";
 		strip = StrUtil.stripIgnoreCase(str, null, "567");
-		Assert.assertEquals("abcd123", strip);
+		assertEquals("abcd123", strip);
 	}
 
 	@Test
 	public void indexOfIgnoreCaseTest() {
-		Assert.assertEquals(-1, StrUtil.indexOfIgnoreCase(null, "balabala", 0));
-		Assert.assertEquals(-1, StrUtil.indexOfIgnoreCase("balabala", null, 0));
-		Assert.assertEquals(0, StrUtil.indexOfIgnoreCase("", "", 0));
-		Assert.assertEquals(0, StrUtil.indexOfIgnoreCase("aabaabaa", "A", 0));
-		Assert.assertEquals(2, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 0));
-		Assert.assertEquals(1, StrUtil.indexOfIgnoreCase("aabaabaa", "AB", 0));
-		Assert.assertEquals(5, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 3));
-		Assert.assertEquals(-1, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 9));
-		Assert.assertEquals(2, StrUtil.indexOfIgnoreCase("aabaabaa", "B", -1));
-		Assert.assertEquals(-1, StrUtil.indexOfIgnoreCase("aabaabaa", "", 2));
-		Assert.assertEquals(-1, StrUtil.indexOfIgnoreCase("abc", "", 9));
+		assertEquals(-1, StrUtil.indexOfIgnoreCase(null, "balabala", 0));
+		assertEquals(-1, StrUtil.indexOfIgnoreCase("balabala", null, 0));
+		assertEquals(0, StrUtil.indexOfIgnoreCase("", "", 0));
+		assertEquals(0, StrUtil.indexOfIgnoreCase("aabaabaa", "A", 0));
+		assertEquals(2, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 0));
+		assertEquals(1, StrUtil.indexOfIgnoreCase("aabaabaa", "AB", 0));
+		assertEquals(5, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 3));
+		assertEquals(-1, StrUtil.indexOfIgnoreCase("aabaabaa", "B", 9));
+		assertEquals(2, StrUtil.indexOfIgnoreCase("aabaabaa", "B", -1));
+		assertEquals(-1, StrUtil.indexOfIgnoreCase("aabaabaa", "", 2));
+		assertEquals(-1, StrUtil.indexOfIgnoreCase("abc", "", 9));
 	}
 
 	@Test
 	public void lastIndexOfTest() {
 		final String a = "aabbccddcc";
 		final int lastIndexOf = StrUtil.lastIndexOf(a, "c", 0, false);
-		Assert.assertEquals(-1, lastIndexOf);
+		assertEquals(-1, lastIndexOf);
 	}
 
 	@Test
 	public void lastIndexOfIgnoreCaseTest() {
-		Assert.assertEquals(-1, StrUtil.lastIndexOfIgnoreCase(null, "balabala", 0));
-		Assert.assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("balabala", null));
-		Assert.assertEquals(0, StrUtil.lastIndexOfIgnoreCase("", ""));
-		Assert.assertEquals(7, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "A"));
-		Assert.assertEquals(5, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B"));
-		Assert.assertEquals(4, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "AB"));
-		Assert.assertEquals(2, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", 3));
-		Assert.assertEquals(5, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", 9));
-		Assert.assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", -1));
-		Assert.assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "", 2));
-		Assert.assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("abc", "", 9));
-		Assert.assertEquals(0, StrUtil.lastIndexOfIgnoreCase("AAAcsd", "aaa"));
+		assertEquals(-1, StrUtil.lastIndexOfIgnoreCase(null, "balabala", 0));
+		assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("balabala", null));
+		assertEquals(0, StrUtil.lastIndexOfIgnoreCase("", ""));
+		assertEquals(7, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "A"));
+		assertEquals(5, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B"));
+		assertEquals(4, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "AB"));
+		assertEquals(2, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", 3));
+		assertEquals(5, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", 9));
+		assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "B", -1));
+		assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("aabaabaa", "", 2));
+		assertEquals(-1, StrUtil.lastIndexOfIgnoreCase("abc", "", 9));
+		assertEquals(0, StrUtil.lastIndexOfIgnoreCase("AAAcsd", "aaa"));
 	}
 
 	@Test
 	public void replaceTest() {
 		String string = StrUtil.replaceByCodePoint("aabbccdd", 2, 6, '*');
-		Assert.assertEquals("aa****dd", string);
+		assertEquals("aa****dd", string);
 		string = StrUtil.replaceByCodePoint("aabbccdd", 2, 12, '*');
-		Assert.assertEquals("aa******", string);
+		assertEquals("aa******", string);
 	}
 
 	@Test
 	public void replaceTest2() {
 		final String result = StrUtil.replace("123", "2", "3");
-		Assert.assertEquals("133", result);
+		assertEquals("133", result);
 	}
 
 	@Test
 	public void replaceTest3() {
 		final String result = StrUtil.replace(",abcdef,", ",", "|");
-		Assert.assertEquals("|abcdef|", result);
+		assertEquals("|abcdef|", result);
 	}
 
 	@Test
 	public void replaceTest4() {
 		final String a = "1039";
 		final String result = StrUtil.padPre(a, 8, "0"); //在字符串1039前补4个0
-		Assert.assertEquals("00001039", result);
+		assertEquals("00001039", result);
 
 		final String aa = "1039";
 		final String result1 = StrUtil.padPre(aa, -1, "0"); //在字符串1039前补4个0
-		Assert.assertEquals("103", result1);
+		assertEquals("103", result1);
 	}
 
 	@Test
 	public void replaceTest5() {
 		final String a = "\uD853\uDC09秀秀";
 		final String result = StrUtil.replaceByCodePoint(a, 1, a.length(), '*');
-		Assert.assertEquals("\uD853\uDC09**", result);
+		assertEquals("\uD853\uDC09**", result);
 
 		final String aa = "规划大师";
 		final String result1 = StrUtil.replaceByCodePoint(aa, 2, a.length(), '*');
-		Assert.assertEquals("规划**", result1);
+		assertEquals("规划**", result1);
 	}
 
 	@Test
 	public void upperFirstTest() {
 		final StringBuilder sb = new StringBuilder("KEY");
 		final String s = StrUtil.upperFirst(sb);
-		Assert.assertEquals(s, sb.toString());
+		assertEquals(s, sb.toString());
 	}
 
 	@Test
 	public void lowerFirstTest() {
 		final StringBuilder sb = new StringBuilder("KEY");
 		final String s = StrUtil.lowerFirst(sb);
-		Assert.assertEquals("kEY", s);
+		assertEquals("kEY", s);
 	}
 
 	@Test
 	public void subTest() {
 		final String a = "abcderghigh";
 		final String pre = StrUtil.sub(a, -5, a.length());
-		Assert.assertEquals("ghigh", pre);
+		assertEquals("ghigh", pre);
 	}
 
 	@Test
@@ -286,180 +289,180 @@ public class StrUtilTest {
 
 		// 不正确的子字符串
 		final String wrongAnswer = StrUtil.sub(test, 0, 3);
-		Assert.assertNotEquals("\uD83E\uDD14\uD83D\uDC4D\uD83C\uDF53", wrongAnswer);
+		assertNotEquals("\uD83E\uDD14\uD83D\uDC4D\uD83C\uDF53", wrongAnswer);
 
 		// 正确的子字符串
 		final String rightAnswer = StrUtil.subByCodePoint(test, 0, 3);
-		Assert.assertEquals("\uD83E\uDD14\uD83D\uDC4D\uD83C\uDF53", rightAnswer);
+		assertEquals("\uD83E\uDD14\uD83D\uDC4D\uD83C\uDF53", rightAnswer);
 	}
 
 	@Test
 	public void subBeforeTest() {
 		final String a = "abcderghigh";
 		String pre = StrUtil.subBefore(a, "d", false);
-		Assert.assertEquals("abc", pre);
+		assertEquals("abc", pre);
 		pre = StrUtil.subBefore(a, 'd', false);
-		Assert.assertEquals("abc", pre);
+		assertEquals("abc", pre);
 		pre = StrUtil.subBefore(a, 'a', false);
-		Assert.assertEquals("", pre);
+		assertEquals("", pre);
 
 		//找不到返回原串
 		pre = StrUtil.subBefore(a, 'k', false);
-		Assert.assertEquals(a, pre);
+		assertEquals(a, pre);
 		pre = StrUtil.subBefore(a, 'k', true);
-		Assert.assertEquals(a, pre);
+		assertEquals(a, pre);
 	}
 
 	@Test
 	public void subAfterTest() {
 		final String a = "abcderghigh";
 		String pre = StrUtil.subAfter(a, "d", false);
-		Assert.assertEquals("erghigh", pre);
+		assertEquals("erghigh", pre);
 		pre = StrUtil.subAfter(a, 'd', false);
-		Assert.assertEquals("erghigh", pre);
+		assertEquals("erghigh", pre);
 		pre = StrUtil.subAfter(a, 'h', true);
-		Assert.assertEquals("", pre);
+		assertEquals("", pre);
 
 		//找不到字符返回空串
 		pre = StrUtil.subAfter(a, 'k', false);
-		Assert.assertEquals("", pre);
+		assertEquals("", pre);
 		pre = StrUtil.subAfter(a, 'k', true);
-		Assert.assertEquals("", pre);
+		assertEquals("", pre);
 	}
 
 	@Test
 	public void subSufByLengthTest() {
-		Assert.assertEquals("cde", StrUtil.subSufByLength("abcde", 3));
-		Assert.assertEquals("", StrUtil.subSufByLength("abcde", -1));
-		Assert.assertEquals("", StrUtil.subSufByLength("abcde", 0));
-		Assert.assertEquals("abcde", StrUtil.subSufByLength("abcde", 5));
-		Assert.assertEquals("abcde", StrUtil.subSufByLength("abcde", 10));
+		assertEquals("cde", StrUtil.subSufByLength("abcde", 3));
+		assertEquals("", StrUtil.subSufByLength("abcde", -1));
+		assertEquals("", StrUtil.subSufByLength("abcde", 0));
+		assertEquals("abcde", StrUtil.subSufByLength("abcde", 5));
+		assertEquals("abcde", StrUtil.subSufByLength("abcde", 10));
 	}
 
 	@Test
 	public void repeatAndJoinTest() {
 		String repeatAndJoin = StrUtil.repeatAndJoin("?", 5, ",");
-		Assert.assertEquals("?,?,?,?,?", repeatAndJoin);
+		assertEquals("?,?,?,?,?", repeatAndJoin);
 
 		repeatAndJoin = StrUtil.repeatAndJoin("?", 0, ",");
-		Assert.assertEquals("", repeatAndJoin);
+		assertEquals("", repeatAndJoin);
 
 		repeatAndJoin = StrUtil.repeatAndJoin("?", 5, null);
-		Assert.assertEquals("?????", repeatAndJoin);
+		assertEquals("?????", repeatAndJoin);
 	}
 
 	@Test
 	public void moveTest() {
 		final String str = "aaaaaaa22222bbbbbbb";
 		String result = StrUtil.move(str, 7, 12, -3);
-		Assert.assertEquals("aaaa22222aaabbbbbbb", result);
+		assertEquals("aaaa22222aaabbbbbbb", result);
 		result = StrUtil.move(str, 7, 12, -4);
-		Assert.assertEquals("aaa22222aaaabbbbbbb", result);
+		assertEquals("aaa22222aaaabbbbbbb", result);
 		result = StrUtil.move(str, 7, 12, -7);
-		Assert.assertEquals("22222aaaaaaabbbbbbb", result);
+		assertEquals("22222aaaaaaabbbbbbb", result);
 		result = StrUtil.move(str, 7, 12, -20);
-		Assert.assertEquals("aaaaaa22222abbbbbbb", result);
+		assertEquals("aaaaaa22222abbbbbbb", result);
 
 		result = StrUtil.move(str, 7, 12, 3);
-		Assert.assertEquals("aaaaaaabbb22222bbbb", result);
+		assertEquals("aaaaaaabbb22222bbbb", result);
 		result = StrUtil.move(str, 7, 12, 7);
-		Assert.assertEquals("aaaaaaabbbbbbb22222", result);
+		assertEquals("aaaaaaabbbbbbb22222", result);
 		result = StrUtil.move(str, 7, 12, 20);
-		Assert.assertEquals("aaaaaaab22222bbbbbb", result);
+		assertEquals("aaaaaaab22222bbbbbb", result);
 
 		result = StrUtil.move(str, 7, 12, 0);
-		Assert.assertEquals("aaaaaaa22222bbbbbbb", result);
+		assertEquals("aaaaaaa22222bbbbbbb", result);
 	}
 
 	@Test
 	public void removePrefixIgnorecaseTest() {
 		final String a = "aaabbb";
 		String prefix = "aaa";
-		Assert.assertEquals("bbb", StrUtil.removePrefixIgnoreCase(a, prefix));
+		assertEquals("bbb", StrUtil.removePrefixIgnoreCase(a, prefix));
 
 		prefix = "AAA";
-		Assert.assertEquals("bbb", StrUtil.removePrefixIgnoreCase(a, prefix));
+		assertEquals("bbb", StrUtil.removePrefixIgnoreCase(a, prefix));
 
 		prefix = "AAABBB";
-		Assert.assertEquals("", StrUtil.removePrefixIgnoreCase(a, prefix));
+		assertEquals("", StrUtil.removePrefixIgnoreCase(a, prefix));
 	}
 
 	@Test
 	public void maxLengthTest() {
 		final String text = "我是一段正文，很长的正文，需要截取的正文";
 		String str = StrUtil.maxLength(text, 5);
-		Assert.assertEquals("我是一段正...", str);
+		assertEquals("我是一段正...", str);
 		str = StrUtil.maxLength(text, 21);
-		Assert.assertEquals(text, str);
+		assertEquals(text, str);
 		str = StrUtil.maxLength(text, 50);
-		Assert.assertEquals(text, str);
+		assertEquals(text, str);
 	}
 
 	@Test
 	public void containsAnyTest() {
 		//字符
 		boolean containsAny = StrUtil.containsAny("aaabbbccc", 'a', 'd');
-		Assert.assertTrue(containsAny);
+		assertTrue(containsAny);
 		containsAny = StrUtil.containsAny("aaabbbccc", 'e', 'd');
-		Assert.assertFalse(containsAny);
+		assertFalse(containsAny);
 		containsAny = StrUtil.containsAny("aaabbbccc", 'd', 'c');
-		Assert.assertTrue(containsAny);
+		assertTrue(containsAny);
 
 		//字符串
 		containsAny = StrUtil.containsAny("aaabbbccc", "a", "d");
-		Assert.assertTrue(containsAny);
+		assertTrue(containsAny);
 		containsAny = StrUtil.containsAny("aaabbbccc", "e", "d");
-		Assert.assertFalse(containsAny);
+		assertFalse(containsAny);
 		containsAny = StrUtil.containsAny("aaabbbccc", "d", "c");
-		Assert.assertTrue(containsAny);
+		assertTrue(containsAny);
 
 		// https://gitee.com/dromara/hutool/issues/I7WSYD
 		containsAny = StrUtil.containsAny("你好啊", "嗯", null);
-		Assert.assertFalse(containsAny);
+		assertFalse(containsAny);
 	}
 
 	@Test
 	public void centerTest() {
-		Assert.assertNull(StrUtil.center(null, 10));
-		Assert.assertEquals("    ", StrUtil.center("", 4));
-		Assert.assertEquals("ab", StrUtil.center("ab", -1));
-		Assert.assertEquals(" ab ", StrUtil.center("ab", 4));
-		Assert.assertEquals("abcd", StrUtil.center("abcd", 2));
-		Assert.assertEquals(" a  ", StrUtil.center("a", 4));
+		assertNull(StrUtil.center(null, 10));
+		assertEquals("    ", StrUtil.center("", 4));
+		assertEquals("ab", StrUtil.center("ab", -1));
+		assertEquals(" ab ", StrUtil.center("ab", 4));
+		assertEquals("abcd", StrUtil.center("abcd", 2));
+		assertEquals(" a  ", StrUtil.center("a", 4));
 	}
 
 	@Test
 	public void padPreTest() {
-		Assert.assertNull(StrUtil.padPre(null, 10, ' '));
-		Assert.assertEquals("001", StrUtil.padPre("1", 3, '0'));
-		Assert.assertEquals("12", StrUtil.padPre("123", 2, '0'));
+		assertNull(StrUtil.padPre(null, 10, ' '));
+		assertEquals("001", StrUtil.padPre("1", 3, '0'));
+		assertEquals("12", StrUtil.padPre("123", 2, '0'));
 
-		Assert.assertNull(StrUtil.padPre(null, 10, "AA"));
-		Assert.assertEquals("AB1", StrUtil.padPre("1", 3, "ABC"));
-		Assert.assertEquals("12", StrUtil.padPre("123", 2, "ABC"));
+		assertNull(StrUtil.padPre(null, 10, "AA"));
+		assertEquals("AB1", StrUtil.padPre("1", 3, "ABC"));
+		assertEquals("12", StrUtil.padPre("123", 2, "ABC"));
 	}
 
 	@Test
 	public void padAfterTest() {
-		Assert.assertNull(StrUtil.padAfter(null, 10, ' '));
-		Assert.assertEquals("100", StrUtil.padAfter("1", 3, '0'));
-		Assert.assertEquals("23", StrUtil.padAfter("123", 2, '0'));
-		Assert.assertEquals("", StrUtil.padAfter("123", -1, '0'));
+		assertNull(StrUtil.padAfter(null, 10, ' '));
+		assertEquals("100", StrUtil.padAfter("1", 3, '0'));
+		assertEquals("23", StrUtil.padAfter("123", 2, '0'));
+		assertEquals("", StrUtil.padAfter("123", -1, '0'));
 
-		Assert.assertNull(StrUtil.padAfter(null, 10, "ABC"));
-		Assert.assertEquals("1AB", StrUtil.padAfter("1", 3, "ABC"));
-		Assert.assertEquals("23", StrUtil.padAfter("123", 2, "ABC"));
+		assertNull(StrUtil.padAfter(null, 10, "ABC"));
+		assertEquals("1AB", StrUtil.padAfter("1", 3, "ABC"));
+		assertEquals("23", StrUtil.padAfter("123", 2, "ABC"));
 	}
 
 	@Test
 	public void subBetweenAllTest() {
-		Assert.assertArrayEquals(new String[]{"yz", "abc"}, StrUtil.subBetweenAll("saho[yz]fdsadp[abc]a", "[", "]"));
-		Assert.assertArrayEquals(new String[]{"abc"}, StrUtil.subBetweenAll("saho[yzfdsadp[abc]a]", "[", "]"));
-		Assert.assertArrayEquals(new String[]{"abc", "abc"}, StrUtil.subBetweenAll("yabczyabcz", "y", "z"));
-		Assert.assertArrayEquals(new String[0], StrUtil.subBetweenAll(null, "y", "z"));
-		Assert.assertArrayEquals(new String[0], StrUtil.subBetweenAll("", "y", "z"));
-		Assert.assertArrayEquals(new String[0], StrUtil.subBetweenAll("abc", null, "z"));
-		Assert.assertArrayEquals(new String[0], StrUtil.subBetweenAll("abc", "y", null));
+		assertArrayEquals(new String[]{"yz", "abc"}, StrUtil.subBetweenAll("saho[yz]fdsadp[abc]a", "[", "]"));
+		assertArrayEquals(new String[]{"abc"}, StrUtil.subBetweenAll("saho[yzfdsadp[abc]a]", "[", "]"));
+		assertArrayEquals(new String[]{"abc", "abc"}, StrUtil.subBetweenAll("yabczyabcz", "y", "z"));
+		assertArrayEquals(new String[0], StrUtil.subBetweenAll(null, "y", "z"));
+		assertArrayEquals(new String[0], StrUtil.subBetweenAll("", "y", "z"));
+		assertArrayEquals(new String[0], StrUtil.subBetweenAll("abc", null, "z"));
+		assertArrayEquals(new String[0], StrUtil.subBetweenAll("abc", "y", null));
 	}
 
 	@Test
@@ -469,38 +472,38 @@ public class StrUtilTest {
 		final String src2 = "/ * hutool  */  asdas  / * hutool  */";
 
 		final String[] results1 = StrUtil.subBetweenAll(src1, "/**", "*/");
-		Assert.assertEquals(0, results1.length);
+		assertEquals(0, results1.length);
 
 		final String[] results2 = StrUtil.subBetweenAll(src2, "/*", "*/");
-		Assert.assertEquals(0, results2.length);
+		assertEquals(0, results2.length);
 	}
 
 	@Test
 	public void subBetweenAllTest3() {
 		final String src1 = "'abc'and'123'";
 		String[] strings = StrUtil.subBetweenAll(src1, "'", "'");
-		Assert.assertEquals(2, strings.length);
-		Assert.assertEquals("abc", strings[0]);
-		Assert.assertEquals("123", strings[1]);
+		assertEquals(2, strings.length);
+		assertEquals("abc", strings[0]);
+		assertEquals("123", strings[1]);
 
 		final String src2 = "'abc''123'";
 		strings = StrUtil.subBetweenAll(src2, "'", "'");
-		Assert.assertEquals(2, strings.length);
-		Assert.assertEquals("abc", strings[0]);
-		Assert.assertEquals("123", strings[1]);
+		assertEquals(2, strings.length);
+		assertEquals("abc", strings[0]);
+		assertEquals("123", strings[1]);
 
 		final String src3 = "'abc'123'";
 		strings = StrUtil.subBetweenAll(src3, "'", "'");
-		Assert.assertEquals(1, strings.length);
-		Assert.assertEquals("abc", strings[0]);
+		assertEquals(1, strings.length);
+		assertEquals("abc", strings[0]);
 	}
 
 	@Test
 	public void subBetweenAllTest4() {
 		final String str = "你好:1388681xxxx用户已开通,1877275xxxx用户已开通,无法发送业务开通短信";
 		final String[] strings = StrUtil.subBetweenAll(str, "1877275xxxx", ",");
-		Assert.assertEquals(1, strings.length);
-		Assert.assertEquals("用户已开通", strings[0]);
+		assertEquals(1, strings.length);
+		assertEquals("用户已开通", strings[0]);
 	}
 
 	@Test
@@ -509,14 +512,14 @@ public class StrUtilTest {
 		final String str = RandomUtil.randomString(RandomUtil.randomInt(1, 100));
 		for (int maxLength = 1; maxLength < str.length(); maxLength++) {
 			final String brief = StrUtil.brief(str, maxLength);
-			Assert.assertEquals(brief.length(), maxLength);
+			assertEquals(brief.length(), maxLength);
 		}
 
 		// case: 不会格式化的值
-		Assert.assertEquals(str, StrUtil.brief(str, 0));
-		Assert.assertEquals(str, StrUtil.brief(str, -1));
-		Assert.assertEquals(str, StrUtil.brief(str, str.length()));
-		Assert.assertEquals(str, StrUtil.brief(str, str.length() + 1));
+		assertEquals(str, StrUtil.brief(str, 0));
+		assertEquals(str, StrUtil.brief(str, -1));
+		assertEquals(str, StrUtil.brief(str, str.length()));
+		assertEquals(str, StrUtil.brief(str, str.length() + 1));
 	}
 
 	@Test
@@ -524,15 +527,15 @@ public class StrUtilTest {
 		final String str = "123";
 		int maxLength = 3;
 		String brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("123", brief);
+		assertEquals("123", brief);
 
 		maxLength = 2;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1.", brief);
+		assertEquals("1.", brief);
 
 		maxLength = 1;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1", brief);
+		assertEquals("1", brief);
 	}
 
 	@Test
@@ -541,44 +544,44 @@ public class StrUtilTest {
 
 		int maxLength = 6;
 		String brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals(str, brief);
+		assertEquals(str, brief);
 
 		maxLength = 5;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1...c", brief);
+		assertEquals("1...c", brief);
 
 		maxLength = 4;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1..c", brief);
+		assertEquals("1..c", brief);
 
 		maxLength = 3;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1.c", brief);
+		assertEquals("1.c", brief);
 
 		maxLength = 2;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1.", brief);
+		assertEquals("1.", brief);
 
 		maxLength = 1;
 		brief = StrUtil.brief(str, maxLength);
-		Assert.assertEquals("1", brief);
+		assertEquals("1", brief);
 	}
 
 	@Test
 	public void filterTest() {
 		final String filterNumber = StrUtil.filter("hutool678", CharUtil::isNumber);
-		Assert.assertEquals("678", filterNumber);
+		assertEquals("678", filterNumber);
 		final String cleanBlank = StrUtil.filter("	 你 好　", c -> !CharUtil.isBlankChar(c));
-		Assert.assertEquals("你好", cleanBlank);
+		assertEquals("你好", cleanBlank);
 	}
 
 	@Test
 	public void wrapAllTest() {
 		String[] strings = StrUtil.wrapAll("`", "`", StrUtil.splitToArray("1,2,3,4", ','));
-		Assert.assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
+		assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
 
 		strings = StrUtil.wrapAllWithPair("`", StrUtil.splitToArray("1,2,3,4", ','));
-		Assert.assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
+		assertEquals("[`1`, `2`, `3`, `4`]", StrUtil.utf8Str(strings));
 	}
 
 	@Test
@@ -586,64 +589,64 @@ public class StrUtilTest {
 		final String a = "123";
 		final String b = "123";
 
-		Assert.assertTrue(StrUtil.startWith(a, b));
-		Assert.assertFalse(StrUtil.startWithIgnoreEquals(a, b));
+		assertTrue(StrUtil.startWith(a, b));
+		assertFalse(StrUtil.startWithIgnoreEquals(a, b));
 	}
 
 	@Test
 	public void indexedFormatTest() {
 		final String ret = StrUtil.indexedFormat("this is {0} for {1}", "a", 1000);
-		Assert.assertEquals("this is a for 1,000", ret);
+		assertEquals("this is a for 1,000", ret);
 	}
 
 	@Test
 	public void hideTest() {
-		Assert.assertNull(StrUtil.hide(null, 1, 1));
-		Assert.assertEquals("", StrUtil.hide("", 1, 1));
-		Assert.assertEquals("****duan@163.com", StrUtil.hide("jackduan@163.com", -1, 4));
-		Assert.assertEquals("ja*kduan@163.com", StrUtil.hide("jackduan@163.com", 2, 3));
-		Assert.assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 3, 2));
-		Assert.assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 16, 16));
-		Assert.assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 16, 17));
+		assertNull(StrUtil.hide(null, 1, 1));
+		assertEquals("", StrUtil.hide("", 1, 1));
+		assertEquals("****duan@163.com", StrUtil.hide("jackduan@163.com", -1, 4));
+		assertEquals("ja*kduan@163.com", StrUtil.hide("jackduan@163.com", 2, 3));
+		assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 3, 2));
+		assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 16, 16));
+		assertEquals("jackduan@163.com", StrUtil.hide("jackduan@163.com", 16, 17));
 	}
 
 
 	@Test
 	public void isCharEqualsTest() {
 		final String a = "aaaaaaaaa";
-		Assert.assertTrue(StrUtil.isCharEquals(a));
+		assertTrue(StrUtil.isCharEquals(a));
 	}
 
 	@Test
 	public void isNumericTest() {
 		final String a = "2142342422423423";
-		Assert.assertTrue(StrUtil.isNumeric(a));
+		assertTrue(StrUtil.isNumeric(a));
 	}
 
 	@Test
 	public void containsAllTest() {
 		final String a = "2142342422423423";
-		Assert.assertTrue(StrUtil.containsAll(a, "214", "234"));
+		assertTrue(StrUtil.containsAll(a, "214", "234"));
 	}
 
 	@Test
 	public void replaceLastTest() {
 		final String str = "i am jackjack";
 		final String result = StrUtil.replaceLast(str, "JACK", null, true);
-		Assert.assertEquals(result, "i am jack");
+		assertEquals(result, "i am jack");
 	}
 
 	@Test
 	public void replaceFirstTest() {
 		final String str = "yesyes i do";
 		final String result = StrUtil.replaceFirst(str, "YES", "", true);
-		Assert.assertEquals(result, "yes i do");
+		assertEquals(result, "yes i do");
 	}
 
 	@Test
 	public void issueI5YN49Test() {
 		final String str = "A5E6005700000000000000000000000000000000000000090D0100000000000001003830";
-		Assert.assertEquals("38", StrUtil.subWithLength(str,-2,2));
+		assertEquals("38", StrUtil.subWithLength(str, -2, 2));
 	}
 
 	@Test
@@ -651,43 +654,43 @@ public class StrUtilTest {
 		// https://gitee.com/dromara/hutool/issues/I6KKFU
 		final String template = "I''m {0} years old.";
 		final String result = StrUtil.indexedFormat(template, 10);
-		Assert.assertEquals("I'm 10 years old.", result);
+		assertEquals("I'm 10 years old.", result);
 	}
 
 	@Test
 	public void truncateUtf8Test() {
 		final String str = "这是This一段中英文";
 		String ret = StrUtil.truncateUtf8(str, 12);
-		Assert.assertEquals("这是Thi...", ret);
+		assertEquals("这是Thi...", ret);
 
 		ret = StrUtil.truncateUtf8(str, 13);
-		Assert.assertEquals("这是This...", ret);
+		assertEquals("这是This...", ret);
 
 		ret = StrUtil.truncateUtf8(str, 14);
-		Assert.assertEquals("这是This...", ret);
+		assertEquals("这是This...", ret);
 
 		ret = StrUtil.truncateUtf8(str, 999);
-		Assert.assertEquals(str, ret);
+		assertEquals(str, ret);
 	}
 
 	@Test
 	public void truncateUtf8Test2() {
 		final String str = "这是This一";
 		final String ret = StrUtil.truncateUtf8(str, 13);
-		Assert.assertEquals("这是This一", ret);
+		assertEquals("这是This一", ret);
 	}
 
 	@Test
 	public void truncateUtf8Test3() {
 		final String str = "一二三四";
 		final String ret = StrUtil.truncateUtf8(str, 11);
-		Assert.assertEquals("一二...", ret);
+		assertEquals("一二...", ret);
 	}
 
 	@Test
 	public void truncateByByteLengthTest() {
 		final String str = "This is English";
-		final String ret = StrUtil.truncateByByteLength(str, StandardCharsets.ISO_8859_1,10, 1, false);
-		Assert.assertEquals("This is En", ret);
+		final String ret = StrUtil.truncateByByteLength(str, StandardCharsets.ISO_8859_1, 10, 1, false);
+		assertEquals("This is En", ret);
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
index a67ed9cd8..d05e46cfa 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/TypeUtilTest.java
@@ -5,8 +5,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class TypeUtilTest {
 
@@ -14,20 +14,20 @@ public class TypeUtilTest {
 	public void getEleTypeTest() {
 		Method method = ReflectUtil.getMethod(TestClass.class, "getList");
 		Type type = TypeUtil.getReturnType(method);
-		Assert.assertEquals("java.util.List<java.lang.String>", type.toString());
+		assertEquals("java.util.List<java.lang.String>", type.toString());
 
 		Type type2 = TypeUtil.getTypeArgument(type);
-		Assert.assertEquals(String.class, type2);
+		assertEquals(String.class, type2);
 	}
 
 	@Test
 	public void getParamTypeTest() {
 		Method method = ReflectUtil.getMethod(TestClass.class, "intTest", Integer.class);
 		Type type = TypeUtil.getParamType(method, 0);
-		Assert.assertEquals(Integer.class, type);
+		assertEquals(Integer.class, type);
 
 		Type returnType = TypeUtil.getReturnType(method);
-		Assert.assertEquals(Integer.class, returnType);
+		assertEquals(Integer.class, returnType);
 	}
 
 	@Test
@@ -35,12 +35,12 @@ public class TypeUtilTest {
 		Method method = ReflectUtil.getMethod(Parent.class, "getLevel");
 		Type returnType = TypeUtil.getReturnType(method);
 		Class clazz = TypeUtil.getClass(returnType);
-		Assert.assertEquals(Level1.class, clazz);
+		assertEquals(Level1.class, clazz);
 
 		method = ReflectUtil.getMethod(Level1.class, "getId");
 		returnType = TypeUtil.getReturnType(method);
 		clazz = TypeUtil.getClass(returnType);
-		Assert.assertEquals(Object.class, clazz);
+		assertEquals(Object.class, clazz);
 	}
 
 	public static class TestClass {
@@ -58,7 +58,7 @@ public class TypeUtilTest {
 	public void getTypeArgumentTest() {
 		// 测试不继承父类，而是实现泛型接口时是否可以获取成功。
 		final Type typeArgument = TypeUtil.getTypeArgument(IPService.class);
-		Assert.assertEquals(String.class, typeArgument);
+		assertEquals(String.class, typeArgument);
 	}
 
 	public interface OperateService<T> {
@@ -76,7 +76,7 @@ public class TypeUtilTest {
 		// 测试多层级泛型参数是否能获取成功
 		Type idType = TypeUtil.getActualType(Level3.class, ReflectUtil.getField(Level3.class, "id"));
 
-		Assert.assertEquals(Long.class, idType);
+		assertEquals(Long.class, idType);
 	}
 
 	public static class Level3 extends Level2<Level3> {
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
index 4980ee2c9..c449b1f1a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/URLUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.core.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -20,51 +20,51 @@ public class URLUtilTest {
 		// issue#I25MZL，多个/被允许
 		String url = "http://www.hutool.cn//aaa/bbb";
 		String normalize = URLUtil.normalize(url);
-		Assert.assertEquals("http://www.hutool.cn//aaa/bbb", normalize);
+		assertEquals("http://www.hutool.cn//aaa/bbb", normalize);
 
 		url = "www.hutool.cn//aaa/bbb";
 		normalize = URLUtil.normalize(url);
-		Assert.assertEquals("http://www.hutool.cn//aaa/bbb", normalize);
+		assertEquals("http://www.hutool.cn//aaa/bbb", normalize);
 	}
 
 	@Test
 	public void normalizeTest2() {
 		String url = "http://www.hutool.cn//aaa/\\bbb?a=1&b=2";
 		String normalize = URLUtil.normalize(url);
-		Assert.assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
 
 		url = "www.hutool.cn//aaa/bbb?a=1&b=2";
 		normalize = URLUtil.normalize(url);
-		Assert.assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
 	}
 
 	@Test
 	public void normalizeTest3() {
 		String url = "http://www.hutool.cn//aaa/\\bbb?a=1&b=2";
 		String normalize = URLUtil.normalize(url, true);
-		Assert.assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
 
 		url = "www.hutool.cn//aaa/bbb?a=1&b=2";
 		normalize = URLUtil.normalize(url, true);
-		Assert.assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
 
 		url = "\\/www.hutool.cn//aaa/bbb?a=1&b=2";
 		normalize = URLUtil.normalize(url, true);
-		Assert.assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa/bbb?a=1&b=2", normalize);
 	}
 
 	@Test
 	public void normalizeIpv6Test() {
 		String url = "http://[fe80::8f8:2022:a603:d180]:9439";
 		String normalize = URLUtil.normalize("http://[fe80::8f8:2022:a603:d180]:9439", true);
-		Assert.assertEquals(url, normalize);
+		assertEquals(url, normalize);
 	}
 
 	@Test
 	public void formatTest() {
 		String url = "//www.hutool.cn//aaa/\\bbb?a=1&b=2";
 		String normalize = URLUtil.normalize(url);
-		Assert.assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
+		assertEquals("http://www.hutool.cn//aaa//bbb?a=1&b=2", normalize);
 	}
 
 	@Test
@@ -72,32 +72,32 @@ public class URLUtilTest {
 		String url = "https://www.hutool.cn//aaa/\\bbb?a=1&b=2";
 		String normalize = URLUtil.normalize(url);
 		URI host = URLUtil.getHost(new URL(normalize));
-		Assert.assertEquals("https://www.hutool.cn", host.toString());
+		assertEquals("https://www.hutool.cn", host.toString());
 	}
 
 	@Test
 	public void encodeTest() {
 		String body = "366466 - 副本.jpg";
 		String encode = URLUtil.encode(body);
-		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode);
-		Assert.assertEquals(body, URLUtil.decode(encode));
+		assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode);
+		assertEquals(body, URLUtil.decode(encode));
 
 		String encode2 = URLUtil.encodeQuery(body);
-		Assert.assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode2);
+		assertEquals("366466%20-%20%E5%89%AF%E6%9C%AC.jpg", encode2);
 	}
 
 	@Test
 	public void encodeQueryPlusTest() {
 		String body = "+";
 		String encode2 = URLUtil.encodeQuery(body);
-		Assert.assertEquals("+", encode2);
+		assertEquals("+", encode2);
 	}
 
 	@Test
 	public void getPathTest(){
 		String url = " http://www.aaa.bbb/search?scope=ccc&q=ddd";
 		String path = URLUtil.getPath(url);
-		Assert.assertEquals("/search", path);
+		assertEquals("/search", path);
 	}
 
 	@Test
@@ -105,6 +105,6 @@ public class URLUtilTest {
 		String fileFullName = "/Uploads/20240601/aaaa.txt";
 		final URI uri = URLUtil.toURI(fileFullName);
 		final URI resolve = uri.resolve(".");
-		Assert.assertEquals("/Uploads/20240601/", resolve.toString());
+		assertEquals("/Uploads/20240601/", resolve.toString());
 	}
 }
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
index 34eb76b84..6f0932082 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapBuilder;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -41,11 +41,11 @@ public class XmlUtilTest {
 				+ "</returnsms>";
 		final Document docResult = XmlUtil.parseXml(result);
 		final String elementText = XmlUtil.elementText(docResult.getDocumentElement(), "returnstatus");
-		Assert.assertEquals("Success", elementText);
+		assertEquals("Success", elementText);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		final String result = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"//
 				+ "<returnsms>"//
@@ -71,7 +71,7 @@ public class XmlUtilTest {
 				+ "</returnsms>";
 		final Document docResult = XmlUtil.parseXml(result);
 		final Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING);
-		Assert.assertEquals("ok", value);
+		assertEquals("ok", value);
 	}
 
 	@Test
@@ -79,7 +79,7 @@ public class XmlUtilTest {
 		final String result = ResourceUtil.readUtf8Str("test.xml");
 		final Document docResult = XmlUtil.parseXml(result);
 		final Object value = XmlUtil.getByXPath("//returnsms/message", docResult, XPathConstants.STRING);
-		Assert.assertEquals("ok", value);
+		assertEquals("ok", value);
 	}
 
 	@Test
@@ -95,13 +95,13 @@ public class XmlUtilTest {
 				+ "</returnsms>";
 		final Map<String, Object> map = XmlUtil.xmlToMap(xml);
 
-		Assert.assertEquals(6, map.size());
-		Assert.assertEquals("Success", map.get("returnstatus"));
-		Assert.assertEquals("ok", map.get("message"));
-		Assert.assertEquals("1490", map.get("remainpoint"));
-		Assert.assertEquals("885", map.get("taskID"));
-		Assert.assertEquals("1", map.get("successCounts"));
-		Assert.assertEquals("subText", ((Map<?, ?>) map.get("newNode")).get("sub"));
+		assertEquals(6, map.size());
+		assertEquals("Success", map.get("returnstatus"));
+		assertEquals("ok", map.get("message"));
+		assertEquals("1490", map.get("remainpoint"));
+		assertEquals("885", map.get("taskID"));
+		assertEquals("1", map.get("successCounts"));
+		assertEquals("subText", ((Map<?, ?>) map.get("newNode")).get("sub"));
 	}
 
 	@Test
@@ -109,8 +109,8 @@ public class XmlUtilTest {
 		final String xml = "<root><name>张三</name><name>李四</name></root>";
 		final Map<String, Object> map = XmlUtil.xmlToMap(xml);
 
-		Assert.assertEquals(1, map.size());
-		Assert.assertEquals(CollUtil.newArrayList("张三", "李四"), map.get("name"));
+		assertEquals(1, map.size());
+		assertEquals(CollUtil.newArrayList("张三", "李四"), map.get("name"));
 	}
 
 	@Test
@@ -122,7 +122,7 @@ public class XmlUtilTest {
 				.build();
 		final Document doc = XmlUtil.mapToXml(map, "user");
 		// Console.log(XmlUtil.toStr(doc, false));
-		Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"//
+		assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"//
 						+ "<user>"//
 						+ "<name>张三</name>"//
 						+ "<age>12</age>"//
@@ -142,7 +142,7 @@ public class XmlUtilTest {
 				.build();
 
 		final Document doc = XmlUtil.mapToXml(map, "City");
-		Assert.assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
+		assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>" +
 						"<City>" +
 						"<Town>town1</Town>" +
 						"<Town>town2</Town>" +
@@ -153,7 +153,7 @@ public class XmlUtilTest {
 	@Test
 	public void readTest() {
 		final Document doc = XmlUtil.readXML("test.xml");
-		Assert.assertNotNull(doc);
+		assertNotNull(doc);
 	}
 
 	@Test
@@ -163,7 +163,7 @@ public class XmlUtilTest {
 		XmlUtil.readBySax(ResourceUtil.getStream("test.xml"), new DefaultHandler(){
 			@Override
 			public void startElement(final String uri, final String localName, final String qName, final Attributes attributes) {
-				Assert.assertTrue(eles.contains(localName));
+				assertTrue(eles.contains(localName));
 			}
 		});
 	}
@@ -175,7 +175,7 @@ public class XmlUtilTest {
 				.put("name", "ddatsh")
 				.build();
 		final String xml = XmlUtil.mapToXmlStr(map, true);
-		Assert.assertEquals("<xml><name>ddatsh</name></xml>", xml);
+		assertEquals("<xml><name>ddatsh</name></xml>", xml);
 	}
 
 	@Test
@@ -193,7 +193,7 @@ public class XmlUtilTest {
 		final Object value = XmlUtil.getByXPath(
 				"//soap:Envelope/soap:Body/ns2:testResponse/return",
 				document, XPathConstants.STRING);//
-		Assert.assertEquals("2020/04/15 21:01:21", value);
+		assertEquals("2020/04/15 21:01:21", value);
 	}
 
 	@Test
@@ -216,11 +216,11 @@ public class XmlUtilTest {
 
 		// 不忽略空字段情况下保留自闭标签
 		Document doc = XmlUtil.beanToXml(testBean, null, false);
-		Assert.assertNotNull(XmlUtil.getElement(doc.getDocumentElement(), "ProjectCode"));
+		assertNotNull(XmlUtil.getElement(doc.getDocumentElement(), "ProjectCode"));
 
 		// 忽略空字段情况下无自闭标签
 		doc = XmlUtil.beanToXml(testBean, null, true);
-		Assert.assertNull(XmlUtil.getElement(doc.getDocumentElement(), "ProjectCode"));
+		assertNull(XmlUtil.getElement(doc.getDocumentElement(), "ProjectCode"));
 	}
 
 	@Test
@@ -242,14 +242,14 @@ public class XmlUtilTest {
 		testBean.setBankCode("00001");
 
 		final Document doc = XmlUtil.beanToXml(testBean);
-		Assert.assertEquals(TestBean.class.getSimpleName(), doc.getDocumentElement().getTagName());
+		assertEquals(TestBean.class.getSimpleName(), doc.getDocumentElement().getTagName());
 
 		final TestBean testBean2 = XmlUtil.xmlToBean(doc, TestBean.class);
-		Assert.assertEquals(testBean.getReqCode(), testBean2.getReqCode());
-		Assert.assertEquals(testBean.getAccountName(), testBean2.getAccountName());
-		Assert.assertEquals(testBean.getOperator(), testBean2.getOperator());
-		Assert.assertEquals(testBean.getProjectCode(), testBean2.getProjectCode());
-		Assert.assertEquals(testBean.getBankCode(), testBean2.getBankCode());
+		assertEquals(testBean.getReqCode(), testBean2.getReqCode());
+		assertEquals(testBean.getAccountName(), testBean2.getAccountName());
+		assertEquals(testBean.getOperator(), testBean2.getOperator());
+		assertEquals(testBean.getProjectCode(), testBean2.getProjectCode());
+		assertEquals(testBean.getBankCode(), testBean2.getBankCode());
 	}
 
 	@Test
@@ -272,18 +272,18 @@ public class XmlUtilTest {
 		// toBean方式
 		final SmsRes res1 = XmlUtil.xmlToBean(doc.getFirstChild(), SmsRes.class);
 
-		Assert.assertEquals(res.toString(), res1.toString());
+		assertEquals(res.toString(), res1.toString());
 	}
 
 	@Test
 	public void cleanCommentTest() {
 		final String xmlContent = "<info><title>hutool</title><!-- 这是注释 --><lang>java</lang></info>";
 		final String ret = XmlUtil.cleanComment(xmlContent);
-		Assert.assertEquals("<info><title>hutool</title><lang>java</lang></info>", ret);
+		assertEquals("<info><title>hutool</title><lang>java</lang></info>", ret);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void formatTest(){
 		// https://github.com/looly/hutool/pull/1234
 		final Document xml = XmlUtil.createXml("NODES");
@@ -330,7 +330,7 @@ public class XmlUtilTest {
 
 		final Document doc = XmlUtil.parseXml(xml);
 		final String name = doc.getDocumentElement().getAttribute("name");
-		Assert.assertEquals("aaaa", name);
+		assertEquals("aaaa", name);
 	}
 
 	@Test
@@ -338,9 +338,9 @@ public class XmlUtilTest {
 		final String xml = "<userInfo><name>张三</name><age>20</age><email>zhangsan@example.com</email></userInfo>";
 		final Document document = XmlUtil.readXML(xml);
 		final UserInfo userInfo = XmlUtil.xmlToBean(document, UserInfo.class);
-		Assert.assertEquals("张三", userInfo.getName());
-		Assert.assertEquals("20", userInfo.getAge());
-		Assert.assertEquals("zhangsan@example.com", userInfo.getEmail());
+		assertEquals("张三", userInfo.getName());
+		assertEquals("20", userInfo.getAge());
+		assertEquals("zhangsan@example.com", userInfo.getEmail());
 	}
 
 	@Data
@@ -362,8 +362,8 @@ public class XmlUtilTest {
 			"</r>";
 
 		final R r = XmlUtil.xmlToBean(XmlUtil.parseXml(xml), R.class);
-		Assert.assertEquals("1", r.getC().get(0).getS());
-		Assert.assertEquals("str", r.getC().get(0).getP());
+		assertEquals("1", r.getC().get(0).getS());
+		assertEquals("str", r.getC().get(0).getP());
 	}
 
 	@Data
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
index 9a00ec1a3..6ca03ce2a 100644
--- a/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/ZipUtilTest.java
@@ -4,21 +4,17 @@ import cn.hutool.core.compress.ZipReader;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipFile;
 
 import static cn.hutool.core.util.ZipUtil.unzip;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * {@link ZipUtil}单元测试
@@ -43,9 +39,9 @@ public class ZipUtilTest {
 		List<String> afterNames = zipEntryNames(tempZipFile);
 
 		// 确认增加了文件
-		Assert.assertEquals(beforeNames.size() + 1, afterNames.size());
-		Assert.assertTrue(afterNames.containsAll(beforeNames));
-		Assert.assertTrue(afterNames.contains(appendFile.getName()));
+		assertEquals(beforeNames.size() + 1, afterNames.size());
+		assertTrue(afterNames.containsAll(beforeNames));
+		assertTrue(afterNames.contains(appendFile.getName()));
 
 		// test dir add
 		beforeNames = zipEntryNames(tempZipFile);
@@ -54,12 +50,12 @@ public class ZipUtilTest {
 		afterNames = zipEntryNames(tempZipFile);
 
 		// 确认增加了文件和目录，增加目录和目录下一个文件，故此处+2
-		Assert.assertEquals(beforeNames.size() + 2, afterNames.size());
-		Assert.assertTrue(afterNames.containsAll(beforeNames));
-		Assert.assertTrue(afterNames.contains(appendFile.getName()));
+		assertEquals(beforeNames.size() + 2, afterNames.size());
+		assertTrue(afterNames.containsAll(beforeNames));
+		assertTrue(afterNames.contains(appendFile.getName()));
 
 		// rollback
-		Assert.assertTrue(String.format("delete temp file %s failed", tempZipFile.getCanonicalPath()), tempZipFile.delete());
+		assertTrue(tempZipFile.delete(), String.format("delete temp file %s failed", tempZipFile.getCanonicalPath()));
 	}
 
 	/**
@@ -77,43 +73,43 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipDirTest() {
 		ZipUtil.zip(new File("d:/test"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipTest() {
 		final File unzip = ZipUtil.unzip("d:/test/hutool.zip", "d:\\test", CharsetUtil.CHARSET_GBK);
 		Console.log(unzip);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipTest2() {
 		final File unzip = ZipUtil.unzip("f:/test/各种资源.zip", "f:/test/各种资源", CharsetUtil.CHARSET_GBK);
 		Console.log(unzip);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipFromStreamTest() {
 		final File unzip = ZipUtil.unzip(FileUtil.getInputStream("e:/test/hutool-core-5.1.0.jar"), FileUtil.file("e:/test/"), CharsetUtil.CHARSET_UTF_8);
 		Console.log(unzip);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipChineseTest() {
 		ZipUtil.unzip("d:/测试.zip");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void unzipFileBytesTest() {
 		final byte[] fileBytes = ZipUtil.unzipFileBytes(FileUtil.file("e:/02 电力相关设备及服务2-241-.zip"), CharsetUtil.CHARSET_GBK, "images/CE-EP-HY-MH01-ES-0001.jpg");
-		Assert.assertNotNull(fileBytes);
+		assertNotNull(fileBytes);
 	}
 
 	@Test
@@ -123,11 +119,11 @@ public class ZipUtilTest {
 		final byte[] gzip = ZipUtil.gzip(bytes);
 
 		//保证gzip长度正常
-		Assert.assertEquals(68, gzip.length);
+		assertEquals(68, gzip.length);
 
 		final byte[] unGzip = ZipUtil.unGzip(gzip);
 		//保证正常还原
-		Assert.assertEquals(data, StrUtil.utf8Str(unGzip));
+		assertEquals(data, StrUtil.utf8Str(unGzip));
 	}
 
 	@Test
@@ -137,21 +133,21 @@ public class ZipUtilTest {
 		byte[] gzip = ZipUtil.zlib(bytes, 0);
 
 		//保证zlib长度正常
-		Assert.assertEquals(62, gzip.length);
+		assertEquals(62, gzip.length);
 		final byte[] unGzip = ZipUtil.unZlib(gzip);
 		//保证正常还原
-		Assert.assertEquals(data, StrUtil.utf8Str(unGzip));
+		assertEquals(data, StrUtil.utf8Str(unGzip));
 
 		gzip = ZipUtil.zlib(bytes, 9);
 		//保证zlib长度正常
-		Assert.assertEquals(56, gzip.length);
+		assertEquals(56, gzip.length);
 		final byte[] unGzip2 = ZipUtil.unZlib(gzip);
 		//保证正常还原
-		Assert.assertEquals(data, StrUtil.utf8Str(unGzip2));
+		assertEquals(data, StrUtil.utf8Str(unGzip2));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipStreamTest(){
 		//https://github.com/dromara/hutool/issues/944
 		final String dir = "d:/test";
@@ -166,7 +162,7 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipStreamTest2(){
 		// https://github.com/dromara/hutool/issues/944
 		final String file1 = "d:/test/a.txt";
@@ -183,7 +179,7 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipToStreamTest(){
 		final String zip = "d:/test/testToStream.zip";
 		final OutputStream out = FileUtil.getOutputStream(zip);
@@ -192,7 +188,7 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipMultiFileTest(){
 		final File[] dd={FileUtil.file("d:\\test\\qr_a.jpg")
 				,FileUtil.file("d:\\test\\qr_b.jpg")};
@@ -201,7 +197,7 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sizeUnzipTest() throws IOException {
 		final String zipPath = "e:\\hutool\\demo.zip";
 		final String outPath = "e:\\hutool\\test";
@@ -216,7 +212,7 @@ public class ZipUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue3018Test() {
 		ZipUtil.unzip(
 				FileUtil.getInputStream("d:/test/default.zip")
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java b/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java
index 318a25e1f..7f9494629 100755
--- a/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/TaskTableTest.java
@@ -3,13 +3,13 @@ package cn.hutool.cron;
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.cron.pattern.CronPattern;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class TaskTableTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toStringTest(){
 		final TaskTable taskTable = new TaskTable();
 		taskTable.add(IdUtil.fastUUID(), new CronPattern("*/10 * * * * *"), ()-> Console.log("Task 1"));
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java b/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java
index caff461c8..2735eae87 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/demo/CronTest.java
@@ -6,8 +6,8 @@ import cn.hutool.cron.CronUtil;
 import cn.hutool.cron.TaskExecutor;
 import cn.hutool.cron.listener.TaskListener;
 import cn.hutool.cron.task.Task;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * 定时任务样例
@@ -15,7 +15,7 @@ import org.junit.Test;
 public class CronTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void customCronTest() {
 		CronUtil.schedule("*/2 * * * * *", (Task) () -> Console.log("Task excuted."));
 
@@ -28,7 +28,7 @@ public class CronTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cronTest() {
 		// 支持秒级别定时任务
 		CronUtil.setMatchSecond(true);
@@ -40,7 +40,7 @@ public class CronTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cronWithListenerTest() {
 		CronUtil.getScheduler().addListener(new TaskListener() {
 			@Override
@@ -68,7 +68,7 @@ public class CronTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addAndRemoveTest() {
 		String id = CronUtil.schedule("*/2 * * * * *", (Runnable) () -> Console.log("task running : 2s"));
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java
index 2d00c008c..ee59aee07 100755
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternBuilderTest.java
@@ -1,26 +1,26 @@
 package cn.hutool.cron.pattern;
 
 import cn.hutool.cron.CronException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CronPatternBuilderTest {
 
 	@Test
 	public void buildMatchAllTest(){
 		String build = CronPatternBuilder.of().build();
-		Assert.assertEquals("* * * * *", build);
+		assertEquals("* * * * *", build);
 
 		build = CronPatternBuilder.of()
 				.set(Part.SECOND, "*")
 				.build();
-		Assert.assertEquals("* * * * * *", build);
+		assertEquals("* * * * * *", build);
 
 		build = CronPatternBuilder.of()
 				.set(Part.SECOND, "*")
 				.set(Part.YEAR, "*")
 				.build();
-		Assert.assertEquals("* * * * * * *", build);
+		assertEquals("* * * * * * *", build);
 	}
 
 	@Test
@@ -29,7 +29,7 @@ public class CronPatternBuilderTest {
 				.set(Part.SECOND, "*")
 				.setRange(Part.HOUR, 2, 9)
 				.build();
-		Assert.assertEquals("* * 2-9 * * *", build);
+		assertEquals("* * 2-9 * * *", build);
 	}
 
 	@Test(expected = CronException.class)
@@ -39,6 +39,6 @@ public class CronPatternBuilderTest {
 				// 55无效值
 				.setRange(Part.HOUR, 2, 55)
 				.build();
-		Assert.assertEquals("* * 2-9 * * *", build);
+		assertEquals("* * 2-9 * * *", build);
 	}
 }
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java
index 72e4d3811..b119e38f5 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternNextMatchTest.java
@@ -3,8 +3,8 @@ package cn.hutool.cron.pattern;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 
@@ -16,35 +16,35 @@ public class CronPatternNextMatchTest {
 		CronPattern pattern = new CronPattern("* * * * * * *");
 		DateTime date = DateUtil.truncate(DateUtil.date(), DateField.SECOND);
 		Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
-		Assert.assertEquals(date.getTime() + 1000, DateUtil.date(calendar).getTime());
+		assertEquals(date.getTime() + 1000, DateUtil.date(calendar).getTime());
 
 		// 匹配所有分，返回下一分钟
 		pattern = new CronPattern("0 * * * * * *");
 		date = DateUtil.parse("2022-04-08 07:44:16");
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(date.toCalendar());
-		Assert.assertEquals(DateUtil.parse("2022-04-08 07:45:00"), DateUtil.date(calendar));
+		assertEquals(DateUtil.parse("2022-04-08 07:45:00"), DateUtil.date(calendar));
 
 		// 匹配所有时，返回下一小时
 		pattern = new CronPattern("0 0 * * * * *");
 		date = DateUtil.parse("2022-04-08 07:44:16");
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(date.toCalendar());
-		Assert.assertEquals(DateUtil.parse("2022-04-08 08:00:00"), DateUtil.date(calendar));
+		assertEquals(DateUtil.parse("2022-04-08 08:00:00"), DateUtil.date(calendar));
 
 		// 匹配所有天，返回明日
 		pattern = new CronPattern("0 0 0 * * * *");
 		date = DateUtil.parse("2022-04-08 07:44:16");
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(date.toCalendar());
-		Assert.assertEquals(DateUtil.parse("2022-04-09 00:00:00"), DateUtil.date(calendar));
+		assertEquals(DateUtil.parse("2022-04-09 00:00:00"), DateUtil.date(calendar));
 
 		// 匹配所有月，返回下一月
 		pattern = new CronPattern("0 0 0 1 * * *");
 		date = DateUtil.parse("2022-04-08 07:44:16");
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(date.toCalendar());
-		Assert.assertEquals(DateUtil.parse("2022-05-01 00:00:00"), DateUtil.date(calendar));
+		assertEquals(DateUtil.parse("2022-05-01 00:00:00"), DateUtil.date(calendar));
 	}
 
 	@Test
@@ -56,36 +56,36 @@ public class CronPatternNextMatchTest {
 		Calendar calendar = pattern.nextMatchAfter(
 				DateUtil.parse("2022-04-12 09:12:12").toCalendar());
 
-		Assert.assertTrue(pattern.match(calendar, true));
-		Assert.assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
+		assertTrue(pattern.match(calendar, true));
+		assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
 
 		// 秒超出规定值的最大值，分+1，秒取最小值
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(
 				DateUtil.parse("2022-04-12 09:09:24").toCalendar());
-		Assert.assertTrue(pattern.match(calendar, true));
-		Assert.assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
+		assertTrue(pattern.match(calendar, true));
+		assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
 
 		// 秒超出规定值的最大值，分不变，小时+1，秒和分使用最小值
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(
 				DateUtil.parse("2022-04-12 09:12:24").toCalendar());
-		Assert.assertTrue(pattern.match(calendar, true));
-		Assert.assertEquals("2022-04-12 10:12:23", DateUtil.date(calendar).toString());
+		assertTrue(pattern.match(calendar, true));
+		assertEquals("2022-04-12 10:12:23", DateUtil.date(calendar).toString());
 
 		// 天超出规定值的最大值，月+1，天、时、分、秒取最小值
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(
 				DateUtil.parse("2022-04-13 09:12:24").toCalendar());
-		Assert.assertTrue(pattern.match(calendar, true));
-		Assert.assertEquals("2022-05-12 00:12:23", DateUtil.date(calendar).toString());
+		assertTrue(pattern.match(calendar, true));
+		assertEquals("2022-05-12 00:12:23", DateUtil.date(calendar).toString());
 
 		// 跨年
 		//noinspection ConstantConditions
 		calendar = pattern.nextMatchAfter(
 				DateUtil.parse("2021-12-22 00:00:00").toCalendar());
-		Assert.assertTrue(pattern.match(calendar, true));
-		Assert.assertEquals("2022-01-12 00:12:23", DateUtil.date(calendar).toString());
+		assertTrue(pattern.match(calendar, true));
+		assertEquals("2022-01-12 00:12:23", DateUtil.date(calendar).toString());
 	}
 
 	@Test
@@ -95,7 +95,7 @@ public class CronPatternNextMatchTest {
 		final DateTime time = DateUtil.parse("2022-04-03");
 		assert time != null;
 		final Calendar calendar = pattern.nextMatchAfter(time.toCalendar());
-		Assert.assertEquals("2022-04-09 01:01:01", DateUtil.date(calendar).toString());
+		assertEquals("2022-04-09 01:01:01", DateUtil.date(calendar).toString());
 	}
 
 	@Test
@@ -108,7 +108,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
@@ -129,7 +129,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
@@ -150,7 +150,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
@@ -171,7 +171,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
@@ -192,7 +192,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
@@ -211,7 +211,7 @@ public class CronPatternNextMatchTest {
 			//noinspection ConstantConditions
 			Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
 			date = DateUtil.date(calendar);
-			Assert.assertEquals(date, result);
+			assertEquals(date, result);
 			// 加一秒
 			date = date.offset(DateField.SECOND, 1);
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java
index c9c63130c..34e6addb7 100755
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternTest.java
@@ -2,8 +2,8 @@ package cn.hutool.cron.pattern;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.cron.CronException;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 定时任务单元测试类
@@ -103,11 +103,11 @@ public class CronPatternTest {
 	@Test
 	public void CronPatternTest2() {
 		CronPattern pattern = CronPattern.of("0/30 * * * *");
-		Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:00:00").getTime(), false));
-		Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:30:00").getTime(), false));
+		assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:00:00").getTime(), false));
+		assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:30:00").getTime(), false));
 
 		pattern = CronPattern.of("32 * * * *");
-		Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:32:00").getTime(), false));
+		assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:32:00").getTime(), false));
 	}
 
 	@Test
@@ -173,7 +173,7 @@ public class CronPatternTest {
 	 */
 	@SuppressWarnings("ConstantConditions")
 	private void assertMatch(CronPattern pattern, String date) {
-		Assert.assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), false));
-		Assert.assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), true));
+		assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), false));
+		assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), true));
 	}
 }
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java
index 9ce4a5622..9921e7500 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/CronPatternUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.cron.pattern;
 
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 import java.util.List;
@@ -13,35 +13,35 @@ public class CronPatternUtilTest {
 	public void matchedDatesTest() {
 		//测试每30秒执行
 		List<Date> matchedDates = CronPatternUtil.matchedDates("0/30 * 8-18 * * ?", DateUtil.parse("2018-10-15 14:33:22"), 5, true);
-		Assert.assertEquals(5, matchedDates.size());
-		Assert.assertEquals("2018-10-15 14:33:30", matchedDates.get(0).toString());
-		Assert.assertEquals("2018-10-15 14:34:00", matchedDates.get(1).toString());
-		Assert.assertEquals("2018-10-15 14:34:30", matchedDates.get(2).toString());
-		Assert.assertEquals("2018-10-15 14:35:00", matchedDates.get(3).toString());
-		Assert.assertEquals("2018-10-15 14:35:30", matchedDates.get(4).toString());
+		assertEquals(5, matchedDates.size());
+		assertEquals("2018-10-15 14:33:30", matchedDates.get(0).toString());
+		assertEquals("2018-10-15 14:34:00", matchedDates.get(1).toString());
+		assertEquals("2018-10-15 14:34:30", matchedDates.get(2).toString());
+		assertEquals("2018-10-15 14:35:00", matchedDates.get(3).toString());
+		assertEquals("2018-10-15 14:35:30", matchedDates.get(4).toString());
 	}
 
 	@Test
 	public void matchedDatesTest2() {
 		//测试每小时执行
 		List<Date> matchedDates = CronPatternUtil.matchedDates("0 0 */1 * * *", DateUtil.parse("2018-10-15 14:33:22"), 5, true);
-		Assert.assertEquals(5, matchedDates.size());
-		Assert.assertEquals("2018-10-15 15:00:00", matchedDates.get(0).toString());
-		Assert.assertEquals("2018-10-15 16:00:00", matchedDates.get(1).toString());
-		Assert.assertEquals("2018-10-15 17:00:00", matchedDates.get(2).toString());
-		Assert.assertEquals("2018-10-15 18:00:00", matchedDates.get(3).toString());
-		Assert.assertEquals("2018-10-15 19:00:00", matchedDates.get(4).toString());
+		assertEquals(5, matchedDates.size());
+		assertEquals("2018-10-15 15:00:00", matchedDates.get(0).toString());
+		assertEquals("2018-10-15 16:00:00", matchedDates.get(1).toString());
+		assertEquals("2018-10-15 17:00:00", matchedDates.get(2).toString());
+		assertEquals("2018-10-15 18:00:00", matchedDates.get(3).toString());
+		assertEquals("2018-10-15 19:00:00", matchedDates.get(4).toString());
 	}
 
 	@Test
 	public void matchedDatesTest3() {
 		//测试最后一天
 		List<Date> matchedDates = CronPatternUtil.matchedDates("0 0 */1 L * *", DateUtil.parse("2018-10-30 23:33:22"), 5, true);
-		Assert.assertEquals(5, matchedDates.size());
-		Assert.assertEquals("2018-10-31 00:00:00", matchedDates.get(0).toString());
-		Assert.assertEquals("2018-10-31 01:00:00", matchedDates.get(1).toString());
-		Assert.assertEquals("2018-10-31 02:00:00", matchedDates.get(2).toString());
-		Assert.assertEquals("2018-10-31 03:00:00", matchedDates.get(3).toString());
-		Assert.assertEquals("2018-10-31 04:00:00", matchedDates.get(4).toString());
+		assertEquals(5, matchedDates.size());
+		assertEquals("2018-10-31 00:00:00", matchedDates.get(0).toString());
+		assertEquals("2018-10-31 01:00:00", matchedDates.get(1).toString());
+		assertEquals("2018-10-31 02:00:00", matchedDates.get(2).toString());
+		assertEquals("2018-10-31 03:00:00", matchedDates.get(3).toString());
+		assertEquals("2018-10-31 04:00:00", matchedDates.get(4).toString());
 	}
 }
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue3685Test.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue3685Test.java
index 0675d2acc..b1a72760c 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue3685Test.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue3685Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.cron.pattern;
 
 import cn.hutool.core.date.DateUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI7SMP7Test.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI7SMP7Test.java
index 3a107f54a..8c05176f2 100755
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI7SMP7Test.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI7SMP7Test.java
@@ -14,8 +14,8 @@ package cn.hutool.cron.pattern;
 
 import cn.hutool.cron.pattern.matcher.PatternMatcher;
 import cn.hutool.cron.pattern.parser.PatternParser;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -23,6 +23,6 @@ public class IssueI7SMP7Test {
 	@Test
 	public void parseTest() {
 		final List<PatternMatcher> parse = PatternParser.parse("0 0 3 1 1 ? */1");
-		Assert.assertNotNull(parse);
+		assertNotNull(parse);
 	}
 }
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI82CSHTest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI82CSHTest.java
index 4dfc28c0d..7282ccde4 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI82CSHTest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI82CSHTest.java
@@ -2,8 +2,8 @@ package cn.hutool.cron.pattern;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 import java.util.List;
@@ -16,6 +16,6 @@ public class IssueI82CSHTest {
 		final DateTime end = DateUtil.parse("2025-09-20");
 		final List<Date> dates = CronPatternUtil.matchedDates("0 0 1 3-3,9 *", begin, end, 20, false);
 		//dates.forEach(Console::log);
-		Assert.assertEquals(4,  dates.size());
+		assertEquals(4,  dates.size());
 	}
 }
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI9FQUATest.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI9FQUATest.java
index d6717a3bd..e13d3801a 100644
--- a/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI9FQUATest.java
+++ b/hutool-cron/src/test/java/cn/hutool/cron/pattern/IssueI9FQUATest.java
@@ -1,8 +1,8 @@
 package cn.hutool.cron.pattern;
 
 import cn.hutool.core.date.DateUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 
@@ -14,6 +14,6 @@ public class IssueI9FQUATest {
 			DateUtil.parse("2024-01-01 00:00:00").toCalendar());
 
 		//Console.log(DateUtil.date(calendar));
-		Assert.assertEquals("2024-01-01 00:00:05", DateUtil.date(calendar).toString());
+		assertEquals("2024-01-01 00:00:05", DateUtil.date(calendar).toString());
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java
index daf27255f..be524ecc2 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/BCUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto;
 
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BCUtilTest {
 
@@ -16,7 +16,7 @@ public class BCUtilTest {
 		String y = "F7E938B02EED7280277493B8556E5B01CB436E018A562DFDC53342BF41FDF728";
 
 		final ECPublicKeyParameters keyParameters = BCUtil.toSm2Params(x, y);
-		Assert.assertNotNull(keyParameters);
+		assertNotNull(keyParameters);
 	}
 
 	@Test
@@ -24,6 +24,6 @@ public class BCUtilTest {
 		String privateKeyHex = "5F6CA5BB044C40ED2355F0372BF72A5B3AE6943712F9FDB7C1FFBAECC06F3829";
 
 		final ECPrivateKeyParameters keyParameters = BCUtil.toSm2Params(privateKeyHex);
-		Assert.assertNotNull(keyParameters);
+		assertNotNull(keyParameters);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/Issue3512Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/Issue3512Test.java
index 896ef3af6..4bb1d2f12 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/Issue3512Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/Issue3512Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto;
 
 import cn.hutool.crypto.asymmetric.SignAlgorithm;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Issue3512Test {
 	@Test
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java
index b981799f6..b2038ddff 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/KeyUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.crypto;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.security.KeyPair;
 import java.security.PrivateKey;
@@ -14,11 +14,11 @@ public class KeyUtilTest {
 	 * 测试关闭BouncyCastle支持时是否会正常抛出异常，即关闭是否有效
 	 */
 	@Test(expected = CryptoException.class)
-	@Ignore
+	@Disabled
 	public void generateKeyPairTest() {
 		GlobalBouncyCastleProvider.setUseBouncyCastle(false);
 		KeyPair pair = KeyUtil.generateKeyPair("SM2");
-		Assert.assertNotNull(pair);
+		assertNotNull(pair);
 	}
 
 	@Test
@@ -26,7 +26,7 @@ public class KeyUtilTest {
 		final KeyPair keyPair = KeyUtil.generateKeyPair("RSA");
 		final PrivateKey aPrivate = keyPair.getPrivate();
 		final PublicKey rsaPublicKey = KeyUtil.getRSAPublicKey(aPrivate);
-		Assert.assertEquals(rsaPublicKey, keyPair.getPublic());
+		assertEquals(rsaPublicKey, keyPair.getPublic());
 	}
 
 	/**
@@ -35,31 +35,31 @@ public class KeyUtilTest {
 	@Test
 	public void generateECIESKeyTest(){
 		final KeyPair ecies = KeyUtil.generateKeyPair("ECIES");
-		Assert.assertNotNull(ecies.getPrivate());
-		Assert.assertNotNull(ecies.getPublic());
+		assertNotNull(ecies.getPrivate());
+		assertNotNull(ecies.getPublic());
 
 		byte[] privateKeyBytes = ecies.getPrivate().getEncoded();
 
 		final PrivateKey privateKey = KeyUtil.generatePrivateKey("EC", privateKeyBytes);
-		Assert.assertEquals(ecies.getPrivate(), privateKey);
+		assertEquals(ecies.getPrivate(), privateKey);
 	}
 
 	@Test
 	public void generateDHTest(){
 		final KeyPair dh = KeyUtil.generateKeyPair("DH");
-		Assert.assertNotNull(dh.getPrivate());
-		Assert.assertNotNull(dh.getPublic());
+		assertNotNull(dh.getPrivate());
+		assertNotNull(dh.getPublic());
 
 		byte[] privateKeyBytes = dh.getPrivate().getEncoded();
 
 		final PrivateKey privateKey = KeyUtil.generatePrivateKey("DH", privateKeyBytes);
-		Assert.assertEquals(dh.getPrivate(), privateKey);
+		assertEquals(dh.getPrivate(), privateKey);
 	}
 
 	@Test
 	public void generateSm4KeyTest(){
 		// https://github.com/dromara/hutool/issues/2150
-		Assert.assertEquals(16, KeyUtil.generateKey("sm4").getEncoded().length);
-		Assert.assertEquals(32, KeyUtil.generateKey("sm4", 256).getEncoded().length);
+		assertEquals(16, KeyUtil.generateKey("sm4").getEncoded().length);
+		assertEquals(32, KeyUtil.generateKey("sm4", 256).getEncoded().length);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java
index a6348ce6b..bffeee9c3 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/OpensslKeyUtilTest.java
@@ -3,8 +3,8 @@ package cn.hutool.crypto;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.SM2;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -48,7 +48,7 @@ public class OpensslKeyUtilTest {
 				final String content = "我是Hanley.";
 				final byte[] sign = genSm2.sign(StrUtil.utf8Bytes(content));
 				final boolean verify = genSm2.verify(StrUtil.utf8Bytes(content), sign);
-				Assert.assertTrue(verify);
+				assertTrue(verify);
 			}
 		}
 	}
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java
index 3585c20ea..78c1559b4 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/PemUtilTest.java
@@ -6,9 +6,9 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.RSA;
 import cn.hutool.crypto.asymmetric.SM2;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
@@ -19,19 +19,19 @@ public class PemUtilTest {
 	@Test
 	public void readPrivateKeyTest() {
 		final PrivateKey privateKey = PemUtil.readPemPrivateKey(ResourceUtil.getStream("test_private_key.pem"));
-		Assert.assertNotNull(privateKey);
+		assertNotNull(privateKey);
 	}
 
 	@Test
 	public void readPublicKeyTest() {
 		final PublicKey publicKey = PemUtil.readPemPublicKey(ResourceUtil.getStream("test_public_key.csr"));
-		Assert.assertNotNull(publicKey);
+		assertNotNull(publicKey);
 	}
 
 	@Test
 	public void readPemKeyTest() {
 		final PublicKey publicKey = (PublicKey) PemUtil.readPemKey(ResourceUtil.getStream("test_public_key.csr"));
-		Assert.assertNotNull(publicKey);
+		assertNotNull(publicKey);
 	}
 
 	@Test
@@ -44,7 +44,7 @@ public class PemUtilTest {
 
 		final String encryptStr = rsa.encryptBase64(str, KeyType.PublicKey);
 		final String decryptStr = rsa.decryptStr(encryptStr, KeyType.PrivateKey);
-		Assert.assertEquals(str, decryptStr);
+		assertEquals(str, decryptStr);
 	}
 
 	@Test
@@ -58,11 +58,11 @@ public class PemUtilTest {
 
 		final byte[] sign = sm2.sign(dataBytes, null);
 		// 64位签名
-		Assert.assertEquals(64, sign.length);
+		assertEquals(64, sign.length);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readECPrivateKeyTest2() {
 		// https://gitee.com/dromara/hutool/issues/I37Z75
 		final byte[] d = PemUtil.readPem(FileUtil.getInputStream("d:/test/keys/priv.key"));
@@ -74,7 +74,7 @@ public class PemUtilTest {
 		final String content = "我是Hanley.";
 		final byte[] sign = sm2.sign(StrUtil.utf8Bytes(content));
 		final boolean verify = sm2.verify(StrUtil.utf8Bytes(content), sign);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java
index fa6ea25b2..421808f90 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/SmTest.java
@@ -7,8 +7,8 @@ import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.digest.HMac;
 import cn.hutool.crypto.symmetric.SM4;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.SecretKey;
 
@@ -23,7 +23,7 @@ public class SmTest {
 	@Test
 	public void sm3Test() {
 		String digestHex = SmUtil.sm3("aaaaa");
-		Assert.assertEquals("136ce3c86e4ed909b76082055a61586af20b4dab674732ebd4b599eef080c9be", digestHex);
+		assertEquals("136ce3c86e4ed909b76082055a61586af20b4dab674732ebd4b599eef080c9be", digestHex);
 	}
 
 	@Test
@@ -34,7 +34,7 @@ public class SmTest {
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -46,18 +46,18 @@ public class SmTest {
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
 	public void sm4ECBPKCS5PaddingTest2() {
 		String content = "test中文";
 		SM4 sm4 = new SM4(Mode.ECB, Padding.PKCS5Padding);
-		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
+		assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -67,11 +67,11 @@ public class SmTest {
 		SecretKey key = KeyUtil.generateKey(SM4.ALGORITHM_NAME);
 
 		SM4 sm4 = new SM4(Mode.ECB, Padding.PKCS5Padding, key);
-		Assert.assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
+		assertEquals("SM4/ECB/PKCS5Padding", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -81,11 +81,11 @@ public class SmTest {
 		byte[] key = KeyUtil.generateKey(SM4.ALGORITHM_NAME, 128).getEncoded();
 
 		SM4 sm4 = SmUtil.sm4(key);
-		Assert.assertEquals("SM4", sm4.getCipher().getAlgorithm());
+		assertEquals("SM4", sm4.getCipher().getAlgorithm());
 
 		String encryptHex = sm4.encryptHex(content);
 		String decryptStr = sm4.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public class SmTest {
 		String content = "test中文";
 		HMac hMac = SmUtil.hmacSm3("password".getBytes());
 		String digest = hMac.digestHex(content);
-		Assert.assertEquals("493e3f9a1896b43075fbe54658076727960d69632ac6b6ed932195857a6840c6", digest);
+		assertEquals("493e3f9a1896b43075fbe54658076727960d69632ac6b6ed932195857a6840c6", digest);
 	}
 
 
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java
index 15759a8a5..7dd058295 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/ECIESTest.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto.asymmetric;
 
 import cn.hutool.core.util.StrUtil;
 import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ECIESTest {
 
@@ -47,6 +47,6 @@ public class ECIESTest {
 		String encryptStr = cryptoForEncrypt.encryptBase64(text.toString(), KeyType.PublicKey);
 
 		String decryptStr = StrUtil.utf8Str(cryptoForDecrypt.decrypt(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text.toString(), decryptStr);
+		assertEquals(text.toString(), decryptStr);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/IssueI6OQJATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/IssueI6OQJATest.java
index 4e48fd011..ed6dcfe78 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/IssueI6OQJATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/IssueI6OQJATest.java
@@ -1,8 +1,8 @@
 package cn.hutool.crypto.asymmetric;
 
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("FieldCanBeLocal")
 public class IssueI6OQJATest {
@@ -12,7 +12,7 @@ public class IssueI6OQJATest {
 
 	@Test
 	public void genKeyTest() {
-		Assert.assertEquals(passCryto("123"), passCryto("123"));
+		assertEquals(passCryto("123"), passCryto("123"));
 	}
 
 	@SuppressWarnings("SameParameterValue")
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java
index 6c9c23057..d857aa3bf 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/RSATest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.*;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.Cipher;
 import java.math.BigInteger;
@@ -22,8 +22,8 @@ public class RSATest {
 	@Test
 	public void generateKeyPairTest() {
 		final KeyPair pair = KeyUtil.generateKeyPair("RSA");
-		Assert.assertNotNull(pair.getPrivate());
-		Assert.assertNotNull(pair.getPublic());
+		assertNotNull(pair.getPrivate());
+		assertNotNull(pair.getPublic());
 	}
 
 	@Test
@@ -37,12 +37,12 @@ public class RSATest {
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -50,21 +50,21 @@ public class RSATest {
 		final RSA rsa = new RSA();
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(rsa.getPrivateKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
-		Assert.assertNotNull(rsa.getPublicKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPrivateKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPublicKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -72,21 +72,21 @@ public class RSATest {
 		final RSA rsa = new RSA(AsymmetricAlgorithm.RSA_ECB.getValue());
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(rsa.getPrivateKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
-		Assert.assertNotNull(rsa.getPublicKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPrivateKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPublicKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -94,43 +94,43 @@ public class RSATest {
 		final RSA rsa = new RSA("RSA/ECB/OAEPWithSHA-1AndMGF1Padding");
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(rsa.getPrivateKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
-		Assert.assertNotNull(rsa.getPublicKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPrivateKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPublicKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
-	
+
 	@Test
 	public void rsaNoneTest() {
 		final RSA rsa = new RSA(AsymmetricAlgorithm.RSA_None.getValue());
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(rsa.getPrivateKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
-		Assert.assertNotNull(rsa.getPublicKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPrivateKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPublicKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -139,20 +139,20 @@ public class RSATest {
 		rsa.setEncryptBlockSize(3);
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(rsa.getPrivateKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
-		Assert.assertNotNull(rsa.getPublicKey());
-		Assert.assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPrivateKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
+		assertNotNull(rsa.getPublicKey());
+		assertNotNull(rsa.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		final byte[] encrypt = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 		final byte[] decrypt = rsa.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 私钥加密，公钥解密
 		final byte[] encrypt2 = rsa.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PrivateKey);
 		final byte[] decrypt2 = rsa.decrypt(encrypt2, KeyType.PublicKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt2, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -164,12 +164,12 @@ public class RSATest {
 		// 公钥加密，私钥解密
 		final String encryptStr = rsa.encryptBcd(text, KeyType.PublicKey);
 		final String decryptStr = StrUtil.utf8Str(rsa.decryptFromBcd(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text, decryptStr);
+		assertEquals(text, decryptStr);
 
 		// 私钥加密，公钥解密
 		final String encrypt2 = rsa.encryptBcd(text, KeyType.PrivateKey);
 		final String decrypt2 = StrUtil.utf8Str(rsa.decryptFromBcd(encrypt2, KeyType.PublicKey));
-		Assert.assertEquals(text, decrypt2);
+		assertEquals(text, decrypt2);
 	}
 
 	@Test
@@ -185,12 +185,12 @@ public class RSATest {
 		// 公钥加密，私钥解密
 		final String encryptStr = rsa.encryptBase64(text.toString(), KeyType.PublicKey);
 		final String decryptStr = StrUtil.utf8Str(rsa.decrypt(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text.toString(), decryptStr);
+		assertEquals(text.toString(), decryptStr);
 
 		// 私钥加密，公钥解密
 		final String encrypt2 = rsa.encryptBase64(text.toString(), KeyType.PrivateKey);
 		final String decrypt2 = StrUtil.utf8Str(rsa.decrypt(encrypt2, KeyType.PublicKey));
-		Assert.assertEquals(text.toString(), decrypt2);
+		assertEquals(text.toString(), decrypt2);
 	}
 
 	@Test
@@ -215,7 +215,7 @@ public class RSATest {
 		final byte[] aByte = HexUtil.decodeHex(a);
 		final byte[] decrypt = rsa.decrypt(aByte, KeyType.PrivateKey);
 
-		Assert.assertEquals("虎头闯杭州,多抬头看天,切勿只管种地", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("虎头闯杭州,多抬头看天,切勿只管种地", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -241,7 +241,7 @@ public class RSATest {
 		rsa.setEncryptBlockSize(128);
 		final String result2 = rsa.encryptHex(finalData, KeyType.PublicKey);
 
-		Assert.assertEquals(result1, result2);
+		assertEquals(result1, result2);
 	}
 
 	@Test
@@ -254,6 +254,6 @@ public class RSATest {
 		final RSA rsa = new RSA(new BigInteger(modulus, 16), null, new BigInteger(publicExponent));
 
 		final String encryptBase64 = rsa.encryptBase64("测试内容", KeyType.PublicKey);
-		Assert.assertNotNull(encryptBase64);
+		assertNotNull(encryptBase64);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
index ad78cfc57..60053ce03 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SM2Test.java
@@ -12,8 +12,8 @@ import org.bouncycastle.crypto.DataLengthException;
 import org.bouncycastle.crypto.engines.SM2Engine;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.jcajce.spec.OpenSSHPrivateKeySpec;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.security.KeyPair;
@@ -30,8 +30,8 @@ public class SM2Test {
 	@Test
 	public void generateKeyPairTest() {
 		KeyPair pair = SecureUtil.generateKeyPair("SM2");
-		Assert.assertNotNull(pair.getPrivate());
-		Assert.assertNotNull(pair.getPublic());
+		assertNotNull(pair.getPrivate());
+		assertNotNull(pair.getPublic());
 	}
 
 	@Test
@@ -39,8 +39,8 @@ public class SM2Test {
 		// OBJECT IDENTIFIER 1.2.156.10197.1.301
 		String OID = "06082A811CCF5501822D";
 		KeyPair pair = SecureUtil.generateKeyPair("SM2");
-		Assert.assertTrue(HexUtil.encodeHexStr(pair.getPrivate().getEncoded()).toUpperCase().contains(OID));
-		Assert.assertTrue(HexUtil.encodeHexStr(pair.getPublic().getEncoded()).toUpperCase().contains(OID));
+		assertTrue(HexUtil.encodeHexStr(pair.getPrivate().getEncoded()).toUpperCase().contains(OID));
+		assertTrue(HexUtil.encodeHexStr(pair.getPublic().getEncoded()).toUpperCase().contains(OID));
 	}
 
 	@Test
@@ -55,7 +55,7 @@ public class SM2Test {
 		// 公钥加密，私钥解密
 		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 		byte[] decrypt = sm2.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -63,15 +63,15 @@ public class SM2Test {
 		final SM2 sm2 = SmUtil.sm2();
 
 		// 获取私钥和公钥
-		Assert.assertNotNull(sm2.getPrivateKey());
-		Assert.assertNotNull(sm2.getPrivateKeyBase64());
-		Assert.assertNotNull(sm2.getPublicKey());
-		Assert.assertNotNull(sm2.getPrivateKeyBase64());
+		assertNotNull(sm2.getPrivateKey());
+		assertNotNull(sm2.getPrivateKeyBase64());
+		assertNotNull(sm2.getPublicKey());
+		assertNotNull(sm2.getPrivateKeyBase64());
 
 		// 公钥加密，私钥解密
 		byte[] encrypt = sm2.encrypt(StrUtil.bytes("我是一段测试aaaa", CharsetUtil.CHARSET_UTF_8), KeyType.PublicKey);
 		byte[] decrypt = sm2.decrypt(encrypt, KeyType.PrivateKey);
-		Assert.assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals("我是一段测试aaaa", StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 	}
 
 	@Test
@@ -83,7 +83,7 @@ public class SM2Test {
 		// 公钥加密，私钥解密
 		String encryptStr = sm2.encryptBcd(text, KeyType.PublicKey);
 		String decryptStr = StrUtil.utf8Str(sm2.decryptFromBcd(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text, decryptStr);
+		assertEquals(text, decryptStr);
 	}
 
 	@Test
@@ -99,7 +99,7 @@ public class SM2Test {
 		// 公钥加密，私钥解密
 		String encryptStr = sm2.encryptBase64(text.toString(), KeyType.PublicKey);
 		String decryptStr = StrUtil.utf8Str(sm2.decrypt(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text.toString(), decryptStr);
+		assertEquals(text.toString(), decryptStr);
 
 		// 测试自定义密钥后是否生效
 		PrivateKey privateKey = sm2.getPrivateKey();
@@ -109,7 +109,7 @@ public class SM2Test {
 		sm2.setPrivateKey(privateKey);
 		sm2.setPublicKey(publicKey);
 		String decryptStr2 = StrUtil.utf8Str(sm2.decrypt(encryptStr, KeyType.PrivateKey));
-		Assert.assertEquals(text.toString(), decryptStr2);
+		assertEquals(text.toString(), decryptStr2);
 	}
 
 	@Test
@@ -123,7 +123,7 @@ public class SM2Test {
 		sm2.usePlainEncoding();
 		byte[] sign = sm2.sign(dataBytes, null);
 		// 64位签名
-		Assert.assertEquals(64, sign.length);
+		assertEquals(64, sign.length);
 	}
 
 	@Test
@@ -139,7 +139,7 @@ public class SM2Test {
 		sm2.usePlainEncoding();
 
 		boolean verify = sm2.verify(dataBytes, HexUtil.decodeHex(signHex));
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -150,7 +150,7 @@ public class SM2Test {
 
 		byte[] sign = sm2.sign(StrUtil.utf8Bytes(content));
 		boolean verify = sm2.verify(StrUtil.utf8Bytes(content), sign);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -161,7 +161,7 @@ public class SM2Test {
 
 		String sign = sm2.signHex(HexUtil.encodeHexStr(content));
 		boolean verify = sm2.verifyHex(HexUtil.encodeHexStr(content), sign);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -174,7 +174,7 @@ public class SM2Test {
 
 		byte[] sign = sm2.sign(content.getBytes(StandardCharsets.UTF_8));
 		boolean verify = sm2.verify(content.getBytes(StandardCharsets.UTF_8), sign);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -190,7 +190,7 @@ public class SM2Test {
 
 		byte[] sign = sm2.sign(content.getBytes(StandardCharsets.UTF_8));
 		boolean verify = sm2.verify(content.getBytes(StandardCharsets.UTF_8), sign);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -202,8 +202,8 @@ public class SM2Test {
 		String encodeB64 = Base64.encode(data);
 		PublicKey Hexdecode = KeyUtil.decodeECPoint(encodeHex, KeyUtil.SM2_DEFAULT_CURVE);
 		PublicKey B64decode = KeyUtil.decodeECPoint(encodeB64, KeyUtil.SM2_DEFAULT_CURVE);
-		Assert.assertEquals(HexUtil.encodeHexStr(publicKey.getEncoded()), HexUtil.encodeHexStr(Hexdecode.getEncoded()));
-		Assert.assertEquals(HexUtil.encodeHexStr(publicKey.getEncoded()), HexUtil.encodeHexStr(B64decode.getEncoded()));
+		assertEquals(HexUtil.encodeHexStr(publicKey.getEncoded()), HexUtil.encodeHexStr(Hexdecode.getEncoded()));
+		assertEquals(HexUtil.encodeHexStr(publicKey.getEncoded()), HexUtil.encodeHexStr(B64decode.getEncoded()));
 	}
 
 	@Test
@@ -217,7 +217,7 @@ public class SM2Test {
 
 		final SM2 sm2 = new SM2(d, x, y);
 		final String sign = sm2.signHex(data, id);
-		Assert.assertTrue(sm2.verifyHex(data, sign));
+		assertTrue(sm2.verifyHex(data, sign));
 	}
 
 	@Test
@@ -227,8 +227,8 @@ public class SM2Test {
 		String q = "04" + x + y;
 		final SM2 sm1 = new SM2(null, x, y);
 		final SM2 sm2 = new SM2(null, q);
-        Assert.assertNotNull(sm1);
-		Assert.assertNotNull(sm2);
+        assertNotNull(sm1);
+		assertNotNull(sm2);
 	}
 
 	@Test
@@ -248,10 +248,10 @@ public class SM2Test {
 
 
 		String sign = "DCA0E80A7F46C93714B51C3EFC55A922BCEF7ECF0FE9E62B53BA6A7438B543A76C145A452CA9036F3CB70D7E6C67D4D9D7FE114E5367A2F6F5A4D39F2B10F3D6";
-		Assert.assertTrue(sm2.verifyHex(data, sign));
+		assertTrue(sm2.verifyHex(data, sign));
 
 		String sign2 = sm2.signHex(data, id);
-		Assert.assertTrue(sm2.verifyHex(data, sign2));
+		assertTrue(sm2.verifyHex(data, sign2));
 	}
 
 	@Test
@@ -266,7 +266,7 @@ public class SM2Test {
 		final String encryptHex = sm2.encryptHex(data, KeyType.PublicKey);
 		final String decryptStr = sm2.decryptStr(encryptHex, KeyType.PrivateKey);
 
-		Assert.assertEquals(data, decryptStr);
+		assertEquals(data, decryptStr);
 	}
 
 	@Test
@@ -277,10 +277,10 @@ public class SM2Test {
 		byte[] data = sm2.encrypt(src, KeyType.PublicKey);
 		byte[] sign =  sm2.sign(src.getBytes(StandardCharsets.UTF_8));
 
-		Assert.assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
+		assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
 
 		byte[] dec =  sm2.decrypt(data, KeyType.PrivateKey);
-		Assert.assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
+		assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
 	}
 
 	@Test
@@ -298,10 +298,10 @@ public class SM2Test {
 		byte[] data = sm2.encrypt(src, KeyType.PublicKey);
 		byte[] sign =  sm2.sign(src.getBytes(StandardCharsets.UTF_8));
 
-		Assert.assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
+		assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
 
 		byte[] dec =  sm2.decrypt(data, KeyType.PrivateKey);
-		Assert.assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
+		assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
 	}
 
 	@Test
@@ -316,20 +316,20 @@ public class SM2Test {
 		byte[] data = sm2.encrypt(src, KeyType.PublicKey);
 		byte[] sign =  sm2.sign(src.getBytes(StandardCharsets.UTF_8));
 
-		Assert.assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
+		assertTrue(sm2.verify( src.getBytes(StandardCharsets.UTF_8), sign));
 
 		byte[] dec =  sm2.decrypt(data, KeyType.PrivateKey);
-		Assert.assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
+		assertArrayEquals(dec, src.getBytes(StandardCharsets.UTF_8));
 	}
 
 	@Test
 	public void dLengthTest(){
 		final SM2 sm2 = SmUtil.sm2();
-		Assert.assertEquals(64, sm2.getDHex().length());
-		Assert.assertEquals(32, sm2.getD().length);
+		assertEquals(64, sm2.getDHex().length());
+		assertEquals(32, sm2.getD().length);
 
 		// 04占位一个字节
-		Assert.assertEquals(65, sm2.getQ(false).length);
+		assertEquals(65, sm2.getQ(false).length);
 	}
 
 	@Test
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java
index 003d69604..03961b070 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/asymmetric/SignTest.java
@@ -3,8 +3,8 @@ package cn.hutool.crypto.asymmetric;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -23,7 +23,7 @@ public class SignTest {
 
 		String privateKey = "MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAJ4fG8vJ0tzu7tjXMSJhyNjlE5B7GkTKMKEQlR6LY3IhIhMFVjuA6W+DqH1VMxl9h3GIM4yCKG2VRZEYEPazgVxa5/ifO8W0pfmrzWCPrddUq4t0Slz5u2lLKymLpPjCzboHoDb8VlF+1HOxjKQckAXq9q7U7dV5VxOzJDuZXlz3AgMBAAECgYABo2LfVqT3owYYewpIR+kTzjPIsG3SPqIIWSqiWWFbYlp/BfQhw7EndZ6+Ra602ecYVwfpscOHdx90ZGJwm+WAMkKT4HiWYwyb0ZqQzRBGYDHFjPpfCBxrzSIJ3QL+B8c8YHq4HaLKRKmq7VUF1gtyWaek87rETWAmQoGjt8DyAQJBAOG4OxsT901zjfxrgKwCv6fV8wGXrNfDSViP1t9r3u6tRPsE6Gli0dfMyzxwENDTI75sOEAfyu6xBlemQGmNsfcCQQCzVWQkl9YUoVDWEitvI5MpkvVKYsFLRXKvLfyxLcY3LxpLKBcEeJ/n5wLxjH0GorhJMmM2Rw3hkjUTJCoqqe0BAkATt8FKC0N2O5ryqv1xiUfuxGzW/cX2jzOwDdiqacTuuqok93fKBPzpyhUS8YM2iss7jj6Xs29JzKMOMxK7ZcpfAkAf21lwzrAu9gEgJhYlJhKsXfjJAAYKUwnuaKLs7o65mtp242ZDWxI85eK1+hjzptBJ4HOTXsfufESFY/VBovIBAkAltO886qQRoNSc0OsVlCi4X1DGo6x2RqQ9EsWPrxWEZGYuyEdODrc54b8L+zaUJLfMJdsCIHEUbM7WXxvFVXNv";
 		Sign sign = SecureUtil.sign(SignAlgorithm.SHA1withRSA, privateKey, null);
-		Assert.assertNull(sign.getPublicKeyBase64());
+		assertNull(sign.getPublicKeyBase64());
 		// 签名
 		byte[] signed = sign.sign(content.getBytes());
 
@@ -31,7 +31,7 @@ public class SignTest {
 		sign = SecureUtil.sign(SignAlgorithm.SHA1withRSA, null, publicKey);
 		// 验证签名
 		boolean verify = sign.verify(content.getBytes(), signed);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -70,7 +70,7 @@ public class SignTest {
 
 		// 验证签名
 		boolean verify = sign.verify(data, signed);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	/**
@@ -87,7 +87,7 @@ public class SignTest {
 
 		// 验证签名
 		boolean verify = sign.verify(data, signed);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
@@ -97,11 +97,11 @@ public class SignTest {
 				.put("key2", "value2").build();
 
 		String sign1 = SecureUtil.signParamsSha1(build);
-		Assert.assertEquals("9ed30bfe2efbc7038a824b6c55c24a11bfc0dce5", sign1);
+		assertEquals("9ed30bfe2efbc7038a824b6c55c24a11bfc0dce5", sign1);
 		String sign2 = SecureUtil.signParamsSha1(build, "12345678");
-		Assert.assertEquals("944b68d94c952ec178c4caf16b9416b6661f7720", sign2);
+		assertEquals("944b68d94c952ec178c4caf16b9416b6661f7720", sign2);
 		String sign3 = SecureUtil.signParamsSha1(build, "12345678", "abc");
-		Assert.assertEquals("edee1b477af1b96ebd20fdf08d818f352928d25d", sign3);
+		assertEquals("edee1b477af1b96ebd20fdf08d818f352928d25d", sign3);
 	}
 
 	/**
@@ -118,6 +118,6 @@ public class SignTest {
 
 		// 验证签名
 		boolean verify = sign.verify(data, signed);
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java
index 7ab03177b..fe63b9221 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/BCryptTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.crypto.digest;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BCryptTest {
 
 	@Test
 	public void checkpwTest(){
-		Assert.assertFalse(BCrypt.checkpw("xxx",
+		assertFalse(BCrypt.checkpw("xxx",
 				"$2a$2a$10$e4lBTlZ019KhuAFyqAlgB.Jxc6cM66GwkSR/5/xXNQuHUItPLyhzy"));
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
index 85fbbbd55..189278695 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/CBCBlockCipherMacEngineTest.java
@@ -6,8 +6,8 @@ import cn.hutool.crypto.digest.mac.SM4MacEngine;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CBCBlockCipherMacEngineTest {
 
@@ -22,7 +22,7 @@ public class CBCBlockCipherMacEngineTest {
 		String testStr = "test中文";
 
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("3212e848db7f816a4bd591ad9948debf", macHex1);
+		assertEquals("3212e848db7f816a4bd591ad9948debf", macHex1);
 	}
 
 	@Test
@@ -38,6 +38,6 @@ public class CBCBlockCipherMacEngineTest {
 		String testStr = "test中文";
 
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("3212e848db7f816a4bd591ad9948debf", macHex1);
+		assertEquals("3212e848db7f816a4bd591ad9948debf", macHex1);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java
index 80acd8c4f..98ccb744f 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/DigestTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.crypto.digest;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.CharsetUtil;
@@ -18,7 +18,7 @@ public class DigestTest {
 
 		Digester md5 = new Digester(DigestAlgorithm.MD5);
 		String digestHex = md5.digestHex(testStr);
-		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", digestHex);
+		assertEquals("5393554e94bf0eb6436f240a4fd71282", digestHex);
 	}
 
 	@Test
@@ -26,10 +26,10 @@ public class DigestTest {
 		String testStr = "test中文";
 
 		String md5Hex1 = DigestUtil.md5Hex(testStr);
-		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex1);
+		assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex1);
 
 		String md5Hex2 = DigestUtil.md5Hex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex2);
+		assertEquals("5393554e94bf0eb6436f240a4fd71282", md5Hex2);
 	}
 
 	@Test
@@ -41,16 +41,16 @@ public class DigestTest {
 		//加盐
 		md5.setSalt("saltTest".getBytes());
 		String md5Hex1 = md5.digestHex(testStr);
-		Assert.assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex1);
+		assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex1);
 		String md5Hex2 = md5.digestHex(IoUtil.toUtf8Stream(testStr));
-		Assert.assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex2);
+		assertEquals("762f7335200299dfa09bebbb601a5bc6", md5Hex2);
 
 		//重复2次
 		md5.setDigestCount(2);
 		String md5Hex3 = md5.digestHex(testStr);
-		Assert.assertEquals("2b0616296f6755d25efc07f90afe9684", md5Hex3);
+		assertEquals("2b0616296f6755d25efc07f90afe9684", md5Hex3);
 		String md5Hex4 = md5.digestHex(IoUtil.toUtf8Stream(testStr));
-		Assert.assertEquals("2b0616296f6755d25efc07f90afe9684", md5Hex4);
+		assertEquals("2b0616296f6755d25efc07f90afe9684", md5Hex4);
 	}
 
 	@Test
@@ -58,16 +58,16 @@ public class DigestTest {
 		String testStr = "test中文";
 
 		String sha1Hex1 = DigestUtil.sha1Hex(testStr);
-		Assert.assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex1);
+		assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex1);
 
 		String sha1Hex2 = DigestUtil.sha1Hex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex2);
+		assertEquals("ecabf586cef0d3b11c56549433ad50b81110a836", sha1Hex2);
 	}
 
 	@Test
 	public void hash256Test() {
 		String testStr = "Test中文";
 		String hex = DigestUtil.sha256Hex(testStr);
-		Assert.assertEquals(64, hex.length());
+		assertEquals(64, hex.length());
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java
index d7fb4d939..f0ea4c360 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/HmacTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.symmetric.ZUC;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.spec.IvParameterSpec;
 
@@ -25,10 +25,10 @@ public class HmacTest {
 		HMac mac = new HMac(HmacAlgorithm.HmacMD5, key);
 
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
+		assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
 
 		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
+		assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
 	}
 
 	@Test
@@ -38,10 +38,10 @@ public class HmacTest {
 		HMac mac = SecureUtil.hmacMd5("password");
 
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
+		assertEquals("b977f4b13f93f549e06140971bded384", macHex1);
 
 		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
+		assertEquals("b977f4b13f93f549e06140971bded384", macHex2);
 	}
 
 	@Test
@@ -50,10 +50,10 @@ public class HmacTest {
 
 		String testStr = "test中文";
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex1);
+		assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex1);
 
 		String macHex2 = mac.digestHex(IoUtil.toStream(testStr, CharsetUtil.CHARSET_UTF_8));
-		Assert.assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex2);
+		assertEquals("1dd68d2f119d5640f0d416e99d3f42408b88d511", macHex2);
 	}
 
 	@Test
@@ -66,7 +66,7 @@ public class HmacTest {
 
 		String testStr = "test中文";
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("1e0b9455", macHex1);
+		assertEquals("1e0b9455", macHex1);
 	}
 
 	@Test
@@ -79,7 +79,7 @@ public class HmacTest {
 
 		String testStr = "test中文";
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("d9ad618357c1bfb1d9d1200a763d5eaa", macHex1);
+		assertEquals("d9ad618357c1bfb1d9d1200a763d5eaa", macHex1);
 	}
 
 	@Test
@@ -93,6 +93,6 @@ public class HmacTest {
 		String testStr = "test中文";
 
 		String macHex1 = mac.digestHex(testStr);
-		Assert.assertEquals("58a0d231315664af51b858a174eabc21", macHex1);
+		assertEquals("58a0d231315664af51b858a174eabc21", macHex1);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java
index 0216105d3..3a493dcb2 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/Md5Test.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto.digest;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.thread.ConcurrencyTester;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * MD5 单元测试
@@ -16,8 +16,8 @@ public class Md5Test {
 	@Test
 	public void md5To16Test() {
 		String hex16 = new MD5().digestHex16("中国");
-		Assert.assertEquals(16, hex16.length());
-		Assert.assertEquals("cb143acd6c929826", hex16);
+		assertEquals(16, hex16.length());
+		assertEquals("cb143acd6c929826", hex16);
 	}
 
 	@Test
@@ -26,7 +26,7 @@ public class Md5Test {
 		final ConcurrencyTester tester = new ConcurrencyTester(1000);
 		tester.test(()->{
 			final String digest = new MD5().digestHex(text);
-			Assert.assertEquals("8060075dd8df47bac3247438e940a728", digest);
+			assertEquals("8060075dd8df47bac3247438e940a728", digest);
 		});
 		IoUtil.close(tester);
 	}
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java
index c63aea4c7..79d475c76 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/digest/OTPTest.java
@@ -3,8 +3,8 @@ package cn.hutool.crypto.digest;
 import cn.hutool.core.codec.Base32;
 import cn.hutool.crypto.digest.otp.HOTP;
 import cn.hutool.crypto.digest.otp.TOTP;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -18,49 +18,49 @@ public class OTPTest {
 	@Test
 	public void genKeyTest() {
 		String key = TOTP.generateSecretKey(8);
-		Assert.assertEquals(8, Base32.decode(key).length);
+		assertEquals(8, Base32.decode(key).length);
 	}
 
 	@Test
 	public void validTest() {
 		String key = "VYCFSW2QZ3WZO";
 		// 2021/7/1下午6:29:54 显示code为 106659
-		//Assert.assertEquals(new TOTP(Base32.decode(key)).generate(Instant.ofEpochSecond(1625135394L)),106659);
+		//assertEquals(new TOTP(Base32.decode(key)).generate(Instant.ofEpochSecond(1625135394L)),106659);
 		TOTP totp = new TOTP(Base32.decode(key));
 		Instant instant = Instant.ofEpochSecond(1625135394L);
-		Assert.assertTrue(totp.validate(instant, 0, 106659));
-		Assert.assertTrue(totp.validate(instant.plusSeconds(30), 1, 106659));
-		Assert.assertTrue(totp.validate(instant.plusSeconds(60), 2, 106659));
+		assertTrue(totp.validate(instant, 0, 106659));
+		assertTrue(totp.validate(instant.plusSeconds(30), 1, 106659));
+		assertTrue(totp.validate(instant.plusSeconds(60), 2, 106659));
 
-		Assert.assertFalse(totp.validate(instant.plusSeconds(60), 1, 106659));
-		Assert.assertFalse(totp.validate(instant.plusSeconds(90), 2, 106659));
+		assertFalse(totp.validate(instant.plusSeconds(60), 1, 106659));
+		assertFalse(totp.validate(instant.plusSeconds(90), 2, 106659));
 	}
 
 	@Test
 	public void googleAuthTest() {
 		String str = TOTP.generateGoogleSecretKey("xl7@qq.com", 10);
-		Assert.assertTrue(str.startsWith("otpauth://totp/xl7@qq.com?secret="));
+		assertTrue(str.startsWith("otpauth://totp/xl7@qq.com?secret="));
 	}
 
 	@Test
 	public void longPasswordLengthTest() {
-		Assert.assertThrows(IllegalArgumentException.class, () -> new HOTP(9, "123".getBytes()));
+		assertThrows(IllegalArgumentException.class, () -> new HOTP(9, "123".getBytes()));
 	}
 
 	@Test
 	public void generateHOPTTest(){
 		byte[] key = "12345678901234567890".getBytes();
 		final HOTP hotp = new HOTP(key);
-		Assert.assertEquals(755224, hotp.generate(0));
-		Assert.assertEquals(287082, hotp.generate(1));
-		Assert.assertEquals(359152, hotp.generate(2));
-		Assert.assertEquals(969429, hotp.generate(3));
-		Assert.assertEquals(338314, hotp.generate(4));
-		Assert.assertEquals(254676, hotp.generate(5));
-		Assert.assertEquals(287922, hotp.generate(6));
-		Assert.assertEquals(162583, hotp.generate(7));
-		Assert.assertEquals(399871, hotp.generate(8));
-		Assert.assertEquals(520489, hotp.generate(9));
+		assertEquals(755224, hotp.generate(0));
+		assertEquals(287082, hotp.generate(1));
+		assertEquals(359152, hotp.generate(2));
+		assertEquals(969429, hotp.generate(3));
+		assertEquals(338314, hotp.generate(4));
+		assertEquals(254676, hotp.generate(5));
+		assertEquals(287922, hotp.generate(6));
+		assertEquals(162583, hotp.generate(7));
+		assertEquals(399871, hotp.generate(8));
+		assertEquals(520489, hotp.generate(9));
 	}
 
 	@Test
@@ -69,7 +69,7 @@ public class OTPTest {
 
 		final TOTP totp = new TOTP(timeStep, "123".getBytes());
 
-		Assert.assertEquals(timeStep, totp.getTimeStep());
+		assertEquals(timeStep, totp.getTimeStep());
 	}
 
 	@Test
@@ -79,17 +79,17 @@ public class OTPTest {
 		TOTP totp = new TOTP(Duration.ofSeconds(30), 8, algorithm, key);
 
 		int generate = totp.generate(Instant.ofEpochSecond(59L));
-		Assert.assertEquals(94287082, generate);
+		assertEquals(94287082, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111109L));
-		Assert.assertEquals(7081804, generate);
+		assertEquals(7081804, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111111L));
-		Assert.assertEquals(14050471, generate);
+		assertEquals(14050471, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1234567890L));
-		Assert.assertEquals(89005924, generate);
+		assertEquals(89005924, generate);
 		generate = totp.generate(Instant.ofEpochSecond(2000000000L));
-		Assert.assertEquals(69279037, generate);
+		assertEquals(69279037, generate);
 		generate = totp.generate(Instant.ofEpochSecond(20000000000L));
-		Assert.assertEquals(65353130, generate);
+		assertEquals(65353130, generate);
 	}
 
 	@Test
@@ -99,17 +99,17 @@ public class OTPTest {
 		TOTP totp = new TOTP(Duration.ofSeconds(30), 8, algorithm, key);
 
 		int generate = totp.generate(Instant.ofEpochSecond(59L));
-		Assert.assertEquals(46119246, generate);
+		assertEquals(46119246, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111109L));
-		Assert.assertEquals(68084774, generate);
+		assertEquals(68084774, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111111L));
-		Assert.assertEquals(67062674, generate);
+		assertEquals(67062674, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1234567890L));
-		Assert.assertEquals(91819424, generate);
+		assertEquals(91819424, generate);
 		generate = totp.generate(Instant.ofEpochSecond(2000000000L));
-		Assert.assertEquals(90698825, generate);
+		assertEquals(90698825, generate);
 		generate = totp.generate(Instant.ofEpochSecond(20000000000L));
-		Assert.assertEquals(77737706, generate);
+		assertEquals(77737706, generate);
 	}
 
 	@Test
@@ -119,16 +119,16 @@ public class OTPTest {
 		TOTP totp = new TOTP(Duration.ofSeconds(30), 8, algorithm, key);
 
 		int generate = totp.generate(Instant.ofEpochSecond(59L));
-		Assert.assertEquals(90693936, generate);
+		assertEquals(90693936, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111109L));
-		Assert.assertEquals(25091201, generate);
+		assertEquals(25091201, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1111111111L));
-		Assert.assertEquals(99943326, generate);
+		assertEquals(99943326, generate);
 		generate = totp.generate(Instant.ofEpochSecond(1234567890L));
-		Assert.assertEquals(93441116, generate);
+		assertEquals(93441116, generate);
 		generate = totp.generate(Instant.ofEpochSecond(2000000000L));
-		Assert.assertEquals(38618901, generate);
+		assertEquals(38618901, generate);
 		generate = totp.generate(Instant.ofEpochSecond(20000000000L));
-		Assert.assertEquals(47863826, generate);
+		assertEquals(47863826, generate);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java
index 3dd30e4b2..bd08b0074 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/AESTest.java
@@ -6,8 +6,8 @@ import cn.hutool.core.util.RandomUtil;
 import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.GCMParameterSpec;
@@ -21,7 +21,7 @@ public class AESTest {
 		AES aes = new AES(Mode.CBC, Padding.PKCS5Padding,
 				"1234567890123456".getBytes(), "1234567890123456".getBytes());
 		String encryptHex = aes.encryptHex("123456");
-		Assert.assertEquals("d637735ae9e21ba50cb686b74fab8d2c", encryptHex);
+		assertEquals("d637735ae9e21ba50cb686b74fab8d2c", encryptHex);
 	}
 
 	@Test
@@ -30,7 +30,7 @@ public class AESTest {
 		AES aes = new AES(Mode.CTS, Padding.PKCS5Padding,
 				"0CoJUm6Qyw8W8jue".getBytes(), "0102030405060708".getBytes());
 		final String encryptHex = aes.encryptHex(content);
-		Assert.assertEquals("8dc9de7f050e86ca2c8261dde56dfec9", encryptHex);
+		assertEquals("8dc9de7f050e86ca2c8261dde56dfec9", encryptHex);
 	}
 
 	@Test
@@ -39,7 +39,7 @@ public class AESTest {
 		AES aes = new AES(Mode.CBC.name(), "pkcs7padding",
 				"1234567890123456".getBytes(), "1234567890123456".getBytes());
 		String encryptHex = aes.encryptHex("123456");
-		Assert.assertEquals("d637735ae9e21ba50cb686b74fab8d2c", encryptHex);
+		assertEquals("d637735ae9e21ba50cb686b74fab8d2c", encryptHex);
 	}
 
 	/**
@@ -71,32 +71,32 @@ public class AESTest {
 		// 加密数据为16进制字符串
 		String encryptHex = aes.encryptHex(HexUtil.decodeHex("16c5"));
 		// 加密后的Hex
-		Assert.assertEquals("25869eb3ff227d9e34b3512d3c3c92ed", encryptHex);
+		assertEquals("25869eb3ff227d9e34b3512d3c3c92ed", encryptHex);
 
 		// 加密数据为16进制字符串
 		String encryptHex2 = aes.encryptBase64(HexUtil.decodeHex("16c5"));
 		// 加密后的Base64
-		Assert.assertEquals("JYaes/8ifZ40s1EtPDyS7Q==", encryptHex2);
+		assertEquals("JYaes/8ifZ40s1EtPDyS7Q==", encryptHex2);
 
 		// 解密
-		Assert.assertEquals("16c5", HexUtil.encodeHexStr(aes.decrypt("25869eb3ff227d9e34b3512d3c3c92ed")));
-		Assert.assertEquals("16c5", HexUtil.encodeHexStr(aes.decrypt(HexUtil.encodeHexStr(Base64.decode("JYaes/8ifZ40s1EtPDyS7Q==")))));
+		assertEquals("16c5", HexUtil.encodeHexStr(aes.decrypt("25869eb3ff227d9e34b3512d3c3c92ed")));
+		assertEquals("16c5", HexUtil.encodeHexStr(aes.decrypt(HexUtil.encodeHexStr(Base64.decode("JYaes/8ifZ40s1EtPDyS7Q==")))));
 		// ------------------------------------------------------------------------
 
 		// ------------------------------------------------------------------------
 		// 加密数据为字符串(UTF-8)
 		String encryptStr = aes.encryptHex("16c5");
 		// 加密后的Hex
-		Assert.assertEquals("79c210d3e304932cf9ea6a9c887c6d7c", encryptStr);
+		assertEquals("79c210d3e304932cf9ea6a9c887c6d7c", encryptStr);
 
 		// 加密数据为字符串(UTF-8)
 		String encryptStr2 = aes.encryptBase64("16c5");
 		// 加密后的Base64
-		Assert.assertEquals("ecIQ0+MEkyz56mqciHxtfA==", encryptStr2);
+		assertEquals("ecIQ0+MEkyz56mqciHxtfA==", encryptStr2);
 
 		// 解密
-		Assert.assertEquals("16c5", aes.decryptStr("79c210d3e304932cf9ea6a9c887c6d7c"));
-		Assert.assertEquals("16c5", aes.decryptStr(Base64.decode("ecIQ0+MEkyz56mqciHxtfA==")));
+		assertEquals("16c5", aes.decryptStr("79c210d3e304932cf9ea6a9c887c6d7c"));
+		assertEquals("16c5", aes.decryptStr(Base64.decode("ecIQ0+MEkyz56mqciHxtfA==")));
 		// ------------------------------------------------------------------------
 	}
 
@@ -110,7 +110,7 @@ public class AESTest {
 		final String result1 = aes.encryptBase64(content);
 
 		final String decryptStr = aes.decryptStr(result1);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	/**
@@ -130,6 +130,6 @@ public class AESTest {
 		// 加密
 		byte[] encrypt = aes.encrypt(phone);
 		final String decryptStr = aes.decryptStr(encrypt);
-		Assert.assertEquals(phone, decryptStr);
+		assertEquals(phone, decryptStr);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java
index 888720ca1..a1f2c9828 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ChaCha20Test.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 见：https://stackoverflow.com/questions/32672241/using-bouncycastles-chacha-for-file-encryption
@@ -25,6 +25,6 @@ public class ChaCha20Test {
 		// 解密为字符串
 		String decryptStr = chacha.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java
index acd584cea..39e0c82f0 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/DesTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * DES加密解密单元测试
@@ -20,7 +20,7 @@ public class DesTest {
 		final String encryptHex = des.encryptHex(content);
 		final String result = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, result);
+		assertEquals(content, result);
 	}
 
 	@Test
@@ -36,6 +36,6 @@ public class DesTest {
 		final String encryptHex = des.encryptHex(content);
 		final String result = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, result);
+		assertEquals(content, result);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java
index 7e6c2138a..d530a0d3a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/PBKDF2Test.java
@@ -2,14 +2,14 @@ package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PBKDF2Test {
 
 	@Test
 	public void encryptTest(){
 		final String s = SecureUtil.pbkdf2("123456".toCharArray(), RandomUtil.randomBytes(16));
-		Assert.assertEquals(128, s.length());
+		assertEquals(128, s.length());
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java
index 7d4cec54c..baa55bbd2 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/RC4Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class RC4Test {
 
@@ -13,12 +13,12 @@ public class RC4Test {
 		String message = "Hello, World!";
 		byte[] crypt = rc4.encrypt(message);
 		String msg = rc4.decrypt(crypt);
-		Assert.assertEquals(message, msg);
+		assertEquals(message, msg);
 
 		String message2 = "Hello, World， this is megssage 2";
 		byte[] crypt2 = rc4.encrypt(message2);
 		String msg2 = rc4.decrypt(crypt2);
-		Assert.assertEquals(message2, msg2);
+		assertEquals(message2, msg2);
 	}
 
 	@Test
@@ -28,12 +28,12 @@ public class RC4Test {
 		RC4 rc4 = new RC4(key);
 		byte[] crypt = rc4.encrypt(message);
 		String msg = rc4.decrypt(crypt);
-		Assert.assertEquals(message, msg);
+		assertEquals(message, msg);
 
 		String message2 = "这是第二个中文消息！";
 		byte[] crypt2 = rc4.encrypt(message2);
 		String msg2 = rc4.decrypt(crypt2);
-		Assert.assertEquals(message2, msg2);
+		assertEquals(message2, msg2);
 	}
 
 	@Test
@@ -43,12 +43,12 @@ public class RC4Test {
 		RC4 rc4 = new RC4(key);
 		String encryptHex = rc4.encryptHex(message, CharsetUtil.CHARSET_UTF_8);
 		String msg = rc4.decrypt(encryptHex);
-		Assert.assertEquals(message, msg);
+		assertEquals(message, msg);
 
 		String message2 = "这是第二个用来测试密文为十六进制字符串的消息！";
 		String encryptHex2 = rc4.encryptHex(message2);
 		String msg2 = rc4.decrypt(encryptHex2);
-		Assert.assertEquals(message2, msg2);
+		assertEquals(message2, msg2);
 	}
 
 
@@ -59,11 +59,11 @@ public class RC4Test {
 		RC4 rc4 = new RC4(key);
 		String encryptHex = rc4.encryptBase64(message, CharsetUtil.CHARSET_UTF_8);
 		String msg = rc4.decrypt(encryptHex);
-		Assert.assertEquals(message, msg);
+		assertEquals(message, msg);
 
 		String message2 = "这是第一个用来测试密文为Base64编码的消息！";
 		String encryptHex2 = rc4.encryptBase64(message2);
 		String msg2 = rc4.decrypt(encryptHex2);
-		Assert.assertEquals(message2, msg2);
+		assertEquals(message2, msg2);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java
index e31a93841..542aa68ba 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/Sm4StreamTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto.symmetric;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -19,7 +19,7 @@ public class Sm4StreamTest {
 	private static final boolean IS_CLOSE = false;
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sm4Test(){
 		String source = "d:/test/sm4_1.txt";
 		String target = "d:/test/sm4_2.data";
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java
index eeee72a2f..30738db3a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/SymmetricTest.java
@@ -9,8 +9,8 @@ import cn.hutool.crypto.KeyUtil;
 import cn.hutool.crypto.Mode;
 import cn.hutool.crypto.Padding;
 import cn.hutool.crypto.SecureUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
@@ -37,14 +37,14 @@ public class SymmetricTest {
 		// 解密
 		byte[] decrypt = aes.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
+		assertEquals(content, StrUtil.str(decrypt, CharsetUtil.CHARSET_UTF_8));
 
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
 		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -62,14 +62,14 @@ public class SymmetricTest {
 		// 解密
 		byte[] decrypt = aes.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
 		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -83,14 +83,14 @@ public class SymmetricTest {
 		// 解密
 		byte[] decrypt = aes.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 		// 解密为字符串
 		String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -101,7 +101,7 @@ public class SymmetricTest {
 		// 加密为16进制表示
 		String encryptHex = aes.encryptHex(content);
 
-		Assert.assertEquals("cd0e3a249eaf0ed80c330338508898c4bddcfd665a1b414622164a273ca5daf7b4ebd2c00aaa66b84dd0a237708dac8e", encryptHex);
+		assertEquals("cd0e3a249eaf0ed80c330338508898c4bddcfd665a1b414622164a273ca5daf7b4ebd2c00aaa66b84dd0a237708dac8e", encryptHex);
 	}
 
 	@Test
@@ -114,7 +114,7 @@ public class SymmetricTest {
 		String encryptHex = crypto.encryptHex(content);
 		final String data = crypto.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, data);
+		assertEquals(content, data);
 	}
 
 	@Test
@@ -127,8 +127,8 @@ public class SymmetricTest {
 		String randomData = aes.updateHex(content.getBytes(StandardCharsets.UTF_8));
 		aes.setMode(CipherMode.encrypt);
 		String randomData2 = aes.updateHex(content.getBytes(StandardCharsets.UTF_8));
-		Assert.assertEquals(randomData2, randomData);
-		Assert.assertEquals(randomData, "cd0e3a249eaf0ed80c330338508898c4");
+		assertEquals(randomData2, randomData);
+		assertEquals(randomData, "cd0e3a249eaf0ed80c330338508898c4");
 	}
 
 
@@ -141,7 +141,7 @@ public class SymmetricTest {
 		String encryptHex = aes.encryptHex(content);
 		// 解密
 		String decryptStr = aes.decryptStr(encryptHex);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -155,7 +155,7 @@ public class SymmetricTest {
 		final ByteArrayOutputStream contentStream = new ByteArrayOutputStream();
 		aes.decrypt(IoUtil.toStream(encryptStream), contentStream, true);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(contentStream.toByteArray()));
+		assertEquals(content, StrUtil.utf8Str(contentStream.toByteArray()));
 	}
 
 	@Test
@@ -169,7 +169,7 @@ public class SymmetricTest {
 		String encryptHex = aes.encryptHex(content);
 		// 解密
 		String decryptStr = aes.decryptStr(encryptHex);
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -182,12 +182,12 @@ public class SymmetricTest {
 		byte[] encrypt = des.encrypt(content);
 		byte[] decrypt = des.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		String encryptHex = des.encryptHex(content);
 		String decryptStr = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -200,12 +200,12 @@ public class SymmetricTest {
 		byte[] encrypt = des.encrypt(content);
 		byte[] decrypt = des.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		String encryptHex = des.encryptHex(content);
 		String decryptStr = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -217,12 +217,12 @@ public class SymmetricTest {
 		byte[] encrypt = des.encrypt(content);
 		byte[] decrypt = des.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		String encryptHex = des.encryptHex(content);
 		String decryptStr = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -236,12 +236,12 @@ public class SymmetricTest {
 		byte[] encrypt = des.encrypt(content);
 		byte[] decrypt = des.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		String encryptHex = des.encryptHex(content);
 		String decryptStr = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -255,12 +255,12 @@ public class SymmetricTest {
 		byte[] encrypt = des.encrypt(content);
 		byte[] decrypt = des.decrypt(encrypt);
 
-		Assert.assertEquals(content, StrUtil.utf8Str(decrypt));
+		assertEquals(content, StrUtil.utf8Str(decrypt));
 
 		String encryptHex = des.encryptHex(content);
 		String decryptStr = des.decryptStr(encryptHex);
 
-		Assert.assertEquals(content, decryptStr);
+		assertEquals(content, decryptStr);
 	}
 
 	@Test
@@ -269,8 +269,8 @@ public class SymmetricTest {
 		String key = "CompleteVictory";
 
 		String encrypt = Vigenere.encrypt(content, key);
-		Assert.assertEquals("zXScRZ]KIOMhQjc0\\bYRXZOJK[Vi", encrypt);
+		assertEquals("zXScRZ]KIOMhQjc0\\bYRXZOJK[Vi", encrypt);
 		String decrypt = Vigenere.decrypt(encrypt, key);
-		Assert.assertEquals(content, decrypt);
+		assertEquals(content, decrypt);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java
index 7044db722..4aaeed36a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/TEATest.java
@@ -1,7 +1,7 @@
 package cn.hutool.crypto.symmetric;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * TEA（Tiny Encryption Algorithm）和 XTEA算法单元测试
@@ -19,7 +19,7 @@ public class TEATest {
 		// 解密
 		final String decryptStr = tea.decryptStr(encrypt);
 
-		Assert.assertEquals(data, decryptStr);
+		assertEquals(data, decryptStr);
 	}
 
 	@Test
@@ -33,7 +33,7 @@ public class TEATest {
 		// 解密
 		final String decryptStr = tea.decryptStr(encrypt);
 
-		Assert.assertEquals(data, decryptStr);
+		assertEquals(data, decryptStr);
 	}
 
 	@Test
@@ -47,6 +47,6 @@ public class TEATest {
 		// 解密
 		final String decryptStr = tea.decryptStr(encrypt);
 
-		Assert.assertEquals(data, decryptStr);
+		assertEquals(data, decryptStr);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java
index 1c384ffff..c6baceb0a 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/ZucTest.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto.symmetric;
 
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ZucTest {
 
@@ -16,7 +16,7 @@ public class ZucTest {
 		String msg = RandomUtil.randomString(500);
 		byte[] crypt2 = zuc.encrypt(msg);
 		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(msg, msg2);
+		assertEquals(msg, msg2);
 	}
 
 	@Test
@@ -28,6 +28,6 @@ public class ZucTest {
 		String msg = RandomUtil.randomString(500);
 		byte[] crypt2 = zuc.encrypt(msg);
 		String msg2 = zuc.decryptStr(crypt2, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(msg, msg2);
+		assertEquals(msg, msg2);
 	}
 }
diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
index 25c667886..f1fb57ac9 100644
--- a/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
+++ b/hutool-crypto/src/test/java/cn/hutool/crypto/symmetric/fpe/FPETest.java
@@ -2,8 +2,8 @@ package cn.hutool.crypto.symmetric.fpe;
 
 import cn.hutool.core.util.RandomUtil;
 import org.bouncycastle.crypto.util.BasicAlphabetMapper;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class FPETest {
 
@@ -20,10 +20,10 @@ public class FPETest {
 		String phone = RandomUtil.randomString("A0123456789", 13);
 		final String encrypt = fpe.encrypt(phone);
 		// 加密后与原密文长度一致
-		Assert.assertEquals(phone.length(), encrypt.length());
+		assertEquals(phone.length(), encrypt.length());
 
 		final String decrypt = fpe.decrypt(encrypt);
-		Assert.assertEquals(phone, decrypt);
+		assertEquals(phone, decrypt);
 	}
 
 	@Test
@@ -39,9 +39,9 @@ public class FPETest {
 		String phone = RandomUtil.randomString("A0123456789", 13);
 		final String encrypt = fpe.encrypt(phone);
 		// 加密后与原密文长度一致
-		Assert.assertEquals(phone.length(), encrypt.length());
+		assertEquals(phone.length(), encrypt.length());
 
 		final String decrypt = fpe.decrypt(encrypt);
-		Assert.assertEquals(phone, decrypt);
+		assertEquals(phone, decrypt);
 	}
 }
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index c294e2cf1..def6c4f5f 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -20,14 +20,14 @@
 		<Automatic-Module-Name>cn.hutool.db</Automatic-Module-Name>
 
 		<!-- versions -->
-		<c3p0.version>0.9.5.5</c3p0.version>
-		<dbcp2.version>2.11.0</dbcp2.version>
+		<c3p0.version>0.10.1</c3p0.version>
+		<dbcp2.version>2.12.0</dbcp2.version>
 		<tomcat-jdbc.version>10.0.23</tomcat-jdbc.version>
-		<druid.version>1.2.21</druid.version>
+		<druid.version>1.2.23</druid.version>
 		<!-- 此处固定4.x，支持到JDK8 -->
 		<hikariCP.version>4.0.3</hikariCP.version>
 		<mongo4.version>4.9.1</mongo4.version>
-		<sqlite.version>3.44.1.0</sqlite.version>
+		<sqlite.version>3.46.0.1</sqlite.version>
 		<!-- 此处固定2.5.x，支持到JDK8 -->
 		<hsqldb.version>2.5.2</hsqldb.version>
 		<jedis.version>5.0.2</jedis.version>
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.7.2</version>
+			<version>42.7.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -163,25 +163,25 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>2.2.224</version>
+			<version>2.3.230</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.clickhouse</groupId>
 			<artifactId>clickhouse-jdbc</artifactId>
-			<version>0.5.0</version>
+			<version>0.6.3</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.dameng</groupId>
 			<artifactId>DmJdbcDriver18</artifactId>
-			<version>8.1.2.141</version>
+			<version>8.1.3.140</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.oracle.database.jdbc</groupId>
 			<artifactId>ojdbc8</artifactId>
-			<version>21.13.0.0</version>
+			<version>23.5.0.24.07</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
diff --git a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java b/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
index 3a357fa7e..480e66fff 100644
--- a/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/CRUDTest.java
@@ -7,9 +7,9 @@ import cn.hutool.db.handler.EntityListHandler;
 import cn.hutool.db.pojo.User;
 import cn.hutool.db.sql.Condition;
 import cn.hutool.db.sql.Condition.LikeType;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -28,96 +28,96 @@ public class CRUDTest {
 	@Test
 	public void findIsNullTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", "is null"));
-		Assert.assertEquals(0, results.size());
+		assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findIsNullTest2() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", "= null"));
-		Assert.assertEquals(0, results.size());
+		assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findIsNullTest3() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", null));
-		Assert.assertEquals(0, results.size());
+		assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findBetweenTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", "between '18' and '40'"));
-		Assert.assertEquals(1, results.size());
+		assertEquals(1, results.size());
 	}
 
 	@Test
 	public void findByBigIntegerTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", new BigInteger("12")));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findByBigDecimalTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("age", new BigDecimal("12")));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("name", "like \"%三%\""));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest2() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("name", new Condition("name", "三", LikeType.Contains)));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findLikeTest3() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("name", new Condition("name", null, LikeType.Contains)));
-		Assert.assertEquals(0, results.size());
+		assertEquals(0, results.size());
 	}
 
 	@Test
 	public void findInTest() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user").set("id", "in 1,2,3"));
 		Console.log(results);
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findInTest2() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user")
 				.set("id", new Condition("id", new long[]{1, 2, 3})));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findInTest3() throws SQLException {
 		List<Entity> results = db.findAll(Entity.create("user")
 				.set("id", new long[]{1, 2, 3}));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 
 	@Test
 	public void findAllTest() throws SQLException {
 		List<Entity> results = db.findAll("user");
-		Assert.assertEquals(4, results.size());
+		assertEquals(4, results.size());
 	}
 
 	@Test
 	public void findTest() throws SQLException {
 		List<Entity> find = db.find(CollUtil.newArrayList("name AS name2"), Entity.create("user"), EntityListHandler.create());
-		Assert.assertFalse(find.isEmpty());
+		assertFalse(find.isEmpty());
 	}
 
 	@Test
 	public void findActiveTest() {
 		ActiveEntity entity = new ActiveEntity(db, "user");
 		entity.setFieldNames("name AS name2").load();
-		Assert.assertEquals("user", entity.getTableName());
-		Assert.assertFalse(entity.isEmpty());
+		assertEquals("user", entity.getTableName());
+		assertFalse(entity.isEmpty());
 	}
 
 	/**
@@ -126,30 +126,30 @@ public class CRUDTest {
 	 * @throws SQLException SQL异常
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void crudTest() throws SQLException {
 
 		// 增
 		Long id = db.insertForGeneratedKey(Entity.create("user").set("name", "unitTestUser").set("age", 66));
-		Assert.assertTrue(id > 0);
+		assertTrue(id > 0);
 		Entity result = db.get("user", "name", "unitTestUser");
-		Assert.assertSame(66, result.getInt("age"));
+		assertSame(66, result.getInt("age"));
 
 		// 改
 		int update = db.update(Entity.create().set("age", 88), Entity.create("user").set("name", "unitTestUser"));
-		Assert.assertTrue(update > 0);
+		assertTrue(update > 0);
 		Entity result2 = db.get("user", "name", "unitTestUser");
-		Assert.assertSame(88, result2.getInt("age"));
+		assertSame(88, result2.getInt("age"));
 
 		// 删
 		int del = db.del("user", "name", "unitTestUser");
-		Assert.assertTrue(del > 0);
+		assertTrue(del > 0);
 		Entity result3 = db.get("user", "name", "unitTestUser");
-		Assert.assertNull(result3);
+		assertNull(result3);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertBatchTest() throws SQLException {
 		User user1 = new User();
 		user1.setName("张三");
@@ -175,7 +175,7 @@ public class CRUDTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertBatchOneTest() throws SQLException {
 		User user1 = new User();
 		user1.setName("张三");
@@ -195,6 +195,6 @@ public class CRUDTest {
 	public void selectInTest() throws SQLException {
 		final List<Entity> results = db.query("select * from user where id in (:ids)",
 				MapUtil.of("ids", new int[]{1, 2, 3}));
-		Assert.assertEquals(2, results.size());
+		assertEquals(2, results.size());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
index b5b5450cc..4fce50e59 100755
--- a/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/ConcurentTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.db.handler.EntityListHandler;
 import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
  * @author looly
  *
  */
-@Ignore
+@Disabled
 public class ConcurentTest {
 
 	private Db db;
diff --git a/hutool-db/src/test/java/cn/hutool/db/DbTest.java b/hutool-db/src/test/java/cn/hutool/db/DbTest.java
index 83350017c..f1ef975ac 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DbTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/DbTest.java
@@ -3,9 +3,9 @@ package cn.hutool.db;
 import cn.hutool.db.handler.EntityListHandler;
 import cn.hutool.db.sql.Condition;
 import cn.hutool.log.StaticLog;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -22,22 +22,22 @@ public class DbTest {
 	@Test
 	public void queryTest() throws SQLException {
 		List<Entity> find = Db.use().query("select * from user where age = ?", 18);
-		Assert.assertEquals("王五", find.get(0).get("name"));
+		assertEquals("王五", find.get(0).get("name"));
 	}
 
 	@Test
 	public void findTest() throws SQLException {
 		List<Entity> find = Db.use().find(Entity.create("user").set("age", 18));
-		Assert.assertEquals("王五", find.get(0).get("name"));
+		assertEquals("王五", find.get(0).get("name"));
 	}
 
 	@Test
 	public void pageTest() throws SQLException {
 		// 测试数据库中一共4条数据，第0页有3条，第1页有1条
 		List<Entity> page0 = Db.use().page(Entity.create("user"), 0, 3);
-		Assert.assertEquals(3, page0.size());
+		assertEquals(3, page0.size());
 		List<Entity> page1 = Db.use().page(Entity.create("user"), 1, 3);
-		Assert.assertEquals(1, page1.size());
+		assertEquals(1, page1.size());
 	}
 
 	@Test
@@ -46,11 +46,11 @@ public class DbTest {
 		// 测试数据库中一共4条数据，第0页有3条，第1页有1条
 		List<Entity> page0 = Db.use().page(
 				sql, Page.of(0, 3));
-		Assert.assertEquals(3, page0.size());
+		assertEquals(3, page0.size());
 
 		List<Entity> page1 = Db.use().page(
 				sql, Page.of(1, 3));
-		Assert.assertEquals(1, page1.size());
+		assertEquals(1, page1.size());
 	}
 
 	@Test
@@ -59,42 +59,42 @@ public class DbTest {
 		PageResult<Entity> result = Db.use().page(
 				sql, Page.of(0, 3), "张三");
 
-		Assert.assertEquals(2, result.getTotal());
-		Assert.assertEquals(1, result.getTotalPage());
-		Assert.assertEquals(2, result.size());
+		assertEquals(2, result.getTotal());
+		assertEquals(1, result.getTotalPage());
+		assertEquals(2, result.size());
 	}
 
 	@Test
 	public void countTest() throws SQLException {
 		final long count = Db.use().count("select * from user");
-		Assert.assertEquals(4, count);
+		assertEquals(4, count);
 	}
 
 	@Test
 	public void countByQueryTest() throws SQLException {
 		final long count = Db.use().count(Entity.create("user"));
-		Assert.assertEquals(4, count);
+		assertEquals(4, count);
 	}
 
 	@Test
 	public void countTest2() throws SQLException {
 		final long count = Db.use().count("select * from user order by name DESC");
-		Assert.assertEquals(4, count);
+		assertEquals(4, count);
 	}
 
 	@Test
 	public void findLikeTest() throws SQLException {
 		// 方式1
 		List<Entity> find = Db.use().find(Entity.create("user").set("name", "like 王%"));
-		Assert.assertEquals("王五", find.get(0).get("name"));
+		assertEquals("王五", find.get(0).get("name"));
 
 		// 方式2
 		find = Db.use().findLike("user", "name", "王", Condition.LikeType.StartWith);
-		Assert.assertEquals("王五", find.get(0).get("name"));
+		assertEquals("王五", find.get(0).get("name"));
 
 		// 方式3
 		find = Db.use().query("select * from user where name like ?", "王%");
-		Assert.assertEquals("王五", find.get(0).get("name"));
+		assertEquals("王五", find.get(0).get("name"));
 	}
 
 	@Test
@@ -106,11 +106,11 @@ public class DbTest {
 		for (Entity entity : find) {
 			StaticLog.debug("{}", entity);
 		}
-		Assert.assertEquals("unitTestUser", find.get(0).get("name"));
+		assertEquals("unitTestUser", find.get(0).get("name"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void txTest() throws SQLException {
 		Db.use().tx(db -> {
 			db.insert(Entity.create("user").set("name", "unitTestUser2"));
@@ -120,7 +120,7 @@ public class DbTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void queryFetchTest() throws SQLException {
 		// https://gitee.com/dromara/hutool/issues/I4JXWN
 		Db.use().query((conn->{
@@ -134,7 +134,7 @@ public class DbTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void findWithDotTest() throws SQLException {
 		Db.use().find(Entity.create("user").set("a.b", "1"));
 	}
diff --git a/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java b/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
index 3bc02cd63..748686261 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/DerbyTest.java
@@ -1,23 +1,23 @@
 package cn.hutool.db;
 
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
 
 /**
  * Derby数据库单元测试
- * 
+ *
  * @author looly
  *
  */
 public class DerbyTest {
-	
+
 	private static final String DS_GROUP_NAME = "derby";
-	
+
 	@BeforeClass
 	public static void init() throws SQLException {
 		Db db = Db.use(DS_GROUP_NAME);
@@ -33,18 +33,18 @@ public class DerbyTest {
 		db.insert(Entity.create("test").set("a", 3).set("b", 31));
 		db.insert(Entity.create("test").set("a", 4).set("b", 41));
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void queryTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).query("select * from test");
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void findTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).find(Entity.create("test"));
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/DmTest.java b/hutool-db/src/test/java/cn/hutool/db/DmTest.java
index 521a588a9..f7ba5a7b8 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DmTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/DmTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.db;
 
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
@@ -28,11 +28,11 @@ public class DmTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void upsertTest() throws SQLException {
 		Db db = Db.use(DS_GROUP_NAME);
 		db.upsert(Entity.create("test").set("a", 1).set("b", 111), "a");
 		Entity a1 = db.get("test", "a", 1);
-		Assert.assertEquals(Long.valueOf(111), a1.getLong("b"));
+		assertEquals(Long.valueOf(111), a1.getLong("b"));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/DsTest.java b/hutool-db/src/test/java/cn/hutool/db/DsTest.java
index cec55a376..61f235cd1 100644
--- a/hutool-db/src/test/java/cn/hutool/db/DsTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/DsTest.java
@@ -11,8 +11,8 @@ import cn.hutool.db.ds.hikari.HikariDSFactory;
 import cn.hutool.db.ds.pooled.PooledDSFactory;
 import cn.hutool.db.ds.tomcat.TomcatDSFactory;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
@@ -31,7 +31,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -40,7 +40,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -50,7 +50,7 @@ public class DsTest {
 
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -59,7 +59,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -68,7 +68,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -77,7 +77,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -86,7 +86,7 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 
 	@Test
@@ -94,8 +94,8 @@ public class DsTest {
 		// https://gitee.com/dromara/hutool/issues/I4T7XZ
 		DSFactory.setCurrentDSFactory(new C3p0DSFactory());
 		ComboPooledDataSource ds = (ComboPooledDataSource) ((DataSourceWrapper) DSFactory.get("mysql")).getRaw();
-		Assert.assertEquals("root", ds.getUser());
-		Assert.assertEquals("123456", ds.getPassword());
+		assertEquals("root", ds.getUser());
+		assertEquals("123456", ds.getPassword());
 	}
 
 	@Test
@@ -104,6 +104,6 @@ public class DsTest {
 		DataSource ds = DSFactory.get("test");
 		Db db = Db.use(ds);
 		List<Entity> all = db.findAll("user");
-		Assert.assertTrue(CollUtil.isNotEmpty(all));
+		assertTrue(CollUtil.isNotEmpty(all));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/EntityTest.java b/hutool-db/src/test/java/cn/hutool/db/EntityTest.java
index 26e4d762a..a0448f5b3 100644
--- a/hutool-db/src/test/java/cn/hutool/db/EntityTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/EntityTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.db;
 
 import cn.hutool.db.pojo.User;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Entity测试
@@ -19,8 +19,8 @@ public class EntityTest {
 		user.setName("test");
 
 		Entity entity = Entity.create("testTable").parseBean(user);
-		Assert.assertEquals(Integer.valueOf(1), entity.getInt("id"));
-		Assert.assertEquals("test", entity.getStr("name"));
+		assertEquals(Integer.valueOf(1), entity.getInt("id"));
+		assertEquals("test", entity.getStr("name"));
 	}
 
 	@Test
@@ -30,9 +30,9 @@ public class EntityTest {
 		user.setName("test");
 
 		Entity entity = Entity.create().parseBean(user);
-		Assert.assertEquals(Integer.valueOf(1), entity.getInt("id"));
-		Assert.assertEquals("test", entity.getStr("name"));
-		Assert.assertEquals("user", entity.getTableName());
+		assertEquals(Integer.valueOf(1), entity.getInt("id"));
+		assertEquals("test", entity.getStr("name"));
+		assertEquals("user", entity.getTableName());
 	}
 
 	@Test
@@ -42,9 +42,9 @@ public class EntityTest {
 
 		Entity entity = Entity.create().parseBean(user, false, true);
 
-		Assert.assertFalse(entity.containsKey("id"));
-		Assert.assertEquals("test", entity.getStr("name"));
-		Assert.assertEquals("user", entity.getTableName());
+		assertFalse(entity.containsKey("id"));
+		assertEquals("test", entity.getStr("name"));
+		assertEquals("user", entity.getTableName());
 	}
 
 	@Test
@@ -52,7 +52,7 @@ public class EntityTest {
 		Entity entity = Entity.create().set("ID", 2).set("NAME", "testName");
 		User user = entity.toBeanIgnoreCase(User.class);
 
-		Assert.assertEquals(Integer.valueOf(2), user.getId());
-		Assert.assertEquals("testName", user.getName());
+		assertEquals(Integer.valueOf(2), user.getId());
+		assertEquals("testName", user.getName());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java b/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
index 2b19206db..9ba76fb1f 100644
--- a/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/FindBeanTest.java
@@ -1,16 +1,16 @@
 package cn.hutool.db;
 
 import cn.hutool.db.pojo.User;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
 
 /**
  * Entity测试
- * 
+ *
  * @author looly
  *
  */
@@ -26,43 +26,43 @@ public class FindBeanTest {
 	@Test
 	public void findAllBeanTest() throws SQLException {
 		List<User> results = db.findAll(Entity.create("user"), User.class);
-		
-		Assert.assertEquals(4, results.size());
-		Assert.assertEquals(Integer.valueOf(1), results.get(0).getId());
-		Assert.assertEquals("张三", results.get(0).getName());
+
+		assertEquals(4, results.size());
+		assertEquals(Integer.valueOf(1), results.get(0).getId());
+		assertEquals("张三", results.get(0).getName());
 	}
-	
+
 	@Test
 	@SuppressWarnings("rawtypes")
 	public void findAllListTest() throws SQLException {
 		List<List> results = db.findAll(Entity.create("user"), List.class);
-		
-		Assert.assertEquals(4, results.size());
-		Assert.assertEquals(1, results.get(0).get(0));
-		Assert.assertEquals("张三", results.get(0).get(1));
+
+		assertEquals(4, results.size());
+		assertEquals(1, results.get(0).get(0));
+		assertEquals("张三", results.get(0).get(1));
 	}
-	
+
 	@Test
 	public void findAllArrayTest() throws SQLException {
 		List<Object[]> results = db.findAll(Entity.create("user"), Object[].class);
-		
-		Assert.assertEquals(4, results.size());
-		Assert.assertEquals(1, results.get(0)[0]);
-		Assert.assertEquals("张三", results.get(0)[1]);
+
+		assertEquals(4, results.size());
+		assertEquals(1, results.get(0)[0]);
+		assertEquals("张三", results.get(0)[1]);
 	}
-	
+
 	@Test
 	public void findAllStringTest() throws SQLException {
 		List<String> results = db.findAll(Entity.create("user"), String.class);
-		Assert.assertEquals(4, results.size());
+		assertEquals(4, results.size());
 	}
-	
+
 	@Test
 	public void findAllStringArrayTest() throws SQLException {
 		List<String[]> results = db.findAll(Entity.create("user"), String[].class);
-		
-		Assert.assertEquals(4, results.size());
-		Assert.assertEquals("1", results.get(0)[0]);
-		Assert.assertEquals("张三", results.get(0)[1]);
+
+		assertEquals(4, results.size());
+		assertEquals("1", results.get(0)[0]);
+		assertEquals("张三", results.get(0)[1]);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/H2Test.java b/hutool-db/src/test/java/cn/hutool/db/H2Test.java
index 0cd77fe5e..c12b8c167 100644
--- a/hutool-db/src/test/java/cn/hutool/db/H2Test.java
+++ b/hutool-db/src/test/java/cn/hutool/db/H2Test.java
@@ -2,9 +2,9 @@ package cn.hutool.db;
 
 import cn.hutool.core.map.CaseInsensitiveMap;
 import cn.hutool.core.map.MapUtil;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -34,7 +34,7 @@ public class H2Test {
 	@Test
 	public void queryTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).query("select * from test");
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 
 	@Test
@@ -45,13 +45,13 @@ public class H2Test {
 				.put("b", 31)
 				.build();
 		List<Entity> query = Db.use(DS_GROUP_NAME).page(sql, Page.of(0, 3), paramMap);
-		Assert.assertEquals(1, query.size());
+		assertEquals(1, query.size());
 	}
 
 	@Test
 	public void findTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).find(Entity.create("test"));
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 
 	@Test
@@ -59,6 +59,6 @@ public class H2Test {
 		Db db=Db.use(DS_GROUP_NAME);
 		db.upsert(Entity.create("test").set("a",1).set("b",111),"a");
 		Entity a1=db.get("test","a",1);
-		Assert.assertEquals(Long.valueOf(111),a1.getLong("b"));
+		assertEquals(Long.valueOf(111),a1.getLong("b"));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java b/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
index 4a1ded9d3..80681f644 100644
--- a/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/HsqldbTest.java
@@ -1,22 +1,22 @@
 package cn.hutool.db;
 
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
 
 /**
  * HSQLDB数据库单元测试
- * 
+ *
  * @author looly
  *
  */
 public class HsqldbTest {
-	
+
 	private static final String DS_GROUP_NAME = "hsqldb";
-	
+
 	@BeforeClass
 	public static void init() throws SQLException {
 		Db db = Db.use(DS_GROUP_NAME);
@@ -26,16 +26,16 @@ public class HsqldbTest {
 		db.insert(Entity.create("test").set("a", 3).set("b", 31));
 		db.insert(Entity.create("test").set("a", 4).set("b", 41));
 	}
-	
+
 	@Test
 	public void connTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).query("select * from test");
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 
 	@Test
 	public void findTest() throws SQLException {
 		List<Entity> query = Db.use(DS_GROUP_NAME).find(Entity.create("test"));
-		Assert.assertEquals(4, query.size());
+		assertEquals(4, query.size());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/IssueI73770Test.java b/hutool-db/src/test/java/cn/hutool/db/IssueI73770Test.java
index bce31d62e..89f40e09b 100644
--- a/hutool-db/src/test/java/cn/hutool/db/IssueI73770Test.java
+++ b/hutool-db/src/test/java/cn/hutool/db/IssueI73770Test.java
@@ -13,8 +13,8 @@
 package cn.hutool.db;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
@@ -28,8 +28,8 @@ public class IssueI73770Test {
 			.page("select * from user where id = ?"
 				, new Page(0, 10), User.class, 9);
 
-		Assert.assertEquals(1, result.size());
-		Assert.assertEquals(Integer.valueOf(9), result.get(0).getId());
+		assertEquals(1, result.size());
+		assertEquals(Integer.valueOf(9), result.get(0).getId());
 	}
 
 	@Data
diff --git a/hutool-db/src/test/java/cn/hutool/db/IssueI9BANETest.java b/hutool-db/src/test/java/cn/hutool/db/IssueI9BANETest.java
index f2189ece8..a7d13a858 100644
--- a/hutool-db/src/test/java/cn/hutool/db/IssueI9BANETest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/IssueI9BANETest.java
@@ -4,15 +4,15 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.db.ds.DSFactory;
 import cn.hutool.db.meta.MetaUtil;
 import cn.hutool.db.meta.Table;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
 import java.sql.SQLException;
 
 public class IssueI9BANETest {
 	@Test
-	@Ignore
+	@Disabled
 	public void metaTest() throws SQLException {
 		final Db db = Db.use("orcl");
 		db.find(Entity.create("\"1234\""));
diff --git a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
index c7aa2e4bf..0de2d694e 100755
--- a/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/MySQLTest.java
@@ -1,10 +1,10 @@
 package cn.hutool.db;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -16,14 +16,14 @@ import java.util.List;
  */
 public class MySQLTest {
 	@BeforeClass
-	@Ignore
+	@Disabled
 	public static void createTable() throws SQLException {
 		Db db = Db.use("mysql");
 		db.executeBatch("drop table if exists testuser", "CREATE TABLE if not exists `testuser` ( `id` int(11) NOT NULL, `account` varchar(255) DEFAULT NULL, `pass` varchar(255) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertTest() throws SQLException {
 		for (int id = 100; id < 200; id++) {
 			Db.use("mysql").insert(Entity.create("user")//
@@ -42,7 +42,7 @@ public class MySQLTest {
 	 * @throws SQLException SQL异常
 	 */
 	@Test(expected = SQLException.class)
-	@Ignore
+	@Disabled
 	public void txTest() throws SQLException {
 		Db.use("mysql").tx(db -> {
 			int update = db.update(Entity.create("user").set("text", "描述100"), Entity.create().set("id", 100));
@@ -56,7 +56,7 @@ public class MySQLTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pageTest() throws SQLException {
 		PageResult<Entity> result = Db.use("mysql").page(Entity.create("user"), new Page(2, 10));
 		for (Entity entity : result) {
@@ -65,20 +65,20 @@ public class MySQLTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTimeStampTest() throws SQLException {
 		final List<Entity> all = Db.use("mysql").findAll("test");
 		Console.log(all);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void upsertTest() throws SQLException {
 		Db db = Db.use("mysql");
 		db.insert(Entity.create("testuser").set("id", 1).set("account", "ice").set("pass", "123456"));
 		db.upsert(Entity.create("testuser").set("id", 1).set("account", "icefairy").set("pass", "a123456"));
 		Entity user = db.get(Entity.create("testuser").set("id", 1));
 		System.out.println("user======="+user.getStr("account")+"___"+user.getStr("pass"));
-		Assert.assertEquals(user.getStr("account"), new String("icefairy"));
+		assertEquals(user.getStr("account"), new String("icefairy"));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java b/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java
index e724bfd3b..dba29ae8f 100644
--- a/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/NamedSqlTest.java
@@ -2,8 +2,8 @@ package cn.hutool.db;
 
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.db.sql.NamedSql;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -24,9 +24,9 @@ public class NamedSqlTest {
 
 		NamedSql namedSql = new NamedSql(sql, paramMap);
 		//未指定参数原样输出
-		Assert.assertEquals("select * from table where id=@id and name = ? and nickName = ?", namedSql.getSql());
-		Assert.assertEquals("张三", namedSql.getParams()[0]);
-		Assert.assertEquals("小豆豆", namedSql.getParams()[1]);
+		assertEquals("select * from table where id=@id and name = ? and nickName = ?", namedSql.getSql());
+		assertEquals("张三", namedSql.getParams()[0]);
+		assertEquals("小豆豆", namedSql.getParams()[1]);
 	}
 
 	@Test
@@ -41,11 +41,11 @@ public class NamedSqlTest {
 				.build();
 
 		NamedSql namedSql = new NamedSql(sql, paramMap);
-		Assert.assertEquals("select * from table where id=? and name = ? and nickName = ?", namedSql.getSql());
+		assertEquals("select * from table where id=? and name = ? and nickName = ?", namedSql.getSql());
 		//指定了null参数的依旧替换，参数值为null
-		Assert.assertNull(namedSql.getParams()[0]);
-		Assert.assertEquals("张三", namedSql.getParams()[1]);
-		Assert.assertEquals("小豆豆", namedSql.getParams()[2]);
+		assertNull(namedSql.getParams()[0]);
+		assertEquals("张三", namedSql.getParams()[1]);
+		assertEquals("小豆豆", namedSql.getParams()[2]);
 	}
 
 	@Test
@@ -58,7 +58,7 @@ public class NamedSqlTest {
 				.build();
 
 		NamedSql namedSql = new NamedSql(sql, paramMap);
-		Assert.assertEquals(sql, namedSql.getSql());
+		assertEquals(sql, namedSql.getSql());
 	}
 
 	@Test
@@ -71,7 +71,7 @@ public class NamedSqlTest {
 				.build();
 
 		NamedSql namedSql = new NamedSql(sql, paramMap);
-		Assert.assertEquals(sql, namedSql.getSql());
+		assertEquals(sql, namedSql.getSql());
 	}
 
 	@Test
@@ -80,10 +80,10 @@ public class NamedSqlTest {
 		final HashMap<String, Object> paramMap = MapUtil.of("ids", new int[]{1, 2, 3});
 
 		NamedSql namedSql = new NamedSql(sql, paramMap);
-		Assert.assertEquals("select * from user where id in (?,?,?)", namedSql.getSql());
-		Assert.assertEquals(1, namedSql.getParams()[0]);
-		Assert.assertEquals(2, namedSql.getParams()[1]);
-		Assert.assertEquals(3, namedSql.getParams()[2]);
+		assertEquals("select * from user where id in (?,?,?)", namedSql.getSql());
+		assertEquals(1, namedSql.getParams()[0]);
+		assertEquals(2, namedSql.getParams()[1]);
+		assertEquals(3, namedSql.getParams()[2]);
 	}
 
 	@Test
@@ -94,10 +94,10 @@ public class NamedSqlTest {
 		String sql = "select * from user where name = @name1 and age = @age1";
 
 		List<Entity> query = Db.use().query(sql, paramMap);
-		Assert.assertEquals(1, query.size());
+		assertEquals(1, query.size());
 
 		// 采用传统方式查询是否能识别Map类型参数
 		query = Db.use().query(sql, new Object[]{paramMap});
-		Assert.assertEquals(1, query.size());
+		assertEquals(1, query.size());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java
index f042e7549..e56058ec9 100755
--- a/hutool-db/src/test/java/cn/hutool/db/OracleTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/OracleTest.java
@@ -4,15 +4,15 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.db.sql.Query;
 import cn.hutool.db.sql.SqlBuilder;
 import cn.hutool.db.sql.SqlUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
 /**
  * Oracle操作单元测试
- * 
+ *
  * @author looly
  *
  */
@@ -36,11 +36,11 @@ public class OracleTest {
 		String ok = "SELECT * FROM "//
 				+ "( SELECT row_.*, rownum rownum_ from ( SELECT * FROM PMCPERFORMANCEINFO WHERE yearPI = ? ) row_ "//
 				+ "where rownum <= 10) table_alias where table_alias.rownum_ >= 0";//
-		Assert.assertEquals(ok, builder.toString());
+		assertEquals(ok, builder.toString());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertTest() throws SQLException {
 		for (int id = 100; id < 200; id++) {
 			Db.use("orcl").insert(Entity.create("T_USER")//
@@ -53,7 +53,7 @@ public class OracleTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pageTest() throws SQLException {
 		PageResult<Entity> result = Db.use("orcl").page(Entity.create("T_USER"), new Page(2, 10));
 		for (Entity entity : result) {
diff --git a/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java b/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java
index 43c1835fe..d84ad3825 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PageResultTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PageResultTest {
 
@@ -9,6 +9,6 @@ public class PageResultTest {
 	public void isLastTest(){
 		// 每页2条，共10条，总共5页，第一页是0，最后一页应该是4
 		final PageResult<String> result = new PageResult<>(4, 2, 10);
-		Assert.assertTrue(result.isLast());
+		assertTrue(result.isLast());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/PageTest.java b/hutool-db/src/test/java/cn/hutool/db/PageTest.java
index 92751278a..a7b286b97 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PageTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PageTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.db;
 
 import cn.hutool.db.sql.Order;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PageTest {
 
@@ -10,8 +10,8 @@ public class PageTest {
 	public void addOrderTest() {
 		Page page = new Page();
 		page.addOrder(new Order("aaa"));
-		Assert.assertEquals(page.getOrders().length, 1);
+		assertEquals(page.getOrders().length, 1);
 		page.addOrder(new Order("aaa"));
-		Assert.assertEquals(page.getOrders().length, 2);
+		assertEquals(page.getOrders().length, 2);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
index 4f3c6b315..3bfd71d9e 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
@@ -3,8 +3,8 @@ package cn.hutool.db;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -12,7 +12,7 @@ import java.sql.SQLException;
 public class PicTransferTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void findTest() throws SQLException {
 		Db.use().find(
 				ListUtil.of("NAME", "TYPE", "GROUP", "PIC"),
diff --git a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java b/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
index 250930efe..8bc915582 100644
--- a/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/PostgreTest.java
@@ -2,9 +2,9 @@ package cn.hutool.db;
 
 import java.sql.SQLException;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.lang.Console;
 
@@ -16,7 +16,7 @@ import cn.hutool.core.lang.Console;
 public class PostgreTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertTest() throws SQLException {
 		for (int id = 100; id < 200; id++) {
 			Db.use("postgre").insert(Entity.create("user")//
@@ -27,7 +27,7 @@ public class PostgreTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pageTest() throws SQLException {
 		PageResult<Entity> result = Db.use("postgre").page(Entity.create("user"), new Page(2, 10));
 		for (Entity entity : result) {
@@ -36,7 +36,7 @@ public class PostgreTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void upsertTest() throws SQLException {
 		Db db = Db.use("postgre");
 		db.executeBatch("drop table if exists ctest",
@@ -44,6 +44,6 @@ public class PostgreTest {
 		db.insert(Entity.create("ctest").set("id", 1).set("t1", "111").set("t2", "222").set("t3", "333"));
 		db.upsert(Entity.create("ctest").set("id", 1).set("t1", "new111").set("t2", "new222").set("t3", "bew333"),"id");
 		Entity et=db.get(Entity.create("ctest").set("id", 1));
-		Assert.assertEquals("new111",et.getStr("t1"));
+		assertEquals("new111",et.getStr("t1"));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/SessionTest.java b/hutool-db/src/test/java/cn/hutool/db/SessionTest.java
index e2bada3fc..6212b325b 100644
--- a/hutool-db/src/test/java/cn/hutool/db/SessionTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/SessionTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
@@ -11,9 +11,9 @@ import java.sql.SQLException;
  *
  */
 public class SessionTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void transTest() {
 		Session session = Session.create("test");
 		try {
@@ -24,9 +24,9 @@ public class SessionTest {
 			session.quietRollback();
 		}
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void txTest() throws SQLException {
 		Session.create("test").tx(session -> session.update(Entity.create().set("age", 78), Entity.create("user").set("name", "unitTestUser")));
 	}
diff --git a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java b/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java
index c9842b458..38596de59 100755
--- a/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/SqlServerTest.java
@@ -2,27 +2,27 @@ package cn.hutool.db;
 
 import java.sql.SQLException;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.lang.Console;
 
 /**
  * SQL Server操作单元测试
- * 
+ *
  * @author looly
  *
  */
 public class SqlServerTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void createTableTest() throws SQLException {
 		Db.use("sqlserver").execute("create table T_USER(ID bigint, name varchar(255))");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void insertTest() throws SQLException {
 		for (int id = 100; id < 200; id++) {
 			Db.use("sqlserver").insert(Entity.create("T_USER")//
@@ -33,7 +33,7 @@ public class SqlServerTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void pageTest() throws SQLException {
 		PageResult<Entity> result = Db.use("sqlserver").page(Entity.create("T_USER"), new Page(2, 10));
 		for (Entity entity : result) {
diff --git a/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java b/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
index d582419a8..628761733 100644
--- a/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/UpdateTest.java
@@ -1,34 +1,34 @@
 package cn.hutool.db;
 
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
 
 public class UpdateTest {
-	
+
 	Db db;
 
 	@Before
 	public void init() {
 		db = Db.use("test");
 	}
-	
+
 	/**
 	 * 对更新做单元测试
-	 * 
+	 *
 	 * @throws SQLException SQL异常
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void updateTest() throws SQLException {
 
 		// 改
 		int update = db.update(Entity.create("user").set("age", 88), Entity.create().set("name", "unitTestUser"));
-		Assert.assertTrue(update > 0);
+		assertTrue(update > 0);
 		Entity result2 = db.get("user", "name", "unitTestUser");
-		Assert.assertSame(88, result2.getInt("age"));
+		assertSame(88, result2.getInt("age"));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/WrapperTest.java b/hutool-db/src/test/java/cn/hutool/db/WrapperTest.java
index ba89e80b6..6840be462 100644
--- a/hutool-db/src/test/java/cn/hutool/db/WrapperTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/WrapperTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.db;
 
 import cn.hutool.db.sql.Wrapper;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author bwcx_jzy
@@ -12,32 +12,32 @@ import org.junit.Test;
 public class WrapperTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void test() {
 		Wrapper wrapper = new Wrapper('`');
 		String originalName = "name";
 		String wrapName = wrapper.wrap(originalName);
 		String unWrapName = wrapper.unWrap(wrapName);
-		Assert.assertEquals(unWrapName, originalName);
+		assertEquals(unWrapName, originalName);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testDotWrap() {
 		Wrapper wrapper = new Wrapper('`');
 		String originalName = "name.age";
 		String wrapName = wrapper.wrap(originalName);
 		String unWrapName = wrapper.unWrap(wrapName);
-		Assert.assertEquals(unWrapName, originalName);
+		assertEquals(unWrapName, originalName);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testError() {
 		Wrapper wrapper = new Wrapper('`');
 		String originalName = "name.age*";
 		String wrapName = wrapper.wrap(originalName);
 		String unWrapName = wrapper.unWrap(wrapName);
-		Assert.assertEquals(unWrapName, originalName);
+		assertEquals(unWrapName, originalName);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java b/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java
index 8222dcdac..b262006db 100644
--- a/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/dialect/DialectFactoryTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.db.dialect;
 
 import cn.hutool.core.util.RandomUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +44,7 @@ public class DialectFactoryTest {
 		map.put("mariadb",DRIVER_MARIADB);
 
 
-		map.forEach((k,v) -> Assert.assertEquals(v,
+		map.forEach((k,v) -> assertEquals(v,
 				DialectFactory.identifyDriver(k+ RandomUtil.randomString(2),null) ));
 
 	}
diff --git a/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java b/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java
index 7dacba36a..33f965ec5 100644
--- a/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/dialect/DriverUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.dialect;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DriverUtilTest {
 
@@ -9,6 +9,6 @@ public class DriverUtilTest {
 	public void identifyDriverTest(){
 		String url = "jdbc:h2:file:./db/test;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;MODE=MYSQL";
 		String driver = DriverUtil.identifyDriver(url); // driver 返回 mysql 的 driver
-		Assert.assertEquals("org.h2.Driver", driver);
+		assertEquals("org.h2.Driver", driver);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java b/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java
index 14819d78f..075f18f0a 100644
--- a/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/ds/DataSourceWrapperTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.db.ds;
 
 import cn.hutool.db.ds.simple.SimpleDataSource;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class DataSourceWrapperTest {
 
@@ -12,7 +12,7 @@ public class DataSourceWrapperTest {
 		final DataSourceWrapper wrapper = new DataSourceWrapper(simpleDataSource, "test.driver");
 
 		final DataSourceWrapper clone = wrapper.clone();
-		Assert.assertEquals("test.driver", clone.getDriver());
-		Assert.assertEquals(simpleDataSource, clone.getRaw());
+		assertEquals("test.driver", clone.getDriver());
+		assertEquals(simpleDataSource, clone.getRaw());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/ds/IssueI70J95Test.java b/hutool-db/src/test/java/cn/hutool/db/ds/IssueI70J95Test.java
index f216ac98c..23e0b2f42 100755
--- a/hutool-db/src/test/java/cn/hutool/db/ds/IssueI70J95Test.java
+++ b/hutool-db/src/test/java/cn/hutool/db/ds/IssueI70J95Test.java
@@ -13,8 +13,8 @@
 package cn.hutool.db.ds;
 
 import cn.hutool.setting.Setting;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
 
@@ -35,6 +35,6 @@ public class IssueI70J95Test {
 	public void getDataSourceTest2() {
 		final Setting dbSetting = new Setting("config/db.setting");
 		final DataSource dataSource = DSFactory.create(dbSetting).getDataSource("");
-		Assert.assertNotNull(dataSource);
+		assertNotNull(dataSource);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
index d9ece6a58..740030c74 100644
--- a/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.DbRuntimeException;
 import cn.hutool.db.ds.DSFactory;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.sql.DataSource;
 import java.util.List;
@@ -22,25 +22,25 @@ public class MetaUtilTest {
 	@Test
 	public void getTablesTest() {
 		final List<String> tables = MetaUtil.getTables(ds);
-		Assert.assertEquals("user", tables.get(0));
+		assertEquals("user", tables.get(0));
 	}
 
 	@Test
 	public void getTableMetaTest() {
 		final Table table = MetaUtil.getTableMeta(ds, "user");
-		Assert.assertEquals(CollectionUtil.newHashSet("id"), table.getPkNames());
+		assertEquals(CollectionUtil.newHashSet("id"), table.getPkNames());
 	}
 
 	@Test
 	public void getColumnNamesTest() {
 		final String[] names = MetaUtil.getColumnNames(ds, "user");
-		Assert.assertArrayEquals(StrUtil.splitToArray("id,name,age,birthday,gender", ','), names);
+		assertArrayEquals(StrUtil.splitToArray("id,name,age,birthday,gender", ','), names);
 	}
 
 	@Test
 	public void getTableIndexInfoTest() {
 		final Table table = MetaUtil.getTableMeta(ds, "user_1");
-		Assert.assertEquals(table.getIndexInfoList().size(), 2);
+		assertEquals(table.getIndexInfoList().size(), 2);
 	}
 
 	/**
@@ -49,6 +49,6 @@ public class MetaUtilTest {
 	@Test(expected = DbRuntimeException.class)
 	public void getTableNotExistTest() {
 		final Table table = MetaUtil.getTableMeta(ds, "user_not_exist");
-		Assert.assertEquals(table.getIndexInfoList().size(), 2);
+		assertEquals(table.getIndexInfoList().size(), 2);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/nosql/MongoDBTest.java b/hutool-db/src/test/java/cn/hutool/db/nosql/MongoDBTest.java
index 866ba0b4c..411fa71c2 100644
--- a/hutool-db/src/test/java/cn/hutool/db/nosql/MongoDBTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/nosql/MongoDBTest.java
@@ -2,9 +2,9 @@ package cn.hutool.db.nosql;
 
 import cn.hutool.db.nosql.mongo.MongoFactory;
 import com.mongodb.client.MongoDatabase;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author VampireAchao
@@ -12,9 +12,9 @@ import org.junit.Test;
 public class MongoDBTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mongoDSTest() {
 		MongoDatabase db = MongoFactory.getDS("master").getDb("test");
-		Assert.assertEquals("test", db.getName());
+		assertEquals("test", db.getName());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/nosql/RedisDSTest.java b/hutool-db/src/test/java/cn/hutool/db/nosql/RedisDSTest.java
index 416830f52..ce8776788 100644
--- a/hutool-db/src/test/java/cn/hutool/db/nosql/RedisDSTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/nosql/RedisDSTest.java
@@ -1,14 +1,14 @@
 package cn.hutool.db.nosql;
 
 import cn.hutool.db.nosql.redis.RedisDS;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 
 public class RedisDSTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void redisDSTest(){
 		final Jedis jedis = RedisDS.create().getJedis();
 	}
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java
index 260bb5e96..501db9d52 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionBuilderTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.sql;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ConditionBuilderTest {
 
@@ -14,8 +14,8 @@ public class ConditionBuilderTest {
 
 		final ConditionBuilder builder = ConditionBuilder.of(c1, c2, c3);
 		final String sql = builder.build();
-		Assert.assertEquals("user IS NULL OR name IS NOT NULL AND group LIKE ?", sql);
-		Assert.assertEquals(1, builder.getParamValues().size());
-		Assert.assertEquals("%aaa", builder.getParamValues().get(0));
+		assertEquals("user IS NULL OR name IS NOT NULL AND group LIKE ?", sql);
+		assertEquals(1, builder.getParamValues().size());
+		assertEquals("%aaa", builder.getParamValues().get(0));
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java
index 843e0420b..12da48471 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionGroupTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.db.sql;
 
 import cn.hutool.core.collection.ListUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class ConditionGroupTest {
 	@Test
@@ -22,7 +22,7 @@ public class ConditionGroupTest {
 
 		final ConditionBuilder conditionBuilder = ConditionBuilder.of(cg2, condition4);
 
-		Assert.assertEquals("((a = ? OR b = ?) AND c = ?) AND d = ?", conditionBuilder.build());
-		Assert.assertEquals(ListUtil.of("A", "B", "C", "D"), conditionBuilder.getParamValues());
+		assertEquals("((a = ? OR b = ?) AND c = ?) AND d = ?", conditionBuilder.build());
+		assertEquals(ListUtil.of("A", "B", "C", "D"), conditionBuilder.getParamValues());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
index ff52ad2ec..2b7108170 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.sql;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
@@ -10,62 +10,62 @@ public class ConditionTest {
 	@Test
 	public void toStringTest() {
 		Condition conditionNull = new Condition("user", null);
-		Assert.assertEquals("user IS NULL", conditionNull.toString());
+		assertEquals("user IS NULL", conditionNull.toString());
 
 		Condition conditionNotNull = new Condition("user", "!= null");
-		Assert.assertEquals("user IS NOT NULL", conditionNotNull.toString());
+		assertEquals("user IS NOT NULL", conditionNotNull.toString());
 
 		Condition condition2 = new Condition("user", "= zhangsan");
-		Assert.assertEquals("user = ?", condition2.toString());
+		assertEquals("user = ?", condition2.toString());
 
 		Condition conditionLike = new Condition("user", "like %aaa");
-		Assert.assertEquals("user LIKE ?", conditionLike.toString());
+		assertEquals("user LIKE ?", conditionLike.toString());
 
 		Condition conditionIn = new Condition("user", "in 1,2,3");
-		Assert.assertEquals("user IN (?,?,?)", conditionIn.toString());
+		assertEquals("user IN (?,?,?)", conditionIn.toString());
 
 		Condition conditionBetween = new Condition("user", "between 12 and 13");
-		Assert.assertEquals("user BETWEEN ? AND ?", conditionBetween.toString());
+		assertEquals("user BETWEEN ? AND ?", conditionBetween.toString());
 	}
 
 	@Test
 	public void toStringNoPlaceHolderTest() {
 		Condition conditionNull = new Condition("user", null);
 		conditionNull.setPlaceHolder(false);
-		Assert.assertEquals("user IS NULL", conditionNull.toString());
+		assertEquals("user IS NULL", conditionNull.toString());
 
 		Condition conditionNotNull = new Condition("user", "!= null");
 		conditionNotNull.setPlaceHolder(false);
-		Assert.assertEquals("user IS NOT NULL", conditionNotNull.toString());
+		assertEquals("user IS NOT NULL", conditionNotNull.toString());
 
 		Condition conditionEquals = new Condition("user", "= zhangsan");
 		conditionEquals.setPlaceHolder(false);
-		Assert.assertEquals("user = zhangsan", conditionEquals.toString());
+		assertEquals("user = zhangsan", conditionEquals.toString());
 
 		Condition conditionLike = new Condition("user", "like %aaa");
 		conditionLike.setPlaceHolder(false);
-		Assert.assertEquals("user LIKE '%aaa'", conditionLike.toString());
+		assertEquals("user LIKE '%aaa'", conditionLike.toString());
 
 		Condition conditionIn = new Condition("user", "in 1,2,3");
 		conditionIn.setPlaceHolder(false);
-		Assert.assertEquals("user IN (1,2,3)", conditionIn.toString());
+		assertEquals("user IN (1,2,3)", conditionIn.toString());
 
 		Condition conditionBetween = new Condition("user", "between 12 and 13");
 		conditionBetween.setPlaceHolder(false);
-		Assert.assertEquals("user BETWEEN 12 AND 13", conditionBetween.toString());
+		assertEquals("user BETWEEN 12 AND 13", conditionBetween.toString());
 	}
 
 	@Test
 	public void parseTest(){
 		final Condition age = Condition.parse("age", "< 10");
-		Assert.assertEquals("age < ?", age.toString());
+		assertEquals("age < ?", age.toString());
 		// issue I38LTM
-		Assert.assertSame(BigDecimal.class, age.getValue().getClass());
+		assertSame(BigDecimal.class, age.getValue().getClass());
 	}
 
 	@Test
 	public void parseInTest(){
 		final Condition age = Condition.parse("age", "in 1,2,3");
-		Assert.assertEquals("age IN (?,?,?)", age.toString());
+		assertEquals("age IN (?,?,?)", age.toString());
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java
index 055c758cc..b32ddd658 100644
--- a/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/sql/SqlBuilderTest.java
@@ -1,23 +1,23 @@
 package cn.hutool.db.sql;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class SqlBuilderTest {
 
 	@Test
 	public void queryNullTest() {
 		SqlBuilder builder = SqlBuilder.create().select().from("user").where(new Condition("name", "= null"));
-		Assert.assertEquals("SELECT * FROM user WHERE name IS NULL", builder.build());
+		assertEquals("SELECT * FROM user WHERE name IS NULL", builder.build());
 
 		SqlBuilder builder2 = SqlBuilder.create().select().from("user").where(new Condition("name", "is null"));
-		Assert.assertEquals("SELECT * FROM user WHERE name IS NULL", builder2.build());
+		assertEquals("SELECT * FROM user WHERE name IS NULL", builder2.build());
 
 		SqlBuilder builder3 = SqlBuilder.create().select().from("user").where(new Condition("name", "!= null"));
-		Assert.assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder3.build());
+		assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder3.build());
 
 		SqlBuilder builder4 = SqlBuilder.create().select().from("user").where(new Condition("name", "is not null"));
-		Assert.assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder4.build());
+		assertEquals("SELECT * FROM user WHERE name IS NOT NULL", builder4.build());
 	}
 
 	@Test
@@ -29,7 +29,7 @@ public class SqlBuilderTest {
 						new Condition("username", "abc", Condition.LikeType.Contains)
 				).orderBy(new Order("id"));
 
-		Assert.assertEquals("SELECT id,username FROM user INNER JOIN role ON user.id = role.user_id WHERE age >= ? AND username LIKE ? ORDER BY id", builder.build());
+		assertEquals("SELECT id,username FROM user INNER JOIN role ON user.id = role.user_id WHERE age >= ? AND username LIKE ? ORDER BY id", builder.build());
 	}
 
 	@Test
@@ -42,6 +42,6 @@ public class SqlBuilderTest {
 		sqlBuilder.from("user");
 		sqlBuilder.where(conditionEquals);
 		String s1 = sqlBuilder.build();
-		Assert.assertEquals("SELECT id FROM user WHERE user LIKE '%123%'", s1);
+		assertEquals("SELECT id FROM user WHERE user LIKE '%123%'", s1);
 	}
 }
diff --git a/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java b/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java
index 953d4edbb..7d0c6ead1 100755
--- a/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java
+++ b/hutool-db/src/test/java/cn/hutool/db/sql/SqlFormatterTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.db.sql;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class SqlFormatterTest {
 
@@ -14,7 +14,7 @@ public class SqlFormatterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testKeyword() {
 		final String sql = "select * from `order`";
 		final String format = SqlFormatter.format(sql);
@@ -22,7 +22,7 @@ public class SqlFormatterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testSqlBuilderFormat() {
 		final String sql = "SELECT `link_table_a`.`value_a` AS `link_table_a.value_a`,`link_table_a`.`id` AS `link_table_a.id`,`link_table_b`.`value_b` AS `link_table_b.value_b`,`link_table_c`.`id` AS `link_table_c.id`,`link_table_b`.`id` AS `link_table_b.id`,`link_table_c`.`value_c` AS `link_table_c.value_c` FROM `link_table_a` INNER JOIN `link_table_b` ON `link_table_a`.`table_b_id` = `link_table_b`.`id` INNER JOIN `link_table_c` ON `link_table_b`.`table_c_id` = `link_table_c`.`id`";
 		final String format = SqlBuilder.of(sql).format().build();
diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java b/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java
index f185fac31..515237e25 100755
--- a/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java
+++ b/hutool-dfa/src/test/java/cn/hutool/dfa/DfaTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.dfa;
 
 import cn.hutool.core.collection.CollUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -27,7 +27,7 @@ public class DfaTest {
 		// 匹配到【大】，就不再继续匹配了，因此【大土豆】不匹配
 		// 匹配到【刚出锅】，就跳过这三个字了，因此【出锅】不匹配（由于刚首先被匹配，因此长的被匹配，最短匹配只针对第一个字相同选最短）
 		List<String> matchAll = tree.matchAll(text, -1, false, false);
-		Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅"));
+		assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅"));
 	}
 
 	/**
@@ -43,7 +43,7 @@ public class DfaTest {
 		// 【大】被匹配，最短匹配原则【大土豆】被跳过，【土豆继续被匹配】
 		// 【刚出锅】被匹配，由于不跳过已经匹配的词，【出锅】被匹配
 		List<String> matchAll = tree.matchAll(text, -1, true, false);
-		Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅", "出锅"));
+		assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅", "出锅"));
 	}
 
 	/**
@@ -59,7 +59,7 @@ public class DfaTest {
 		// 匹配到【大】，由于非密集匹配，因此从下一个字符开始查找，匹配到【土豆】接着被匹配
 		// 由于【刚出锅】被匹配，由于非密集匹配，【出锅】被跳过
 		List<String> matchAll = tree.matchAll(text, -1, false, true);
-		Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅"));
+		assertEquals(matchAll, CollUtil.newArrayList("大", "土^豆", "刚出锅"));
 
 	}
 
@@ -76,7 +76,7 @@ public class DfaTest {
 		// 匹配到【大】，由于到最长匹配，因此【大土豆】接着被匹配，由于不跳过已经匹配的关键词，土豆继续被匹配
 		// 【刚出锅】被匹配，由于不跳过已经匹配的词，【出锅】被匹配
 		List<String> matchAll = tree.matchAll(text, -1, true, true);
-		Assert.assertEquals(matchAll, CollUtil.newArrayList("大", "大土^豆", "土^豆", "刚出锅", "出锅"));
+		assertEquals(matchAll, CollUtil.newArrayList("大", "大土^豆", "土^豆", "刚出锅", "出锅"));
 
 	}
 
@@ -88,19 +88,19 @@ public class DfaTest {
 		tree.addWord("赵阿三");
 
 		final List<FoundWord> result = tree.matchAllWords("赵阿三在做什么", -1, true, true);
-		Assert.assertEquals(3, result.size());
+		assertEquals(3, result.size());
 
-		Assert.assertEquals("赵", result.get(0).getWord());
-		Assert.assertEquals(0, result.get(0).getStartIndex().intValue());
-		Assert.assertEquals(0, result.get(0).getEndIndex().intValue());
+		assertEquals("赵", result.get(0).getWord());
+		assertEquals(0, result.get(0).getStartIndex().intValue());
+		assertEquals(0, result.get(0).getEndIndex().intValue());
 
-		Assert.assertEquals("赵阿", result.get(1).getWord());
-		Assert.assertEquals(0, result.get(1).getStartIndex().intValue());
-		Assert.assertEquals(1, result.get(1).getEndIndex().intValue());
+		assertEquals("赵阿", result.get(1).getWord());
+		assertEquals(0, result.get(1).getStartIndex().intValue());
+		assertEquals(1, result.get(1).getEndIndex().intValue());
 
-		Assert.assertEquals("赵阿三", result.get(2).getWord());
-		Assert.assertEquals(0, result.get(2).getStartIndex().intValue());
-		Assert.assertEquals(2, result.get(2).getEndIndex().intValue());
+		assertEquals("赵阿三", result.get(2).getWord());
+		assertEquals(0, result.get(2).getStartIndex().intValue());
+		assertEquals(2, result.get(2).getEndIndex().intValue());
 	}
 
 	/**
@@ -112,7 +112,7 @@ public class DfaTest {
 		tree.addWord("tio");
 
 		List<String> all = tree.matchAll("AAAAAAAt-ioBBBBBBB");
-		Assert.assertEquals(all, CollUtil.newArrayList("t-io"));
+		assertEquals(all, CollUtil.newArrayList("t-io"));
 	}
 
 	@Test
@@ -121,31 +121,31 @@ public class DfaTest {
 		tree.addWord("women");
 		String text = "a WOMEN todo.".toLowerCase();
 		List<String> matchAll = tree.matchAll(text, -1, false, false);
-		Assert.assertEquals("[women]", matchAll.toString());
+		assertEquals("[women]", matchAll.toString());
 	}
 
 	@Test
 	public void clearTest(){
 		WordTree tree = new WordTree();
 		tree.addWord("黑");
-		Assert.assertTrue(tree.matchAll("黑大衣").contains("黑"));
+		assertTrue(tree.matchAll("黑大衣").contains("黑"));
 		//clear时直接调用Map的clear并没有把endCharacterSet清理掉
 		tree.clear();
 		tree.addWords("黑大衣","红色大衣");
 
 		//clear() 覆写前 这里想匹配到黑大衣，但是却匹配到了黑
-//		Assert.assertFalse(tree.matchAll("黑大衣").contains("黑大衣"));
-//		Assert.assertTrue(tree.matchAll("黑大衣").contains("黑"));
+//		assertFalse(tree.matchAll("黑大衣").contains("黑大衣"));
+//		assertTrue(tree.matchAll("黑大衣").contains("黑"));
 		//clear() 覆写后
-		Assert.assertTrue(tree.matchAll("黑大衣").contains("黑大衣"));
-		Assert.assertFalse(tree.matchAll("黑大衣").contains("黑"));
-		Assert.assertTrue(tree.matchAll("红色大衣").contains("红色大衣"));
+		assertTrue(tree.matchAll("黑大衣").contains("黑大衣"));
+		assertFalse(tree.matchAll("黑大衣").contains("黑"));
+		assertTrue(tree.matchAll("红色大衣").contains("红色大衣"));
 
 		//如果不覆写只能通过new出新对象才不会有问题
 		tree = new WordTree();
 		tree.addWords("黑大衣","红色大衣");
-		Assert.assertTrue(tree.matchAll("黑大衣").contains("黑大衣"));
-		Assert.assertTrue(tree.matchAll("红色大衣").contains("红色大衣"));
+		assertTrue(tree.matchAll("黑大衣").contains("黑大衣"));
+		assertTrue(tree.matchAll("红色大衣").contains("红色大衣"));
 	}
 
 	// ----------------------------------------------------------------------------------------------------------
diff --git a/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java b/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java
index 5bbbe9f23..22ad8acca 100755
--- a/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java
+++ b/hutool-dfa/src/test/java/cn/hutool/dfa/SensitiveUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.dfa;
 
 import cn.hutool.core.collection.ListUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ public class SensitiveUtilTest {
 		bean.setNum(100);
 		SensitiveUtil.init(wordList);
 		bean = SensitiveUtil.sensitiveFilter(bean, true, null);
-		Assert.assertEquals(bean.getStr(), "我有一颗$****，***的");
+		assertEquals(bean.getStr(), "我有一颗$****，***的");
 	}
 
 	@Data
@@ -37,6 +37,6 @@ public class SensitiveUtilTest {
 		SensitiveUtil.init(ListUtil.of("赵", "赵阿", "赵阿三"));
 
 		String result = SensitiveUtil.sensitiveFilter("赵阿三在做什么。", true, null);
-		Assert.assertEquals("***在做什么。", result);
+		assertEquals("***在做什么。", result);
 	}
 }
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index 9b740f59c..4c055c7d7 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -27,7 +27,7 @@
 		<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
 		<mail.version>1.6.2</mail.version>
 		<jsch.version>0.1.55</jsch.version>
-		<sshj.version>0.37.0</sshj.version>
+		<sshj.version>0.38.0</sshj.version>
 		<zxing.version>3.5.3</zxing.version>
 		<net.version>3.9.0</net.version>
 		<emoji-java.version>5.1.1</emoji-java.version>
@@ -145,14 +145,14 @@
 		<dependency>
 			<groupId>jakarta.mail</groupId>
 			<artifactId>jakarta.mail-api</artifactId>
-			<version>2.1.2</version>
+			<version>2.1.3</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.angus</groupId>
 			<artifactId>jakarta.mail</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -420,7 +420,7 @@
 		<dependency>
 			<groupId>com.googlecode.aviator</groupId>
 			<artifactId>aviator</artifactId>
-			<version>5.4.1</version>
+			<version>5.4.3</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
@@ -469,7 +469,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>QLExpress</artifactId>
-			<version>3.3.2</version>
+			<version>3.3.3</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java
index df8662378..d9c894a16 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/cglib/CglibUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.extra.cglib;
 
 import cn.hutool.core.convert.Convert;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class CglibUtilTest {
 
@@ -15,20 +15,20 @@ public class CglibUtilTest {
 		bean.setValue2("123");
 
 		CglibUtil.copy(bean, otherBean);
-		Assert.assertEquals("Hello world", otherBean.getValue());
+		assertEquals("Hello world", otherBean.getValue());
 		// 无定义转换器，转换失败
-		Assert.assertEquals(0, otherBean.getValue2());
+		assertEquals(0, otherBean.getValue2());
 
 		OtherSampleBean otherBean2 = CglibUtil.copy(bean, OtherSampleBean.class);
-		Assert.assertEquals("Hello world", otherBean2.getValue());
+		assertEquals("Hello world", otherBean2.getValue());
 		// 无定义转换器，转换失败
-		Assert.assertEquals(0, otherBean.getValue2());
+		assertEquals(0, otherBean.getValue2());
 
 		otherBean = new OtherSampleBean();
 		//自定义转换器
 		CglibUtil.copy(bean, otherBean, (value, target, context) -> Convert.convertQuietly(target, value));
-		Assert.assertEquals("Hello world", otherBean.getValue());
-		Assert.assertEquals(123, otherBean.getValue2());
+		assertEquals("Hello world", otherBean.getValue());
+		assertEquals(123, otherBean.getValue2());
 	}
 
 	@Data
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
index 3175efc3e..59f02f3d5 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/ArchiverTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.extra.compress.archiver.StreamArchiver;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
@@ -14,7 +14,7 @@ import java.io.File;
 public class ArchiverTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipTest(){
 		final File file = FileUtil.file("d:/test/compress/test.zip");
 		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.ZIP, file)
@@ -26,7 +26,7 @@ public class ArchiverTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void tarTest(){
 		final File file = FileUtil.file("d:/test/compress/test.tar");
 		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.TAR, file)
@@ -38,7 +38,7 @@ public class ArchiverTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cpioTest(){
 		final File file = FileUtil.file("d:/test/compress/test.cpio");
 		StreamArchiver.create(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.CPIO, file)
@@ -50,7 +50,7 @@ public class ArchiverTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sevenZTest(){
 		final File file = FileUtil.file("d:/test/compress/test.7z");
 		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, ArchiveStreamFactory.SEVEN_Z, file)
@@ -62,7 +62,7 @@ public class ArchiverTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void tgzTest(){
 		final File file = FileUtil.file("d:/test/compress/test.tgz");
 		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "tgz", file)
@@ -82,7 +82,7 @@ public class ArchiverTest {
 	 * Add: D:\disk-all\新建文件夹
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void emptyTest(){
 		final File file = FileUtil.file("d:/disk-all.tgz");
 		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "tgz", file)
@@ -94,7 +94,7 @@ public class ArchiverTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void emptyZTest(){
 		final File file = FileUtil.file("d:/disk-all.7z");
 		CompressUtil.createArchiver(CharsetUtil.CHARSET_UTF_8, "7z", file)
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
index 6fc11e320..3575c6aeb 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/ExtractorTest.java
@@ -3,15 +3,15 @@ package cn.hutool.extra.compress;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.extra.compress.extractor.Extractor;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 public class ExtractorTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipTest() {
 		final Extractor extractor = CompressUtil.createExtractor(
 				CharsetUtil.defaultCharset(),
@@ -21,7 +21,7 @@ public class ExtractorTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sevenZTest() {
 		final Extractor extractor = CompressUtil.createExtractor(
 				CharsetUtil.defaultCharset(),
@@ -31,7 +31,7 @@ public class ExtractorTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void tgzTest() {
 		final Extractor extractor = CompressUtil.createExtractor(
 				CharsetUtil.defaultCharset(),
@@ -42,7 +42,7 @@ public class ExtractorTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sevenZTest2() {
 		final File targetDir = FileUtil.file("d:/test/sevenZ2/");
 		FileUtil.clean(targetDir);
@@ -55,7 +55,7 @@ public class ExtractorTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void zipTest2() {
 		final File targetDir = FileUtil.file("d:/test/zip2/");
 		FileUtil.clean(targetDir);
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/compress/IssueI7PMJ0Test.java b/hutool-extra/src/test/java/cn/hutool/extra/compress/IssueI7PMJ0Test.java
index 02e734210..073419347 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/compress/IssueI7PMJ0Test.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/compress/IssueI7PMJ0Test.java
@@ -14,8 +14,8 @@ package cn.hutool.extra.compress;
 
 import cn.hutool.core.io.FileUtil;
 import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
@@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
 public class IssueI7PMJ0Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void createArchiverTest() {
 		final File tarFile = FileUtil.file("d:/test/issueI7PMJ0.zip");
 		CompressUtil.createArchiver(StandardCharsets.UTF_8, ArchiveStreamFactory.ZIP, tarFile)
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
index 98c3ba77a..38e07d9c0 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/emoji/EmojiUtilTest.java
@@ -1,28 +1,28 @@
 package cn.hutool.extra.emoji;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class EmojiUtilTest {
-	
+
 	@Test
 	public void toUnicodeTest() {
 		String emoji = EmojiUtil.toUnicode(":smile:");
-		Assert.assertEquals("😄", emoji);
+		assertEquals("😄", emoji);
 	}
-	
+
 	@Test
 	public void toAliasTest() {
 		String alias = EmojiUtil.toAlias("😄");
-		Assert.assertEquals(":smile:", alias);
+		assertEquals(":smile:", alias);
 	}
-	
+
 	@Test
 	public void containsEmojiTest() {
 		boolean containsEmoji = EmojiUtil.containsEmoji("测试一下是否包含EMOJ:😄");
-		Assert.assertTrue(containsEmoji);
+		assertTrue(containsEmoji);
 		boolean notContainsEmoji = EmojiUtil.containsEmoji("不包含EMOJ:^_^");
-		Assert.assertFalse(notContainsEmoji);
+		assertFalse(notContainsEmoji);
 
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
index 74307e722..807faaddd 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/AviatorTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.expression.engine.aviator.AviatorEngine;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
@@ -22,19 +22,19 @@ public class AviatorTest {
 		String exp =
 				"\"[foo i=\"+ foo.i + \", f=\" + foo.f + \", date.year=\" + (foo.date.year+1900) + \", date.month=\" + foo.date.month + \", bars[0].name=\" + #foo.bars[0].name + \"]\"";
 		String result = (String) engine.eval(exp, Dict.create().set("foo", foo), null);
-		Assert.assertEquals("[foo i=100, f=3.14, date.year=2020, date.month=10, bars[0].name=bar]", result);
+		assertEquals("[foo i=100, f=3.14, date.year=2020, date.month=10, bars[0].name=bar]", result);
 
 		// Assignment.
 		exp = "#foo.bars[0].name='hello aviator' ; #foo.bars[0].name";
 		result = (String) engine.eval(exp, Dict.create().set("foo", foo), null);
-		Assert.assertEquals("hello aviator", result);
-		Assert.assertEquals("hello aviator", foo.bars[0].getName());
+		assertEquals("hello aviator", result);
+		assertEquals("hello aviator", foo.bars[0].getName());
 
 		exp = "foo.bars[0] = nil ; foo.bars[0]";
 		result = (String) engine.eval(exp, Dict.create().set("foo", foo), null);
 		Console.log("Execute expression: " + exp);
-		Assert.assertNull(result);
-		Assert.assertNull(foo.bars[0]);
+		assertNull(result);
+		assertNull(foo.bars[0]);
 	}
 
 	@Data
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
index 15282a1e0..90824e442 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/expression/ExpressionUtilTest.java
@@ -7,8 +7,8 @@ import cn.hutool.extra.expression.engine.mvel.MvelEngine;
 import cn.hutool.extra.expression.engine.qlexpress.QLExpressEngine;
 import cn.hutool.extra.expression.engine.rhino.RhinoEngine;
 import cn.hutool.extra.expression.engine.spel.SpELEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = ExpressionUtil.eval("a-(b-c)", dict);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -34,7 +34,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("a-(b-c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -45,7 +45,7 @@ public class ExpressionUtilTest {
 		final Map<String,Object> map2=new HashMap<>();
 		map2.put("a", 1);
 		final Object eval1 = engine.eval(exps2, map2, null);
-		Assert.assertEquals(100, eval1);
+		assertEquals(100, eval1);
 	}
 
 	@Test
@@ -57,7 +57,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("a-(b-c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -69,7 +69,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("a-(b-c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -81,7 +81,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("#a-(#b-#c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -93,7 +93,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("a-(b-c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 	@Test
@@ -105,7 +105,7 @@ public class ExpressionUtilTest {
 				.set("b", 45)
 				.set("c", -199.100);
 		final Object eval = engine.eval("a-(b-c)", dict, null);
-		Assert.assertEquals(-143.8, (double)eval, 0);
+		assertEquals(-143.8, (double)eval, 0);
 	}
 
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
index 760cf6829..33f392519 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/ftp/FtpTest.java
@@ -6,8 +6,8 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.extra.ssh.Sftp;
 import org.apache.commons.net.ftp.FTPFile;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,7 +16,7 @@ import java.util.List;
 public class FtpTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void cdTest() {
 		final Ftp ftp = new Ftp("looly.centos");
 
@@ -27,7 +27,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadTest() {
 		final Ftp ftp = new Ftp("localhost");
 
@@ -38,7 +38,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadDirectorTest() {
 		final Ftp ftp = new Ftp("localhost");
 
@@ -47,7 +47,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void reconnectIfTimeoutTest() throws InterruptedException {
 		final Ftp ftp = new Ftp("looly.centos");
 
@@ -71,7 +71,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void recursiveDownloadFolder() {
 		final Ftp ftp = new Ftp("looly.centos");
 		ftp.recursiveDownloadFolder("/",FileUtil.file("d:/test/download"));
@@ -80,7 +80,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void recursiveDownloadFolderSftp() {
 		final Sftp ftp = new Sftp("127.0.0.1", 22, "test", "test");
 
@@ -92,7 +92,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadTest() {
 		String downloadPath = "d:/test/download/";
 		try (final Ftp ftp = new Ftp("localhost")) {
@@ -114,7 +114,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void isDirTest() throws Exception {
 		try (final Ftp ftp = new Ftp("127.0.0.1", 21)) {
 			Console.log(ftp.pwd());
@@ -124,7 +124,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void existSftpTest() throws Exception {
 		try (final Sftp ftp = new Sftp("127.0.0.1", 22, "test", "test")) {
 			Console.log(ftp.pwd());
@@ -147,7 +147,7 @@ public class FtpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void existFtpTest() throws Exception {
 		try (final Ftp ftp = new Ftp("127.0.0.1", 21)) {
 			Console.log(ftp.pwd());
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/JakartaMailTest.java b/hutool-extra/src/test/java/cn/hutool/extra/mail/JakartaMailTest.java
index b70cfee15..ec0824aac 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/mail/JakartaMailTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/mail/JakartaMailTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.extra.mail;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -18,20 +18,20 @@ import java.util.Properties;
 public class JakartaMailTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithFileTest() {
 		JakartaMailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true, FileUtil.file("d:/测试附件文本.txt"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithLongNameFileTest() {
 		//附件名长度大于60时的测试
 		JakartaMailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true, FileUtil.file("d:/6-LongLong一阶段平台建设周报2018.3.12-3.16.xlsx"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithImageTest() {
 		Map<String, InputStream> map = new HashMap<>();
 		map.put("testImage", FileUtil.getInputStream("f:/test/me.png"));
@@ -39,13 +39,13 @@ public class JakartaMailTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendHtmlTest() {
 		JakartaMailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendByAccountTest() {
 		MailAccount account = new MailAccount();
 		account.setHost("smtp.yeah.net");
@@ -64,6 +64,6 @@ public class JakartaMailTest {
 		account.setDebug(true);
 		account.defaultIfEmpty();
 		Properties props = account.getSmtpProps();
-		Assert.assertEquals("true", props.getProperty("mail.debug"));
+		assertEquals("true", props.getProperty("mail.debug"));
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java
index f50d2f9a8..3cc3887ca 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailAccountTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.extra.mail;
 
 import com.sun.mail.util.MailSSLSocketFactory;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.security.GeneralSecurityException;
 
@@ -19,8 +19,8 @@ public class MailAccountTest {
 		MailAccount account = GlobalMailAccount.INSTANCE.getAccount();
 		account.getSmtpProps();
 
-		Assert.assertNotNull(account.getCharset());
-		Assert.assertTrue(account.isSslEnable());
+		assertNotNull(account.getCharset());
+		assertTrue(account.isSslEnable());
 	}
 
 	/**
@@ -31,7 +31,7 @@ public class MailAccountTest {
 	 * 已经测试通过
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void customPropertyTest() throws GeneralSecurityException {
 		MailAccount mailAccount = new MailAccount();
 		mailAccount.setFrom("xxx@xxx.com");
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
index 6f35818b7..9784b70af 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.extra.mail;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.HashMap;
@@ -18,20 +18,20 @@ import java.util.Properties;
 public class MailTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithFileTest() {
 		MailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true, FileUtil.file("d:/测试附件文本.txt"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithLongNameFileTest() {
 		//附件名长度大于60时的测试
 		MailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true, FileUtil.file("d:/6-LongLong一阶段平台建设周报2018.3.12-3.16.xlsx"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendWithImageTest() {
 		Map<String, InputStream> map = new HashMap<>();
 		map.put("testImage", FileUtil.getInputStream("f:/test/me.png"));
@@ -39,13 +39,13 @@ public class MailTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendHtmlTest() {
 		MailUtil.send("hutool@foxmail.com", "测试", "<h1>邮件来自Hutool测试</h1>", true);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sendByAccountTest() {
 		MailAccount account = new MailAccount();
 		account.setHost("smtp.yeah.net");
@@ -64,6 +64,6 @@ public class MailTest {
 		account.setDebug(true);
 		account.defaultIfEmpty();
 		Properties props = account.getSmtpProps();
-		Assert.assertEquals("true", props.getProperty("mail.debug"));
+		assertEquals("true", props.getProperty("mail.debug"));
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java
index 86e97cd6d..a5b1038c1 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Bopomofo4jTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.extra.pinyin.engine.bopomofo4j.Bopomofo4jEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Bopomofo4jTest {
 
@@ -11,13 +11,13 @@ public class Bopomofo4jTest {
 	@Test
 	public void getFirstLetterByBopomofo4jTest(){
 		final String result = engine.getFirstLetter("林海", "");
-		Assert.assertEquals("lh", result);
+		assertEquals("lh", result);
 	}
 
 	@Test
 	public void getPinyinByBopomofo4jTest() {
 		final String pinyin = engine.getPinyin("你好h", " ");
-		Assert.assertEquals("ni haoh", pinyin);
+		assertEquals("ni haoh", pinyin);
 	}
 
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java
index 624c8b133..cc6949312 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/HoubbPinyinTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.extra.pinyin.engine.houbbpinyin.HoubbPinyinEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HoubbPinyinTest {
 
@@ -11,12 +11,12 @@ public class HoubbPinyinTest {
 	@Test
 	public void getFirstLetterTest(){
 		final String result = engine.getFirstLetter("林海", "");
-		Assert.assertEquals("lh", result);
+		assertEquals("lh", result);
 	}
 
 	@Test
 	public void getPinyinTest() {
 		final String pinyin = engine.getPinyin("你好h", " ");
-		Assert.assertEquals("ni hao h", pinyin);
+		assertEquals("ni hao h", pinyin);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java
index e8a2c41c0..9a8eecee0 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/JpinyinTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.extra.pinyin.engine.jpinyin.JPinyinEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JpinyinTest {
 
@@ -11,13 +11,13 @@ public class JpinyinTest {
 	@Test
 	public void getFirstLetterByPinyin4jTest(){
 		final String result = engine.getFirstLetter("林海", "");
-		Assert.assertEquals("lh", result);
+		assertEquals("lh", result);
 	}
 
 	@Test
 	public void getPinyinByPinyin4jTest() {
 		final String pinyin = engine.getPinyin("你好h", " ");
-		Assert.assertEquals("ni hao h", pinyin);
+		assertEquals("ni hao h", pinyin);
 	}
 
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java
index 3af1d8ed3..25b8457ba 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/Pinyin4jTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.extra.pinyin.engine.pinyin4j.Pinyin4jEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Pinyin4jTest {
 
@@ -11,12 +11,12 @@ public class Pinyin4jTest {
 	@Test
 	public void getFirstLetterByPinyin4jTest(){
 		final String result = engine.getFirstLetter("林海", "");
-		Assert.assertEquals("lh", result);
+		assertEquals("lh", result);
 	}
 
 	@Test
 	public void getPinyinByPinyin4jTest() {
 		final String pinyin = engine.getPinyin("你好h", " ");
-		Assert.assertEquals("ni hao h", pinyin);
+		assertEquals("ni hao h", pinyin);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java
index dfe17edf8..ac1dee5c5 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/PinyinUtilTest.java
@@ -1,25 +1,25 @@
 package cn.hutool.extra.pinyin;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class PinyinUtilTest {
 
 	@Test
 	public void getPinyinTest(){
 		final String pinyin = PinyinUtil.getPinyin("你好怡", " ");
-		Assert.assertEquals("ni hao yi", pinyin);
+		assertEquals("ni hao yi", pinyin);
 	}
 
 	@Test
 	public void getFirstLetterTest(){
 		final String result = PinyinUtil.getFirstLetter("H是第一个", ", ");
-		Assert.assertEquals("h, s, d, y, g", result);
+		assertEquals("h, s, d, y, g", result);
 	}
 
 	@Test
 	public void getFirstLetterTest2(){
 		final String result = PinyinUtil.getFirstLetter("崞阳", ", ");
-		Assert.assertEquals("g, y", result);
+		assertEquals("g, y", result);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java
index 87e7b14ff..b7a35e8f5 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/pinyin/TinyPinyinTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.pinyin;
 
 import cn.hutool.extra.pinyin.engine.tinypinyin.TinyPinyinEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class TinyPinyinTest {
 
@@ -11,12 +11,12 @@ public class TinyPinyinTest {
 	@Test
 	public void getFirstLetterByPinyin4jTest(){
 		final String result = engine.getFirstLetter("林海", "");
-		Assert.assertEquals("lh", result);
+		assertEquals("lh", result);
 	}
 
 	@Test
 	public void getPinyinByPinyin4jTest() {
 		final String pinyin = engine.getPinyin("你好h", " ");
-		Assert.assertEquals("ni hao h", pinyin);
+		assertEquals("ni hao h", pinyin);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/IssueI7RUIVTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/IssueI7RUIVTest.java
index 55e214e45..fd7bca120 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/IssueI7RUIVTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/IssueI7RUIVTest.java
@@ -15,8 +15,8 @@ package cn.hutool.extra.qrcode;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 import java.io.File;
@@ -24,7 +24,7 @@ import java.io.File;
 public class IssueI7RUIVTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateTest() {
 		final QrConfig config = new QrConfig(300, 300);
 
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
index 0b67c4e4c..1f52d8114 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
@@ -7,8 +7,8 @@ import cn.hutool.core.lang.Assert;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Color;
 import java.awt.image.BufferedImage;
@@ -31,7 +31,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateCustomTest() {
 		final QrConfig config = new QrConfig();
 		config.setMargin(0);
@@ -43,7 +43,7 @@ public class QrCodeUtilTest {
 		QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.touch(path));
 	}
 	@Test
-	@Ignore
+	@Disabled
 	public void generateNoCustomColorTest() {
 		final QrConfig config = new QrConfig();
 		config.setMargin(0);
@@ -56,7 +56,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateWithLogoTest() {
 		final String icon = FileUtil.isWindows() ? "d:/test/pic/face.jpg" : "~/Desktop/hutool/pic/face.jpg";
 		final String targetPath = FileUtil.isWindows() ? "d:/test/qrcodeWithLogo.jpg" : "~/Desktop/hutool/qrcodeWithLogo.jpg";
@@ -67,14 +67,14 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void decodeTest() {
 		final String decode = QrCodeUtil.decode(FileUtil.file("d:/test/pic/qr.png"));
 		//Console.log(decode);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void decodeTest2() {
 		// 条形码
 		final String decode = QrCodeUtil.decode(FileUtil.file("d:/test/90.png"));
@@ -88,7 +88,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateAsBase64Test2() {
 		final byte[] bytes = FileUtil.readBytes(
 				new File("d:/test/qr.png"));
@@ -105,7 +105,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void decodeTest3() {
 		final String decode = QrCodeUtil.decode(ImgUtil.read("d:/test/qr_a.png"), false, true);
 		//Console.log(decode);
@@ -130,7 +130,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateSvgTest() {
 		final QrConfig qrConfig = QrConfig.create()
 				.setImg("d:/test/logo.png")
@@ -170,7 +170,7 @@ public class QrCodeUtilTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateToFileTest() {
 		final QrConfig qrConfig = QrConfig.create()
 				.setForeColor(Color.BLUE)
@@ -183,7 +183,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void generateToStreamTest() {
 		final QrConfig qrConfig = QrConfig.create()
 				.setForeColor(Color.BLUE)
@@ -201,7 +201,7 @@ public class QrCodeUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void comparePngAndSvgAndAsciiArtTest() {
 		final QrConfig qrConfig = QrConfig.create()
 				.setForeColor(null)
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
index 444b3d9fb..607e51354 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/servlet/ServletUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.extra.servlet;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets;
 public class ServletUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		HttpServletResponse response = null;
 		byte[] bytes = StrUtil.utf8Bytes("地球是我们共同的家园，需要大家珍惜.");
@@ -35,7 +35,7 @@ public class ServletUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void jakartaWriteTest() {
 		jakarta.servlet.http.HttpServletResponse response = null;
 		byte[] bytes = StrUtil.utf8Bytes("地球是我们共同的家园，需要大家珍惜.");
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
index 5d48569c0..c27839c44 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/EnableSpringUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.spring;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -17,8 +17,8 @@ public class EnableSpringUtilTest {
 	@Test
 	public void test() {
 		// 使用@EnableSpringUtil注解后, 能获取上下文
-		Assert.assertNotNull(SpringUtil.getApplicationContext());
+		assertNotNull(SpringUtil.getApplicationContext());
 		// 不使用时, 为null
-//        Assert.assertNull(SpringUtil.getApplicationContext());
+//        assertNull(SpringUtil.getApplicationContext());
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
index a0ef2a2c6..2436eba2f 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilTest.java
@@ -3,8 +3,8 @@ package cn.hutool.extra.spring;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +32,8 @@ public class SpringUtilTest {
 		SpringUtil.registerBean("registerBean", registerBean);
 
 		Demo2 registerBean2 = SpringUtil.getBean("registerBean");
-		Assert.assertEquals(123, registerBean2.getId());
-		Assert.assertEquals("222", registerBean2.getName());
+		assertEquals(123, registerBean2.getId());
+		assertEquals("222", registerBean2.getName());
 
 
 	}
@@ -44,12 +44,12 @@ public class SpringUtilTest {
 	@Test
 	public void unregisterBeanTest() {
 		registerTestAutoWired();
-		Assert.assertNotNull(SpringUtil.getBean("testAutoWired"));
+		assertNotNull(SpringUtil.getBean("testAutoWired"));
 		SpringUtil.unregisterBean("testAutoWired1");
 		try {
 			SpringUtil.getBean("testAutoWired");
 		} catch (NoSuchBeanDefinitionException e) {
-			Assert.assertEquals(e.getClass(), NoSuchBeanDefinitionException.class);
+			assertEquals(e.getClass(), NoSuchBeanDefinitionException.class);
 		}
 	}
 
@@ -64,26 +64,26 @@ public class SpringUtilTest {
 		SpringUtil.registerBean("testAutoWired", testAutoWired);
 
 		testAutoWired = SpringUtil.getBean("testAutoWired");
-		Assert.assertNotNull(testAutoWired);
-		Assert.assertNotNull(testAutoWired.getAutowiredBean());
-		Assert.assertNotNull(testAutoWired.getResourceBean());
-		Assert.assertEquals("123", testAutoWired.getAutowiredBean().getId());
+		assertNotNull(testAutoWired);
+		assertNotNull(testAutoWired.getAutowiredBean());
+		assertNotNull(testAutoWired.getResourceBean());
+		assertEquals("123", testAutoWired.getAutowiredBean().getId());
 
 	}
 
 	@Test
 	public void getBeanTest(){
 		final Demo2 testDemo = SpringUtil.getBean("testDemo");
-		Assert.assertEquals(12345, testDemo.getId());
-		Assert.assertEquals("test", testDemo.getName());
+		assertEquals(12345, testDemo.getId());
+		assertEquals("test", testDemo.getName());
 	}
 
 	@Test
 	public void getBeanWithTypeReferenceTest() {
 		Map<String, Object> mapBean = SpringUtil.getBean(new TypeReference<Map<String, Object>>() {});
-		Assert.assertNotNull(mapBean);
-		Assert.assertEquals("value1", mapBean.get("key1"));
-		Assert.assertEquals("value2", mapBean.get("key2"));
+		assertNotNull(mapBean);
+		assertEquals("value1", mapBean.get("key1"));
+		assertEquals("value2", mapBean.get("key2"));
 	}
 
 	@Data
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
index ea8ee73c3..9ed2c379b 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/spring/SpringUtilWithAutoConfigTest.java
@@ -3,8 +3,8 @@ package cn.hutool.extra.spring;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -31,23 +31,23 @@ public class SpringUtilWithAutoConfigTest {
 		SpringUtil.registerBean("registerBean", registerBean);
 
 		Demo2 registerBean2 = SpringUtil.getBean("registerBean");
-		Assert.assertEquals(123, registerBean2.getId());
-		Assert.assertEquals("222", registerBean2.getName());
+		assertEquals(123, registerBean2.getId());
+		assertEquals("222", registerBean2.getName());
 	}
 
 	@Test
 	public void getBeanTest(){
 		final Demo2 testDemo = SpringUtil.getBean("testDemo");
-		Assert.assertEquals(12345, testDemo.getId());
-		Assert.assertEquals("test", testDemo.getName());
+		assertEquals(12345, testDemo.getId());
+		assertEquals("test", testDemo.getName());
 	}
 
 	@Test
 	public void getBeanWithTypeReferenceTest() {
 		Map<String, Object> mapBean = SpringUtil.getBean(new TypeReference<Map<String, Object>>() {});
-		Assert.assertNotNull(mapBean);
-		Assert.assertEquals("value1", mapBean.get("key1"));
-		Assert.assertEquals("value2", mapBean.get("key2"));
+		assertNotNull(mapBean);
+		assertEquals("value1", mapBean.get("key1"));
+		assertEquals("value2", mapBean.get("key2"));
 	}
 
 	@Data
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
index 05b1725cb..1474e555d 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/JschUtilTest.java
@@ -3,9 +3,9 @@ package cn.hutool.extra.ssh;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.Console;
 import com.jcraft.jsch.Session;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 
@@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets;
 public class JschUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bindPortTest() {
 		//新建会话，此会话用于ssh连接到跳板机（堡垒机），此处为10.1.1.1:22
 		Session session = JschUtil.getSession("looly.centos", 22, "test", "123456");
@@ -28,13 +28,13 @@ public class JschUtilTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bindRemotePort() throws InterruptedException {
 		// 建立会话
 		Session session = JschUtil.getSession("looly.centos", 22, "test", "123456");
 		// 绑定ssh服务端8089端口到本机的8000端口上
 		boolean b = JschUtil.bindRemotePort(session, 8089, "localhost", 8000);
-		Assert.assertTrue(b);
+		assertTrue(b);
 		// 保证一直运行
 //		while (true){
 //			Thread.sleep(3000);
@@ -42,7 +42,7 @@ public class JschUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sftpTest() {
 		Session session = JschUtil.getSession("looly.centos", 22, "root", "123456");
 		Sftp sftp = JschUtil.createSftp(session);
@@ -51,7 +51,7 @@ public class JschUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void reconnectIfTimeoutTest() throws InterruptedException {
 		Session session = JschUtil.getSession("sunnyserver", 22,"mysftp","liuyang1234");
 		Sftp sftp = JschUtil.createSftp(session);
@@ -79,12 +79,12 @@ public class JschUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getSessionTest(){
 		JschUtil.getSession("192.168.1.134", 22, "root", "aaa", null);
 	}
 	@Test
-	@Ignore
+	@Disabled
 	public void sftpPrivateKeyTest(){
 		Session session = JschUtil.getSession("192.168.1.109", 22, "root", ("-----BEGIN RSA PRIVATE KEY-----\n" +
 			"MIIEpAIBAAKCAQEA5SJ1bjhSA0uQJjbbF/LCFiQvs+nMKgkSnSE+JEll7azv7jnh\n" +
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java b/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
index 1de875877..e7429b873 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/ssh/SftpTest.java
@@ -2,8 +2,8 @@ package cn.hutool.extra.ssh;
 
 import cn.hutool.core.util.CharsetUtil;
 import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
@@ -19,13 +19,13 @@ public class SftpTest {
 	private SshjSftp sshjSftp;
 
 	@Before
-	@Ignore
+	@Disabled
 	public void init() {
 		sshjSftp = new SshjSftp("ip", 22, "test", "test", CharsetUtil.CHARSET_UTF_8);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void lsTest() {
 		List<String> files = sshjSftp.ls("/");
 		if (files != null && !files.isEmpty()) {
@@ -34,33 +34,33 @@ public class SftpTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadTest() {
 		sshjSftp.recursiveDownloadFolder("/home/test/temp", new File("C:\\Users\\akwangl\\Downloads\\temp"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadTest() {
 		sshjSftp.upload("/home/test/temp/", new File("C:\\Users\\akwangl\\Downloads\\temp\\辽宁_20190718_104324.CIME"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mkDirTest() {
 		boolean flag = sshjSftp.mkdir("/home/test/temp");
 		System.out.println("是否创建成功: " + flag);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mkDirsTest() {
 		// 在当前目录下批量创建目录
 		sshjSftp.mkDirs("/home/test/temp");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void delDirTest() {
 		sshjSftp.delDir("/home/test/temp");
 	}
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/Issue3488Test.java b/hutool-extra/src/test/java/cn/hutool/extra/template/Issue3488Test.java
index de9407147..dbde9640f 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/Issue3488Test.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/Issue3488Test.java
@@ -4,7 +4,7 @@ import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.extra.template.engine.freemarker.FreemarkerEngine;
 import lombok.Data;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Issue3488Test {
 	@Test
@@ -23,7 +23,7 @@ public class Issue3488Test {
 
 		String result = template.render(Dict.create().set("paymentInfo", paymentInfo));
 		//Console.log(result);
-		//Assert.assertEquals("你好,hutool", result);
+		//assertEquals("你好,hutool", result);
 	}
 
 	@Data
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
index 1ee03b473..a52b9d3ab 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/JetbrickTest.java
@@ -3,8 +3,8 @@ package cn.hutool.extra.template;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.template.engine.jetbrick.JetbrickEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JetbrickTest {
 
@@ -16,7 +16,7 @@ public class JetbrickTest {
 		TemplateEngine engine = TemplateUtil.createEngine(config);
 		Template template = engine.getTemplate("jetbrick_test.jetx");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("你好,hutool", StrUtil.trim(result));
+		assertEquals("你好,hutool", StrUtil.trim(result));
 	}
 
 	@Test
@@ -27,6 +27,6 @@ public class JetbrickTest {
 		TemplateEngine engine = TemplateUtil.createEngine(config);
 		Template template = engine.getTemplate("hello,${name}");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", StrUtil.trim(result));
+		assertEquals("hello,hutool", StrUtil.trim(result));
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
index 2889ddf50..50412792e 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java
@@ -10,9 +10,9 @@ import cn.hutool.extra.template.engine.rythm.RythmEngine;
 import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
 import cn.hutool.extra.template.engine.velocity.VelocityEngine;
 import cn.hutool.extra.template.engine.wit.WitEngine;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.HashMap;
@@ -32,13 +32,13 @@ public class TemplateUtilTest {
 		TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
 		Template template = engine.getTemplate("hello,${name}");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result);
+		assertEquals("hello,hutool", result);
 
 		// classpath中获取模板
 		engine = TemplateUtil.createEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH));
 		Template template2 = engine.getTemplate("beetl_test.btl");
 		String result2 = template2.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result2);
+		assertEquals("hello,hutool", result2);
 	}
 
 	@Test
@@ -47,13 +47,13 @@ public class TemplateUtilTest {
 		TemplateEngine engine = new BeetlEngine(new TemplateConfig("templates"));
 		Template template = engine.getTemplate("hello,${name}");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result);
+		assertEquals("hello,hutool", result);
 
 		// classpath中获取模板
 		engine = new BeetlEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH));
 		Template template2 = engine.getTemplate("beetl_test.btl");
 		String result2 = template2.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result2);
+		assertEquals("hello,hutool", result2);
 	}
 
 	@Test
@@ -63,12 +63,12 @@ public class TemplateUtilTest {
 				new TemplateConfig("templates").setCustomEngine(RythmEngine.class));
 		Template template = engine.getTemplate("hello,@name");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result);
+		assertEquals("hello,hutool", result);
 
 		// classpath中获取模板
 		Template template2 = engine.getTemplate("rythm_test.tmpl");
 		String result2 = template2.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result2);
+		assertEquals("hello,hutool", result2);
 	}
 
 	@Test
@@ -78,14 +78,14 @@ public class TemplateUtilTest {
 				new TemplateConfig("templates", ResourceMode.STRING).setCustomEngine(FreemarkerEngine.class));
 		Template template = engine.getTemplate("hello,${name}");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result);
+		assertEquals("hello,hutool", result);
 
 		//ClassPath模板
 		engine = TemplateUtil.createEngine(
 				new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(FreemarkerEngine.class));
 		template = engine.getTemplate("freemarker_test.ftl");
 		result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", result);
+		assertEquals("hello,hutool", result);
 	}
 
 	@Test
@@ -95,18 +95,18 @@ public class TemplateUtilTest {
 				new TemplateConfig("templates", ResourceMode.STRING).setCustomEngine(VelocityEngine.class));
 		Template template = engine.getTemplate("你好,$name");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("你好,hutool", result);
+		assertEquals("你好,hutool", result);
 
 		//ClassPath模板
 		engine = TemplateUtil.createEngine(
 				new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(VelocityEngine.class));
 		template = engine.getTemplate("velocity_test.vtl");
 		result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("你好,hutool", result);
+		assertEquals("你好,hutool", result);
 
 		template = engine.getTemplate("templates/velocity_test.vtl");
 		result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("你好,hutool", result);
+		assertEquals("你好,hutool", result);
 	}
 
 	@Test
@@ -116,14 +116,14 @@ public class TemplateUtilTest {
 				new TemplateConfig("templates").setCustomEngine(EnjoyEngine.class));
 		Template template = engine.getTemplate("#(x + 123)");
 		String result = template.render(Dict.create().set("x", 1));
-		Assert.assertEquals("124", result);
+		assertEquals("124", result);
 
 		//ClassPath模板
 		engine = new EnjoyEngine(
 				new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(EnjoyEngine.class));
 		template = engine.getTemplate("enjoy_test.etl");
 		result = template.render(Dict.create().set("x", 1));
-		Assert.assertEquals("124", result);
+		assertEquals("124", result);
 	}
 
 	@Test
@@ -133,18 +133,18 @@ public class TemplateUtilTest {
 				new TemplateConfig("templates").setCustomEngine(ThymeleafEngine.class));
 		Template template = engine.getTemplate("<h3 th:text=\"${message}\"></h3>");
 		String result = template.render(Dict.create().set("message", "Hutool"));
-		Assert.assertEquals("<h3>Hutool</h3>", result);
+		assertEquals("<h3>Hutool</h3>", result);
 
 		//ClassPath模板
 		engine = TemplateUtil.createEngine(
 				new TemplateConfig("templates", ResourceMode.CLASSPATH).setCustomEngine(ThymeleafEngine.class));
 		template = engine.getTemplate("thymeleaf_test.ttl");
 		result = template.render(Dict.create().set("message", "Hutool"));
-		Assert.assertEquals("<h3>Hutool</h3>", result);
+		assertEquals("<h3>Hutool</h3>", result);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void renderToFileTest() {
 		TemplateEngine engine = new BeetlEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH));
 		Template template = engine.getTemplate("freemarker_test.ftl");
@@ -163,7 +163,7 @@ public class TemplateUtilTest {
 		TemplateEngine engine = TemplateUtil.createEngine(config);
 		Template template = engine.getTemplate("/wit_test.wit");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", StrUtil.trim(result));
+		assertEquals("hello,hutool", StrUtil.trim(result));
 
 		// 字符串模板
 		config = new TemplateConfig("templates", ResourceMode.STRING)
@@ -171,6 +171,6 @@ public class TemplateUtilTest {
 		engine = TemplateUtil.createEngine(config);
 		template = engine.getTemplate("<%var name;%>hello,${name}");
 		result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("hello,hutool", StrUtil.trim(result));
+		assertEquals("hello,hutool", StrUtil.trim(result));
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
index e82345ef3..dc1486e2c 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
@@ -3,9 +3,9 @@ package cn.hutool.extra.template;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.standard.StandardDialect;
 import org.thymeleaf.templateresolver.StringTemplateResolver;
@@ -31,7 +31,7 @@ public class ThymeleafTest {
 	 * 自定义操作原始引擎
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void addDialectTest(){
 		final TemplateEngine engine = TemplateUtil.createEngine();
 		if(engine instanceof ThymeleafEngine){
@@ -61,7 +61,7 @@ public class ThymeleafTest {
 		TemplateEngine engine = new ThymeleafEngine(new TemplateConfig());
 		Template template = engine.getTemplate("<h3 th:each=\"item : ${list}\" th:text=\"${item.name}\"></h3>");
 		String render = template.render(Dict.create().set("list", list));
-		Assert.assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", render);
+		assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", render);
 	}
 
 	@Test
@@ -98,7 +98,7 @@ public class ThymeleafTest {
 		Context context = new Context(Locale.getDefault(), map);
 		templateEngine.process("<h3 th:each=\"item : ${list}\" th:text=\"${item.name}\"></h3>", context, writer);
 
-		Assert.assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", writer.toString());
+		assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", writer.toString());
 	}
 
 	@SuppressWarnings("rawtypes")
@@ -109,6 +109,6 @@ public class ThymeleafTest {
 		Template template = engine.getTemplate("<h3 th:each=\"item : ${list}\" th:text=\"${item.name}\"></h3>");
 		// "<h3 th:text=\"${nestMap.nestKey}\"></h3>"
 		String render = template.render(map);
-		Assert.assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", render);
+		assertEquals("<h3>a</h3><h3>b</h3><h3>2019-01-01 00:00:00</h3>", render);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
index fc53fd165..fc1881fdd 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/template/VelocityTest.java
@@ -3,8 +3,8 @@ package cn.hutool.extra.template;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.extra.template.engine.velocity.VelocityEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class VelocityTest {
 
@@ -16,6 +16,6 @@ public class VelocityTest {
 		final TemplateEngine engine = TemplateUtil.createEngine(config);
 		Template template = engine.getTemplate("velocity_test_gbk.vtl");
 		String result = template.render(Dict.create().set("name", "hutool"));
-		Assert.assertEquals("你好,hutool", result);
+		assertEquals("你好,hutool", result);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java
index 4f5e858ea..9bfa14ddc 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/tokenizer/TokenizerUtilTest.java
@@ -9,8 +9,8 @@ import cn.hutool.extra.tokenizer.engine.jieba.JiebaEngine;
 import cn.hutool.extra.tokenizer.engine.mmseg.MmsegEngine;
 import cn.hutool.extra.tokenizer.engine.mynlp.MynlpEngine;
 import cn.hutool.extra.tokenizer.engine.word.WordEngine;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 模板引擎单元测试
@@ -35,7 +35,7 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new HanLPEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这 两 个 方法 的 区别 在于 返回 值", resultStr);
+		assertEquals("这 两 个 方法 的 区别 在于 返回 值", resultStr);
 	}
 
 	@Test
@@ -43,7 +43,7 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new IKAnalyzerEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这两个 方法 的 区别 在于 返回值", resultStr);
+		assertEquals("这两个 方法 的 区别 在于 返回值", resultStr);
 	}
 
 	@Test
@@ -58,7 +58,7 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new JiebaEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这 两个 方法 的 区别 在于 返回值", resultStr);
+		assertEquals("这 两个 方法 的 区别 在于 返回值", resultStr);
 	}
 
 	@Test
@@ -73,7 +73,7 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new SmartcnEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这 两 个 方法 的 区别 在于 返回 值", resultStr);
+		assertEquals("这 两 个 方法 的 区别 在于 返回 值", resultStr);
 	}
 
 	@Test
@@ -81,7 +81,7 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new WordEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这两个 方法 的 区别 在于 返回值", resultStr);
+		assertEquals("这两个 方法 的 区别 在于 返回值", resultStr);
 	}
 
 	@Test
@@ -89,11 +89,11 @@ public class TokenizerUtilTest {
 		final TokenizerEngine engine = new MynlpEngine();
 		final Result result = engine.parse(text);
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这 两个 方法 的 区别 在于 返回 值", resultStr);
+		assertEquals("这 两个 方法 的 区别 在于 返回 值", resultStr);
 	}
 
 	private void checkResult(final Result result) {
 		final String resultStr = IterUtil.join(result, " ");
-		Assert.assertEquals("这 两个 方法 的 区别 在于 返回 值", resultStr);
+		assertEquals("这 两个 方法 的 区别 在于 返回 值", resultStr);
 	}
 }
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
index ce2ed7217..d059be7cc 100755
--- a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.extra.validation;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import jakarta.validation.constraints.NotBlank;
 
@@ -40,14 +40,14 @@ public class BeanValidatorUtilTest {
 	@Test
 	public void beanValidatorTest() {
 		BeanValidationResult result = ValidationUtil.warpValidate(new TestClass());
-		Assert.assertFalse(result.isSuccess());
-		Assert.assertEquals(2, result.getErrorMessages().size());
+		assertFalse(result.isSuccess());
+		assertEquals(2, result.getErrorMessages().size());
 	}
 
 	@Test
 	public void propertyValidatorTest() {
 		BeanValidationResult result = ValidationUtil.warpValidateProperty(new TestClass(), "name");
-		Assert.assertFalse(result.isSuccess());
-		Assert.assertEquals(1, result.getErrorMessages().size());
+		assertFalse(result.isSuccess());
+		assertEquals(1, result.getErrorMessages().size());
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java b/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
index 4a50da82f..6fa7e729a 100644
--- a/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/ContentTypeTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.http;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * ContentType 单元测试
@@ -14,7 +14,7 @@ public class ContentTypeTest {
 	@Test
 	public void testBuild() {
 		String result = ContentType.build(ContentType.JSON, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("application/json;charset=UTF-8", result);
+		assertEquals("application/json;charset=UTF-8", result);
 	}
 
 	@Test
@@ -23,6 +23,6 @@ public class ContentTypeTest {
 			"     \"name\": \"hutool\"\n" +
 			" }";
 		ContentType contentType = ContentType.get(json);
-		Assert.assertEquals(ContentType.JSON, contentType);
+		assertEquals(ContentType.JSON, contentType);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java b/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
index 888f5d765..c21d4dc9d 100644
--- a/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/DownloadTest.java
@@ -4,9 +4,9 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.StreamProgress;
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import java.util.UUID;
 public class DownloadTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadPicTest() {
 		final String url = "http://wx.qlogo.cn/mmopen/vKhlFcibVUtNBVDjcIowlg0X8aJfHXrTNCEFBukWVH9ta99pfEN88lU39MKspCUCOP3yrFBH3y2NbV7sYtIIlon8XxLwAEqv2/0";
 		HttpUtil.downloadFile(url, "e:/pic/t3.jpg");
@@ -30,21 +30,21 @@ public class DownloadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadSizeTest() {
 		final String url = "https://res.t-io.org/im/upload/img/67/8948/1119501/88097554/74541310922/85/231910/366466 - 副本.jpg";
 		HttpRequest.get(url).setSSLProtocol("TLSv1.2").executeAsync().writeBody("e:/pic/366466.jpg");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadTest1() {
 		final long size = HttpUtil.downloadFile("http://explorer.bbfriend.com/crossdomain.xml", "e:/temp/");
 		System.out.println("Download size: " + size);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadTest() {
 		// 带进度显示的文件下载
 		HttpUtil.downloadFile("http://mirrors.sohu.com/centos/7/isos/x86_64/CentOS-7-x86_64-DVD-2009.iso", FileUtil.file("d:/"), new StreamProgress() {
@@ -70,16 +70,16 @@ public class DownloadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadFileFromUrlTest1() {
 		final File file = HttpUtil.downloadFileFromUrl("http://groovy-lang.org/changelogs/changelog-3.0.5.html", "d:/download/temp");
-		Assert.assertNotNull(file);
-		Assert.assertTrue(file.isFile());
-		Assert.assertTrue(file.length() > 0);
+		assertNotNull(file);
+		assertTrue(file.isFile());
+		assertTrue(file.length() > 0);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadFileFromUrlTest2() {
 		File file = null;
 		try {
@@ -100,20 +100,20 @@ public class DownloadTest {
 				}
 			});
 
-			Assert.assertNotNull(file);
-			Assert.assertTrue(file.exists());
-			Assert.assertTrue(file.isFile());
-			Assert.assertTrue(file.length() > 0);
-			Assert.assertTrue(file.getName().length() > 0);
+			assertNotNull(file);
+			assertTrue(file.exists());
+			assertTrue(file.isFile());
+			assertTrue(file.length() > 0);
+			assertTrue(file.getName().length() > 0);
 		} catch (final Exception e) {
-			Assert.assertTrue(e instanceof IORuntimeException);
+			assertTrue(e instanceof IORuntimeException);
 		} finally {
 			FileUtil.del(file);
 		}
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadFileFromUrlTest3() {
 		File file = null;
 		try {
@@ -134,30 +134,30 @@ public class DownloadTest {
 				}
 			});
 
-			Assert.assertNotNull(file);
-			Assert.assertTrue(file.exists());
-			Assert.assertTrue(file.isFile());
-			Assert.assertTrue(file.length() > 0);
-			Assert.assertTrue(file.getName().length() > 0);
+			assertNotNull(file);
+			assertTrue(file.exists());
+			assertTrue(file.isFile());
+			assertTrue(file.length() > 0);
+			assertTrue(file.getName().length() > 0);
 		} finally {
 			FileUtil.del(file);
 		}
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadFileFromUrlTest4() {
 		File file = null;
 		try {
 			file = HttpUtil.downloadFileFromUrl("http://groovy-lang.org/changelogs/changelog-3.0.5.html", FileUtil.file("d:/download/temp"), 1);
 
-			Assert.assertNotNull(file);
-			Assert.assertTrue(file.exists());
-			Assert.assertTrue(file.isFile());
-			Assert.assertTrue(file.length() > 0);
-			Assert.assertTrue(file.getName().length() > 0);
+			assertNotNull(file);
+			assertTrue(file.exists());
+			assertTrue(file.isFile());
+			assertTrue(file.length() > 0);
+			assertTrue(file.getName().length() > 0);
 		} catch (final Exception e) {
-			Assert.assertTrue(e instanceof IORuntimeException);
+			assertTrue(e instanceof IORuntimeException);
 		} finally {
 			FileUtil.del(file);
 		}
@@ -165,16 +165,16 @@ public class DownloadTest {
 
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadFileFromUrlTest5() {
 		File file = null;
 		try {
 			file = HttpUtil.downloadFileFromUrl("http://groovy-lang.org/changelogs/changelog-3.0.5.html", FileUtil.file("d:/download/temp", UUID.randomUUID().toString()));
 
-			Assert.assertNotNull(file);
-			Assert.assertTrue(file.exists());
-			Assert.assertTrue(file.isFile());
-			Assert.assertTrue(file.length() > 0);
+			assertNotNull(file);
+			assertTrue(file.exists());
+			assertTrue(file.isFile());
+			assertTrue(file.length() > 0);
 		} finally {
 			FileUtil.del(file);
 		}
@@ -183,17 +183,17 @@ public class DownloadTest {
 		try {
 			file1 = HttpUtil.downloadFileFromUrl("http://groovy-lang.org/changelogs/changelog-3.0.5.html", FileUtil.file("d:/download/temp"));
 
-			Assert.assertNotNull(file1);
-			Assert.assertTrue(file1.exists());
-			Assert.assertTrue(file1.isFile());
-			Assert.assertTrue(file1.length() > 0);
+			assertNotNull(file1);
+			assertTrue(file1.exists());
+			assertTrue(file1.isFile());
+			assertTrue(file1.length() > 0);
 		} finally {
 			FileUtil.del(file1);
 		}
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadTeamViewerTest() throws IOException {
 		// 此URL有3次重定向, 需要请求4次
 		final String url = "https://download.teamviewer.com/download/TeamViewer_Setup_x64.exe";
diff --git a/hutool-http/src/test/java/cn/hutool/http/HTMLFilterTest.java b/hutool-http/src/test/java/cn/hutool/http/HTMLFilterTest.java
index 03045a9a7..f48fd7383 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HTMLFilterTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HTMLFilterTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.http;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class HTMLFilterTest {
 	@Test
@@ -11,9 +11,9 @@ public class HTMLFilterTest {
 
 		final HTMLFilter htmlFilter = new HTMLFilter();
 		String filter = htmlFilter.filter(p1);
-		Assert.assertEquals("<p>a</p>", filter);
+		assertEquals("<p>a</p>", filter);
 
 		filter = htmlFilter.filter(p2);
-		Assert.assertEquals("<p>a</p>", filter);
+		assertEquals("<p>a</p>", filter);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java
index a6bd1e018..6e0d56a59 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HtmlUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.http;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Html单元测试
@@ -16,32 +16,32 @@ public class HtmlUtilTest {
 		//非闭合标签
 		String str = "pre<img src=\"xxx/dfdsfds/test.jpg\">";
 		String result = HtmlUtil.removeHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img>";
 		result = HtmlUtil.removeHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img src=\"xxx/dfdsfds/test.jpg\" />";
 		result = HtmlUtil.removeHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img />";
 		result = HtmlUtil.removeHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//包含内容标签
 		str = "pre<div class=\"test_div\">dfdsfdsfdsf</div>";
 		result = HtmlUtil.removeHtmlTag(str, "div");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//带换行
 		str = "pre<div class=\"test_div\">\r\n\t\tdfdsfdsfdsf\r\n</div>";
 		result = HtmlUtil.removeHtmlTag(str, "div");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 	}
 
 	@Test
@@ -49,32 +49,32 @@ public class HtmlUtilTest {
 		//非闭合标签
 		String str = "pre<img src=\"xxx/dfdsfds/test.jpg\">";
 		String result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img>";
 		result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img src=\"xxx/dfdsfds/test.jpg\" />";
 		result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img />";
 		result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//包含内容标签
 		str = "pre<div class=\"test_div\">dfdsfdsfdsf</div>";
 		result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("predfdsfdsfdsf", result);
+		assertEquals("predfdsfdsfdsf", result);
 
 		//带换行
 		str = "pre<div class=\"test_div\">\r\n\t\tdfdsfdsfdsf\r\n</div><div class=\"test_div\">BBBB</div>";
 		result = HtmlUtil.cleanHtmlTag(str);
-		Assert.assertEquals("pre\r\n\t\tdfdsfdsfdsf\r\nBBBB", result);
+		assertEquals("pre\r\n\t\tdfdsfdsfdsf\r\nBBBB", result);
 	}
 
 	@Test
@@ -82,37 +82,37 @@ public class HtmlUtilTest {
 		//非闭合标签
 		String str = "pre<img src=\"xxx/dfdsfds/test.jpg\">";
 		String result = HtmlUtil.unwrapHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img>";
 		result = HtmlUtil.unwrapHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img src=\"xxx/dfdsfds/test.jpg\" />";
 		result = HtmlUtil.unwrapHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img />";
 		result = HtmlUtil.unwrapHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//闭合标签
 		str = "pre<img/>";
 		result = HtmlUtil.unwrapHtmlTag(str, "img");
-		Assert.assertEquals("pre", result);
+		assertEquals("pre", result);
 
 		//包含内容标签
 		str = "pre<div class=\"test_div\">abc</div>";
 		result = HtmlUtil.unwrapHtmlTag(str, "div");
-		Assert.assertEquals("preabc", result);
+		assertEquals("preabc", result);
 
 		//带换行
 		str = "pre<div class=\"test_div\">\r\n\t\tabc\r\n</div>";
 		result = HtmlUtil.unwrapHtmlTag(str, "div");
-		Assert.assertEquals("pre\r\n\t\tabc\r\n", result);
+		assertEquals("pre\r\n\t\tabc\r\n", result);
 	}
 
 	@Test
@@ -121,34 +121,34 @@ public class HtmlUtilTest {
 		final String htmlString = "<html><img src='aaa'><i>测试文本</i></html>";
 		final String tagString = "i,br";
 		final String cleanTxt = HtmlUtil.removeHtmlTag(htmlString, false, tagString.split(","));
-		Assert.assertEquals("<html><img src='aaa'>测试文本</html>", cleanTxt);
+		assertEquals("<html><img src='aaa'>测试文本</html>", cleanTxt);
 	}
 
 	@Test
 	public void escapeTest() {
 		final String html = "<html><body>123'123'</body></html>";
 		final String escape = HtmlUtil.escape(html);
-		Assert.assertEquals("&lt;html&gt;&lt;body&gt;123&#039;123&#039;&lt;/body&gt;&lt;/html&gt;", escape);
+		assertEquals("&lt;html&gt;&lt;body&gt;123&#039;123&#039;&lt;/body&gt;&lt;/html&gt;", escape);
 		final String restoreEscaped = HtmlUtil.unescape(escape);
-		Assert.assertEquals(html, restoreEscaped);
-		Assert.assertEquals("'", HtmlUtil.unescape("&apos;"));
+		assertEquals(html, restoreEscaped);
+		assertEquals("'", HtmlUtil.unescape("&apos;"));
 	}
 
 	@Test
 	public void escapeTest2() {
 		final char c = ' '; // 不断开空格（non-breaking space，缩写nbsp。)
-		Assert.assertEquals(c, 160);
+		assertEquals(c, 160);
 		final String html = "<html><body> </body></html>";
 		final String escape = HtmlUtil.escape(html);
-		Assert.assertEquals("&lt;html&gt;&lt;body&gt;&nbsp;&lt;/body&gt;&lt;/html&gt;", escape);
-		Assert.assertEquals(" ", HtmlUtil.unescape("&nbsp;"));
+		assertEquals("&lt;html&gt;&lt;body&gt;&nbsp;&lt;/body&gt;&lt;/html&gt;", escape);
+		assertEquals(" ", HtmlUtil.unescape("&nbsp;"));
 	}
 
 	@Test
 	public void filterTest() {
 		final String html = "<alert></alert>";
 		final String filter = HtmlUtil.filter(html);
-		Assert.assertEquals("", filter);
+		assertEquals("", filter);
 	}
 
 	@Test
@@ -157,39 +157,39 @@ public class HtmlUtilTest {
 		// 去除的属性加双引号测试
 		String html = "<div class=\"test_div\"></div><span class=\"test_div\"></span>";
 		String result = HtmlUtil.removeHtmlAttr(html, "class");
-		Assert.assertEquals("<div></div><span></span>", result);
+		assertEquals("<div></div><span></span>", result);
 
 		// 去除的属性后跟空格、加单引号、不加引号测试
 		html = "<div class=test_div></div><span Class='test_div' ></span>";
 		result = HtmlUtil.removeHtmlAttr(html, "class");
-		Assert.assertEquals("<div></div><span></span>", result);
+		assertEquals("<div></div><span></span>", result);
 
 		// 去除的属性位于标签末尾、其它属性前测试
 		html = "<div style=\"margin:100%\" class=test_div></div><span Class='test_div' width=100></span>";
 		result = HtmlUtil.removeHtmlAttr(html, "class");
-		Assert.assertEquals("<div style=\"margin:100%\"></div><span width=100></span>", result);
+		assertEquals("<div style=\"margin:100%\"></div><span width=100></span>", result);
 
 		// 去除的属性名和值之间存在空格
 		html = "<div style = \"margin:100%\" class = test_div></div><span Class = 'test_div' width=100></span>";
 		result = HtmlUtil.removeHtmlAttr(html, "class");
-		Assert.assertEquals("<div style = \"margin:100%\"></div><span width=100></span>", result);
+		assertEquals("<div style = \"margin:100%\"></div><span width=100></span>", result);
 	}
 
 	@Test
 	public void removeAllHtmlAttrTest() {
 		final String html = "<div class=\"test_div\" width=\"120\"></div>";
 		final String result = HtmlUtil.removeAllHtmlAttr(html, "div");
-		Assert.assertEquals("<div></div>", result);
+		assertEquals("<div></div>", result);
 	}
 
 	@Test
 	public void issueI6YNTFTest() {
 		String html = "<html><body><div class=\"a1 a2\">hello world</div></body></html>";
 		String cleanText = HtmlUtil.removeHtmlAttr(html,"class");
-		Assert.assertEquals("<html><body><div>hello world</div></body></html>", cleanText);
+		assertEquals("<html><body><div>hello world</div></body></html>", cleanText);
 
 		html = "<html><body><div class=a1>hello world</div></body></html>";
 		cleanText = HtmlUtil.removeHtmlAttr(html,"class");
-		Assert.assertEquals("<html><body><div>hello world</div></body></html>", cleanText);
+		assertEquals("<html><body><div>hello world</div></body></html>", cleanText);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpGlobalConfigTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpGlobalConfigTest.java
index 2551f2140..787992d27 100755
--- a/hutool-http/src/test/java/cn/hutool/http/HttpGlobalConfigTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpGlobalConfigTest.java
@@ -1,6 +1,6 @@
 package cn.hutool.http;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class HttpGlobalConfigTest {
 	@Test
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
index c4db9c305..1334302a5 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpRequestTest.java
@@ -7,8 +7,8 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.net.SSLProtocols;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.net.CookieManager;
 import java.net.HttpCookie;
@@ -26,14 +26,14 @@ public class HttpRequestTest {
 	final String url = "http://photo.qzone.qq.com/fcgi-bin/fcg_list_album?uin=88888&outstyle=2";
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getHttpsTest() {
 		final String body = HttpRequest.get("https://www.hutool.cn/").timeout(10).execute().body();
 		Console.log(body);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getHttpsThenTest() {
 		HttpRequest
 				.get("https://hutool.cn")
@@ -41,7 +41,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getCookiesTest() {
 		// 检查在Connection关闭情况下Cookie是否可以正常获取
 		final HttpResponse res = HttpRequest.get("https://www.oschina.net/").execute();
@@ -51,7 +51,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toStringTest() {
 		final String url = "https://hutool.cn?ccc=你好";
 
@@ -60,7 +60,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void asyncHeadTest() {
 		final HttpResponse response = HttpRequest.head(url).execute();
 		final Map<String, List<String>> headers = response.headers();
@@ -69,7 +69,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void asyncGetTest() {
 		final TimeInterval timer = DateUtil.timer();
 		final HttpResponse body = HttpRequest.get(url).charset("GBK").executeAsync();
@@ -81,7 +81,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void syncGetTest() {
 		final TimeInterval timer = DateUtil.timer();
 		final HttpResponse body = HttpRequest.get(url).charset("GBK").execute();
@@ -93,7 +93,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void customGetTest() {
 		// 自定义构建HTTP GET请求，发送Http GET请求，针对HTTPS安全加密，可以自定义SSL
 		final HttpRequest request = HttpRequest.get(url)
@@ -107,7 +107,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getDeflateTest() {
 		final String res = HttpRequest.get("https://comment.bilibili.com/67573272.xml")
 				.execute().body();
@@ -115,7 +115,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bodyTest() {
 		final String ddddd1 = HttpRequest.get("https://baijiahao.baidu.com/s").body("id=1625528941695652600").execute().body();
 		Console.log(ddddd1);
@@ -125,7 +125,7 @@ public class HttpRequestTest {
 	 * 测试GET请求附带body体是否会变更为POST
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void getLocalTest() {
 		final List<String> list = new ArrayList<>();
 		list.add("hhhhh");
@@ -144,7 +144,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWithoutEncodeTest() {
 		final String url = "https://img-cloud.voc.com.cn/140/2020/09/03/c3d41b93e0d32138574af8e8b50928b376ca5ba61599127028157.png?imageMogr2/auto-orient/thumbnail/500&pid=259848";
 		final HttpRequest get = HttpUtil.createGet(url);
@@ -154,7 +154,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void followRedirectsTest() {
 		// 从5.7.19开始关闭JDK的自动重定向功能，改为手动重定向
 		// 当有多层重定向时，JDK的重定向会失效，或者说只有最后一个重定向有效，因此改为手动更易控制次数
@@ -173,7 +173,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void followRedirectsCookieTrueTest() {
 		final String url = "http://localhost:8888/redirect1";
 		CookieManager cookieManager = new CookieManager();
@@ -187,7 +187,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void followRedirectsCookieFalseTest() {
 		final String url = "http://localhost:8888/redirect1";
 		CookieManager cookieManager = new CookieManager();
@@ -200,7 +200,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addInterceptorTest() {
 		HttpUtil.createGet("https://hutool.cn")
 				.addInterceptor(Console::log)
@@ -209,14 +209,14 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addGlobalInterceptorTest() {
 		GlobalInterceptor.INSTANCE.addRequestInterceptor(Console::log);
 		HttpUtil.createGet("https://hutool.cn").execute();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWithFormTest(){
 		final String url = "https://postman-echo.com/get";
 		final Map<String, Object> map = new HashMap<>();
@@ -226,7 +226,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void urlWithParamIfGetTest(){
 		final UrlBuilder urlBuilder = new UrlBuilder();
 		urlBuilder.setScheme("https").setHost("hutool.cn");
@@ -236,21 +236,21 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueI5Y68WTest() {
 		final HttpResponse httpResponse = HttpRequest.get("http://82.157.17.173:8100/app/getAddress").execute();
 		Console.log(httpResponse.body());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueIAAE88Test() {
 		final HttpRequest request = HttpRequest.of("http://127.0.0.1:8003/com.rnd.aiq:message/message/getName/15", null);
 		Console.log(request);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testHttpResource() {
 
 		HttpRequest httpRequest = HttpRequest.post("http://127.0.0.1:8080/testHttpResource");
@@ -264,7 +264,7 @@ public class HttpRequestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueIAAOC1Test() {
 		HttpGlobalConfig.setDecodeUrl(true);
 		HttpRequest request = HttpRequest.get("http://localhost:9999/qms/bus/qmsBusReportCenterData/getReportDataList?reportProcessNo=A00&goodsName=工业硫酸98%&conReportTypeId=1010100000000000007&measureDateStr=2024-07-01");
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
index 8570f5aa7..a1e1f3aec 100755
--- a/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
@@ -7,9 +7,9 @@ import cn.hutool.core.net.NetUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ReUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.util.LinkedHashMap;
@@ -21,21 +21,21 @@ public class HttpUtilTest {
 
 	@Test
 	public void isHttpTest(){
-		Assert.assertTrue(HttpUtil.isHttp("Http://aaa.bbb"));
-		Assert.assertTrue(HttpUtil.isHttp("HTTP://aaa.bbb"));
-		Assert.assertFalse(HttpUtil.isHttp("FTP://aaa.bbb"));
+		assertTrue(HttpUtil.isHttp("Http://aaa.bbb"));
+		assertTrue(HttpUtil.isHttp("HTTP://aaa.bbb"));
+		assertFalse(HttpUtil.isHttp("FTP://aaa.bbb"));
 	}
 
 	@Test
 	public void isHttpsTest(){
-		Assert.assertTrue(HttpUtil.isHttps("Https://aaa.bbb"));
-		Assert.assertTrue(HttpUtil.isHttps("HTTPS://aaa.bbb"));
-		Assert.assertTrue(HttpUtil.isHttps("https://aaa.bbb"));
-		Assert.assertFalse(HttpUtil.isHttps("ftp://aaa.bbb"));
+		assertTrue(HttpUtil.isHttps("Https://aaa.bbb"));
+		assertTrue(HttpUtil.isHttps("HTTPS://aaa.bbb"));
+		assertTrue(HttpUtil.isHttps("https://aaa.bbb"));
+		assertFalse(HttpUtil.isHttps("ftp://aaa.bbb"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest() {
 		final String result = HttpUtil.createPost("api.uhaozu.com/goods/description/1120448506")
 				.charset(CharsetUtil.UTF_8)
@@ -44,7 +44,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest2() {
 		// 某些接口对Accept头有特殊要求，此处自定义头
 		final String result = HttpUtil
@@ -56,14 +56,14 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		final String result1 = HttpUtil.get("http://photo.qzone.qq.com/fcgi-bin/fcg_list_album?uin=88888&outstyle=2", CharsetUtil.CHARSET_GBK);
 		Console.log(result1);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest2() {
 		// 此链接较为特殊，User-Agent去掉后进入一个JS跳转页面，如果设置了，需要开启302跳转
 		// 自定义的默认header无效
@@ -74,7 +74,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest3() {
 		// 测试url中带有空格的情况
 		final String result1 = HttpUtil.get("http://hutool.cn:5000/kf?abc= d");
@@ -82,7 +82,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest4() {
 		// 测试url中带有空格的情况
 		final byte[] str = HttpRequest.get("http://img01.fs.yiban.cn/mobile/2D0Y71").execute().bodyBytes();
@@ -92,7 +92,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest5() {
 		String url2 = "http://storage.chancecloud.com.cn/20200413_%E7%B2%A4B12313_386.pdf";
 		final ByteArrayOutputStream os2 = new ByteArrayOutputStream();
@@ -103,7 +103,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void get12306Test() {
 		HttpRequest.get("https://kyfw.12306.cn/otn/")
 				.setFollowRedirects(true)
@@ -111,7 +111,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void downloadStringTest() {
 		final String url = "https://www.baidu.com";
 		// 从远程直接读取字符串，需要自定义编码，直接调用JDK方法
@@ -120,7 +120,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void oschinaTest() {
 		// 请求列表页
 		String listContent = HttpUtil.get("https://www.oschina.net/action/ajax/get_more_news_list?newsType=&p=2");
@@ -140,17 +140,17 @@ public class HttpUtilTest {
 	public void decodeParamsTest() {
 		final String paramsStr = "uuuu=0&a=b&c=%3F%23%40!%24%25%5E%26%3Ddsssss555555";
 		final Map<String, List<String>> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.UTF_8);
-		Assert.assertEquals("0", map.get("uuuu").get(0));
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("?#@!$%^&=dsssss555555", map.get("c").get(0));
+		assertEquals("0", map.get("uuuu").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("?#@!$%^&=dsssss555555", map.get("c").get(0));
 	}
 
 	@Test
 	public void decodeParamMapTest() {
 		// 参数值存在分界标记等号时
 		final Map<String, String> paramMap = HttpUtil.decodeParamMap("https://www.xxx.com/api.action?aa=123&f_token=NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("123",paramMap.get("aa"));
-		Assert.assertEquals("NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=",paramMap.get("f_token"));
+		assertEquals("123",paramMap.get("aa"));
+		assertEquals("NzBkMjQxNDM1MDVlMDliZTk1OTU3ZDI1OTI0NTBiOWQ=",paramMap.get("f_token"));
 	}
 
 	@Test
@@ -159,7 +159,7 @@ public class HttpUtilTest {
 		final Map<String, List<String>> map = HttpUtil.decodeParams(paramsStr, CharsetUtil.UTF_8);
 
 		final String encodedParams = HttpUtil.toParams(map);
-		Assert.assertEquals(paramsStr, encodedParams);
+		assertEquals(paramsStr, encodedParams);
 	}
 
 	@Test
@@ -167,52 +167,52 @@ public class HttpUtilTest {
 		// ?单独存在去除之，&单位位于末尾去除之
 		String paramsStr = "?a=b&c=d&";
 		String encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=b&c=d", encode);
+		assertEquals("a=b&c=d", encode);
 
 		// url不参与转码
 		paramsStr = "http://www.abc.dd?a=b&c=d&";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("http://www.abc.dd?a=b&c=d", encode);
+		assertEquals("http://www.abc.dd?a=b&c=d", encode);
 
 		// b=b中的=被当作值的一部分，不做encode
 		paramsStr = "a=b=b&c=d&";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=b=b&c=d", encode);
+		assertEquals("a=b=b&c=d", encode);
 
 		// =d的情况被处理为key为空
 		paramsStr = "a=bbb&c=d&=d";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=bbb&c=d&=d", encode);
+		assertEquals("a=bbb&c=d&=d", encode);
 
 		// d=的情况被处理为value为空
 		paramsStr = "a=bbb&c=d&d=";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=bbb&c=d&d=", encode);
+		assertEquals("a=bbb&c=d&d=", encode);
 
 		// 多个&&被处理为单个，相当于空条件
 		paramsStr = "a=bbb&c=d&&&d=";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=bbb&c=d&d=", encode);
+		assertEquals("a=bbb&c=d&d=", encode);
 
 		// &d&相当于只有键，无值得情况
 		paramsStr = "a=bbb&c=d&d&";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=bbb&c=d&d=", encode);
+		assertEquals("a=bbb&c=d&d=", encode);
 
 		// 中文的键和值被编码
 		paramsStr = "a=bbb&c=你好&哈喽&";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=", encode);
+		assertEquals("a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=", encode);
 
 		// URL原样输出
 		paramsStr = "https://www.hutool.cn/";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals(paramsStr, encode);
+		assertEquals(paramsStr, encode);
 
 		// URL原样输出
 		paramsStr = "https://www.hutool.cn/?";
 		encode = HttpUtil.encodeParams(paramsStr, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("https://www.hutool.cn/", encode);
+		assertEquals("https://www.hutool.cn/", encode);
 	}
 
 	@Test
@@ -220,55 +220,55 @@ public class HttpUtilTest {
 		// 开头的？被去除
 		String a = "?a=b&c=d&";
 		Map<String, List<String>> map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
 
 		// =e被当作空为key，e为value
 		a = "?a=b&c=d&=e";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
-		Assert.assertEquals("e", map.get("").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
+		assertEquals("e", map.get("").get(0));
 
 		// 多余的&去除
 		a = "?a=b&c=d&=e&&&&";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
-		Assert.assertEquals("e", map.get("").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
+		assertEquals("e", map.get("").get(0));
 
 		// 值为空
 		a = "?a=b&c=d&e=";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
-		Assert.assertEquals("", map.get("e").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
+		assertEquals("", map.get("e").get(0));
 
 		// &=被作为键和值都为空
 		a = "a=b&c=d&=";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
-		Assert.assertEquals("", map.get("").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
+		assertEquals("", map.get("").get(0));
 
 		// &e&这类单独的字符串被当作key
 		a = "a=b&c=d&e&";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("b", map.get("a").get(0));
-		Assert.assertEquals("d", map.get("c").get(0));
-		Assert.assertNull(map.get("e").get(0));
-		Assert.assertNull(map.get("").get(0));
+		assertEquals("b", map.get("a").get(0));
+		assertEquals("d", map.get("c").get(0));
+		assertNull(map.get("e").get(0));
+		assertNull(map.get("").get(0));
 
 		// 被编码的键和值被还原
 		a = "a=bbb&c=%E4%BD%A0%E5%A5%BD&%E5%93%88%E5%96%BD=";
 		map = HttpUtil.decodeParams(a, CharsetUtil.UTF_8);
-		Assert.assertEquals("bbb", map.get("a").get(0));
-		Assert.assertEquals("你好", map.get("c").get(0));
-		Assert.assertEquals("", map.get("哈喽").get(0));
+		assertEquals("bbb", map.get("a").get(0));
+		assertEquals("你好", map.get("c").get(0));
+		assertEquals("", map.get("哈喽").get(0));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void patchTest() {
 		// 验证patch请求是否可用
 		final String body = HttpRequest.patch("https://www.baidu.com").execute().body();
@@ -289,12 +289,12 @@ public class HttpUtilTest {
 		param.put("Version", "1.0");
 
 		String urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.CHARSET_UTF_8, false);
-		Assert.assertEquals(
+		assertEquals(
 				"http://api.hutool.cn/login?type=aaa&AccessKeyId=123&Action=DescribeDomainRecords&Format=date&DomainName=lesper.cn&SignatureMethod=POST&SignatureNonce=123&SignatureVersion=4.3.1&Timestamp=123432453&Version=1.0",
 				urlWithForm);
 
 		urlWithForm = HttpUtil.urlWithForm("http://api.hutool.cn/login?type=aaa", param, CharsetUtil.CHARSET_UTF_8, false);
-		Assert.assertEquals(
+		assertEquals(
 				"http://api.hutool.cn/login?type=aaa&AccessKeyId=123&Action=DescribeDomainRecords&Format=date&DomainName=lesper.cn&SignatureMethod=POST&SignatureNonce=123&SignatureVersion=4.3.1&Timestamp=123432453&Version=1.0",
 				urlWithForm);
 	}
@@ -302,38 +302,38 @@ public class HttpUtilTest {
 	@Test
 	public void getCharsetTest() {
 		String charsetName = ReUtil.get(HttpUtil.CHARSET_PATTERN, "Charset=UTF-8;fq=0.9", 1);
-		Assert.assertEquals("UTF-8", charsetName);
+		assertEquals("UTF-8", charsetName);
 
 		charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset=utf-8", 1);
-		Assert.assertEquals("utf-8", charsetName);
+		assertEquals("utf-8", charsetName);
 		charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset='utf-8'", 1);
-		Assert.assertEquals("utf-8", charsetName);
+		assertEquals("utf-8", charsetName);
 		charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset=\"utf-8\"", 1);
-		Assert.assertEquals("utf-8", charsetName);
+		assertEquals("utf-8", charsetName);
 		charsetName = ReUtil.get(HttpUtil.META_CHARSET_PATTERN, "<meta charset = \"utf-8\"", 1);
-		Assert.assertEquals("utf-8", charsetName);
+		assertEquals("utf-8", charsetName);
 	}
 
 	@Test
 	public void normalizeParamsTest() {
 		final String encodeResult = HttpUtil.normalizeParams("参数", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("%E5%8F%82%E6%95%B0", encodeResult);
+		assertEquals("%E5%8F%82%E6%95%B0", encodeResult);
 	}
 
 	@Test
 	public void normalizeBlankParamsTest() {
 		final String encodeResult = HttpUtil.normalizeParams("", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("", encodeResult);
+		assertEquals("", encodeResult);
 	}
 
 	@Test
 	public void getMimeTypeTest() {
 		final String mimeType = HttpUtil.getMimeType("aaa.aaa");
-		Assert.assertNull(mimeType);
+		assertNull(mimeType);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWeixinTest(){
 		// 测试特殊URL，即URL中有&amp;情况是否请求正常
 		final String url = "https://mp.weixin.qq.com/s?__biz=MzI5NjkyNTIxMg==&amp;mid=100000465&amp;idx=1&amp;sn=1044c0d19723f74f04f4c1da34eefa35&amp;chksm=6cbda3a25bca2ab4516410db6ce6e125badaac2f8c5548ea6e18eab6dc3c5422cb8cbe1095f7";
@@ -342,7 +342,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getNocovTest(){
 		final String url = "https://qiniu.nocov.cn/medical-manage%2Ftest%2FBANNER_IMG%2F444004467954556928%2F1595215173047icon.png~imgReduce?e=1597081986&token=V2lJYVgQgAv_sbypfEZ0qpKs6TzD1q5JIDVr0Tw8:89cbBkLLwEc9JsMoCLkAEOu820E=";
 		final String s = HttpUtil.get(url);
@@ -350,21 +350,21 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void sinajsTest(){
 		final String s = HttpUtil.get("http://hq.sinajs.cn/list=sh600519");
 		Console.log(s);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void gimg2Test(){
 		final byte[] bytes = HttpUtil.downloadBytes("https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.jj20.com%2Fup%2Fallimg%2F1114%2F0H320120Z3%2F200H3120Z3-6-1200.jpg&refer=http%3A%2F%2Fpic.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1621996490&t=8c384c2823ea453da15a1b9cd5183eea");
 		Console.log(Base64.encode(bytes));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void acplayTest(){
 		final String body = HttpRequest.get("https://api.acplay.net/api/v2/bangumi/9541")
 				.execute().body();
@@ -372,7 +372,7 @@ public class HttpUtilTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getPicTest(){
 		HttpGlobalConfig.setDecodeUrl(false);
 		final String url = "https://p3-sign.douyinpic.com/tos-cn-i-0813/f41afb2e79a94dcf80970affb9a69415~noop.webp?x-expires=1647738000&x-signature=%2Br1ekUCGjXiu50Y%2Bk0MO4ovulK8%3D&from=4257465056&s=PackSourceEnum_DOUYIN_REFLOW&se=false&sh=&sc=&l=2022021809224601020810013524310DD3&biz_tag=aweme_images";
@@ -392,10 +392,10 @@ public class HttpUtilTest {
 
 		final String resp = HttpUtil.createPost(String.format("http://localhost:%s/formEncoded", port))
 				.form("test", test).execute().body();
-		Assert.assertEquals("Form请求参数解码", test, resp);
+		assertEquals("Form请求参数解码", test, resp);
 
 		final String urlGet = UrlBuilder.of(String.format("http://localhost:%s/urlEncoded", port)).addQuery("test", test).build();
 		final String resp2 = HttpUtil.createGet(urlGet).execute().body();
-		Assert.assertEquals("QueryString请求参数编码", test, resp2);
+		assertEquals("QueryString请求参数编码", test, resp2);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java b/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java
index ece225ed5..f0465c78d 100644
--- a/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/HttpsTest.java
@@ -2,8 +2,8 @@ package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.thread.ThreadUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -13,7 +13,7 @@ public class HttpsTest {
 	 * 测试单例的SSLSocketFactory是否有线程安全问题
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		final AtomicInteger count = new AtomicInteger();
 		for(int i =0; i < 100; i++){
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue2658Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue2658Test.java
index 47aaf5534..e5989238a 100755
--- a/hutool-http/src/test/java/cn/hutool/http/Issue2658Test.java
+++ b/hutool-http/src/test/java/cn/hutool/http/Issue2658Test.java
@@ -2,8 +2,8 @@ package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.http.cookie.GlobalCookieManager;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.net.HttpCookie;
 import java.util.List;
@@ -12,7 +12,7 @@ public class Issue2658Test {
 
 	@SuppressWarnings("resource")
 	@Test
-	@Ignore
+	@Disabled
 	public void getWithCookieTest(){
 		HttpRequest.get("https://www.baidu.com/").execute();
 		final List<HttpCookie> cookies = GlobalCookieManager.getCookieManager().getCookieStore().getCookies();
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue3074Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue3074Test.java
index 8afc6ed63..d723f70ba 100644
--- a/hutool-http/src/test/java/cn/hutool/http/Issue3074Test.java
+++ b/hutool-http/src/test/java/cn/hutool/http/Issue3074Test.java
@@ -12,13 +12,13 @@
 
 package cn.hutool.http;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue3074Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void bodyTest() {
 		HttpUtil.createPost("http://localhost:8888/body")
 			.contentType(ContentType.JSON.getValue())
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue3197Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue3197Test.java
index 6655ab9f0..1108663ae 100755
--- a/hutool-http/src/test/java/cn/hutool/http/Issue3197Test.java
+++ b/hutool-http/src/test/java/cn/hutool/http/Issue3197Test.java
@@ -13,12 +13,12 @@
 package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue3197Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		final String s = HttpUtil.get("http://localhost:8080/index");
 		Console.log(s);
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue3314Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue3314Test.java
index 3107c9d42..ded4b2745 100644
--- a/hutool-http/src/test/java/cn/hutool/http/Issue3314Test.java
+++ b/hutool-http/src/test/java/cn/hutool/http/Issue3314Test.java
@@ -2,12 +2,12 @@ package cn.hutool.http;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue3314Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest() {
 		String url = "https://hutool.cn/test/getList";
 		final String body = HttpRequest.get(url)
diff --git a/hutool-http/src/test/java/cn/hutool/http/Issue3536Test.java b/hutool-http/src/test/java/cn/hutool/http/Issue3536Test.java
index 29bbbacee..cfc54dfad 100644
--- a/hutool-http/src/test/java/cn/hutool/http/Issue3536Test.java
+++ b/hutool-http/src/test/java/cn/hutool/http/Issue3536Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.http;
 
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -17,7 +17,7 @@ public class Issue3536Test {
 		paramMap.put("scope", "a,b,c你");
 
 		final String s = HttpUtil.urlWithFormUrlEncoded(url, paramMap, CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("https://hutool.cn/test?scope=a,b,c%E4%BD%A0&redirect_uri=https://api.hutool.cn/v1/test", s);
+		assertEquals("https://hutool.cn/test?scope=a,b,c%E4%BD%A0&redirect_uri=https://api.hutool.cn/v1/test", s);
 	}
 
 	@Test
@@ -27,6 +27,6 @@ public class Issue3536Test {
 		paramMap.put("scope", "a,b,c你");
 
 		final String params = HttpUtil.toParams(paramMap, CharsetUtil.CHARSET_UTF_8, true);
-		Assert.assertEquals("scope=a%2Cb%2Cc%E4%BD%A0&redirect_uri=https%3A%2F%2Fapi.hutool.cn%2Fv1%2Ftest", params);
+		assertEquals("scope=a%2Cb%2Cc%E4%BD%A0&redirect_uri=https%3A%2F%2Fapi.hutool.cn%2Fv1%2Ftest", params);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
index a297634fd..f5e82c60d 100755
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
@@ -1,14 +1,14 @@
 package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.net.HttpCookie;
 
 public class IssueI5TPSYTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void redirectTest() {
 		final String url = "https://bsxt.gdzwfw.gov.cn/UnifiedReporting/auth/newIndex";
 		final HttpResponse res = HttpUtil.createGet(url).setFollowRedirects(true)
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI6RE7JTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI6RE7JTest.java
index d7c8d7b9e..89319b2ff 100644
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI6RE7JTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI6RE7JTest.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.http;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,7 +21,7 @@ import java.util.Map;
 public class IssueI6RE7JTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		HttpGlobalConfig.setDecodeUrl(true);
 		final String baseUrl = "http://192.168.98.73/PIAPI/ArcValue";
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI7EHSETest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI7EHSETest.java
index dcb5d6657..39b6a7bc6 100755
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI7EHSETest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI7EHSETest.java
@@ -13,12 +13,12 @@
 package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI7EHSETest {
 	@Test
-	@Ignore
+	@Disabled
 	public void encodePathTest() {
 		String body = HttpUtil
 			.createGet("http://hq.sinajs.cn/list=s_sh600090")
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI7WZEOTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI7WZEOTest.java
index 632f6f2ab..65d3856cc 100755
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI7WZEOTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI7WZEOTest.java
@@ -13,12 +13,12 @@
 package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI7WZEOTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest() {
 		final String post = HttpUtil.post("https://tenapi.cn/v2/video", "url=https://v.douyin.com/ie1EX3LH/");
 		Console.log(post);
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI7ZRJUTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI7ZRJUTest.java
index 166a8310d..1cb57a7d1 100755
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI7ZRJUTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI7ZRJUTest.java
@@ -13,15 +13,15 @@
 package cn.hutool.http;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.net.ssl.SSLSocketFactory;
 
 public class IssueI7ZRJUTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		final HttpRequest httpRequest = HttpRequest.get("https://expired.badssl.com/");
 		httpRequest.setSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault());
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI8YV0KTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI8YV0KTest.java
index 8a1a62900..61c9a3427 100644
--- a/hutool-http/src/test/java/cn/hutool/http/IssueI8YV0KTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI8YV0KTest.java
@@ -1,25 +1,25 @@
 package cn.hutool.http;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI8YV0KTest {
 
 	@Test
 	public void removeHtmlAttrTest(){
 		final String str = "<content styleCode=\"xmChange yes\">";
-		Assert.assertEquals("<content>", HtmlUtil.removeHtmlAttr(str, "styleCode"));
+		assertEquals("<content>", HtmlUtil.removeHtmlAttr(str, "styleCode"));
 	}
 
 	@Test
 	public void removeHtmlAttrTest2(){
 		final String str = "<content styleCode=\"xmChange\"/>";
-		Assert.assertEquals("<content/>", HtmlUtil.removeHtmlAttr(str, "styleCode"));
+		assertEquals("<content/>", HtmlUtil.removeHtmlAttr(str, "styleCode"));
 	}
 
 	@Test
 	public void removeHtmlAttrTest3(){
 		String str = "<content styleCode=\"dada ada\" data=\"dsad\" >";
-		Assert.assertEquals("<content data=\"dsad\">", HtmlUtil.removeHtmlAttr(str, "styleCode"));
+		assertEquals("<content data=\"dsad\">", HtmlUtil.removeHtmlAttr(str, "styleCode"));
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/RestTest.java b/hutool-http/src/test/java/cn/hutool/http/RestTest.java
index dc93de788..70ae253b8 100644
--- a/hutool-http/src/test/java/cn/hutool/http/RestTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/RestTest.java
@@ -3,9 +3,9 @@ package cn.hutool.http;
 import cn.hutool.core.io.resource.StringResource;
 import cn.hutool.core.lang.Console;
 import cn.hutool.json.JSONUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Rest类型请求单元测试
@@ -20,11 +20,11 @@ public class RestTest {
 				.body(JSONUtil.createObj()
 						.set("aaa", "aaaValue")
 						.set("键2", "值2").toString());
-		Assert.assertEquals("application/json;charset=UTF-8", request.header("Content-Type"));
+		assertEquals("application/json;charset=UTF-8", request.header("Content-Type"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest() {
 		HttpRequest request = HttpRequest.post("http://localhost:8888/restTest/")//
 				.body(new StringResource(JSONUtil.createObj()
@@ -34,7 +34,7 @@ public class RestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void postTest2() {
 		String result = HttpUtil.post("http://localhost:8090/rest/restTest/", JSONUtil.createObj()//
 				.set("aaa", "aaaValue")
@@ -43,7 +43,7 @@ public class RestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWithBodyTest() {
 		HttpRequest request = HttpRequest.get("http://localhost:8888/restTest")//
 				.header(Header.CONTENT_TYPE, "application/json")
@@ -54,7 +54,7 @@ public class RestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWithBodyTest2() {
 		HttpRequest request = HttpRequest.get("https://ad.oceanengine.com/open_api/2/advertiser/info/")//
 				// Charles代理
@@ -68,7 +68,7 @@ public class RestTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getTest() {
 		final HttpRequest request = HttpRequest.get("http://localhost:8888/restTest");
 		final HttpResponse execute = request.execute();
diff --git a/hutool-http/src/test/java/cn/hutool/http/UploadTest.java b/hutool-http/src/test/java/cn/hutool/http/UploadTest.java
index 6d863cdf0..df6d47703 100644
--- a/hutool-http/src/test/java/cn/hutool/http/UploadTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/UploadTest.java
@@ -2,8 +2,8 @@ package cn.hutool.http;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -22,7 +22,7 @@ public class UploadTest {
 	 * 多文件上传测试
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadFilesTest() {
 		File file = FileUtil.file("d:\\图片1.JPG");
 		File file2 = FileUtil.file("d:\\图片3.png");
@@ -37,7 +37,7 @@ public class UploadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadFileTest() {
 		File file = FileUtil.file("D:\\face.jpg");
 
@@ -50,7 +50,7 @@ public class UploadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void uploadTest2() {
 		//客户端
 		String url = "http://192.168.1.200:8888/meta/upload/img";
@@ -70,7 +70,7 @@ public class UploadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void smmsTest(){
 		// https://github.com/dromara/hutool/issues/2079
 		// hutool的user agent 被封了
diff --git a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
index 471b6813c..74492918b 100644
--- a/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/body/MultipartBodyTest.java
@@ -3,8 +3,8 @@ package cn.hutool.http.body;
 import cn.hutool.core.io.resource.StringResource;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.http.HttpResource;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@ public class MultipartBodyTest {
 
 		final MultipartBody body = MultipartBody.create(form, CharsetUtil.CHARSET_UTF_8);
 
-		Assert.assertNotNull(body.toString());
+		assertNotNull(body.toString());
 //		Console.log(body);
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java b/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
index cc2814477..323948308 100644
--- a/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/useragent/UserAgentUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.http.useragent;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class UserAgentUtilTest {
 
@@ -10,14 +10,14 @@ public class UserAgentUtilTest {
 		final String uaStr = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.163 Safari/535.1";
 
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Chrome", ua.getBrowser().toString());
-		Assert.assertEquals("14.0.835.163", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("535.1", ua.getEngineVersion());
-		Assert.assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
-		Assert.assertEquals("6.1", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("Chrome", ua.getBrowser().toString());
+		assertEquals("14.0.835.163", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("535.1", ua.getEngineVersion());
+		assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
+		assertEquals("6.1", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
@@ -25,182 +25,182 @@ public class UserAgentUtilTest {
 		final String uaStr = "User-Agent:Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_3 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8J2 Safari/6533.18.5";
 
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Safari", ua.getBrowser().toString());
-		Assert.assertEquals("5.0.2", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("533.17.9", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("4_3_3", ua.getOsVersion());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Safari", ua.getBrowser().toString());
+		assertEquals("5.0.2", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("533.17.9", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("4_3_3", ua.getOsVersion());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseMiui10WithChromeTest() {
 		final String uaStr = "Mozilla/5.0 (Linux; Android 9; MIX 3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.80 Mobile Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Chrome", ua.getBrowser().toString());
-		Assert.assertEquals("70.0.3538.80", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("9", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Chrome", ua.getBrowser().toString());
+		assertEquals("70.0.3538.80", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("9", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseHuaweiPhoneWithNativeBrowserTest() {
 		final String uaString = "Mozilla/5.0 (Linux; Android 10; EML-AL00 Build/HUAWEIEML-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("Android Browser", ua.getBrowser().toString());
-		Assert.assertEquals("4.0", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("10", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Android Browser", ua.getBrowser().toString());
+		assertEquals("4.0", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("10", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseSamsungPhoneWithNativeBrowserTest() {
 		final String uaString = "Dalvik/2.1.0 (Linux; U; Android 9; SM-G950U Build/PPR1.180610.011)";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("Android Browser", ua.getBrowser().toString());
-		Assert.assertNull(ua.getVersion());
-		Assert.assertEquals("Unknown", ua.getEngine().toString());
-		Assert.assertNull(ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("9", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Android Browser", ua.getBrowser().toString());
+		assertNull(ua.getVersion());
+		assertEquals("Unknown", ua.getEngine().toString());
+		assertNull(ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("9", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseWindows10WithChromeTest() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Chrome", ua.getBrowser().toString());
-		Assert.assertEquals("70.0.3538.102", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("Chrome", ua.getBrowser().toString());
+		assertEquals("70.0.3538.102", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseWindows10WithIe11Test() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSIE11", ua.getBrowser().toString());
-		Assert.assertEquals("11.0", ua.getVersion());
-		Assert.assertEquals("Trident", ua.getEngine().toString());
-		Assert.assertEquals("7.0", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MSIE11", ua.getBrowser().toString());
+		assertEquals("11.0", ua.getVersion());
+		assertEquals("Trident", ua.getEngine().toString());
+		assertEquals("7.0", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseWindows10WithIeMobileLumia520Test() {
 		final String uaStr = "Mozilla/5.0 (Mobile; Windows Phone 8.1; Android 4.0; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; Lumia 520) like iPhone OS 7_0_3 Mac OS X AppleWebKit/537 (KHTML, like Gecko) Mobile Safari/537 ";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("IEMobile", ua.getBrowser().toString());
-		Assert.assertEquals("11.0", ua.getVersion());
-		Assert.assertEquals("Trident", ua.getEngine().toString());
-		Assert.assertEquals("7.0", ua.getEngineVersion());
-		Assert.assertEquals("Windows Phone", ua.getOs().toString());
-		Assert.assertEquals("8.1", ua.getOsVersion());
-		Assert.assertEquals("Windows Phone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("IEMobile", ua.getBrowser().toString());
+		assertEquals("11.0", ua.getVersion());
+		assertEquals("Trident", ua.getEngine().toString());
+		assertEquals("7.0", ua.getEngineVersion());
+		assertEquals("Windows Phone", ua.getOs().toString());
+		assertEquals("8.1", ua.getOsVersion());
+		assertEquals("Windows Phone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseWindows10WithIe8EmulatorTest() {
 		final String uaStr = "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSIE", ua.getBrowser().toString());
-		Assert.assertEquals("8.0", ua.getVersion());
-		Assert.assertEquals("Trident", ua.getEngine().toString());
-		Assert.assertEquals("4.0", ua.getEngineVersion());
-		Assert.assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
-		Assert.assertEquals("6.1", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MSIE", ua.getBrowser().toString());
+		assertEquals("8.0", ua.getVersion());
+		assertEquals("Trident", ua.getEngine().toString());
+		assertEquals("4.0", ua.getEngineVersion());
+		assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
+		assertEquals("6.1", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseWindows10WithEdgeTest() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/18.17763";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSEdge", ua.getBrowser().toString());
-		Assert.assertEquals("18.17763", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MSEdge", ua.getBrowser().toString());
+		assertEquals("18.17763", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseEdgeOnLumia950XLTest() {
 		final String uaStr = "Mozilla/5.0 (Windows Phone 10.0; Android 6.0.1; Microsoft; Lumia 950XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Mobile Safari/537.36 Edge/15.14900";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSEdge", ua.getBrowser().toString());
-		Assert.assertEquals("15.14900", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows Phone", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows Phone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("MSEdge", ua.getBrowser().toString());
+		assertEquals("15.14900", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows Phone", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows Phone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseChromeOnWindowsServer2012R2Test() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Chrome", ua.getBrowser().toString());
-		Assert.assertEquals("63.0.3239.132", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 8.1 or Windows Server 2012R2", ua.getOs().toString());
-		Assert.assertEquals("6.3", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("Chrome", ua.getBrowser().toString());
+		assertEquals("63.0.3239.132", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 8.1 or Windows Server 2012R2", ua.getOs().toString());
+		assertEquals("6.3", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseIE11OnWindowsServer2008R2Test() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSIE11", ua.getBrowser().toString());
-		Assert.assertEquals("11.0", ua.getVersion());
-		Assert.assertEquals("Trident", ua.getEngine().toString());
-		Assert.assertEquals("7.0", ua.getEngineVersion());
-		Assert.assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
-		Assert.assertEquals("6.1", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MSIE11", ua.getBrowser().toString());
+		assertEquals("11.0", ua.getVersion());
+		assertEquals("Trident", ua.getEngine().toString());
+		assertEquals("7.0", ua.getEngineVersion());
+		assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
+		assertEquals("6.1", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseEdgeTest() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.69 Safari/537.36 Edg/81.0.416.34";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSEdge", ua.getBrowser().toString());
-		Assert.assertEquals("81.0.416.34", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MSEdge", ua.getBrowser().toString());
+		assertEquals("81.0.416.34", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	/**
@@ -210,153 +210,153 @@ public class UserAgentUtilTest {
 	public void parseMicroMessengerTest() {
 		final String uaString = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Mobile/15A372 MicroMessenger/7.0.17(0x17001127) NetType/WIFI Language/zh_CN";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("MicroMessenger", ua.getBrowser().toString());
-		Assert.assertEquals("7.0.17", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("604.1.38", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("11_0", ua.getOsVersion());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("MicroMessenger", ua.getBrowser().toString());
+		assertEquals("7.0.17", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("604.1.38", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("11_0", ua.getOsVersion());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseWorkWxTest() {
 		final String uaString = "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 wxwork/3.0.31 MicroMessenger/7.0.1 Language/zh";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("wxwork", ua.getBrowser().toString());
-		Assert.assertEquals("3.0.31", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("605.1.15", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("wxwork", ua.getBrowser().toString());
+		assertEquals("3.0.31", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("605.1.15", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseQQTest() {
 		final String uaString = "User-Agent: MQQBrowser/26 Mozilla/5.0 (Linux; U; Android 2.3.7; zh-cn; MB200 Build/GRJ22; CyanogenMod-7) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("QQBrowser", ua.getBrowser().toString());
-		Assert.assertEquals("26", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("533.1", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("2.3.7", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("QQBrowser", ua.getBrowser().toString());
+		assertEquals("26", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("533.1", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("2.3.7", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseDingTalkTest() {
 		final String uaString = "Mozilla/5.0 (iPhone; CPU iPhone OS 14_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/18A373 AliApp(DingTalk/5.1.33) com.laiwang.DingTalk/13976299 Channel/201200 language/zh-Hans-CN WK";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("DingTalk", ua.getBrowser().toString());
-		Assert.assertEquals("5.1.33", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("605.1.15", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("14_0", ua.getOsVersion());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("DingTalk", ua.getBrowser().toString());
+		assertEquals("5.1.33", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("605.1.15", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("14_0", ua.getOsVersion());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseAlipayTest() {
 		final String uaString = "Mozilla/5.0 (Linux; U; Android 7.0; zh-CN; FRD-AL00 Build/HUAWEIFRD-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/40.0.2214.89 UCBrowser/11.3.8.909 UWS/2.10.2.5 Mobile Safari/537.36 UCBS/2.10.2.5 Nebula AlipayDefined(nt:WIFI,ws:360|0|3.0) AliApp(AP/10.0.18.062203) AlipayClient/10.0.18.062203 Language/zh-Hans useStatusBar/true";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("Alipay", ua.getBrowser().toString());
-		Assert.assertEquals("10.0.18.062203", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("7.0", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Alipay", ua.getBrowser().toString());
+		assertEquals("10.0.18.062203", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("7.0", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseTaobaoTest() {
 		final String uaString = "Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; MI 2C Build/KTU84P) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/30.0.0.0 Mobile Safari/537.36 AliApp(TB/4.9.2) WindVane/5.2.2 TBANDROID/700342@taobao_android_4.9.2 720X1280";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("Taobao", ua.getBrowser().toString());
-		Assert.assertEquals("4.9.2", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("4.4.4", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Taobao", ua.getBrowser().toString());
+		assertEquals("4.9.2", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("4.4.4", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseUCTest() {
 		final String uaString = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.122 UBrowser/4.0.3214.0 Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("UCBrowser", ua.getBrowser().toString());
-		Assert.assertEquals("4.0.3214.0", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
-		Assert.assertEquals("6.1", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("UCBrowser", ua.getBrowser().toString());
+		assertEquals("4.0.3214.0", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 7 or Windows Server 2008R2", ua.getOs().toString());
+		assertEquals("6.1", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseUCTest2() {
 		final String uaString = "Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 (KHTML, like Gecko) Mobile/16G102 UCBrowser/12.7.6.1251 Mobile AliApp(TUnionSDK/0.1.20.3)";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("UCBrowser", ua.getBrowser().toString());
-		Assert.assertEquals("12.7.6.1251", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.51.1", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("12_4_1", ua.getOsVersion());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("UCBrowser", ua.getBrowser().toString());
+		assertEquals("12.7.6.1251", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.51.1", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("12_4_1", ua.getOsVersion());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseQuarkTest() {
 		final String uaString = "Mozilla/5.0 (iPhone; CPU iPhone OS 12_4_1 like Mac OS X; zh-cn) AppleWebKit/601.1.46 (KHTML, like Gecko) Mobile/16G102 Quark/3.6.2.993 Mobile";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("Quark", ua.getBrowser().toString());
-		Assert.assertEquals("3.6.2.993", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("601.1.46", ua.getEngineVersion());
-		Assert.assertEquals("iPhone", ua.getOs().toString());
-		Assert.assertEquals("12_4_1", ua.getOsVersion());
-		Assert.assertEquals("iPhone", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("Quark", ua.getBrowser().toString());
+		assertEquals("3.6.2.993", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("601.1.46", ua.getEngineVersion());
+		assertEquals("iPhone", ua.getOs().toString());
+		assertEquals("12_4_1", ua.getOsVersion());
+		assertEquals("iPhone", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
 	public void parseWxworkTest() {
 		final String uaString = "Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36 QBCore/4.0.1326.400 QQBrowser/9.0.2524.400 Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.116 Safari/537.36 wxwork/3.1.10 (MicroMessenger/6.2) WindowsWechat";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("wxwork", ua.getBrowser().toString());
-		Assert.assertEquals("3.1.10", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("wxwork", ua.getBrowser().toString());
+		assertEquals("3.1.10", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
 	public void parseWxworkMobileTest() {
 		final String uaString = "Mozilla/5.0 (Linux; Android 10; JSN-AL00 Build/HONORJSN-AL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120 MQQBrowser/6.2 TBS/045710 Mobile Safari/537.36 wxwork/3.1.10 ColorScheme/Light MicroMessenger/7.0.1 NetType/WIFI Language/zh Lang/zh";
 		final UserAgent ua = UserAgentUtil.parse(uaString);
-		Assert.assertEquals("wxwork", ua.getBrowser().toString());
-		Assert.assertEquals("3.1.10", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("10", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("wxwork", ua.getBrowser().toString());
+		assertEquals("3.1.10", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("10", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
@@ -364,14 +364,14 @@ public class UserAgentUtilTest {
 		// https://gitee.com/dromara/hutool/issues/I4MCBP
 		final String uaStr = "userAgent: Mozilla/5.0 (Linux; Android 11; MI 9 Transparent Edition) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.55 Mobile Safari/537.36 EdgA/96.0.1054.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("MSEdge", ua.getBrowser().toString());
-		Assert.assertEquals("96.0.1054.36", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("11", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("MSEdge", ua.getBrowser().toString());
+		assertEquals("96.0.1054.36", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("11", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
@@ -380,14 +380,14 @@ public class UserAgentUtilTest {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.89 Safari/537.36 SLBrowser/7.0.0.6241 SLBChan/30";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
 
-		Assert.assertEquals("Lenovo", ua.getBrowser().toString());
-		Assert.assertEquals("7.0.0.6241", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("Lenovo", ua.getBrowser().toString());
+		assertEquals("7.0.0.6241", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	@Test
@@ -395,14 +395,14 @@ public class UserAgentUtilTest {
 		final String uaStr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/89.0.4389.116 Safari/534.24 XiaoMi/MiuiBrowser/16.0.18 swan-mibrowser";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
 
-		Assert.assertEquals("MiuiBrowser", ua.getBrowser().toString());
-		Assert.assertEquals("16.0.18", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("534.24", ua.getEngineVersion());
-		Assert.assertEquals("Android", ua.getOs().toString());
-		Assert.assertEquals("11", ua.getOsVersion());
-		Assert.assertEquals("Android", ua.getPlatform().toString());
-		Assert.assertTrue(ua.isMobile());
+		assertEquals("MiuiBrowser", ua.getBrowser().toString());
+		assertEquals("16.0.18", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("534.24", ua.getEngineVersion());
+		assertEquals("Android", ua.getOs().toString());
+		assertEquals("11", ua.getOsVersion());
+		assertEquals("Android", ua.getPlatform().toString());
+		assertTrue(ua.isMobile());
 	}
 
 	@Test
@@ -410,21 +410,21 @@ public class UserAgentUtilTest {
 		// https://gitee.com/dromara/hutool/issues/I50YGY
 		final String uaStr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Linux", ua.getOs().toString());
+		assertEquals("Linux", ua.getOs().toString());
 	}
 
 	@Test
 	public void issueI60UOPTest() {
 		final String uaStr = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.164 Safari/537.36 dingtalk-win/1.0.0 nw(0.14.7) DingTalk(6.5.40-Release.9059101) Mojo/1.0.0 Native AppType(release) Channel/201200";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("DingTalk-win", ua.getBrowser().toString());
-		Assert.assertEquals("6.5.40-Release.9059101", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
-		Assert.assertEquals("10.0", ua.getOsVersion());
-		Assert.assertEquals("Windows", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("DingTalk-win", ua.getBrowser().toString());
+		assertEquals("6.5.40-Release.9059101", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua.getOs().toString());
+		assertEquals("10.0", ua.getOsVersion());
+		assertEquals("Windows", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 
 	/**
@@ -435,26 +435,26 @@ public class UserAgentUtilTest {
 		// MAC Chrome 浏览器 ua
 		final String uaStr = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36";
 		final UserAgent ua = UserAgentUtil.parse(uaStr);
-		Assert.assertEquals("Chrome", ua.getBrowser().toString());
-		Assert.assertEquals("114.0.0.0", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("537.36", ua.getEngineVersion());
-		Assert.assertEquals("OSX", ua.getOs().toString());
-		Assert.assertEquals("10_15_7", ua.getOsVersion());
-		Assert.assertEquals("Mac", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("Chrome", ua.getBrowser().toString());
+		assertEquals("114.0.0.0", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("537.36", ua.getEngineVersion());
+		assertEquals("OSX", ua.getOs().toString());
+		assertEquals("10_15_7", ua.getOsVersion());
+		assertEquals("Mac", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 
 		// iphone Chrome 浏览器ua
 		final String uaStr2 = "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1";
 		final UserAgent ua2 = UserAgentUtil.parse(uaStr2);
-		Assert.assertEquals("Chrome", ua2.getBrowser().toString());
-		Assert.assertEquals("56.0.2924.75", ua2.getVersion());
-		Assert.assertEquals("Webkit", ua2.getEngine().toString());
-		Assert.assertEquals("602.1.50", ua2.getEngineVersion());
-		Assert.assertEquals("iPhone", ua2.getOs().toString());
-		Assert.assertEquals("10_3", ua2.getOsVersion());
-		Assert.assertEquals("iPhone", ua2.getPlatform().toString());
-		Assert.assertTrue(ua2.isMobile());
+		assertEquals("Chrome", ua2.getBrowser().toString());
+		assertEquals("56.0.2924.75", ua2.getVersion());
+		assertEquals("Webkit", ua2.getEngine().toString());
+		assertEquals("602.1.50", ua2.getEngineVersion());
+		assertEquals("iPhone", ua2.getOs().toString());
+		assertEquals("10_3", ua2.getOsVersion());
+		assertEquals("iPhone", ua2.getPlatform().toString());
+		assertTrue(ua2.isMobile());
 	}
 
 	@Test
@@ -463,14 +463,14 @@ public class UserAgentUtilTest {
 			"Mobile/15E148 SP-engine/2.80.0 main%2F1.0 baiduboxapp/13.42.0.11 (Baidu; P2 17.0) NABar/1.0 themeUA=Them";
 		final UserAgent ua2 = UserAgentUtil.parse(s);
 
-		Assert.assertEquals("Baidu", ua2.getBrowser().toString());
-		Assert.assertEquals("13.42.0.11", ua2.getVersion());
-		Assert.assertEquals("Webkit", ua2.getEngine().toString());
-		Assert.assertEquals("605.1.15", ua2.getEngineVersion());
-		Assert.assertEquals("iPhone", ua2.getOs().toString());
-		Assert.assertEquals("17_0", ua2.getOsVersion());
-		Assert.assertEquals("iPhone", ua2.getPlatform().toString());
-		Assert.assertTrue(ua2.isMobile());
+		assertEquals("Baidu", ua2.getBrowser().toString());
+		assertEquals("13.42.0.11", ua2.getVersion());
+		assertEquals("Webkit", ua2.getEngine().toString());
+		assertEquals("605.1.15", ua2.getEngineVersion());
+		assertEquals("iPhone", ua2.getOs().toString());
+		assertEquals("17_0", ua2.getOsVersion());
+		assertEquals("iPhone", ua2.getPlatform().toString());
+		assertTrue(ua2.isMobile());
 	}
 
 	@Test
@@ -479,14 +479,14 @@ public class UserAgentUtilTest {
 			"Safari/537.36 Core/1.94.218.400 QQBrowser/12.1.5496.400";
 		final UserAgent ua2 = UserAgentUtil.parse(s);
 
-		Assert.assertEquals("QQBrowser", ua2.getBrowser().toString());
-		Assert.assertEquals("12.1.5496.400", ua2.getVersion());
-		Assert.assertEquals("Webkit", ua2.getEngine().toString());
-		Assert.assertEquals("537.36", ua2.getEngineVersion());
-		Assert.assertEquals("Windows 10 or Windows Server 2016", ua2.getOs().toString());
-		Assert.assertEquals("10.0", ua2.getOsVersion());
-		Assert.assertEquals("Windows", ua2.getPlatform().toString());
-		Assert.assertFalse(ua2.isMobile());
+		assertEquals("QQBrowser", ua2.getBrowser().toString());
+		assertEquals("12.1.5496.400", ua2.getVersion());
+		assertEquals("Webkit", ua2.getEngine().toString());
+		assertEquals("537.36", ua2.getEngineVersion());
+		assertEquals("Windows 10 or Windows Server 2016", ua2.getOs().toString());
+		assertEquals("10.0", ua2.getOsVersion());
+		assertEquals("Windows", ua2.getPlatform().toString());
+		assertFalse(ua2.isMobile());
 	}
 
 	@Test
@@ -494,13 +494,13 @@ public class UserAgentUtilTest {
 		UserAgent ua = UserAgentUtil.parse(
 			"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) MicroMessenger/6.8.0(0x16080000) MacWechat/3.8.7(0x13080710) Safari/605.1.15 NetType/WIFI");
 
-		Assert.assertEquals("MicroMessenger", ua.getBrowser().toString());
-		Assert.assertEquals("6.8.0", ua.getVersion());
-		Assert.assertEquals("Webkit", ua.getEngine().toString());
-		Assert.assertEquals("605.1.15", ua.getEngineVersion());
-		Assert.assertEquals("OSX", ua.getOs().toString());
-		Assert.assertEquals("10_15_7", ua.getOsVersion());
-		Assert.assertEquals("Mac", ua.getPlatform().toString());
-		Assert.assertFalse(ua.isMobile());
+		assertEquals("MicroMessenger", ua.getBrowser().toString());
+		assertEquals("6.8.0", ua.getVersion());
+		assertEquals("Webkit", ua.getEngine().toString());
+		assertEquals("605.1.15", ua.getEngineVersion());
+		assertEquals("OSX", ua.getOs().toString());
+		assertEquals("10_15_7", ua.getOsVersion());
+		assertEquals("Mac", ua.getPlatform().toString());
+		assertFalse(ua.isMobile());
 	}
 }
diff --git a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
index 52b46791b..e82ed30fc 100644
--- a/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
+++ b/hutool-http/src/test/java/cn/hutool/http/webservice/SoapClientTest.java
@@ -2,8 +2,8 @@ package cn.hutool.http.webservice;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
@@ -17,7 +17,7 @@ import javax.xml.soap.SOAPMessage;
 public class SoapClientTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void requestTest() {
 		SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx")
 		.setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/")
@@ -30,7 +30,7 @@ public class SoapClientTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void requestForMessageTest() throws SOAPException {
 		SoapClient client = SoapClient.create("http://www.webxml.com.cn/WebServices/IpAddressSearchWebService.asmx")
 				.setMethod("web:getCountryCityByIp", "http://WebXml.com.cn/")
diff --git a/hutool-json/src/test/java/cn/hutool/json/BeanToJsonTest.java b/hutool-json/src/test/java/cn/hutool/json/BeanToJsonTest.java
index 5c756759d..52f4e9af5 100644
--- a/hutool-json/src/test/java/cn/hutool/json/BeanToJsonTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/BeanToJsonTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class BeanToJsonTest {
 	@Test
@@ -15,7 +15,7 @@ public class BeanToJsonTest {
 		readParam.setProjectId(123);
 
 		//Console.log(JSONUtil.toJsonStr(readParam));
-		Assert.assertEquals("{\"initSpikeMac\":\"a\",\"mac\":\"b\",\"spikeMac\":\"c\",\"bag\":\"d\",\"projectId\":123}", JSONUtil.toJsonStr(readParam));
+		assertEquals("{\"initSpikeMac\":\"a\",\"mac\":\"b\",\"spikeMac\":\"c\",\"bag\":\"d\",\"projectId\":123}", JSONUtil.toJsonStr(readParam));
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java b/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java
index 28724d92e..004bd7f9b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/CustomSerializeTest.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.json.serialize.JSONObjectSerializer;
 import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
@@ -12,12 +12,12 @@ public class CustomSerializeTest {
 	@Test
 	public void serializeTest() {
 		JSONUtil.putSerializer(CustomBean.class, (JSONObjectSerializer<CustomBean>) (json, bean) -> json.set("customName", bean.name));
-		
+
 		CustomBean customBean = new CustomBean();
 		customBean.name = "testName";
-		
+
 		JSONObject obj = JSONUtil.parseObj(customBean);
-		Assert.assertEquals("testName", obj.getStr("customName"));
+		assertEquals("testName", obj.getStr("customName"));
 	}
 
 	@Test
@@ -27,10 +27,10 @@ public class CustomSerializeTest {
 			customBean.name = ((JSONObject)json).getStr("customName");
 			return customBean;
 		});
-		
+
 		String jsonStr = "{\"customName\":\"testName\"}";
 		CustomBean bean = JSONUtil.parseObj(jsonStr).toBean(CustomBean.class);
-		Assert.assertEquals("testName", bean.name);
+		assertEquals("testName", bean.name);
 	}
 
 	@ToString
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java
index 5c4ee03bf..51550cfba 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue1075Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue1075Test {
 
@@ -12,8 +12,8 @@ public class Issue1075Test {
 	public void testToBean() {
 		// 在不忽略大小写的情况下，f2、fac都不匹配
 		ObjA o2 = JSONUtil.toBean(jsonStr, ObjA.class);
-		Assert.assertNull(o2.getFAC());
-		Assert.assertNull(o2.getF2());
+		assertNull(o2.getFAC());
+		assertNull(o2.getF2());
 	}
 
 	@Test
@@ -21,8 +21,8 @@ public class Issue1075Test {
 		// 在忽略大小写的情况下，f2、fac都匹配
 		ObjA o2 = JSONUtil.parseObj(jsonStr, JSONConfig.create().setIgnoreCase(true)).toBean(ObjA.class);
 
-		Assert.assertEquals("fac", o2.getFAC());
-		Assert.assertEquals("f2", o2.getF2());
+		assertEquals("fac", o2.getFAC());
+		assertEquals("f2", o2.getF2());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
index 21a485edf..51fd904dd 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue1101Test.java
@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.TypeReference;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Comparator;
 import java.util.TreeSet;
@@ -21,7 +21,7 @@ public class Issue1101Test {
 		final JSONArray objects = JSONUtil.parseArray(json);
 		final TreeSet<TreeNodeDto> convert = Convert.convert(new TypeReference<TreeSet<TreeNodeDto>>() {
 		}, objects);
-		Assert.assertEquals(2, convert.size());
+		assertEquals(2, convert.size());
 	}
 
 	@Test
@@ -58,11 +58,11 @@ public class Issue1101Test {
 		final JSONObject jsonObject = JSONUtil.parseObj(json);
 
 		final TreeNode treeNode = JSONUtil.toBean(jsonObject, TreeNode.class);
-		Assert.assertEquals(2, treeNode.getChildren().size());
+		assertEquals(2, treeNode.getChildren().size());
 
 		TreeNodeDto dto = new TreeNodeDto();
 		BeanUtil.copyProperties(treeNode, dto, true);
-		Assert.assertEquals(2, dto.getChildren().size());
+		assertEquals(2, dto.getChildren().size());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
index 466c4a839..1fb6d87be 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue1200Test.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.Console;
 import cn.hutool.json.test.bean.ResultBean;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * 测试在bean转换时使用BeanConverter，默认忽略转换失败的字段。
@@ -16,7 +16,7 @@ import org.junit.Test;
 public class Issue1200Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toBeanTest(){
 		final JSONObject jsonObject = JSONUtil.parseObj(ResourceUtil.readUtf8Str("issue1200.json"));
 		Console.log(jsonObject);
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
index de67cb0e8..3570e3100 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2090Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -21,14 +21,14 @@ public class Issue2090Test {
 
 		final JSONObject json = JSONUtil.parseObj(test);
 		final TestBean test1 = json.toBean(TestBean.class);
-		Assert.assertEquals(test, test1);
+		assertEquals(test, test1);
 	}
 
 	@Test
 	public void parseLocalDateTest(){
 		LocalDate localDate = LocalDate.now();
 		final JSONObject jsonObject = JSONUtil.parseObj(localDate);
-		Assert.assertNotNull(jsonObject.toString());
+		assertNotNull(jsonObject.toString());
 	}
 
 	@Test
@@ -36,7 +36,7 @@ public class Issue2090Test {
 		LocalDate d = LocalDate.now();
 		final JSONObject obj = JSONUtil.parseObj(d);
 		LocalDate d2 = obj.toBean(LocalDate.class);
-		Assert.assertEquals(d, d2);
+		assertEquals(d, d2);
 	}
 
 	@Test
@@ -44,7 +44,7 @@ public class Issue2090Test {
 		LocalDateTime d = LocalDateTime.now();
 		final JSONObject obj = JSONUtil.parseObj(d);
 		LocalDateTime d2 = obj.toBean(LocalDateTime.class);
-		Assert.assertEquals(d, d2);
+		assertEquals(d, d2);
 	}
 
 	@Test
@@ -52,14 +52,14 @@ public class Issue2090Test {
 		LocalTime d = LocalTime.now();
 		final JSONObject obj = JSONUtil.parseObj(d);
 		LocalTime d2 = obj.toBean(LocalTime.class);
-		Assert.assertEquals(d, d2);
+		assertEquals(d, d2);
 	}
 
 	@Test
 	public void monthTest(){
 		final JSONObject jsonObject = new JSONObject();
 		jsonObject.set("month", Month.JANUARY);
-		Assert.assertEquals("{\"month\":1}", jsonObject.toString());
+		assertEquals("{\"month\":1}", jsonObject.toString());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java
index 826a8274a..5e6ca39fe 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2131Test.java
@@ -4,8 +4,8 @@ import cn.hutool.core.collection.ListUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.beans.Transient;
 import java.util.List;
@@ -29,7 +29,7 @@ public class Issue2131Test {
 		final JSONObject jsonObject = JSONUtil.parseObj(jsonStr);
 
 		GoodsResponse result = jsonObject.toBean(GoodsResponse.class);
-		Assert.assertEquals(0, result.getCollections().size());
+		assertEquals(0, result.getCollections().size());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java
index 3c8685160..a76482a96 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2223Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -17,17 +17,17 @@ public class Issue2223Test {
 			m1.put("2022/" + i, i);
 		}
 
-		Assert.assertEquals("{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}", JSONUtil.toJsonStr(m1));
+		assertEquals("{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}", JSONUtil.toJsonStr(m1));
 
 		Map<String, Map<String, Long>> map1 = new HashMap<>();
 		map1.put("m1", m1);
 
-		Assert.assertEquals("{\"m1\":{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}}",
+		assertEquals("{\"m1\":{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}}",
 				JSONUtil.toJsonStr(map1, JSONConfig.create()));
 
 		final BeanDemo beanDemo = new BeanDemo();
 		beanDemo.setMap1(map1);
-		Assert.assertEquals("{\"map1\":{\"m1\":{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}}}",
+		assertEquals("{\"map1\":{\"m1\":{\"2022/0\":0,\"2022/1\":1,\"2022/2\":2,\"2022/3\":3,\"2022/4\":4}}}",
 				JSONUtil.toJsonStr(beanDemo, JSONConfig.create()));
 	}
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2365Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2365Test.java
index 1e3509e7c..94f8898ad 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2365Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2365Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2365Test {
 
@@ -10,8 +10,8 @@ public class Issue2365Test {
 	public void toBeanTest(){
 		String jsonStr = "{\"fileName\":\"aaa\",\"fileBytes\":\"AQ==\"}";
 		final FileInfo fileInfo = JSONUtil.toBean(jsonStr, FileInfo.class);
-		Assert.assertEquals("aaa", fileInfo.getFileName());
-		Assert.assertArrayEquals(new byte[]{1}, fileInfo.getFileBytes());
+		assertEquals("aaa", fileInfo.getFileName());
+		assertArrayEquals(new byte[]{1}, fileInfo.getFileBytes());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2369Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2369Test.java
index be9c1f8bd..5a2c3acfc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2369Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2369Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2369Test {
 
@@ -11,9 +11,9 @@ public class Issue2369Test {
 		// byte[]数组对于JSONArray来说，即可能是一个JSON字符串的二进制流，也可能是普通数组，因此需要做双向兼容
 		final byte[] bytes = {10, 11};
 		final String s = JSONUtil.toJsonStr(bytes);
-		Assert.assertEquals("[10,11]", s);
+		assertEquals("[10,11]", s);
 
 		final Object o = JSONUtil.toBean(s, byte[].class, false);
-		Assert.assertArrayEquals(bytes, (byte[])o);
+		assertArrayEquals(bytes, (byte[])o);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java
index f5dc02ae1..4275edc93 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2377Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -11,15 +11,15 @@ public class Issue2377Test {
 	public void bytesTest() {
 		final Object[] paramArray = new Object[]{1, new byte[]{10, 11}, "报表.xlsx"};
 		final String paramsStr = JSONUtil.toJsonStr(paramArray);
-		Assert.assertEquals("[1,[10,11],\"报表.xlsx\"]", paramsStr);
+		assertEquals("[1,[10,11],\"报表.xlsx\"]", paramsStr);
 
 		final List<Object> paramList = JSONUtil.toList(paramsStr, Object.class);
 
 		final String paramBytesStr = JSONUtil.toJsonStr(paramList.get(1));
-		Assert.assertEquals("[10,11]", paramBytesStr);
+		assertEquals("[10,11]", paramBytesStr);
 
 		final byte[] paramBytes = JSONUtil.toBean(paramBytesStr, byte[].class, false);
-		Assert.assertArrayEquals((byte[]) paramArray[1], paramBytes);
+		assertArrayEquals((byte[]) paramArray[1], paramBytes);
 	}
 
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java
index 5a4509cea..ef213be50 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2447Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
@@ -12,8 +12,8 @@ public class Issue2447Test {
 		Time time = new Time();
 		time.setTime(LocalDateTime.of(1970, 1, 2, 10, 0, 1, 0));
 		String timeStr = JSONUtil.toJsonStr(time);
-		Assert.assertEquals("{\"time\":93601000}", timeStr);
-		Assert.assertEquals(JSONUtil.toBean(timeStr, Time.class).getTime(), time.getTime());
+		assertEquals("{\"time\":93601000}", timeStr);
+		assertEquals(JSONUtil.toBean(timeStr, Time.class).getTime(), time.getTime());
 	}
 
 	static class Time {
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java
index bc0fd4854..75988175f 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2555Test.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.json.serialize.JSONDeserializer;
 import cn.hutool.json.serialize.JSONObjectSerializer;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2555Test {
 
@@ -19,12 +19,12 @@ public class Issue2555Test {
 		simpleObj.setMyType(child);
 
 		final String json = JSONUtil.toJsonStr(simpleObj);
-		Assert.assertEquals("{\"myType\":{\"addr\":\"addrValue1\"}}", json);
+		assertEquals("{\"myType\":{\"addr\":\"addrValue1\"}}", json);
 
 		//MyDeserializer不会被调用
 		final JSONObject jsonObject = JSONUtil.parseObj(json, JSONConfig.create().setIgnoreError(false));
 		final SimpleObj simpleObj2 = jsonObject.toBean(SimpleObj.class);
-		Assert.assertEquals("addrValue1", simpleObj2.getMyType().getAddress());
+		assertEquals("addrValue1", simpleObj2.getMyType().getAddress());
 	}
 
 	@Test
@@ -36,7 +36,7 @@ public class Issue2555Test {
 		//MyDeserializer不会被调用
 		final JSONObject jsonObject = JSONUtil.parseObj(jsonStr, JSONConfig.create().setIgnoreError(false));
 		final SimpleObj simpleObj2 = jsonObject.toBean(SimpleObj.class);
-		Assert.assertEquals("addrValue1", simpleObj2.getMyType().getAddress());
+		assertEquals("addrValue1", simpleObj2.getMyType().getAddress());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java
index ebceefe19..071cf9295 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2572Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.DayOfWeek;
 import java.time.Month;
@@ -19,11 +19,11 @@ public class Issue2572Test {
 		weeks.add(DayOfWeek.MONDAY);
 		final JSONObject obj = new JSONObject();
 		obj.set("weeks", weeks);
-		Assert.assertEquals("{\"weeks\":[1]}", obj.toString());
+		assertEquals("{\"weeks\":[1]}", obj.toString());
 
 		final Map<String, Set<DayOfWeek>> monthDays1 = obj.toBean(new TypeReference<Map<String, Set<DayOfWeek>>>() {
 		});
-		Assert.assertEquals("{weeks=[MONDAY]}", monthDays1.toString());
+		assertEquals("{weeks=[MONDAY]}", monthDays1.toString());
 	}
 
 	@Test
@@ -32,11 +32,11 @@ public class Issue2572Test {
 		months.add(Month.DECEMBER);
 		final JSONObject obj = new JSONObject();
 		obj.set("months", months);
-		Assert.assertEquals("{\"months\":[12]}", obj.toString());
+		assertEquals("{\"months\":[12]}", obj.toString());
 
 		final Map<String, Set<Month>> monthDays1 = obj.toBean(new TypeReference<Map<String, Set<Month>>>() {
 		});
-		Assert.assertEquals("{months=[DECEMBER]}", monthDays1.toString());
+		assertEquals("{months=[DECEMBER]}", monthDays1.toString());
 	}
 
 	@Test
@@ -45,10 +45,10 @@ public class Issue2572Test {
 		monthDays.add(MonthDay.of(Month.DECEMBER, 1));
 		final JSONObject obj = new JSONObject();
 		obj.set("monthDays", monthDays);
-		Assert.assertEquals("{\"monthDays\":[\"--12-01\"]}", obj.toString());
+		assertEquals("{\"monthDays\":[\"--12-01\"]}", obj.toString());
 
 		final Map<String, Set<MonthDay>> monthDays1 = obj.toBean(new TypeReference<Map<String, Set<MonthDay>>>() {
 		});
-		Assert.assertEquals("{monthDays=[--12-01]}", monthDays1.toString());
+		assertEquals("{monthDays=[--12-01]}", monthDays1.toString());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java
index 9aa7560eb..c6d8f3062 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2746Test.java
@@ -1,8 +1,10 @@
 package cn.hutool.json;
 
 import cn.hutool.core.util.StrUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class Issue2746Test {
 	@Test
@@ -11,13 +13,15 @@ public class Issue2746Test {
 		try{
 			JSONUtil.parseObj(str);
 		} catch (final JSONException e){
-			Assert.assertTrue(e.getMessage().startsWith("A JSONObject can not directly nest another JSONObject or JSONArray"));
+			assertTrue(e.getMessage().startsWith("A JSONObject can not directly nest another JSONObject or JSONArray"));
 		}
 	}
 
-	@Test(expected = JSONException.class)
+	@Test
 	public void parseTest() {
-		final String str = StrUtil.repeat("[", 1500) + StrUtil.repeat("]", 1500);
-		JSONUtil.parseArray(str);
+		assertThrows(JSONException.class, () -> {
+			final String str = StrUtil.repeat("[", 1500) + StrUtil.repeat("]", 1500);
+			JSONUtil.parseArray(str);
+		});
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java
index 7e6b53d18..4d06f1100 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2749Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
 public class Issue2749Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void jsonObjectTest() {
 		final Map<String, Object> map = new HashMap<>(1, 1f);
 		Map<String, Object> node = map;
@@ -23,7 +23,7 @@ public class Issue2749Test {
 
 		@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
 		final JSONObject jsonObject = new JSONObject(jsonStr);
-		Assert.assertNotNull(jsonObject);
+		assertNotNull(jsonObject);
 
 		// 栈溢出
 		//noinspection ResultOfMethodCallIgnored
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java
index 2096a3ebe..e43b06423 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2953Test.java
@@ -1,13 +1,13 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2953Test {
 	@Test
 	public void parseObjWithBigNumberTest() {
 		final String a = "{\"a\": 114793903847679990000000000000000000000}";
 		final JSONObject jsonObject = JSONUtil.parseObj(a, JSONConfig.create());
-		Assert.assertEquals("{\"a\":\"114793903847679990000000000000000000000\"}", jsonObject.toString());
+		assertEquals("{\"a\":\"114793903847679990000000000000000000000\"}", jsonObject.toString());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue2997Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue2997Test.java
index 967c9a913..20491e2bc 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue2997Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue2997Test.java
@@ -1,13 +1,13 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2997Test {
 	@Test
 	public void toBeanTest() {
 		// https://github.com/dromara/hutool/issues/2997
 		final Object o = JSONUtil.toBean("{}", Object.class);
-		Assert.assertEquals(JSONObject.class, o.getClass());
+		assertEquals(JSONObject.class, o.getClass());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3051Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3051Test.java
index df89a9a88..f7762c729 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3051Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3051Test.java
@@ -13,8 +13,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://github.com/dromara/hutool/issues/3051
@@ -25,14 +25,14 @@ public class Issue3051Test {
 		final JSONObject jsonObject = JSONUtil.parseObj(new EmptyBean(),
 			JSONConfig.create().setIgnoreError(true));
 
-		Assert.assertEquals("{}", jsonObject.toString());
+		assertEquals("{}", jsonObject.toString());
 	}
 
 	@Test
 	public void parseTest2() {
 		final JSONObject jsonObject = JSONUtil.parseObj(new EmptyBean());
 
-		Assert.assertEquals("{}", jsonObject.toString());
+		assertEquals("{}", jsonObject.toString());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3086Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3086Test.java
index 131f7f144..b4ef7d7e3 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3086Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3086Test.java
@@ -15,8 +15,8 @@ package cn.hutool.json;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.json.serialize.JSONObjectSerializer;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +36,7 @@ public class Issue3086Test {
 		final TestBean testBean = new TestBean();
 		testBean.setAuthorities(strings);
 
-		Assert.assertEquals("{\"authorities\":[\"ROLE_admin\",\"ROLE_normal\"]}",
+		assertEquals("{\"authorities\":[\"ROLE_admin\",\"ROLE_normal\"]}",
 			JSONUtil.toJsonStr(testBean));
 	}
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3139Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3139Test.java
index 16649c62b..0de031770 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3139Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3139Test.java
@@ -14,8 +14,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.util.XmlUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -33,9 +33,9 @@ public class Issue3139Test {
 		final JSONObject jsonObject = XmlUtil.xmlToBean(XmlUtil.parseXml(xml).getDocumentElement(), JSONObject.class);
 		final R bean = jsonObject.toBean(R.class);
 		final List<C> c = bean.getC();
-		Assert.assertEquals(1, c.size());
-		Assert.assertEquals("1", c.get(0).getS());
-		Assert.assertEquals("str", c.get(0).getP());
+		assertEquals(1, c.size());
+		assertEquals("1", c.get(0).getS());
+		assertEquals("str", c.get(0).getP());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3274Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3274Test.java
index a5191d273..1d5a105b5 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3274Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3274Test.java
@@ -14,8 +14,8 @@ package cn.hutool.json;
 
 import lombok.Data;
 import lombok.Getter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3274Test {
 	@Test
@@ -27,7 +27,7 @@ public class Issue3274Test {
 			"    \"id\": \"123123123\"\n" +
 			"}", JSONConfig.create().setIgnoreError(true));
 		final LarkCoreHrPersonal larkCoreHrPersonal = entries.toBean(LarkCoreHrPersonal.class);
-		Assert.assertNotNull(larkCoreHrPersonal);
+		assertNotNull(larkCoreHrPersonal);
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3289Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3289Test.java
index cd938dc92..51e8ede6f 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3289Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3289Test.java
@@ -12,12 +12,16 @@
 
 package cn.hutool.json;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class Issue3289Test {
-	@Test(expected = JSONException.class)
+	@Test
 	public void parseTest() {
-		final String s = "{\"a\":1,[6E962756779]}";
-		JSONUtil.parse(s);
+		assertThrows(JSONException.class, () -> {
+			final String s = "{\"a\":1,[6E962756779]}";
+			JSONUtil.parse(s);
+		});
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3504Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3504Test.java
index ca7b78de2..31a134af1 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3504Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3504Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://github.com/dromara/hutool/issues/3504
@@ -16,8 +16,8 @@ public class Issue3504Test {
 		jsonBean.setClasses(new Class[]{String.class});
 		String huToolJsonStr = JSONUtil.toJsonStr(jsonBean);
 		final JsonBean bean = JSONUtil.toBean(huToolJsonStr, JsonBean.class);
-		Assert.assertNotNull(bean);
-		Assert.assertEquals("test", bean.getName());
+		assertNotNull(bean);
+		assertEquals("test", bean.getName());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3506Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3506Test.java
index d854d5685..1e35e9592 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3506Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3506Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://github.com/dromara/hutool/issues/3506
@@ -15,8 +15,8 @@ public class Issue3506Test {
 		languages.setLanguageType(Java.class);
 		String hutoolJSONString = JSONUtil.toJsonStr(languages);
 		final Languages bean = JSONUtil.toBean(hutoolJSONString, Languages.class);
-		Assert.assertNotNull(bean);
-		Assert.assertEquals(bean.getLanguageType(), Java.class);
+		assertNotNull(bean);
+		assertEquals(bean.getLanguageType(), Java.class);
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3541Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3541Test.java
index 57cf86036..66ac7838f 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3541Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3541Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3541Test {
 	@Test
@@ -11,7 +11,7 @@ public class Issue3541Test {
 		demo.setId(1227690722069581409L);
 		demo.setName("hutool");
 		String jsonStr = JSONUtil.toJsonStr(demo, JSONConfig.create().setWriteLongAsString(true));
-		Assert.assertEquals("{\"id\":\"1227690722069581409\",\"name\":\"hutool\"}", jsonStr);
+		assertEquals("{\"id\":\"1227690722069581409\",\"name\":\"hutool\"}", jsonStr);
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java
index 0ac930aa5..5c4bfe204 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3588Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +13,10 @@ public class Issue3588Test {
 	public void toBeanIgnoreCaseTest() {
 		String json = "{id: 1, code: 1122, tsemaphores: [{type: 1, status: 12}]}";
 		AttrData attrData = JSONUtil.toBean(json, JSONConfig.create().setIgnoreCase(true), AttrData.class);
-		Assert.assertEquals("1", attrData.getId());
-		Assert.assertEquals("1122", attrData.getCode());
-		Assert.assertEquals("1", attrData.getTSemaphores().get(0).getType());
-		Assert.assertEquals("12", attrData.getTSemaphores().get(0).getStatus());
+		assertEquals("1", attrData.getId());
+		assertEquals("1122", attrData.getCode());
+		assertEquals("1", attrData.getTSemaphores().get(0).getType());
+		assertEquals("12", attrData.getTSemaphores().get(0).getStatus());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3619Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3619Test.java
index e9a091f3c..e2f2312de 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3619Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3619Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3619Test {
 	@Test
@@ -21,6 +21,6 @@ public class Issue3619Test {
 			}
 		});
 
-		Assert.assertEquals("{\"int_arr\":[-4]}", jsonStr);
+		assertEquals("{\"int_arr\":[-4]}", jsonStr);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue3649Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue3649Test.java
index 614f0a011..7a9e3f848 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue3649Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue3649Test.java
@@ -1,9 +1,9 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class Issue3649Test {
 	@Test
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
index d7244624e..f499ead38 100755
--- a/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue488Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.TypeReference;
@@ -14,21 +14,21 @@ public class Issue488Test {
 	@Test
 	public void toBeanTest() {
 		String jsonStr = ResourceUtil.readUtf8Str("issue488.json");
-		
+
 		ResultSuccess<List<EmailAddress>> result = JSONUtil.toBean(jsonStr,
 				new TypeReference<ResultSuccess<List<EmailAddress>>>() {}, false);
-		
-		Assert.assertEquals("https://graph.microsoft.com/beta/$metadata#Collection(microsoft.graph.emailAddress)", result.getContext());
-		
+
+		assertEquals("https://graph.microsoft.com/beta/$metadata#Collection(microsoft.graph.emailAddress)", result.getContext());
+
 		List<EmailAddress> adds = result.getValue();
-		Assert.assertEquals("会议室101", adds.get(0).getName());
-		Assert.assertEquals("MeetingRoom101@abc.com", adds.get(0).getAddress());
-		Assert.assertEquals("会议室102", adds.get(1).getName());
-		Assert.assertEquals("MeetingRoom102@abc.com", adds.get(1).getAddress());
-		Assert.assertEquals("会议室103", adds.get(2).getName());
-		Assert.assertEquals("MeetingRoom103@abc.com", adds.get(2).getAddress());
-		Assert.assertEquals("会议室219", adds.get(3).getName());
-		Assert.assertEquals("MeetingRoom219@abc.com", adds.get(3).getAddress());
+		assertEquals("会议室101", adds.get(0).getName());
+		assertEquals("MeetingRoom101@abc.com", adds.get(0).getAddress());
+		assertEquals("会议室102", adds.get(1).getName());
+		assertEquals("MeetingRoom102@abc.com", adds.get(1).getAddress());
+		assertEquals("会议室103", adds.get(2).getName());
+		assertEquals("MeetingRoom103@abc.com", adds.get(2).getAddress());
+		assertEquals("会议室219", adds.get(3).getName());
+		assertEquals("MeetingRoom219@abc.com", adds.get(3).getAddress());
 	}
 
 	@Test
@@ -40,17 +40,17 @@ public class Issue488Test {
 
 		ResultSuccess<List<EmailAddress>> result = resultList.get(0);
 
-		Assert.assertEquals("https://graph.microsoft.com/beta/$metadata#Collection(microsoft.graph.emailAddress)", result.getContext());
+		assertEquals("https://graph.microsoft.com/beta/$metadata#Collection(microsoft.graph.emailAddress)", result.getContext());
 
 		List<EmailAddress> adds = result.getValue();
-		Assert.assertEquals("会议室101", adds.get(0).getName());
-		Assert.assertEquals("MeetingRoom101@abc.com", adds.get(0).getAddress());
-		Assert.assertEquals("会议室102", adds.get(1).getName());
-		Assert.assertEquals("MeetingRoom102@abc.com", adds.get(1).getAddress());
-		Assert.assertEquals("会议室103", adds.get(2).getName());
-		Assert.assertEquals("MeetingRoom103@abc.com", adds.get(2).getAddress());
-		Assert.assertEquals("会议室219", adds.get(3).getName());
-		Assert.assertEquals("MeetingRoom219@abc.com", adds.get(3).getAddress());
+		assertEquals("会议室101", adds.get(0).getName());
+		assertEquals("MeetingRoom101@abc.com", adds.get(0).getAddress());
+		assertEquals("会议室102", adds.get(1).getName());
+		assertEquals("MeetingRoom102@abc.com", adds.get(1).getAddress());
+		assertEquals("会议室103", adds.get(2).getName());
+		assertEquals("MeetingRoom103@abc.com", adds.get(2).getAddress());
+		assertEquals("会议室219", adds.get(3).getName());
+		assertEquals("MeetingRoom219@abc.com", adds.get(3).getAddress());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java
index 6371fbe13..47ced0e81 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue644Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
@@ -20,11 +20,11 @@ public class Issue644Test {
 		final JSONObject jsonObject = JSONUtil.parseObj(beanWithDate);
 
 		BeanWithDate beanWithDate2 = JSONUtil.toBean(jsonObject, BeanWithDate.class);
-		Assert.assertEquals(LocalDateTimeUtil.formatNormal(beanWithDate.getDate()),
+		assertEquals(LocalDateTimeUtil.formatNormal(beanWithDate.getDate()),
 				LocalDateTimeUtil.formatNormal(beanWithDate2.getDate()));
 
 		beanWithDate2 = JSONUtil.toBean(jsonObject.toString(), BeanWithDate.class);
-		Assert.assertEquals(LocalDateTimeUtil.formatNormal(beanWithDate.getDate()),
+		assertEquals(LocalDateTimeUtil.formatNormal(beanWithDate.getDate()),
 				LocalDateTimeUtil.formatNormal(beanWithDate2.getDate()));
 	}
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java
index b6a041318..c28047d81 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue677Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.date.DateUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
@@ -19,7 +19,7 @@ public class Issue677Test {
 
 		final String jsonStr = JSONUtil.toJsonStr(dto);
 		final AuditResultDto auditResultDto = JSONUtil.toBean(jsonStr, AuditResultDto.class);
-		Assert.assertEquals("Mon Dec 15 00:00:00 CST 1969", auditResultDto.getDate().toString().replace("GMT+08:00", "CST"));
+		assertEquals("Mon Dec 15 00:00:00 CST 1969", auditResultDto.getDate().toString().replace("GMT+08:00", "CST"));
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java b/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java
index 9b1a9ab76..480ea01ba 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issue867Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.annotation.Alias;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue867Test {
 
@@ -11,9 +11,9 @@ public class Issue867Test {
 	public void toBeanTest(){
 		String json = "{\"abc_1d\":\"123\",\"abc_d\":\"456\",\"abc_de\":\"789\"}";
 		Test02 bean = JSONUtil.toBean(JSONUtil.parseObj(json),Test02.class);
-		Assert.assertEquals("123", bean.getAbc1d());
-		Assert.assertEquals("456", bean.getAbcD());
-		Assert.assertEquals("789", bean.getAbcDe());
+		assertEquals("123", bean.getAbc1d());
+		assertEquals("456", bean.getAbcD());
+		assertEquals("789", bean.getAbcDe());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java
index 4e80b9417..4b327dae9 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1AU86Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.collection.CollUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -32,7 +32,7 @@ public class IssueI1AU86Test {
 
 		final List<Vcc> vccs = jsonArray.toList(Vcc.class);
 		for (Vcc vcc : vccs) {
-			Assert.assertNotNull(vcc);
+			assertNotNull(vcc);
 		}
 	}
 
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java
index 64bba845e..257705b37 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1F8M2.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
@@ -14,8 +14,8 @@ public class IssueI1F8M2 {
 	public void toBeanTest() {
 		String jsonStr = "{\"eventType\":\"fee\",\"fwdAlertingTime\":\"2020-04-22 16:34:13\",\"fwdAnswerTime\":\"\"}";
 		Param param = JSONUtil.toBean(jsonStr, Param.class);
-		Assert.assertEquals("2020-04-22T16:34:13", param.getFwdAlertingTime().toString());
-		Assert.assertNull(param.getFwdAnswerTime());
+		assertEquals("2020-04-22T16:34:13", param.getFwdAlertingTime().toString());
+		assertNull(param.getFwdAnswerTime());
 	}
 
 	// Param类的字段
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java b/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java
index 90f2ba9bc..a1a4ab18a 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI1H2VN.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -18,11 +18,11 @@ public class IssueI1H2VN {
 		String jsonStr = "{'conditionsVo':[{'column':'StockNo','value':'abc','type':'='},{'column':'CheckIncoming','value':'1','type':'='}]," +
 				"'queryVo':{'conditionsVo':[{'column':'StockNo','value':'abc','type':'='},{'column':'CheckIncoming','value':'1','type':'='}],'queryVo':null}}";
 		QueryVo vo = JSONUtil.toBean(jsonStr, QueryVo.class);
-		Assert.assertEquals(2, vo.getConditionsVo().size());
+		assertEquals(2, vo.getConditionsVo().size());
 		final QueryVo subVo = vo.getQueryVo();
-		Assert.assertNotNull(subVo);
-		Assert.assertEquals(2, subVo.getConditionsVo().size());
-		Assert.assertNull(subVo.getQueryVo());
+		assertNotNull(subVo);
+		assertEquals(2, subVo.getConditionsVo().size());
+		assertNull(subVo.getQueryVo());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java b/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java
index 0844cf073..48dbd517d 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI3BS4S.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.bean.BeanUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
@@ -17,7 +17,7 @@ public class IssueI3BS4S {
 		String jsonStr = "{date: '2021-03-17T06:31:33.99'}";
 		final Bean1 bean1 = new Bean1();
 		BeanUtil.copyProperties(JSONUtil.parseObj(jsonStr), bean1);
-		Assert.assertEquals("2021-03-17T06:31:33.099", bean1.getDate().toString());
+		assertEquals("2021-03-17T06:31:33.099", bean1.getDate().toString());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java b/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java
index ba4fb2467..d57c3c477 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI3EGJP.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.bean.BeanUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI3EGJP {
 
@@ -14,8 +14,8 @@ public class IssueI3EGJP {
 		paramJson.set("is_booleanb", true);
 		ConvertDO convertDO = BeanUtil.toBean(paramJson, ConvertDO.class);
 
-		Assert.assertTrue(convertDO.isBooleana());
-		Assert.assertTrue(convertDO.getIsBooleanb());
+		assertTrue(convertDO.isBooleana());
+		assertTrue(convertDO.getIsBooleanb());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java
index f46ce2b9c..b32ae9e5c 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI49VZBTest.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.core.convert.Convert;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.stream.Stream;
 
@@ -65,12 +65,12 @@ public class IssueI49VZBTest {
 	public void toBeanTest(){
 		String str = "{type: \"password\"}";
 		final UPOpendoor upOpendoor = JSONUtil.toBean(str, UPOpendoor.class);
-		Assert.assertEquals(NBCloudKeyType.password, upOpendoor.getType());
+		assertEquals(NBCloudKeyType.password, upOpendoor.getType());
 	}
 
 	@Test
 	public void enumConvertTest(){
 		final NBCloudKeyType type = Convert.toEnum(NBCloudKeyType.class, "snapKey");
-		Assert.assertEquals(NBCloudKeyType.snapKey, type);
+		assertEquals(NBCloudKeyType.snapKey, type);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java
index 021fd3333..d64ac40b6 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI4RBZ4Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * https://gitee.com/dromara/hutool/issues/I4RBZ4
@@ -13,6 +13,6 @@ public class IssueI4RBZ4Test {
 		String jsonStr = "{\"id\":\"123\",\"array\":[1,2,3],\"outNum\":356,\"body\":{\"ava1\":\"20220108\",\"use\":1,\"ava2\":\"20230108\"},\"name\":\"John\"}";
 
 		final JSONObject jsonObject = JSONUtil.parseObj(jsonStr, JSONConfig.create().setNatureKeyComparator());
-		Assert.assertEquals("{\"array\":[1,2,3],\"body\":{\"ava1\":\"20220108\",\"ava2\":\"20230108\",\"use\":1},\"id\":\"123\",\"name\":\"John\",\"outNum\":356}", jsonObject.toString());
+		assertEquals("{\"array\":[1,2,3],\"body\":{\"ava1\":\"20220108\",\"ava2\":\"20230108\",\"use\":1},\"id\":\"123\",\"name\":\"John\",\"outNum\":356}", jsonObject.toString());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java
index 51cffe12c..d21788ff2 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI4XFMWTest.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.annotation.Alias;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,10 +27,10 @@ public class IssueI4XFMWTest {
 		entityList.add(entityB);
 
 		String jsonStr = JSONUtil.toJsonStr(entityList);
-		Assert.assertEquals("[{\"uid\":\"123\",\"password\":\"456\"},{\"uid\":\"789\",\"password\":\"098\"}]", jsonStr);
+		assertEquals("[{\"uid\":\"123\",\"password\":\"456\"},{\"uid\":\"789\",\"password\":\"098\"}]", jsonStr);
 		List<TestEntity> testEntities = JSONUtil.toList(jsonStr, TestEntity.class);
-		Assert.assertEquals("123", testEntities.get(0).getId());
-		Assert.assertEquals("789", testEntities.get(1).getId());
+		assertEquals("123", testEntities.get(0).getId());
+		assertEquals("789", testEntities.get(1).getId());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java
index cff610a00..6b5e9c26d 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI50EGGTest.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI50EGGTest {
 
@@ -11,7 +11,7 @@ public class IssueI50EGGTest {
 	public void toBeanTest(){
 		String data = "{\"return_code\": 1, \"return_msg\": \"成功\", \"return_data\" : null}";
 		final ApiResult<?> apiResult = JSONUtil.toBean(data, JSONConfig.create().setIgnoreCase(true), ApiResult.class);
-		Assert.assertEquals(1, apiResult.getReturn_code());
+		assertEquals(1, apiResult.getReturn_code());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java
index 6f8401f62..4d8d6fd30 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI59LW4Test.java
@@ -1,25 +1,25 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI59LW4Test {
 
 	@Test
 	public void bytesTest(){
 		final JSONObject jsonObject = JSONUtil.createObj().set("bytes", new byte[]{1});
-		Assert.assertEquals("{\"bytes\":[1]}", jsonObject.toString());
+		assertEquals("{\"bytes\":[1]}", jsonObject.toString());
 
 		final byte[] bytes = jsonObject.getBytes("bytes");
-		Assert.assertArrayEquals(new byte[]{1}, bytes);
+		assertArrayEquals(new byte[]{1}, bytes);
 	}
 
 	@Test
 	public void bytesInJSONArrayTest(){
 		final JSONArray jsonArray = JSONUtil.createArray().set(new byte[]{1});
-		Assert.assertEquals("[[1]]", jsonArray.toString());
+		assertEquals("[[1]]", jsonArray.toString());
 
 		final byte[] bytes = jsonArray.getBytes(0);
-		Assert.assertArrayEquals(new byte[]{1}, bytes);
+		assertArrayEquals(new byte[]{1}, bytes);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java
index 3679e1d5b..ec87be20d 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI5OMSCTest.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.resource.ResourceUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * Predicate多层过滤
@@ -21,6 +21,6 @@ public class IssueI5OMSCTest {
 			}
 			return true;
 		});
-		Assert.assertEquals("{\"store\":{\"bicycle\":{\"color\":\"red\"},\"book\":[{\"author\":\"Evelyn Waugh\"},{\"author\":\"Evelyn Waugh02\"}]}}", s);
+		assertEquals("{\"store\":{\"bicycle\":{\"color\":\"red\"},\"book\":[{\"author\":\"Evelyn Waugh\"},{\"author\":\"Evelyn Waugh02\"}]}}", s);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI676IT.java b/hutool-json/src/test/java/cn/hutool/json/IssueI676IT.java
index 377ece1c0..8b9784658 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI676IT.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI676IT.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.XmlUtil;
 import cn.hutool.json.xml.JSONXMLSerializer;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import static javax.xml.xpath.XPathConstants.STRING;
 
@@ -15,6 +15,6 @@ public class IssueI676IT {
 		final JSONObject jsonObject = JSONUtil.parseObj(ResourceUtil.readUtf8Str("issueI676IT.json"));
 		String xmlStr = JSONXMLSerializer.toXml(jsonObject, null, (String) null);
 		String content = String.valueOf(XmlUtil.getByXPath("/page/orderItems[1]/content", XmlUtil.readXML(xmlStr), STRING));
-		Assert.assertEquals(content, "bar1");
+		assertEquals(content, "bar1");
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java
index 983b654cc..38eb6ad77 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI6H0XFTest.java
@@ -1,15 +1,15 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI6H0XFTest {
 	@Test
 	public void toBeanTest(){
 		final Demo demo = JSONUtil.toBean("{\"biz\":\"A\",\"isBiz\":true}", Demo.class);
-		Assert.assertEquals("A", demo.getBiz());
-		Assert.assertEquals("{\"biz\":\"A\"}", JSONUtil.toJsonStr(demo));
+		assertEquals("A", demo.getBiz());
+		assertEquals("{\"biz\":\"A\"}", JSONUtil.toJsonStr(demo));
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6SZYBTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI6SZYBTest.java
index 82cd025a5..d7dbbb97c 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6SZYBTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI6SZYBTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.Pair;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.AbstractMap;
 import java.util.Map;
@@ -12,19 +12,19 @@ public class IssueI6SZYBTest {
 	public void pairTest() {
 		Pair<Integer,Integer> pair = Pair.of(1, 2);
 		String jsonStr = JSONUtil.toJsonStr(pair);
-		Assert.assertEquals("{\"key\":1,\"value\":2}", jsonStr);
+		assertEquals("{\"key\":1,\"value\":2}", jsonStr);
 
 		final Pair bean = JSONUtil.toBean(jsonStr, Pair.class);
-		Assert.assertEquals(pair, bean);
+		assertEquals(pair, bean);
 	}
 
 	@Test
 	public void entryTest() {
 		Map.Entry<String,Integer> pair = new AbstractMap.SimpleEntry<>("1", 2);
 		String jsonStr = JSONUtil.toJsonStr(pair);
-		Assert.assertEquals("{\"1\":2}", jsonStr);
+		assertEquals("{\"1\":2}", jsonStr);
 
 		final Map.Entry bean = JSONUtil.toBean(jsonStr, AbstractMap.SimpleEntry.class);
-		Assert.assertEquals(pair, bean);
+		assertEquals(pair, bean);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6TPIFTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI6TPIFTest.java
index dcaec64a2..028c27791 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6TPIFTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI6TPIFTest.java
@@ -13,15 +13,15 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 
 public class IssueI6TPIFTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toStringTest() {
 		TestVo test = new TestVo();
 		test.setBigValue(new BigDecimal("1234567899876543210.000000000000000000000000001"));
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI6YN2ATest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI6YN2ATest.java
index 60172e890..7a3a5b257 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI6YN2ATest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI6YN2ATest.java
@@ -13,8 +13,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -27,7 +27,7 @@ public class IssueI6YN2ATest {
 		final JSONObject jsonObject = JSONUtil.parseObj(str);
 
 		final PageQuery<?> bean = jsonObject.toBean(PageQuery.class);
-		Assert.assertEquals("{name=姓名, age=年龄, email=邮箱, number=号码, pwd=密码}", bean.headers.toString());
+		assertEquals("{name=姓名, age=年龄, email=邮箱, number=号码, pwd=密码}", bean.headers.toString());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI71BE6Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI71BE6Test.java
index f6611080c..b51123f14 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI71BE6Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI71BE6Test.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI71BE6Test {
 
@@ -23,6 +23,6 @@ public class IssueI71BE6Test {
 		final String jsonStr = "[50.0,50.0,50.0,50.0]";
 
 		final Double[] doubles = (Double[]) JSONUtil.parseArray(jsonStr).toArray(Double[].class);
-		Assert.assertArrayEquals(new Double[]{50.0,50.0,50.0,50.0}, doubles);
+		assertArrayEquals(new Double[]{50.0,50.0,50.0,50.0}, doubles);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI7FQ29Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI7FQ29Test.java
index 687ac85cd..4465632e5 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI7FQ29Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI7FQ29Test.java
@@ -13,8 +13,8 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -25,7 +25,7 @@ public class IssueI7FQ29Test {
 		final Map<String, Class<?>> map = JSONUtil.toBean(jsonStr, new TypeReference<Map<String, Class<?>>>() {
 		}, false);
 
-		Assert.assertNotNull(map);
-		Assert.assertEquals(String.class, map.get("trans_no"));
+		assertNotNull(map);
+		assertEquals(String.class, map.get("trans_no"));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI7GPGXTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI7GPGXTest.java
index fc0829b5f..2ac214660 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI7GPGXTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI7GPGXTest.java
@@ -14,8 +14,8 @@ package cn.hutool.json;
 
 import cn.hutool.core.lang.Pair;
 import cn.hutool.core.lang.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI7GPGXTest {
 
@@ -24,6 +24,6 @@ public class IssueI7GPGXTest {
 		final Pair<String, Boolean> hutoolPair = new Pair<>("test1", true);
 		final String a = JSONUtil.toJsonStr(hutoolPair);
 		final Pair<String, Boolean> pair = JSONUtil.toBean(a, new TypeReference<Pair<String, Boolean>>() {}, false);
-		Assert.assertEquals(hutoolPair, pair);
+		assertEquals(hutoolPair, pair);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI7M2GZTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI7M2GZTest.java
index 3a0e2190e..9ce7a1fdf 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI7M2GZTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI7M2GZTest.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.core.lang.TypeReference;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,8 +44,8 @@ public class IssueI7M2GZTest {
 		//Console.log(json);
 		final MyEntity<JSONBeanParserImpl> result = JSONUtil.toBean(json, new TypeReference<MyEntity<JSONBeanParserImpl>>() {
 		}, false);
-		Assert.assertEquals("new Object", result.getList().get(0).getName());
-		Assert.assertNotNull(result.getList().get(0).getParsed());
-		Assert.assertEquals(Integer.valueOf(12), result.getList().get(0).getParsed());
+		assertEquals("new Object", result.getList().get(0).getName());
+		assertNotNull(result.getList().get(0).getParsed());
+		assertEquals(Integer.valueOf(12), result.getList().get(0).getParsed());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI82AM8Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI82AM8Test.java
index b20d55874..847883a3c 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI82AM8Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI82AM8Test.java
@@ -3,8 +3,8 @@ package cn.hutool.json;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.TypeReference;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -20,7 +20,7 @@ public class IssueI82AM8Test {
 			JSONUtil.toBean(json, new TypeReference<Map<String, MedicalCenter.MedicalCenterLocalized>>() {
 			}, false);
 
-		bean1.forEach((k, v) -> Assert.assertNotNull(v.getTestimonials()));
+		bean1.forEach((k, v) -> assertNotNull(v.getTestimonials()));
 	}
 
 	// 对象
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI84V6ITest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI84V6ITest.java
index 963d10539..62095debb 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI84V6ITest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI84V6ITest.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI84V6ITest {
 	@Test
@@ -9,7 +9,7 @@ public class IssueI84V6ITest {
 		final String a1 = "{'x':'\\n','y':','}";
 		final String formatJsonStr = JSONUtil.formatJsonStr(a1);
 //		Console.log(formatJsonStr);
-		Assert.assertEquals(
+		assertEquals(
 			"{\n" +
 				"    'x': '\\n',\n" +
 				"    'y': ','\n" +
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI8NMP7Test.java b/hutool-json/src/test/java/cn/hutool/json/IssueI8NMP7Test.java
index 6bd9db836..bdc59f07b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI8NMP7Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI8NMP7Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import lombok.Data;
 import lombok.ToString;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
@@ -12,7 +12,7 @@ public class IssueI8NMP7Test {
 	public void toBeanTest() {
 		final String jsonString = "{\"enableTime\":\"1702262524444\"}";
 		final DemoModel bean = JSONUtil.toBean(jsonString, JSONConfig.create(), DemoModel.class);
-		Assert.assertNotNull(bean.getEnableTime());
+		assertNotNull(bean.getEnableTime());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI8PC9FTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI8PC9FTest.java
index 393fe3371..e7187c869 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI8PC9FTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI8PC9FTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -13,8 +13,8 @@ public class IssueI8PC9FTest {
 		final String testJson = "{\"testMap\":\"\"}";
 		final TestBean test = JSONUtil.parseObj(testJson, JSONConfig.create().setIgnoreError(true))
 			.toBean(TestBean.class);
-		Assert.assertNotNull(test);
-		Assert.assertNull(test.getTestMap());
+		assertNotNull(test);
+		assertNull(test.getTestMap());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueI90ADXTest.java b/hutool-json/src/test/java/cn/hutool/json/IssueI90ADXTest.java
index cdea731b3..344878058 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueI90ADXTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueI90ADXTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Getter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI90ADXTest {
 
@@ -15,7 +15,7 @@ public class IssueI90ADXTest {
 		testBean.name = "aaaa";
 
 		final JSONObject json = JSONUtil.parseObj(testBean);
-		Assert.assertEquals("{\"name\":\"aaaa\"}", json.toString());
+		assertEquals("{\"name\":\"aaaa\"}", json.toString());
 	}
 
 	@Getter
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssueIA5YOETest.java b/hutool-json/src/test/java/cn/hutool/json/IssueIA5YOETest.java
index dbd2ca297..473ed67eb 100644
--- a/hutool-json/src/test/java/cn/hutool/json/IssueIA5YOETest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssueIA5YOETest.java
@@ -1,12 +1,12 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueIA5YOETest {
 	@Test
 	public void parseObjTest() {
 		String res ="{\"id\":\"chatcmpl-9azySxFBm5hjtaMCccREpCHF3gbQ3\",\"object\":\"chat.completion.chunk\",\"created\":1718605064,\"model\":\"gpt-4o-2024-05-13\",\"system_fingerprint\":\"fp_319be4768e\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"\\\"\"},\"logprobs\":null,\"finish_reason\":null}]}";
-		Assert.assertNotNull(JSONUtil.parseObj(res));
+		assertNotNull(JSONUtil.parseObj(res));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java b/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java
index 220d3b608..403ff819d 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Issues1881Test.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -31,6 +31,6 @@ public class Issues1881Test {
 		holderContactVOList.add(new ThingsHolderContactVO().setId(1L).setName("1"));
 		holderContactVOList.add(new ThingsHolderContactVO().setId(2L).setName("2"));
 
-		Assert.assertEquals("[{\"id\":1,\"name\":\"1\"},{\"id\":2,\"name\":\"2\"}]", JSONUtil.parseArray(holderContactVOList).toString());
+		assertEquals("[{\"id\":1,\"name\":\"1\"},{\"id\":2,\"name\":\"2\"}]", JSONUtil.parseArray(holderContactVOList).toString());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java b/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java
index 486b270d2..5d51e968e 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssuesI44E4HTest.java
@@ -5,8 +5,8 @@ import cn.hutool.json.serialize.JSONDeserializer;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * 测试自定义反序列化
@@ -23,7 +23,7 @@ public class IssuesI44E4HTest {
 
 		String jsonStr = "{\"md\":\"value1\"}";
 		final TestDto testDto = JSONUtil.toBean(jsonStr, TestDto.class);
-		Assert.assertEquals("value1", testDto.getMd().getValue());
+		assertEquals("value1", testDto.getMd().getValue());
 	}
 
 	@Getter
diff --git a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
index 6eb7ee7d3..bfeeb559f 100755
--- a/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/IssuesI4V14NTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.TypeReference;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Map;
 
@@ -12,9 +12,9 @@ public class IssuesI4V14NTest {
 	public void parseTest(){
 		String str = "{\"A\" : \"A\\nb\"}";
 		final JSONObject jsonObject = JSONUtil.parseObj(str);
-		Assert.assertEquals("A\nb", jsonObject.getStr("A"));
+		assertEquals("A\nb", jsonObject.getStr("A"));
 
 		final Map<String, String> map = jsonObject.toBean(new TypeReference<Map<String, String>>() {});
-		Assert.assertEquals("A\nb", map.get("A"));
+		assertEquals("A\nb", map.get("A"));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
index 433755265..aa3fa67ac 100755
--- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java
@@ -11,42 +11,42 @@ import cn.hutool.json.test.bean.Exam;
 import cn.hutool.json.test.bean.JsonNode;
 import cn.hutool.json.test.bean.KeyBean;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * JSONArray单元测试
  *
  * @author Looly
- *
  */
 public class JSONArrayTest {
 
 	@Test()
-	public void createJSONArrayFromJSONObjectTest(){
+	public void createJSONArrayFromJSONObjectTest() {
 		// JSONObject实现了Iterable接口，可以转换为JSONArray
 		final JSONObject jsonObject = new JSONObject();
 
 		JSONArray jsonArray = new JSONArray(jsonObject, JSONConfig.create());
-		Assert.assertEquals(new JSONArray(), jsonArray);
+		assertEquals(new JSONArray(), jsonArray);
 
 		jsonObject.set("key1", "value1");
 		jsonArray = new JSONArray(jsonObject, JSONConfig.create());
-		Assert.assertEquals(1, jsonArray.size());
-		Assert.assertEquals("[{\"key1\":\"value1\"}]", jsonArray.toString());
+		assertEquals(1, jsonArray.size());
+		assertEquals("[{\"key1\":\"value1\"}]", jsonArray.toString());
 	}
 
 	@Test
-	public void addNullTest(){
+	public void addNullTest() {
 		final List<String> aaa = ListUtil.of("aaa", null);
 		String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa,
-				JSONConfig.create().setIgnoreNullValue(false)));
-		Assert.assertEquals("[\"aaa\",null]", jsonStr);
+			JSONConfig.create().setIgnoreNullValue(false)));
+		assertEquals("[\"aaa\",null]", jsonStr);
 	}
 
 	@Test
@@ -59,25 +59,25 @@ public class JSONArrayTest {
 		array.add("value2");
 		array.add("value3");
 
-		Assert.assertEquals(array.get(0), "value1");
+		assertEquals(array.get(0), "value1");
 	}
 
 	@Test
 	public void parseTest() {
 		String jsonStr = "[\"value1\", \"value2\", \"value3\"]";
 		JSONArray array = JSONUtil.parseArray(jsonStr);
-		Assert.assertEquals(array.get(0), "value1");
+		assertEquals(array.get(0), "value1");
 	}
 
 	@Test
 	public void parseWithNullTest() {
 		String jsonStr = "[{\"grep\":\"4.8\",\"result\":\"右\"},{\"grep\":\"4.8\",\"result\":null}]";
 		JSONArray jsonArray = JSONUtil.parseArray(jsonStr);
-		Assert.assertFalse(jsonArray.getJSONObject(1).containsKey("result"));
+		assertFalse(jsonArray.getJSONObject(1).containsKey("result"));
 
 		// 不忽略null，则null的键值对被保留
 		jsonArray = new JSONArray(jsonStr, false);
-		Assert.assertTrue(jsonArray.getJSONObject(1).containsKey("result"));
+		assertTrue(jsonArray.getJSONObject(1).containsKey("result"));
 	}
 
 	@Test
@@ -86,7 +86,7 @@ public class JSONArrayTest {
 
 		JSONObject obj0 = array.getJSONObject(0);
 		Exam exam = JSONUtil.toBean(obj0, Exam.class);
-		Assert.assertEquals("0", exam.getAnswerArray()[0].getSeq());
+		assertEquals("0", exam.getAnswerArray()[0].getSeq());
 	}
 
 	@Test
@@ -101,8 +101,8 @@ public class JSONArrayTest {
 		ArrayList<KeyBean> list = CollUtil.newArrayList(b1, b2);
 
 		JSONArray jsonArray = JSONUtil.parseArray(list);
-		Assert.assertEquals("aValue1", jsonArray.getJSONObject(0).getStr("akey"));
-		Assert.assertEquals("bValue2", jsonArray.getJSONObject(1).getStr("bkey"));
+		assertEquals("aValue1", jsonArray.getJSONObject(0).getStr("akey"));
+		assertEquals("bValue2", jsonArray.getJSONObject(1).getStr("bkey"));
 	}
 
 	@Test
@@ -111,8 +111,8 @@ public class JSONArrayTest {
 		JSONArray array = JSONUtil.parseArray(jsonStr);
 
 		List<Exam> list = array.toList(Exam.class);
-		Assert.assertFalse(list.isEmpty());
-		Assert.assertSame(Exam.class, list.get(0).getClass());
+		assertFalse(list.isEmpty());
+		assertSame(Exam.class, list.get(0).getClass());
 	}
 
 	@Test
@@ -122,14 +122,14 @@ public class JSONArrayTest {
 		JSONArray array = JSONUtil.parseArray(jsonArr);
 		List<User> userList = JSONUtil.toList(array, User.class);
 
-		Assert.assertFalse(userList.isEmpty());
-		Assert.assertSame(User.class, userList.get(0).getClass());
+		assertFalse(userList.isEmpty());
+		assertSame(User.class, userList.get(0).getClass());
 
-		Assert.assertEquals(Integer.valueOf(111), userList.get(0).getId());
-		Assert.assertEquals(Integer.valueOf(112), userList.get(1).getId());
+		assertEquals(Integer.valueOf(111), userList.get(0).getId());
+		assertEquals(Integer.valueOf(112), userList.get(1).getId());
 
-		Assert.assertEquals("test1", userList.get(0).getName());
-		Assert.assertEquals("test2", userList.get(1).getName());
+		assertEquals("test1", userList.get(0).getName());
+		assertEquals("test2", userList.get(1).getName());
 	}
 
 	@Test
@@ -140,14 +140,14 @@ public class JSONArrayTest {
 
 		List<Dict> list = JSONUtil.toList(array, Dict.class);
 
-		Assert.assertFalse(list.isEmpty());
-		Assert.assertSame(Dict.class, list.get(0).getClass());
+		assertFalse(list.isEmpty());
+		assertSame(Dict.class, list.get(0).getClass());
 
-		Assert.assertEquals(Integer.valueOf(111), list.get(0).getInt("id"));
-		Assert.assertEquals(Integer.valueOf(112), list.get(1).getInt("id"));
+		assertEquals(Integer.valueOf(111), list.get(0).getInt("id"));
+		assertEquals(Integer.valueOf(112), list.get(1).getInt("id"));
 
-		Assert.assertEquals("test1", list.get(0).getStr("name"));
-		Assert.assertEquals("test2", list.get(1).getStr("name"));
+		assertEquals("test1", list.get(0).getStr("name"));
+		assertEquals("test2", list.get(1).getStr("name"));
 	}
 
 	@Test
@@ -157,8 +157,8 @@ public class JSONArrayTest {
 
 		//noinspection SuspiciousToArrayCall
 		Exam[] list = array.toArray(new Exam[0]);
-		Assert.assertNotEquals(0, list.length);
-		Assert.assertSame(Exam.class, list[0].getClass());
+		assertNotEquals(0, list.length);
+		assertSame(Exam.class, list[0].getClass());
 	}
 
 	/**
@@ -170,17 +170,19 @@ public class JSONArrayTest {
 		JSONArray ja = JSONUtil.parseArray(json);
 
 		List<KeyBean> list = ja.toList(KeyBean.class);
-		Assert.assertNull(list.get(0));
-		Assert.assertEquals("avalue", list.get(1).getAkey());
-		Assert.assertEquals("bvalue", list.get(1).getBkey());
+		assertNull(list.get(0));
+		assertEquals("avalue", list.get(1).getAkey());
+		assertEquals("bvalue", list.get(1).getBkey());
 	}
 
-	@Test(expected = ConvertException.class)
-	public void toListWithErrorTest(){
-		String json = "[['aaa',{'akey':'avalue','bkey':'bvalue'}]]";
-		JSONArray ja = JSONUtil.parseArray(json);
-
-		ja.toBean(new TypeReference<List<List<KeyBean>>>() {});
+	@Test
+	public void toListWithErrorTest() {
+		assertThrows(ConvertException.class, () -> {
+			String json = "[['aaa',{'akey':'avalue','bkey':'bvalue'}]]";
+			JSONArray ja = JSONUtil.parseArray(json);
+			ja.toBean(new TypeReference<List<List<KeyBean>>>() {
+			});
+		});
 	}
 
 	@Test
@@ -193,45 +195,45 @@ public class JSONArrayTest {
 		JSONArray jsonArray = JSONUtil.parseArray(mapList);
 		List<JsonNode> nodeList = jsonArray.toList(JsonNode.class);
 
-		Assert.assertEquals(Long.valueOf(0L), nodeList.get(0).getId());
-		Assert.assertEquals(Long.valueOf(1L), nodeList.get(1).getId());
-		Assert.assertEquals(Long.valueOf(0L), nodeList.get(2).getId());
-		Assert.assertEquals(Long.valueOf(0L), nodeList.get(3).getId());
+		assertEquals(Long.valueOf(0L), nodeList.get(0).getId());
+		assertEquals(Long.valueOf(1L), nodeList.get(1).getId());
+		assertEquals(Long.valueOf(0L), nodeList.get(2).getId());
+		assertEquals(Long.valueOf(0L), nodeList.get(3).getId());
 
-		Assert.assertEquals(Integer.valueOf(0), nodeList.get(0).getParentId());
-		Assert.assertEquals(Integer.valueOf(1), nodeList.get(1).getParentId());
-		Assert.assertEquals(Integer.valueOf(0), nodeList.get(2).getParentId());
-		Assert.assertEquals(Integer.valueOf(0), nodeList.get(3).getParentId());
+		assertEquals(Integer.valueOf(0), nodeList.get(0).getParentId());
+		assertEquals(Integer.valueOf(1), nodeList.get(1).getParentId());
+		assertEquals(Integer.valueOf(0), nodeList.get(2).getParentId());
+		assertEquals(Integer.valueOf(0), nodeList.get(3).getParentId());
 
-		Assert.assertEquals("0", nodeList.get(0).getName());
-		Assert.assertEquals("1", nodeList.get(1).getName());
-		Assert.assertEquals("+0", nodeList.get(2).getName());
-		Assert.assertEquals("-0", nodeList.get(3).getName());
+		assertEquals("0", nodeList.get(0).getName());
+		assertEquals("1", nodeList.get(1).getName());
+		assertEquals("+0", nodeList.get(2).getName());
+		assertEquals("-0", nodeList.get(3).getName());
 	}
 
 	@Test
-	public void getByPathTest(){
+	public void getByPathTest() {
 		String jsonStr = "[{\"id\": \"1\",\"name\": \"a\"},{\"id\": \"2\",\"name\": \"b\"}]";
 		final JSONArray jsonArray = JSONUtil.parseArray(jsonStr);
-		Assert.assertEquals("b", jsonArray.getByPath("[1].name"));
-		Assert.assertEquals("b", JSONUtil.getByPath(jsonArray, "[1].name"));
+		assertEquals("b", jsonArray.getByPath("[1].name"));
+		assertEquals("b", JSONUtil.getByPath(jsonArray, "[1].name"));
 	}
 
 	@Test
-	public void putToIndexTest(){
+	public void putToIndexTest() {
 		final JSONArray jsonArray = new JSONArray();
 		jsonArray.put(3, "test");
 		// 第三个位置插入值，0~2都是null
-		Assert.assertEquals(4, jsonArray.size());
+		assertEquals(4, jsonArray.size());
 	}
 
 	// https://github.com/dromara/hutool/issues/1858
 	@Test
-	public void putTest2(){
+	public void putTest2() {
 		final JSONArray jsonArray = new JSONArray();
 		jsonArray.put(0, 1);
-		Assert.assertEquals(1, jsonArray.size());
-		Assert.assertEquals(1, jsonArray.get(0));
+		assertEquals(1, jsonArray.size());
+		assertEquals(1, jsonArray.get(0));
 	}
 
 	private static Map<String, String> buildMap(String id, String parentId, String name) {
@@ -249,35 +251,35 @@ public class JSONArrayTest {
 	}
 
 	@Test
-	public void filterIncludeTest(){
+	public void filterIncludeTest() {
 		JSONArray json1 = JSONUtil.createArray()
-				.set("value1")
-				.set("value2")
-				.set("value3")
-				.set(true);
+			.set("value1")
+			.set("value2")
+			.set("value3")
+			.set(true);
 
 		final String s = json1.toJSONString(0, (pair) -> pair.getValue().equals("value2"));
-		Assert.assertEquals("[\"value2\"]", s);
+		assertEquals("[\"value2\"]", s);
 	}
 
 	@Test
-	public void filterExcludeTest(){
+	public void filterExcludeTest() {
 		JSONArray json1 = JSONUtil.createArray()
-				.set("value1")
-				.set("value2")
-				.set("value3")
-				.set(true);
+			.set("value1")
+			.set("value2")
+			.set("value3")
+			.set(true);
 
 		final String s = json1.toJSONString(0, (pair) -> false == pair.getValue().equals("value2"));
-		Assert.assertEquals("[\"value1\",\"value3\",true]", s);
+		assertEquals("[\"value1\",\"value3\",true]", s);
 	}
 
 	@Test
-	public void putNullTest(){
+	public void putNullTest() {
 		final JSONArray array = JSONUtil.createArray(JSONConfig.create().setIgnoreNullValue(false));
 		array.set(null);
 
-		Assert.assertEquals("[null]", array.toString());
+		assertEquals("[null]", array.toString());
 	}
 
 	@Test
@@ -285,8 +287,8 @@ public class JSONArrayTest {
 		String jsonArr = "[{\"id\":111,\"name\":\"test1\"},{\"id\":112,\"name\":\"test2\"}]";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONArray array = new JSONArray(jsonArr, null, (mutable) -> mutable.get().toString().contains("111"));
-		Assert.assertEquals(1, array.size());
-		Assert.assertTrue(array.getJSONObject(0).containsKey("id"));
+		assertEquals(1, array.size());
+		assertTrue(array.getJSONObject(0).containsKey("id"));
 	}
 
 	@Test
@@ -295,14 +297,14 @@ public class JSONArrayTest {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONArray array = new JSONArray(jsonArr, null, (mutable) -> {
 			final JSONObject o = new JSONObject(mutable.get());
-			if("111".equals(o.getStr("id"))){
+			if ("111".equals(o.getStr("id"))) {
 				o.set("name", "test1_edit");
 			}
 			mutable.set(o);
 			return true;
 		});
-		Assert.assertEquals(2, array.size());
-		Assert.assertTrue(array.getJSONObject(0).containsKey("id"));
-		Assert.assertEquals("test1_edit", array.getJSONObject(0).get("name"));
+		assertEquals(2, array.size());
+		assertTrue(array.getJSONObject(0).containsKey("id"));
+		assertEquals("test1_edit", array.getJSONObject(0).get("name"));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONBeanParserTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONBeanParserTest.java
index 0fdce9bb4..b81a6976a 100755
--- a/hutool-json/src/test/java/cn/hutool/json/JSONBeanParserTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONBeanParserTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JSONBeanParserTest {
 
@@ -10,9 +10,9 @@ public class JSONBeanParserTest {
 	public void parseTest(){
 		String jsonStr = "{\"customName\": \"customValue\", \"customAddress\": \"customAddressValue\"}";
 		final TestBean testBean = JSONUtil.toBean(jsonStr, TestBean.class);
-		Assert.assertNotNull(testBean);
-		Assert.assertEquals("customValue", testBean.getName());
-		Assert.assertEquals("customAddressValue", testBean.getAddress());
+		assertNotNull(testBean);
+		assertEquals("customValue", testBean.getName());
+		assertEquals("customAddressValue", testBean.getAddress());
 	}
 
 	@Data
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java
index de6146a23..1b62cf0dd 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONConvertTest.java
@@ -4,8 +4,8 @@ import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.json.test.bean.ExamInfoDict;
 import cn.hutool.json.test.bean.PerfectEvaluationProductResVo;
 import cn.hutool.json.test.bean.UserInfoDict;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,7 +14,7 @@ import java.util.Map;
 
 /**
  * JSON转换单元测试
- * 
+ *
  * @author Looly，质量过关
  *
  */
@@ -55,14 +55,14 @@ public class JSONConvertTest {
 		tempMap.put("toSendManIdCard", 1);
 
 		JSONObject obj = JSONUtil.parseObj(tempMap);
-		Assert.assertEquals(new Integer(1), obj.getInt("toSendManIdCard"));
+		assertEquals(new Integer(1), obj.getInt("toSendManIdCard"));
 
 		JSONObject examInfoDictsJson = obj.getJSONObject("userInfoDict");
-		Assert.assertEquals(new Integer(1), examInfoDictsJson.getInt("id"));
-		Assert.assertEquals("质量过关", examInfoDictsJson.getStr("realName"));
-		
+		assertEquals(new Integer(1), examInfoDictsJson.getInt("id"));
+		assertEquals("质量过关", examInfoDictsJson.getStr("realName"));
+
 		Object id = JSONUtil.getByPath(obj, "userInfoDict.examInfoDict[0].id");
-		Assert.assertEquals(1, id);
+		assertEquals(1, id);
 	}
 
 	@Test
@@ -76,18 +76,18 @@ public class JSONConvertTest {
 
 		JSONObject jsonObject = JSONUtil.parseObj(examJson).getJSONObject("examInfoDicts");
 		UserInfoDict userInfoDict = jsonObject.toBean(UserInfoDict.class);
-		
-		Assert.assertEquals(userInfoDict.getId(), new Integer(1));
-		Assert.assertEquals(userInfoDict.getRealName(), "质量过关");
+
+		assertEquals(userInfoDict.getId(), new Integer(1));
+		assertEquals(userInfoDict.getRealName(), "质量过关");
 
 		//============
 
 		String jsonStr = "{\"id\":null,\"examInfoDict\":[{\"answerIs\":1, \"id\":null}]}";//JSONUtil.toJsonStr(userInfoDict1);
 		JSONObject jsonObject2 = JSONUtil.parseObj(jsonStr);//.getJSONObject("examInfoDicts");
 		UserInfoDict userInfoDict2 = jsonObject2.toBean(UserInfoDict.class);
-		Assert.assertNull(userInfoDict2.getId());
+		assertNull(userInfoDict2.getId());
 	}
-	
+
 	/**
 	 * 针对Bean中Setter返回this测试是否可以成功调用Setter方法并注入
 	 */
@@ -96,8 +96,8 @@ public class JSONConvertTest {
 		String jsonStr = ResourceUtil.readUtf8Str("evaluation.json");
 		JSONObject obj = JSONUtil.parseObj(jsonStr);
 		PerfectEvaluationProductResVo vo = obj.toBean(PerfectEvaluationProductResVo.class);
-		
-		Assert.assertEquals(obj.getStr("HA001"), vo.getHA001());
-		Assert.assertEquals(obj.getInt("costTotal"), vo.getCostTotal());
+
+		assertEquals(obj.getStr("HA001"), vo.getHA001());
+		assertEquals(obj.getInt("costTotal"), vo.getCostTotal());
 	}
-}
\ No newline at end of file
+}
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java
index b4a718536..ac363361b 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONNullTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JSONNullTest {
 
@@ -12,12 +12,12 @@ public class JSONNullTest {
 				"            \"device_status_date\": null,\n" +
 				"            \"imsi\": null,\n" +
 				"            \"act_date\": \"2021-07-23T06:23:26.000+00:00\"}");
-		Assert.assertEquals(JSONNull.class, bodyjson.get("device_model").getClass());
-		Assert.assertEquals(JSONNull.class, bodyjson.get("device_status_date").getClass());
-		Assert.assertEquals(JSONNull.class, bodyjson.get("imsi").getClass());
+		assertEquals(JSONNull.class, bodyjson.get("device_model").getClass());
+		assertEquals(JSONNull.class, bodyjson.get("device_status_date").getClass());
+		assertEquals(JSONNull.class, bodyjson.get("imsi").getClass());
 
 		bodyjson.getConfig().setIgnoreNullValue(true);
-		Assert.assertEquals("{\"act_date\":\"2021-07-23T06:23:26.000+00:00\"}", bodyjson.toString());
+		assertEquals("{\"act_date\":\"2021-07-23T06:23:26.000+00:00\"}", bodyjson.toString());
 	}
 
 	@Test
@@ -27,8 +27,8 @@ public class JSONNullTest {
 				"            \"device_status_date\": null,\n" +
 				"            \"imsi\": null,\n" +
 				"            \"act_date\": \"2021-07-23T06:23:26.000+00:00\"}", true);
-		Assert.assertFalse(bodyjson.containsKey("device_model"));
-		Assert.assertFalse(bodyjson.containsKey("device_status_date"));
-		Assert.assertFalse(bodyjson.containsKey("imsi"));
+		assertFalse(bodyjson.containsKey("device_model"));
+		assertFalse(bodyjson.containsKey("device_status_date"));
+		assertFalse(bodyjson.containsKey("imsi"));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
index 0a97c2d3d..1d5e0d557 100755
--- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java
@@ -12,33 +12,22 @@ import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.test.bean.JSONBean;
-import cn.hutool.json.test.bean.ResultDto;
-import cn.hutool.json.test.bean.Seq;
-import cn.hutool.json.test.bean.TokenAuthResponse;
-import cn.hutool.json.test.bean.TokenAuthWarp2;
-import cn.hutool.json.test.bean.UserA;
-import cn.hutool.json.test.bean.UserB;
-import cn.hutool.json.test.bean.UserWithMap;
+import cn.hutool.json.test.bean.*;
 import cn.hutool.json.test.bean.report.CaseReport;
 import cn.hutool.json.test.bean.report.StepReport;
 import cn.hutool.json.test.bean.report.SuiteReport;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * JSONObject单元测试
@@ -48,7 +37,7 @@ import java.util.Set;
 public class JSONObjectTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void toStringTest() {
 		final String str = "{\"code\": 500, \"data\":null}";
 		final JSONObject jsonObject = new JSONObject(str);
@@ -62,7 +51,7 @@ public class JSONObjectTest {
 		final String str = "{\"test\":\"关于开展2018年度“文明集体”、“文明职工”评选表彰活动的通知\"}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(str);
-		Assert.assertEquals(str, json.toString());
+		assertEquals(str, json.toString());
 	}
 
 	/**
@@ -71,53 +60,53 @@ public class JSONObjectTest {
 	@Test
 	public void toStringTest3() {
 		final JSONObject json = Objects.requireNonNull(JSONUtil.createObj()//
-						.set("dateTime", DateUtil.parse("2019-05-02 22:12:01")))//
-				.setDateFormat(DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("{\"dateTime\":\"2019-05-02\"}", json.toString());
+				.set("dateTime", DateUtil.parse("2019-05-02 22:12:01")))//
+			.setDateFormat(DatePattern.NORM_DATE_PATTERN);
+		assertEquals("{\"dateTime\":\"2019-05-02\"}", json.toString());
 	}
 
 	@Test
 	public void toStringWithDateTest() {
 		JSONObject json = JSONUtil.createObj().set("date", DateUtil.parse("2019-05-08 19:18:21"));
 		assert json != null;
-		Assert.assertEquals("{\"date\":1557314301000}", json.toString());
+		assertEquals("{\"date\":1557314301000}", json.toString());
 
 		json = Objects.requireNonNull(JSONUtil.createObj().set("date", DateUtil.parse("2019-05-08 19:18:21"))).setDateFormat(DatePattern.NORM_DATE_PATTERN);
-		Assert.assertEquals("{\"date\":\"2019-05-08\"}", json.toString());
+		assertEquals("{\"date\":\"2019-05-08\"}", json.toString());
 	}
 
 
 	@Test
 	public void putAllTest() {
 		final JSONObject json1 = JSONUtil.createObj()
-				.set("a", "value1")
-				.set("b", "value2")
-				.set("c", "value3")
-				.set("d", true);
+			.set("a", "value1")
+			.set("b", "value2")
+			.set("c", "value3")
+			.set("d", true);
 
 		final JSONObject json2 = JSONUtil.createObj()
-				.set("a", "value21")
-				.set("b", "value22");
+			.set("a", "value21")
+			.set("b", "value22");
 
 		// putAll操作会覆盖相同key的值，因此a,b两个key的值改变，c的值不变
 		json1.putAll(json2);
 
-		Assert.assertEquals(json1.get("a"), "value21");
-		Assert.assertEquals(json1.get("b"), "value22");
-		Assert.assertEquals(json1.get("c"), "value3");
+		assertEquals(json1.get("a"), "value21");
+		assertEquals(json1.get("b"), "value22");
+		assertEquals(json1.get("c"), "value3");
 	}
 
 	@Test
 	public void parseStringTest() {
 		final String jsonStr = "{\"b\":\"value2\",\"c\":\"value3\",\"a\":\"value1\", \"d\": true, \"e\": null}";
 		final JSONObject jsonObject = JSONUtil.parseObj(jsonStr);
-		Assert.assertEquals(jsonObject.get("a"), "value1");
-		Assert.assertEquals(jsonObject.get("b"), "value2");
-		Assert.assertEquals(jsonObject.get("c"), "value3");
-		Assert.assertEquals(jsonObject.get("d"), true);
+		assertEquals(jsonObject.get("a"), "value1");
+		assertEquals(jsonObject.get("b"), "value2");
+		assertEquals(jsonObject.get("c"), "value3");
+		assertEquals(jsonObject.get("d"), true);
 
-		Assert.assertTrue(jsonObject.containsKey("e"));
-		Assert.assertEquals(jsonObject.get("e"), JSONNull.NULL);
+		assertTrue(jsonObject.containsKey("e"));
+		assertEquals(jsonObject.get("e"), JSONNull.NULL);
 	}
 
 	@Test
@@ -125,8 +114,8 @@ public class JSONObjectTest {
 		final String jsonStr = "{\"file_name\":\"RMM20180127009_731.000\",\"error_data\":\"201121151350701001252500000032 18973908335 18973908335 13601893517 201711211700152017112115135420171121 6594000000010100000000000000000000000043190101701001910072 100001100 \",\"error_code\":\"F140\",\"error_info\":\"最早发送时间格式错误，该字段可以为空，当不为空时正确填写格式为“YYYYMMDDHHMISS”\",\"app_name\":\"inter-pre-check\"}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(jsonStr);
-		Assert.assertEquals("F140", json.getStr("error_code"));
-		Assert.assertEquals("最早发送时间格式错误，该字段可以为空，当不为空时正确填写格式为“YYYYMMDDHHMISS”", json.getStr("error_info"));
+		assertEquals("F140", json.getStr("error_code"));
+		assertEquals("最早发送时间格式错误，该字段可以为空，当不为空时正确填写格式为“YYYYMMDDHHMISS”", json.getStr("error_info"));
 	}
 
 	@Test
@@ -134,7 +123,7 @@ public class JSONObjectTest {
 		final String jsonStr = "{\"test\":\"体”、“文\"}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(jsonStr);
-		Assert.assertEquals("体”、“文", json.getStr("test"));
+		assertEquals("体”、“文", json.getStr("test"));
 	}
 
 	@Test
@@ -142,8 +131,8 @@ public class JSONObjectTest {
 		final String jsonStr = "{'msg':'这里还没有内容','data':{'cards':[]},'ok':0}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(jsonStr);
-		Assert.assertEquals(new Integer(0), json.getInt("ok"));
-		Assert.assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
+		assertEquals(new Integer(0), json.getInt("ok"));
+		assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
 	}
 
 	@Test
@@ -151,8 +140,8 @@ public class JSONObjectTest {
 		final String jsonStr = "{'msg':'这里还没有内容','data':{'cards':[]},'ok':0}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(jsonStr.getBytes(StandardCharsets.UTF_8));
-		Assert.assertEquals(new Integer(0), json.getInt("ok"));
-		Assert.assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
+		assertEquals(new Integer(0), json.getInt("ok"));
+		assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
 	}
 
 	@Test
@@ -162,8 +151,8 @@ public class JSONObjectTest {
 
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(stringReader);
-		Assert.assertEquals(new Integer(0), json.getInt("ok"));
-		Assert.assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
+		assertEquals(new Integer(0), json.getInt("ok"));
+		assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
 	}
 
 	@Test
@@ -173,12 +162,12 @@ public class JSONObjectTest {
 
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(in);
-		Assert.assertEquals(new Integer(0), json.getInt("ok"));
-		Assert.assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
+		assertEquals(new Integer(0), json.getInt("ok"));
+		assertEquals(new JSONArray(), json.getJSONObject("data").getJSONArray("cards"));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void parseStringWithBomTest() {
 		final String jsonStr = FileUtil.readUtf8String("f:/test/jsontest.txt");
 		final JSONObject json = new JSONObject(jsonStr);
@@ -193,44 +182,44 @@ public class JSONObjectTest {
 		final String jsonStr = "{\"a\":\"<div>aaa</div>\"}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject json = new JSONObject(jsonStr);
-		Assert.assertEquals("<div>aaa</div>", json.get("a"));
-		Assert.assertEquals(jsonStr, json.toString());
+		assertEquals("<div>aaa</div>", json.get("a"));
+		assertEquals(jsonStr, json.toString());
 	}
 
 	@Test
 	public void toBeanTest() {
 		final JSONObject subJson = JSONUtil.createObj().set("value1", "strValue1").set("value2", "234");
 		final JSONObject json = JSONUtil.createObj().set("strValue", "strTest").set("intValue", 123)
-				// 测试空字符串转对象
-				.set("doubleValue", "")
-				.set("beanValue", subJson)
-				.set("list", JSONUtil.createArray().set("a").set("b")).set("testEnum", "TYPE_A");
+			// 测试空字符串转对象
+			.set("doubleValue", "")
+			.set("beanValue", subJson)
+			.set("list", JSONUtil.createArray().set("a").set("b")).set("testEnum", "TYPE_A");
 
 		final TestBean bean = json.toBean(TestBean.class);
-		Assert.assertEquals("a", bean.getList().get(0));
-		Assert.assertEquals("b", bean.getList().get(1));
+		assertEquals("a", bean.getList().get(0));
+		assertEquals("b", bean.getList().get(1));
 
-		Assert.assertEquals("strValue1", bean.getBeanValue().getValue1());
+		assertEquals("strValue1", bean.getBeanValue().getValue1());
 		// BigDecimal转换检查
-		Assert.assertEquals(new BigDecimal("234"), bean.getBeanValue().getValue2());
+		assertEquals(new BigDecimal("234"), bean.getBeanValue().getValue2());
 		// 枚举转换检查
-		Assert.assertEquals(TestEnum.TYPE_A, bean.getTestEnum());
+		assertEquals(TestEnum.TYPE_A, bean.getTestEnum());
 	}
 
 	@Test
 	public void toBeanNullStrTest() {
 		final JSONObject json = JSONUtil.createObj(JSONConfig.create().setIgnoreError(true))//
-				.set("strValue", "null")//
-				.set("intValue", 123)//
-				// 子对象对应"null"字符串，如果忽略错误，跳过，否则抛出转换异常
-				.set("beanValue", "null")//
-				.set("list", JSONUtil.createArray().set("a").set("b"));
+			.set("strValue", "null")//
+			.set("intValue", 123)//
+			// 子对象对应"null"字符串，如果忽略错误，跳过，否则抛出转换异常
+			.set("beanValue", "null")//
+			.set("list", JSONUtil.createArray().set("a").set("b"));
 
 		final TestBean bean = json.toBean(TestBean.class);
 		// 当JSON中为字符串"null"时应被当作字符串处理
-		Assert.assertEquals("null", bean.getStrValue());
+		assertEquals("null", bean.getStrValue());
 		// 当JSON中为字符串"null"时Bean中的字段类型不匹配应在ignoreError模式下忽略注入
-		Assert.assertNull(bean.getBeanValue());
+		assertNull(bean.getBeanValue());
 	}
 
 	@Test
@@ -244,16 +233,16 @@ public class JSONObjectTest {
 		final JSONObject json = JSONUtil.parseObj(userA);
 		final UserA userA2 = json.toBean(UserA.class);
 		// 测试数组
-		Assert.assertEquals("seq1", userA2.getSqs().get(0).getSeq());
+		assertEquals("seq1", userA2.getSqs().get(0).getSeq());
 		// 测试带换行符等特殊字符转换是否成功
-		Assert.assertTrue(StrUtil.isNotBlank(userA2.getName()));
+		assertTrue(StrUtil.isNotBlank(userA2.getName()));
 	}
 
 	@Test
 	public void toBeanWithNullTest() {
 		final String jsonStr = "{'data':{'userName':'ak','password': null}}";
 		final UserWithMap user = JSONUtil.toBean(JSONUtil.parseObj(jsonStr), UserWithMap.class);
-		Assert.assertTrue(user.getData().containsKey("password"));
+		assertTrue(user.getData().containsKey("password"));
 	}
 
 	@Test
@@ -261,7 +250,7 @@ public class JSONObjectTest {
 		final String json = "{\"data\":{\"b\": \"c\"}}";
 
 		final UserWithMap map = JSONUtil.toBean(json, UserWithMap.class);
-		Assert.assertEquals("c", map.getData().get("b"));
+		assertEquals("c", map.getData().get("b"));
 	}
 
 	@Test
@@ -273,12 +262,12 @@ public class JSONObjectTest {
 		// 第一层
 		final List<CaseReport> caseReports = bean.getCaseReports();
 		final CaseReport caseReport = caseReports.get(0);
-		Assert.assertNotNull(caseReport);
+		assertNotNull(caseReport);
 
 		// 第二层
 		final List<StepReport> stepReports = caseReports.get(0).getStepReports();
 		final StepReport stepReport = stepReports.get(0);
-		Assert.assertNotNull(stepReport);
+		assertNotNull(stepReport);
 	}
 
 	/**
@@ -287,20 +276,20 @@ public class JSONObjectTest {
 	@Test
 	public void toBeanTest6() {
 		final JSONObject json = JSONUtil.createObj()
-				.set("targetUrl", "http://test.com")
-				.set("success", "true")
-				.set("result", JSONUtil.createObj()
-						.set("token", "tokenTest")
-						.set("userId", "测试用户1"));
+			.set("targetUrl", "http://test.com")
+			.set("success", "true")
+			.set("result", JSONUtil.createObj()
+				.set("token", "tokenTest")
+				.set("userId", "测试用户1"));
 
 		final TokenAuthWarp2 bean = json.toBean(TokenAuthWarp2.class);
-		Assert.assertEquals("http://test.com", bean.getTargetUrl());
-		Assert.assertEquals("true", bean.getSuccess());
+		assertEquals("http://test.com", bean.getTargetUrl());
+		assertEquals("true", bean.getSuccess());
 
 		final TokenAuthResponse result = bean.getResult();
-		Assert.assertNotNull(result);
-		Assert.assertEquals("tokenTest", result.getToken());
-		Assert.assertEquals("测试用户1", result.getUserId());
+		assertNotNull(result);
+		assertEquals("tokenTest", result.getToken());
+		assertEquals("测试用户1", result.getUserId());
 	}
 
 	/**
@@ -310,10 +299,10 @@ public class JSONObjectTest {
 	@Test
 	public void toBeanTest7() {
 		final String jsonStr = " {\"result\":{\"phone\":\"15926297342\",\"appKey\":\"e1ie12e1ewsdqw1\"," +
-				"\"secret\":\"dsadadqwdqs121d1e2\",\"message\":\"hello world\"},\"code\":100,\"" +
-				"message\":\"validate message\"}";
+			"\"secret\":\"dsadadqwdqs121d1e2\",\"message\":\"hello world\"},\"code\":100,\"" +
+			"message\":\"validate message\"}";
 		final ResultDto<?> dto = JSONUtil.toBean(jsonStr, ResultDto.class);
-		Assert.assertEquals("validate message", dto.getMessage());
+		assertEquals("validate message", dto.getMessage());
 	}
 
 	@Test
@@ -325,8 +314,8 @@ public class JSONObjectTest {
 
 		final JSONObject json = JSONUtil.parseObj(userA, false);
 
-		Assert.assertTrue(json.containsKey("a"));
-		Assert.assertTrue(json.getJSONArray("sqs").getJSONObject(0).containsKey("seq"));
+		assertTrue(json.containsKey("a"));
+		assertTrue(json.getJSONArray("sqs").getJSONObject(0).containsKey("seq"));
 	}
 
 	@Test
@@ -340,22 +329,22 @@ public class JSONObjectTest {
 
 		final JSONObject json = JSONUtil.parseObj(bean, false);
 		// 枚举转换检查
-		Assert.assertEquals("TYPE_B", json.get("testEnum"));
+		assertEquals("TYPE_B", json.get("testEnum"));
 
 		final TestBean bean2 = json.toBean(TestBean.class);
-		Assert.assertEquals(bean.toString(), bean2.toString());
+		assertEquals(bean.toString(), bean2.toString());
 	}
 
 	@Test
 	public void parseBeanTest3() {
 		final JSONObject json = JSONUtil.createObj()
-				.set("code", 22)
-				.set("data", "{\"jobId\": \"abc\", \"videoUrl\": \"http://a.com/a.mp4\"}");
+			.set("code", 22)
+			.set("data", "{\"jobId\": \"abc\", \"videoUrl\": \"http://a.com/a.mp4\"}");
 
 		final JSONBean bean = json.toBean(JSONBean.class);
-		Assert.assertEquals(22, bean.getCode());
-		Assert.assertEquals("abc", bean.getData().getObj("jobId"));
-		Assert.assertEquals("http://a.com/a.mp4", bean.getData().getObj("videoUrl"));
+		assertEquals(22, bean.getCode());
+		assertEquals("abc", bean.getData().getObj("jobId"));
+		assertEquals("http://a.com/a.mp4", bean.getData().getObj("videoUrl"));
 	}
 
 	@Test
@@ -368,8 +357,8 @@ public class JSONObjectTest {
 		final JSONObject userAJson = JSONUtil.parseObj(userA);
 		final UserB userB = JSONUtil.toBean(userAJson, UserB.class);
 
-		Assert.assertEquals(userA.getName(), userB.getName());
-		Assert.assertEquals(userA.getDate(), userB.getDate());
+		assertEquals(userA.getName(), userB.getName());
+		assertEquals(userA.getDate(), userB.getDate());
 	}
 
 	@Test
@@ -384,17 +373,17 @@ public class JSONObjectTest {
 		userAJson.setDateFormat("yyyy-MM-dd");
 
 		final UserA bean = JSONUtil.toBean(userAJson.toString(), UserA.class);
-		Assert.assertEquals(DateUtil.parse("2018-10-25"), bean.getDate());
+		assertEquals(DateUtil.parse("2018-10-25"), bean.getDate());
 	}
 
 	@Test
 	public void beanTransTest3() {
 		final JSONObject userAJson = JSONUtil.createObj()
-				.set("a", "AValue")
-				.set("name", "nameValue")
-				.set("date", "08:00:00");
+			.set("a", "AValue")
+			.set("name", "nameValue")
+			.set("date", "08:00:00");
 		final UserA bean = JSONUtil.toBean(userAJson.toString(), UserA.class);
-		Assert.assertEquals(DateUtil.today() + " 08:00:00", DateUtil.date(bean.getDate()).toString());
+		assertEquals(DateUtil.today() + " 08:00:00", DateUtil.date(bean.getDate()).toString());
 	}
 
 	@Test
@@ -405,19 +394,19 @@ public class JSONObjectTest {
 		userA.setDate(new Date());
 
 		final JSONObject userAJson = JSONUtil.parseObj(userA);
-		Assert.assertFalse(userAJson.containsKey("a"));
+		assertFalse(userAJson.containsKey("a"));
 
 		final JSONObject userAJsonWithNullValue = JSONUtil.parseObj(userA, false);
-		Assert.assertTrue(userAJsonWithNullValue.containsKey("a"));
-		Assert.assertTrue(userAJsonWithNullValue.containsKey("sqs"));
+		assertTrue(userAJsonWithNullValue.containsKey("a"));
+		assertTrue(userAJsonWithNullValue.containsKey("sqs"));
 	}
 
 	@Test
 	public void specialCharTest() {
 		final String json = "{\"pattern\": \"[abc]\b\u2001\", \"pattern2Json\": {\"patternText\": \"[ab]\\b\"}}";
 		final JSONObject obj = JSONUtil.parseObj(json);
-		Assert.assertEquals("[abc]\\b\\u2001", obj.getStrEscaped("pattern"));
-		Assert.assertEquals("{\"patternText\":\"[ab]\\b\"}", obj.getStrEscaped("pattern2Json"));
+		assertEquals("[abc]\\b\\u2001", obj.getStrEscaped("pattern"));
+		assertEquals("{\"patternText\":\"[ab]\\b\"}", obj.getStrEscaped("pattern2Json"));
 	}
 
 	@Test
@@ -426,12 +415,12 @@ public class JSONObjectTest {
 		final JSONObject jsonObject = JSONUtil.parseObj(json);
 
 		// 没有转义按照默认规则显示
-		Assert.assertEquals("yyb\nbbb", jsonObject.getStr("name"));
+		assertEquals("yyb\nbbb", jsonObject.getStr("name"));
 		// 转义按照字符串显示
-		Assert.assertEquals("yyb\\nbbb", jsonObject.getStrEscaped("name"));
+		assertEquals("yyb\\nbbb", jsonObject.getStrEscaped("name"));
 
 		final String bbb = jsonObject.getStr("bbb", "defaultBBB");
-		Assert.assertEquals("defaultBBB", bbb);
+		assertEquals("defaultBBB", bbb);
 	}
 
 	@Test
@@ -441,15 +430,15 @@ public class JSONObjectTest {
 		beanWithAlias.setValue2(35);
 
 		final JSONObject jsonObject = JSONUtil.parseObj(beanWithAlias);
-		Assert.assertEquals("张三", jsonObject.getStr("name"));
-		Assert.assertEquals(new Integer(35), jsonObject.getInt("age"));
+		assertEquals("张三", jsonObject.getStr("name"));
+		assertEquals(new Integer(35), jsonObject.getInt("age"));
 
 		final JSONObject json = JSONUtil.createObj()
-				.set("name", "张三")
-				.set("age", 35);
+			.set("name", "张三")
+			.set("age", 35);
 		final BeanWithAlias bean = JSONUtil.toBean(Objects.requireNonNull(json).toString(), BeanWithAlias.class);
-		Assert.assertEquals("张三", bean.getValue1());
-		Assert.assertEquals(new Integer(35), bean.getValue2());
+		assertEquals("张三", bean.getValue1());
+		assertEquals(new Integer(35), bean.getValue2());
 	}
 
 	@Test
@@ -461,7 +450,7 @@ public class JSONObjectTest {
 		json.append("date", DateUtil.parse("2020-06-05 11:16:11"));
 		json.append("bbb", "222");
 		json.append("aaa", "123");
-		Assert.assertEquals("{\"date\":[\"2020-06-05 11:16:11\"],\"bbb\":[\"222\"],\"aaa\":[\"123\"]}", json.toString());
+		assertEquals("{\"date\":[\"2020-06-05 11:16:11\"],\"bbb\":[\"222\"],\"aaa\":[\"123\"]}", json.toString());
 	}
 
 	@Test
@@ -477,11 +466,11 @@ public class JSONObjectTest {
 
 		final String jsonStr = "{\"date\":\"2020#06#05\",\"bbb\":\"222\",\"aaa\":\"123\"}";
 
-		Assert.assertEquals(jsonStr, json.toString());
+		assertEquals(jsonStr, json.toString());
 
 		// 解析测试
 		final JSONObject parse = JSONUtil.parseObj(jsonStr, jsonConfig);
-		Assert.assertEquals(DateUtil.beginOfDay(date), parse.getDate("date"));
+		assertEquals(DateUtil.beginOfDay(date), parse.getDate("date"));
 	}
 
 	@Test
@@ -497,11 +486,11 @@ public class JSONObjectTest {
 
 		final String jsonStr = "{\"date\":1591326971,\"bbb\":\"222\",\"aaa\":\"123\"}";
 
-		Assert.assertEquals(jsonStr, json.toString());
+		assertEquals(jsonStr, json.toString());
 
 		// 解析测试
 		final JSONObject parse = JSONUtil.parseObj(jsonStr, jsonConfig);
-		Assert.assertEquals(date, parse.getDate("date"));
+		assertEquals(date, parse.getDate("date"));
 	}
 
 	@Test
@@ -509,7 +498,7 @@ public class JSONObjectTest {
 		final String timeStr = "1970-01-01 00:00:00";
 		final JSONObject jsonObject = JSONUtil.createObj().set("time", timeStr);
 		final Timestamp time = jsonObject.get("time", Timestamp.class);
-		Assert.assertEquals("1970-01-01 00:00:00.0", time.toString());
+		assertEquals("1970-01-01 00:00:00.0", time.toString());
 	}
 
 	public enum TestEnum {
@@ -554,11 +543,11 @@ public class JSONObjectTest {
 	public void parseBeanSameNameTest() {
 		final SameNameBean sameNameBean = new SameNameBean();
 		final JSONObject parse = JSONUtil.parseObj(sameNameBean);
-		Assert.assertEquals("123", parse.getStr("username"));
-		Assert.assertEquals("abc", parse.getStr("userName"));
+		assertEquals("123", parse.getStr("username"));
+		assertEquals("abc", parse.getStr("userName"));
 
 		// 测试ignore注解是否有效
-		Assert.assertNull(parse.getStr("fieldToIgnore"));
+		assertNull(parse.getStr("fieldToIgnore"));
 	}
 
 	/**
@@ -594,13 +583,15 @@ public class JSONObjectTest {
 		final Map.Entry<String, String> next = entries.iterator().next();
 
 		final JSONObject jsonObject = JSONUtil.parseObj(next);
-		Assert.assertEquals("{\"test\":\"testValue\"}", jsonObject.toString());
+		assertEquals("{\"test\":\"testValue\"}", jsonObject.toString());
 	}
 
-	@Test(expected = JSONException.class)
+	@Test
 	public void createJSONObjectTest() {
-		// 集合类不支持转为JSONObject
-		new JSONObject(new JSONArray(), JSONConfig.create());
+		assertThrows(JSONException.class, () -> {
+			// 集合类不支持转为JSONObject
+			new JSONObject(new JSONArray(), JSONConfig.create());
+		});
 	}
 
 	@Test
@@ -609,26 +600,26 @@ public class JSONObjectTest {
 		map.put("c", 2.0F);
 
 		final String s = JSONUtil.toJsonStr(map);
-		Assert.assertEquals("{\"c\":2}", s);
+		assertEquals("{\"c\":2}", s);
 	}
 
 	@Test
 	public void accumulateTest() {
 		final JSONObject jsonObject = JSONUtil.createObj().accumulate("key1", "value1");
-		Assert.assertEquals("{\"key1\":\"value1\"}", jsonObject.toString());
+		assertEquals("{\"key1\":\"value1\"}", jsonObject.toString());
 
 		jsonObject.accumulate("key1", "value2");
-		Assert.assertEquals("{\"key1\":[\"value1\",\"value2\"]}", jsonObject.toString());
+		assertEquals("{\"key1\":[\"value1\",\"value2\"]}", jsonObject.toString());
 
 		jsonObject.accumulate("key1", "value3");
-		Assert.assertEquals("{\"key1\":[\"value1\",\"value2\",\"value3\"]}", jsonObject.toString());
+		assertEquals("{\"key1\":[\"value1\",\"value2\",\"value3\"]}", jsonObject.toString());
 	}
 
 	@Test
 	public void putByPathTest() {
 		final JSONObject json = new JSONObject();
 		json.putByPath("aa.bb", "BB");
-		Assert.assertEquals("{\"aa\":{\"bb\":\"BB\"}}", json.toString());
+		assertEquals("{\"aa\":{\"bb\":\"BB\"}}", json.toString());
 	}
 
 
@@ -636,7 +627,7 @@ public class JSONObjectTest {
 	public void bigDecimalTest() {
 		final String jsonStr = "{\"orderId\":\"1704747698891333662002277\"}";
 		final BigDecimalBean bigDecimalBean = JSONUtil.toBean(jsonStr, BigDecimalBean.class);
-		Assert.assertEquals("{\"orderId\":1704747698891333662002277}", JSONUtil.toJsonStr(bigDecimalBean));
+		assertEquals("{\"orderId\":1704747698891333662002277}", JSONUtil.toJsonStr(bigDecimalBean));
 	}
 
 	@Data
@@ -648,34 +639,34 @@ public class JSONObjectTest {
 	@Test
 	public void filterIncludeTest() {
 		final JSONObject json1 = JSONUtil.createObj(JSONConfig.create())
-				.set("a", "value1")
-				.set("b", "value2")
-				.set("c", "value3")
-				.set("d", true);
+			.set("a", "value1")
+			.set("b", "value2")
+			.set("c", "value3")
+			.set("d", true);
 
 		final String s = json1.toJSONString(0, (pair) -> pair.getKey().equals("b"));
-		Assert.assertEquals("{\"b\":\"value2\"}", s);
+		assertEquals("{\"b\":\"value2\"}", s);
 	}
 
 	@Test
 	public void filterExcludeTest() {
 		final JSONObject json1 = JSONUtil.createObj(JSONConfig.create())
-				.set("a", "value1")
-				.set("b", "value2")
-				.set("c", "value3")
-				.set("d", true);
+			.set("a", "value1")
+			.set("b", "value2")
+			.set("c", "value3")
+			.set("d", true);
 
 		final String s = json1.toJSONString(0, (pair) -> false == pair.getKey().equals("b"));
-		Assert.assertEquals("{\"a\":\"value1\",\"c\":\"value3\",\"d\":true}", s);
+		assertEquals("{\"a\":\"value1\",\"c\":\"value3\",\"d\":true}", s);
 	}
 
 	@Test
 	public void editTest() {
 		final JSONObject json1 = JSONUtil.createObj(JSONConfig.create())
-				.set("a", "value1")
-				.set("b", "value2")
-				.set("c", "value3")
-				.set("d", true);
+			.set("a", "value1")
+			.set("b", "value2")
+			.set("c", "value3")
+			.set("d", true);
 
 		final String s = json1.toJSONString(0, (pair) -> {
 			if ("b".equals(pair.getKey())) {
@@ -686,56 +677,56 @@ public class JSONObjectTest {
 			// 除了"b"，其他都去掉
 			return false;
 		});
-		Assert.assertEquals("{\"b\":\"value2_edit\"}", s);
+		assertEquals("{\"b\":\"value2_edit\"}", s);
 	}
 
 	@Test
 	public void toUnderLineCaseTest() {
 		final JSONObject json1 = JSONUtil.createObj(JSONConfig.create())
-				.set("aKey", "value1")
-				.set("bJob", "value2")
-				.set("cGood", "value3")
-				.set("d", true);
+			.set("aKey", "value1")
+			.set("bJob", "value2")
+			.set("cGood", "value3")
+			.set("d", true);
 
 		final String s = json1.toJSONString(0, (pair) -> {
 			pair.setKey(StrUtil.toUnderlineCase(pair.getKey().toString()));
 			return true;
 		});
-		Assert.assertEquals("{\"a_key\":\"value1\",\"b_job\":\"value2\",\"c_good\":\"value3\",\"d\":true}", s);
+		assertEquals("{\"a_key\":\"value1\",\"b_job\":\"value2\",\"c_good\":\"value3\",\"d\":true}", s);
 	}
 
 	@Test
 	public void nullToEmptyTest() {
 		final JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setIgnoreNullValue(false))
-				.set("a", null)
-				.set("b", "value2");
+			.set("a", null)
+			.set("b", "value2");
 
 		final String s = json1.toJSONString(0, (pair) -> {
 			pair.setValue(ObjectUtil.defaultIfNull(pair.getValue(), StrUtil.EMPTY));
 			return true;
 		});
-		Assert.assertEquals("{\"a\":\"\",\"b\":\"value2\"}", s);
+		assertEquals("{\"a\":\"\",\"b\":\"value2\"}", s);
 	}
 
 	@Test
 	public void parseFilterTest() {
 		final String jsonStr = "{\"b\":\"value2\",\"c\":\"value3\",\"a\":\"value1\", \"d\": true, \"e\": null}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		final JSONObject jsonObject = new JSONObject(jsonStr, null, (pair)-> "b".equals(pair.getKey()));
-		Assert.assertEquals(1, jsonObject.size());
-		Assert.assertEquals("value2", jsonObject.get("b"));
+		final JSONObject jsonObject = new JSONObject(jsonStr, null, (pair) -> "b".equals(pair.getKey()));
+		assertEquals(1, jsonObject.size());
+		assertEquals("value2", jsonObject.get("b"));
 	}
 
 	@Test
 	public void parseFilterEditTest() {
 		final String jsonStr = "{\"b\":\"value2\",\"c\":\"value3\",\"a\":\"value1\", \"d\": true, \"e\": null}";
 		//noinspection MismatchedQueryAndUpdateOfCollection
-		final JSONObject jsonObject = new JSONObject(jsonStr, null, (pair)-> {
-			if("b".equals(pair.getKey())){
+		final JSONObject jsonObject = new JSONObject(jsonStr, null, (pair) -> {
+			if ("b".equals(pair.getKey())) {
 				pair.setValue(pair.getValue() + "_edit");
 			}
 			return true;
 		});
-		Assert.assertEquals("value2_edit", jsonObject.get("b"));
+		assertEquals("value2_edit", jsonObject.get("b"));
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java
index c3ad1281f..472def851 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONPathTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 /**
  * JSON路径单元测试
@@ -15,9 +15,9 @@ public class JSONPathTest {
 	public void getByPathTest() {
 		String json = "[{\"id\":\"1\",\"name\":\"xingming\"},{\"id\":\"2\",\"name\":\"mingzi\"}]";
 		Object value = JSONUtil.parseArray(json).getByPath("[0].name");
-		Assert.assertEquals("xingming", value);
+		assertEquals("xingming", value);
 		value = JSONUtil.parseArray(json).getByPath("[1].name");
-		Assert.assertEquals("mingzi", value);
+		assertEquals("mingzi", value);
 	}
 
 	@Test
@@ -25,6 +25,6 @@ public class JSONPathTest {
 		String str = "{'accountId':111}";
 		JSON json = JSONUtil.parse(str);
 		Long accountId = JSONUtil.getByPath(json, "$.accountId", 0L);
-		Assert.assertEquals(111L, accountId.longValue());
+		assertEquals(111L, accountId.longValue());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java
index 9a6ae58e0..c668ceae7 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONStrFormatterTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.json;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * JSON字符串格式化单元测试
@@ -16,25 +16,25 @@ public class JSONStrFormatterTest {
 	public void formatTest() {
 		String json = "{'age':23,'aihao':['pashan','movies'],'name':{'firstName':'zhang','lastName':'san','aihao':['pashan','movies','name':{'firstName':'zhang','lastName':'san','aihao':['pashan','movies']}]}}";
 		String result = JSONStrFormatter.format(json);
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 	}
 
 	@Test
 	public void formatTest2() {
 		String json = "{\"abc\":{\"def\":\"\\\"[ghi]\"}}";
 		String result = JSONStrFormatter.format(json);
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 	}
 
 	@Test
 	public void formatTest3() {
 		String json = "{\"id\":13,\"title\":\"《标题》\",\"subtitle\":\"副标题z'c'z'xv'c'xv\",\"user_id\":6,\"type\":0}";
 		String result = JSONStrFormatter.format(json);
-		Assert.assertNotNull(result);
+		assertNotNull(result);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void formatTest4(){
 		String jsonStr = "{\"employees\":[{\"firstName\":\"Bill\",\"lastName\":\"Gates\"},{\"firstName\":\"George\",\"lastName\":\"Bush\"},{\"firstName\":\"Thomas\",\"lastName\":\"Carter\"}]}";
 		Console.log(JSONUtil.formatJsonStr(jsonStr));
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java
index 92d1e8e9f..5d97f5f46 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONSupportTest.java
@@ -2,8 +2,8 @@ package cn.hutool.json;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JSONSupportTest {
 
@@ -23,10 +23,10 @@ public class JSONSupportTest {
 
 
 		final TestBean testBean = JSONUtil.toBean(jsonstr, TestBean.class);
-		Assert.assertEquals("https://hutool.cn", testBean.getLocation());
-		Assert.assertEquals("这是一条测试消息", testBean.getMessage());
-		Assert.assertEquals("123456789", testBean.getRequestId());
-		Assert.assertEquals("987654321", testBean.getTraceId());
+		assertEquals("https://hutool.cn", testBean.getLocation());
+		assertEquals("这是一条测试消息", testBean.getMessage());
+		assertEquals("123456789", testBean.getRequestId());
+		assertEquals("987654321", testBean.getTraceId());
 	}
 
 	@EqualsAndHashCode(callSuper = true)
diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
index b3aa1b6af..b772191d7 100644
--- a/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/JSONUtilTest.java
@@ -10,25 +10,24 @@ import cn.hutool.json.test.bean.Price;
 import cn.hutool.json.test.bean.UserA;
 import cn.hutool.json.test.bean.UserC;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
+import java.util.*;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class JSONUtilTest {
 
 	/**
 	 * 出现语法错误时报错，检查解析\x字符时是否会导致死循环异常
 	 */
-	@Test(expected = JSONException.class)
+	@Test
 	public void parseTest() {
-		final JSONArray jsonArray = JSONUtil.parseArray("[{\"a\":\"a\\x]");
-		Console.log(jsonArray);
+		assertThrows(JSONException.class, () -> {
+			final JSONArray jsonArray = JSONUtil.parseArray("[{\"a\":\"a\\x]");
+			Console.log(jsonArray);
+		});
 	}
 
 	/**
@@ -37,17 +36,19 @@ public class JSONUtilTest {
 	@Test
 	public void parseNumberToJSONArrayTest2() {
 		final JSONArray json = JSONUtil.parseArray(123L,
-				JSONConfig.create().setIgnoreError(true));
-		Assert.assertNotNull(json);
+			JSONConfig.create().setIgnoreError(true));
+		assertNotNull(json);
 	}
 
 	/**
 	 * 数字解析为JSONArray报错
 	 */
-	@Test(expected = JSONException.class)
+	@Test
 	public void parseNumberTest() {
-		final JSONArray json = JSONUtil.parseArray(123L);
-		Assert.assertNotNull(json);
+		assertThrows(JSONException.class, () -> {
+			final JSONArray json = JSONUtil.parseArray(123L);
+			assertNotNull(json);
+		});
 	}
 
 	/**
@@ -56,7 +57,7 @@ public class JSONUtilTest {
 	@Test
 	public void parseNumberTest2() {
 		final JSONObject json = JSONUtil.parseObj(123L, JSONConfig.create().setIgnoreError(true));
-		Assert.assertEquals(new JSONObject(), json);
+		assertEquals(new JSONObject(), json);
 	}
 
 	@Test
@@ -77,7 +78,7 @@ public class JSONUtilTest {
 
 		final String str = JSONUtil.toJsonPrettyStr(map);
 		JSONUtil.parse(str);
-		Assert.assertNotNull(str);
+		assertNotNull(str);
 	}
 
 	@Test
@@ -92,10 +93,10 @@ public class JSONUtilTest {
 
 		final JSONObject jsonObject = JSONUtil.parseObj(data);
 
-		Assert.assertTrue(jsonObject.containsKey("model"));
-		Assert.assertEquals(1, jsonObject.getJSONObject("model").getInt("type").intValue());
-		Assert.assertEquals("17610836523", jsonObject.getJSONObject("model").getStr("mobile"));
-		// Assert.assertEquals("{\"model\":{\"type\":1,\"mobile\":\"17610836523\"}}", jsonObject.toString());
+		assertTrue(jsonObject.containsKey("model"));
+		assertEquals(1, jsonObject.getJSONObject("model").getInt("type").intValue());
+		assertEquals("17610836523", jsonObject.getJSONObject("model").getStr("mobile"));
+		// assertEquals("{\"model\":{\"type\":1,\"mobile\":\"17610836523\"}}", jsonObject.toString());
 	}
 
 	@Test
@@ -110,11 +111,11 @@ public class JSONUtilTest {
 		map.put("user", object.toString());
 
 		final JSONObject json = JSONUtil.parseObj(map);
-		Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json.get("user"));
-		Assert.assertEquals("{\"user\":\"{\\\"name\\\":\\\"123123\\\",\\\"value\\\":\\\"\\\\\\\\\\\",\\\"value2\\\":\\\"</\\\"}\"}", json.toString());
+		assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json.get("user"));
+		assertEquals("{\"user\":\"{\\\"name\\\":\\\"123123\\\",\\\"value\\\":\\\"\\\\\\\\\\\",\\\"value2\\\":\\\"</\\\"}\"}", json.toString());
 
 		final JSONObject json2 = JSONUtil.parseObj(json.toString());
-		Assert.assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json2.get("user"));
+		assertEquals("{\"name\":\"123123\",\"value\":\"\\\\\",\"value2\":\"</\"}", json2.get("user"));
 	}
 
 	@Test
@@ -123,12 +124,13 @@ public class JSONUtilTest {
 			private static final long serialVersionUID = 1L;
 
 			{
-			put("attributes", "a");
-			put("b", "b");
-			put("c", "c");
-		}};
+				put("attributes", "a");
+				put("b", "b");
+				put("c", "c");
+			}
+		};
 
-		Assert.assertEquals("{\"attributes\":\"a\",\"b\":\"b\",\"c\":\"c\"}", JSONUtil.toJsonStr(sortedMap));
+		assertEquals("{\"attributes\":\"a\",\"b\":\"b\",\"c\":\"c\"}", JSONUtil.toJsonStr(sortedMap));
 	}
 
 	/**
@@ -139,7 +141,7 @@ public class JSONUtilTest {
 		final String json = "{\"ADT\":[[{\"BookingCode\":[\"N\",\"N\"]}]]}";
 
 		final Price price = JSONUtil.toBean(json, Price.class);
-		Assert.assertEquals("N", price.getADT().get(0).get(0).getBookingCode().get(0));
+		assertEquals("N", price.getADT().get(0).get(0).getBookingCode().get(0));
 	}
 
 	@Test
@@ -147,36 +149,36 @@ public class JSONUtilTest {
 		// 测试JSONObject转为Bean中字符串字段的情况
 		final String json = "{\"id\":123,\"name\":\"张三\",\"prop\":{\"gender\":\"男\", \"age\":18}}";
 		final UserC user = JSONUtil.toBean(json, UserC.class);
-		Assert.assertNotNull(user.getProp());
+		assertNotNull(user.getProp());
 		final String prop = user.getProp();
 		final JSONObject propJson = JSONUtil.parseObj(prop);
-		Assert.assertEquals("男", propJson.getStr("gender"));
-		Assert.assertEquals(18, propJson.getInt("age").intValue());
-		// Assert.assertEquals("{\"age\":18,\"gender\":\"男\"}", user.getProp());
+		assertEquals("男", propJson.getStr("gender"));
+		assertEquals(18, propJson.getInt("age").intValue());
+		// assertEquals("{\"age\":18,\"gender\":\"男\"}", user.getProp());
 	}
 
 	@Test
 	public void getStrTest() {
 		final String html = "{\"name\":\"Something must have been changed since you leave\"}";
 		final JSONObject jsonObject = JSONUtil.parseObj(html);
-		Assert.assertEquals("Something must have been changed since you leave", jsonObject.getStr("name"));
+		assertEquals("Something must have been changed since you leave", jsonObject.getStr("name"));
 	}
 
 	@Test
 	public void getStrTest2() {
 		final String html = "{\"name\":\"Something\\u00a0must have been changed since you leave\"}";
 		final JSONObject jsonObject = JSONUtil.parseObj(html);
-		Assert.assertEquals("Something\\u00a0must\\u00a0have\\u00a0been\\u00a0changed\\u00a0since\\u00a0you\\u00a0leave", jsonObject.getStrEscaped("name"));
+		assertEquals("Something\\u00a0must\\u00a0have\\u00a0been\\u00a0changed\\u00a0since\\u00a0you\\u00a0leave", jsonObject.getStrEscaped("name"));
 	}
 
 	@Test
 	public void parseFromXmlTest() {
 		final String s = "<sfzh>640102197312070614</sfzh><sfz>640102197312070614X</sfz><name>aa</name><gender>1</gender>";
 		final JSONObject json = JSONUtil.parseFromXml(s);
-		Assert.assertEquals(640102197312070614L, json.get("sfzh"));
-		Assert.assertEquals("640102197312070614X", json.get("sfz"));
-		Assert.assertEquals("aa", json.get("name"));
-		Assert.assertEquals(1, json.get("gender"));
+		assertEquals(640102197312070614L, json.get("sfzh"));
+		assertEquals("640102197312070614X", json.get("sfz"));
+		assertEquals("aa", json.get("name"));
+		assertEquals(1, json.get("gender"));
 	}
 
 	@Test
@@ -184,82 +186,84 @@ public class JSONUtilTest {
 		final String json = "{\"test\": 12.00}";
 		final JSONObject jsonObject = JSONUtil.parseObj(json);
 		//noinspection BigDecimalMethodWithoutRoundingCalled
-		Assert.assertEquals("12.00", jsonObject.getBigDecimal("test").setScale(2).toString());
+		assertEquals("12.00", jsonObject.getBigDecimal("test").setScale(2).toString());
 	}
 
 	@Test
 	public void customValueTest() {
 		final JSONObject jsonObject = JSONUtil.createObj()
-		.set("test2", (JSONString) () -> NumberUtil.decimalFormat("#.0", 12.00D));
+			.set("test2", (JSONString) () -> NumberUtil.decimalFormat("#.0", 12.00D));
 
-		Assert.assertEquals("{\"test2\":12.0}", jsonObject.toString());
+		assertEquals("{\"test2\":12.0}", jsonObject.toString());
 	}
 
 	@Test
 	public void setStripTrailingZerosTest() {
 		// 默认去除多余的0
 		final JSONObject jsonObjectDefault = JSONUtil.createObj()
-				.set("test2", 12.00D);
-		Assert.assertEquals("{\"test2\":12}", jsonObjectDefault.toString());
+			.set("test2", 12.00D);
+		assertEquals("{\"test2\":12}", jsonObjectDefault.toString());
 
 		// 不去除多余的0
 		final JSONObject jsonObject = JSONUtil.createObj(JSONConfig.create().setStripTrailingZeros(false))
-				.set("test2", 12.00D);
-		Assert.assertEquals("{\"test2\":12.0}", jsonObject.toString());
+			.set("test2", 12.00D);
+		assertEquals("{\"test2\":12.0}", jsonObject.toString());
 
 		// 去除多余的0
 		jsonObject.getConfig().setStripTrailingZeros(true);
-		Assert.assertEquals("{\"test2\":12}", jsonObject.toString());
+		assertEquals("{\"test2\":12}", jsonObject.toString());
 	}
 
 	@Test
 	public void parseObjTest() {
 		// 测试转义
 		final JSONObject jsonObject = JSONUtil.parseObj("{\n" +
-				"    \"test\": \"\\\\地库地库\",\n" +
-				"}");
+			"    \"test\": \"\\\\地库地库\",\n" +
+			"}");
 
-		Assert.assertEquals("\\地库地库", jsonObject.getObj("test"));
+		assertEquals("\\地库地库", jsonObject.getObj("test"));
 	}
 
 	@Test
-	public void sqlExceptionTest(){
+	public void sqlExceptionTest() {
 		//https://github.com/dromara/hutool/issues/1399
 		// SQLException实现了Iterable接口，默认是遍历之，会栈溢出，修正后只返回string
 		final JSONObject set = JSONUtil.createObj().set("test", new SQLException("test"));
-		Assert.assertEquals("{\"test\":\"java.sql.SQLException: test\"}", set.toString());
+		assertEquals("{\"test\":\"java.sql.SQLException: test\"}", set.toString());
 	}
 
 	@Test
-	public void parseBigNumberTest(){
+	public void parseBigNumberTest() {
 		// 科学计数法使用BigDecimal处理，默认输出非科学计数形式
 		final String str = "{\"test\":100000054128897953e4}";
-		Assert.assertEquals("{\"test\":1000000541288979530000}", JSONUtil.parseObj(str).toString());
+		assertEquals("{\"test\":1000000541288979530000}", JSONUtil.parseObj(str).toString());
 	}
 
 	@Test
-	public void toXmlTest(){
+	public void toXmlTest() {
 		final JSONObject obj = JSONUtil.createObj();
 		obj.set("key1", "v1")
-				.set("key2", ListUtil.of("a", "b", "c"));
+			.set("key2", ListUtil.of("a", "b", "c"));
 		final String xmlStr = JSONUtil.toXmlStr(obj);
-		Assert.assertEquals("<key1>v1</key1><key2>a</key2><key2>b</key2><key2>c</key2>", xmlStr);
+		assertEquals("<key1>v1</key1><key2>a</key2><key2>b</key2><key2>c</key2>", xmlStr);
 	}
 
 	@Test
-	public void duplicateKeyFalseTest(){
+	public void duplicateKeyFalseTest() {
 		final String str = "{id:123, name:\"张三\", name:\"李四\"}";
 
 		final JSONObject jsonObject = JSONUtil.parseObj(str, JSONConfig.create().setCheckDuplicate(false));
-		Assert.assertEquals("{\"id\":123,\"name\":\"李四\"}", jsonObject.toString());
+		assertEquals("{\"id\":123,\"name\":\"李四\"}", jsonObject.toString());
 	}
 
-	@Test(expected = JSONException.class)
+	@Test
 	public void duplicateKeyTrueTest() {
-		final String str = "{id:123, name:\"张三\", name:\"李四\"}";
+		assertThrows(JSONException.class, () -> {
+			final String str = "{id:123, name:\"张三\", name:\"李四\"}";
 
-		final JSONObject jsonObject = JSONUtil.parseObj(str, JSONConfig.create().setCheckDuplicate(true));
-		Assert.assertEquals("{\"id\":123,\"name\":\"李四\"}", jsonObject.toString());
+			final JSONObject jsonObject = JSONUtil.parseObj(str, JSONConfig.create().setCheckDuplicate(true));
+			assertEquals("{\"id\":123,\"name\":\"李四\"}", jsonObject.toString());
+		});
 	}
 
 	/**
@@ -268,7 +272,7 @@ public class JSONUtilTest {
 	@Test
 	public void testArrayEntity() {
 		final String jsonStr = JSONUtil.toJsonStr(new ArrayEntity());
-		Assert.assertEquals("{\"a\":[],\"b\":[0],\"c\":[],\"d\":[],\"e\":[]}", jsonStr);
+		assertEquals("{\"a\":[],\"b\":[0],\"c\":[],\"d\":[],\"e\":[]}", jsonStr);
 	}
 
 	@Data
@@ -282,8 +286,8 @@ public class JSONUtilTest {
 
 	@Test
 	public void issue3540Test() {
-		Long userId=10101010L;
+		Long userId = 10101010L;
 		final String jsonStr = JSONUtil.toJsonStr(userId);
-		Assert.assertEquals("{}", jsonStr);
+		assertEquals("{}", jsonStr);
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java b/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java
index 28e9827c7..cd5c4d10e 100644
--- a/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/ParseBeanTest.java
@@ -2,15 +2,15 @@ package cn.hutool.json;
 
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.collection.CollUtil;
 
 /**
  * 测试Bean中嵌套List等对象时是否完整转换<br>
  * 同时测试私有class是否可以有效实例化
- * 
+ *
  * @author looly
  *
  */
@@ -23,7 +23,7 @@ public class ParseBeanTest {
 		c1.setTest("test1");
 		C c2 = new C();
 		c2.setTest("test2");
-		
+
 		B b1 = new B();
 		b1.setCs(CollUtil.newArrayList(c1, c2));
 		B b2 = new B();
@@ -34,7 +34,7 @@ public class ParseBeanTest {
 
 		JSONObject json = JSONUtil.parseObj(a);
 		A a1 = JSONUtil.toBean(json, A.class);
-		Assert.assertEquals(json.toString(), JSONUtil.toJsonStr(a1));
+		assertEquals(json.toString(), JSONUtil.toJsonStr(a1));
 	}
 
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java b/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java
index 45067f88a..cbb787d64 100644
--- a/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/Pr192Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.json;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,7 +14,7 @@ public class Pr192Test {
 		String number = "1234.123456789123456";
 		String jsonString = "{\"create\":{\"details\":[{\"price\":" + number + "}]}}";
 		WebCreate create = JSONUtil.toBean(jsonString, WebCreate.class);
-		Assert.assertEquals(number,create.getCreate().getDetails().get(0).getPrice().toString());
+		assertEquals(number,create.getCreate().getDetails().get(0).getPrice().toString());
 	}
 
 	static class WebCreate {
diff --git a/hutool-json/src/test/java/cn/hutool/json/TransientTest.java b/hutool-json/src/test/java/cn/hutool/json/TransientTest.java
index 753cf1bee..ed7f80f6d 100644
--- a/hutool-json/src/test/java/cn/hutool/json/TransientTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/TransientTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.json;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class TransientTest {
 
@@ -21,7 +21,7 @@ public class TransientTest {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject jsonObject = new JSONObject(detailBill,
 				JSONConfig.create().setTransientSupport(false));
-		Assert.assertEquals("{\"id\":\"3243\",\"bizNo\":\"bizNo\"}", jsonObject.toString());
+		assertEquals("{\"id\":\"3243\",\"bizNo\":\"bizNo\"}", jsonObject.toString());
 	}
 
 	@Test
@@ -33,7 +33,7 @@ public class TransientTest {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final JSONObject jsonObject = new JSONObject(detailBill,
 				JSONConfig.create().setTransientSupport(true));
-		Assert.assertEquals("{\"bizNo\":\"bizNo\"}", jsonObject.toString());
+		assertEquals("{\"bizNo\":\"bizNo\"}", jsonObject.toString());
 	}
 
 	@Test
@@ -46,8 +46,8 @@ public class TransientTest {
 				JSONConfig.create().setTransientSupport(false));
 
 		final Bill bill = jsonObject.toBean(Bill.class);
-		Assert.assertEquals("3243", bill.getId());
-		Assert.assertEquals("bizNo", bill.getBizNo());
+		assertEquals("3243", bill.getId());
+		assertEquals("bizNo", bill.getBizNo());
 	}
 
 	@Test
@@ -60,7 +60,7 @@ public class TransientTest {
 				JSONConfig.create().setTransientSupport(true));
 
 		final Bill bill = jsonObject.toBean(Bill.class);
-		Assert.assertNull(bill.getId());
-		Assert.assertEquals("bizNo", bill.getBizNo());
+		assertNull(bill.getId());
+		assertEquals("bizNo", bill.getBizNo());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
index 0b934170d..3d740d672 100755
--- a/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/issueIVMD5/IssueIVMD5Test.java
@@ -2,41 +2,41 @@ package cn.hutool.json.issueIVMD5;
 
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
 
 public class IssueIVMD5Test {
-	
+
 	/**
 	 * 测试泛型对象中有泛型字段的转换成功与否
 	 */
 	@Test
 	public void toBeanTest() {
 		String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json");
-		
+
 		TypeReference<BaseResult<StudentInfo>> typeReference = new TypeReference<BaseResult<StudentInfo>>() {};
 		BaseResult<StudentInfo> bean = JSONUtil.toBean(jsonStr, typeReference.getType(), false);
-		
+
 		StudentInfo data2 = bean.getData2();
-		Assert.assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", data2.getAccountId());
+		assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", data2.getAccountId());
 	}
-	
+
 	/**
 	 * 测试泛型对象中有包含泛型字段的类型的转换成功与否，比如List&lt;T&gt; list
 	 */
 	@Test
 	public void toBeanTest2() {
 		String jsonStr = ResourceUtil.readUtf8Str("issueIVMD5.json");
-		
+
 		TypeReference<BaseResult<StudentInfo>> typeReference = new TypeReference<BaseResult<StudentInfo>>() {};
 		BaseResult<StudentInfo> bean = JSONUtil.toBean(jsonStr, typeReference.getType(), false);
-		
+
 		List<StudentInfo> data = bean.getData();
 		StudentInfo studentInfo = data.get(0);
-		Assert.assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", studentInfo.getAccountId());
+		assertEquals("B4DDF491FDF34074AE7A819E1341CB6C", studentInfo.getAccountId());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/xml/Issue2748Test.java b/hutool-json/src/test/java/cn/hutool/json/xml/Issue2748Test.java
index 1237b36ca..72c8f9969 100644
--- a/hutool-json/src/test/java/cn/hutool/json/xml/Issue2748Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/xml/Issue2748Test.java
@@ -3,8 +3,8 @@ package cn.hutool.json.xml;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONException;
 import cn.hutool.json.XML;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue2748Test {
 
@@ -12,7 +12,7 @@ public class Issue2748Test {
 	public void toJSONObjectTest() {
 		final String s = StrUtil.repeat("<a>", 600);
 
-		Assert.assertThrows(JSONException.class, () -> {
+		assertThrows(JSONException.class, () -> {
 			XML.toJSONObject(s, ParseConfig.of().setMaxNestingDepth(512));
 		});
 	}
diff --git a/hutool-json/src/test/java/cn/hutool/json/xml/Issue3560Test.java b/hutool-json/src/test/java/cn/hutool/json/xml/Issue3560Test.java
index 8eadd543a..18fb6cdfb 100644
--- a/hutool-json/src/test/java/cn/hutool/json/xml/Issue3560Test.java
+++ b/hutool-json/src/test/java/cn/hutool/json/xml/Issue3560Test.java
@@ -2,14 +2,14 @@ package cn.hutool.json.xml;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.XML;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3560Test {
 	@Test
 	public void toJSONObjectTest() {
 		String inPara= "<ROOT><ID>002317479934367853</ID><CONTENT><![CDATA[asdfadf&amp;21sdgzxv&amp;aasfasf]]></CONTENT></ROOT>";
 		JSONObject json = XML.toJSONObject(inPara, true);
-		Assert.assertEquals("{\"ROOT\":{\"ID\":\"002317479934367853\",\"CONTENT\":\"asdfadf&amp;21sdgzxv&amp;aasfasf\"}}", json.toString());
+		assertEquals("{\"ROOT\":{\"ID\":\"002317479934367853\",\"CONTENT\":\"asdfadf&amp;21sdgzxv&amp;aasfasf\"}}", json.toString());
 	}
 }
diff --git a/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java b/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java
index 75bc5bc5c..a09a5ce98 100644
--- a/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java
+++ b/hutool-json/src/test/java/cn/hutool/json/xml/XMLTest.java
@@ -3,41 +3,41 @@ package cn.hutool.json.xml;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.json.XML;
-import org.hamcrest.CoreMatchers;
-import org.hamcrest.MatcherAssert;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class XMLTest {
 
 	@Test
-	public void toXmlTest(){
+	public void toXmlTest() {
 		final JSONObject put = JSONUtil.createObj()
-				.set("aaa", "你好")
-				.set("键2", "test");
+			.set("aaa", "你好")
+			.set("键2", "test");
 		final String s = JSONUtil.toXmlStr(put);
-		MatcherAssert.assertThat(s, CoreMatchers.anyOf(CoreMatchers.is("<aaa>你好</aaa><键2>test</键2>"), CoreMatchers.is("<键2>test</键2><aaa>你好</aaa>")));
+		Assertions.assertEquals("<aaa>你好</aaa><键2>test</键2>", s);
 	}
 
 	@Test
-	public void escapeTest(){
+	public void escapeTest() {
 		String xml = "<a>•</a>";
 		JSONObject jsonObject = XML.toJSONObject(xml);
 
-		Assert.assertEquals("{\"a\":\"•\"}", jsonObject.toString());
+		assertEquals("{\"a\":\"•\"}", jsonObject.toString());
 
 		String xml2 = XML.toXml(JSONUtil.parseObj(jsonObject));
-		Assert.assertEquals(xml, xml2);
+		assertEquals(xml, xml2);
 	}
 
 	@Test
-	public void xmlContentTest(){
-		JSONObject jsonObject = JSONUtil.createObj().set("content","123456");
+	public void xmlContentTest() {
+		JSONObject jsonObject = JSONUtil.createObj().set("content", "123456");
 
 		String xml = XML.toXml(jsonObject);
-		Assert.assertEquals("123456", xml);
+		assertEquals("123456", xml);
 
 		xml = XML.toXml(jsonObject, null, new String[0]);
-		Assert.assertEquals("<content>123456</content>", xml);
+		assertEquals("<content>123456</content>", xml);
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/Issue3205Test.java b/hutool-jwt/src/test/java/cn/hutool/jwt/Issue3205Test.java
index 297db5c3e..cb1878bf9 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/Issue3205Test.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/Issue3205Test.java
@@ -6,8 +6,8 @@ import cn.hutool.jwt.signers.AlgorithmUtil;
 import cn.hutool.jwt.signers.JWTSigner;
 import cn.hutool.jwt.signers.JWTSignerUtil;
 import io.jsonwebtoken.Jwts;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.security.KeyPair;
 
@@ -32,6 +32,6 @@ public class Issue3205Test {
 
 		final boolean signed = Jwts.parser().verifyWith(keyPair.getPublic()).build().isSigned(token);
 
-		Assert.assertTrue(signed);
+		assertTrue(signed);
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI5QRUOTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI5QRUOTest.java
index 45fc07b8e..23a5adb3b 100755
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI5QRUOTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI5QRUOTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.jwt;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -29,11 +29,11 @@ public class IssueI5QRUOTest {
 		};
 
 		final String token = JWTUtil.createToken(header, payload, "123456".getBytes());
-		Assert.assertEquals("eyJhbGciOiJIUzM4NCIsInR5cCI6IkpXVCJ9." +
+		assertEquals("eyJhbGciOiJIUzM4NCIsInR5cCI6IkpXVCJ9." +
 				"eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ." +
 				"3Ywq9NlR3cBST4nfcdbR-fcZ8374RHzU50X6flKvG-tnWFMalMaHRm3cMpXs1NrZ", token);
 
 		final boolean verify = JWT.of(token).setKey("123456".getBytes()).verify();
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI6IS5BTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI6IS5BTest.java
index 6255aab0f..1a72a947a 100644
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI6IS5BTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/IssueI6IS5BTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
@@ -19,11 +19,11 @@ public class IssueI6IS5BTest {
 		final JwtToken jwtToken = new JwtToken();
 		jwtToken.setIat(iat);
 		final String token = JWTUtil.createToken(JSONUtil.parseObj(jwtToken), "123".getBytes(StandardCharsets.UTF_8));
-		Assert.assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
+		assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
 		final JSONObject payloads = JWTUtil.parseToken(token).getPayloads();
-		Assert.assertEquals("{\"iat\":1677772800}", payloads.toString());
+		assertEquals("{\"iat\":1677772800}", payloads.toString());
 		final JwtToken o = payloads.toBean(JwtToken.class);
-		Assert.assertEquals(iat, o.getIat());
+		assertEquals(iat, o.getIat());
 	}
 
 	@Data
@@ -37,11 +37,11 @@ public class IssueI6IS5BTest {
 		final JwtToken2 jwtToken = new JwtToken2();
 		jwtToken.setIat(iat);
 		final String token = JWTUtil.createToken(JSONUtil.parseObj(jwtToken), "123".getBytes(StandardCharsets.UTF_8));
-		Assert.assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
+		assertEquals("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE2Nzc3NzI4MDB9.SXU_mm1wT5lNoK-Dq5Y8f3BItv_44zuAlyeWLqajpXg", token);
 		final JSONObject payloads = JWTUtil.parseToken(token).getPayloads();
-		Assert.assertEquals("{\"iat\":1677772800}", payloads.toString());
+		assertEquals("{\"iat\":1677772800}", payloads.toString());
 		final JwtToken2 o = payloads.toBean(JwtToken2.class);
-		Assert.assertEquals(iat, o.getIat());
+		assertEquals(iat, o.getIat());
 	}
 
 	@Data
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java
index 6bd335644..578f83f22 100755
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTSignerTest.java
@@ -5,8 +5,8 @@ import cn.hutool.crypto.KeyUtil;
 import cn.hutool.jwt.signers.AlgorithmUtil;
 import cn.hutool.jwt.signers.JWTSigner;
 import cn.hutool.jwt.signers.JWTSignerUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class JWTSignerTest {
 
@@ -14,7 +14,7 @@ public class JWTSignerTest {
 	public void hs256Test(){
 		String id = "hs256";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -30,7 +30,7 @@ public class JWTSignerTest {
 	public void hs384Test(){
 		String id = "hs384";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -39,7 +39,7 @@ public class JWTSignerTest {
 	public void hs512Test(){
 		String id = "hs512";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -48,7 +48,7 @@ public class JWTSignerTest {
 	public void rs256Test(){
 		String id = "rs256";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -57,7 +57,7 @@ public class JWTSignerTest {
 	public void rs384Test(){
 		String id = "rs384";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -66,7 +66,7 @@ public class JWTSignerTest {
 	public void rs512Test(){
 		String id = "rs512";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -75,7 +75,7 @@ public class JWTSignerTest {
 	public void es256Test(){
 		String id = "es256";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -84,7 +84,7 @@ public class JWTSignerTest {
 	public void es384Test(){
 		String id = "es384";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -93,7 +93,7 @@ public class JWTSignerTest {
 	public void es512Test(){
 		String id = "es512";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -102,7 +102,7 @@ public class JWTSignerTest {
 	public void ps256Test(){
 		String id = "ps256";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -111,7 +111,7 @@ public class JWTSignerTest {
 	public void ps384Test(){
 		String id = "ps384";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -120,7 +120,7 @@ public class JWTSignerTest {
 	public void hmd5Test(){
 		String id = "hmd5";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -129,7 +129,7 @@ public class JWTSignerTest {
 	public void hsha1Test(){
 		String id = "hsha1";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -138,7 +138,7 @@ public class JWTSignerTest {
 	public void sm4cmacTest(){
 		String id = "sm4cmac";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKey(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -147,7 +147,7 @@ public class JWTSignerTest {
 	public void rmd2Test(){
 		String id = "rmd2";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -156,7 +156,7 @@ public class JWTSignerTest {
 	public void rmd5Test(){
 		String id = "rmd5";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -165,7 +165,7 @@ public class JWTSignerTest {
 	public void rsha1Test(){
 		String id = "rsha1";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -174,7 +174,7 @@ public class JWTSignerTest {
 	public void dnoneTest(){
 		String id = "dnone";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -183,7 +183,7 @@ public class JWTSignerTest {
 	public void dsha1Test(){
 		String id = "dsha1";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -192,7 +192,7 @@ public class JWTSignerTest {
 	public void enoneTest(){
 		String id = "enone";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -201,7 +201,7 @@ public class JWTSignerTest {
 	public void esha1Test(){
 		String id = "esha1";
 		final JWTSigner signer = JWTSignerUtil.createSigner(id, KeyUtil.generateKeyPair(AlgorithmUtil.getAlgorithm(id)));
-		Assert.assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
+		assertEquals(AlgorithmUtil.getAlgorithm(id), signer.getAlgorithm());
 
 		signAndVerify(signer);
 	}
@@ -217,6 +217,6 @@ public class JWTSignerTest {
 				.setSigner(signer);
 
 		String token = jwt.sign();
-		Assert.assertTrue(JWT.of(token).verify(signer));
+		assertTrue(JWT.of(token).verify(signer));
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java
index c0ed9fed1..bac342554 100755
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTTest.java
@@ -3,105 +3,107 @@ package cn.hutool.jwt;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.jwt.signers.JWTSignerUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class JWTTest {
 
 	@Test
-	public void createHs256Test(){
+	public void createHs256Test() {
 		final byte[] key = "1234567890".getBytes();
 		final JWT jwt = JWT.create()
-				.setPayload("sub", "1234567890")
-				.setPayload("name", "looly")
-				.setPayload("admin", true)
-				.setExpiresAt(DateUtil.parse("2022-01-01"))
-				.setKey(key);
+			.setPayload("sub", "1234567890")
+			.setPayload("name", "looly")
+			.setPayload("admin", true)
+			.setExpiresAt(DateUtil.parse("2022-01-01"))
+			.setKey(key);
 
 		final String rightToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9." +
-				"eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6Imxvb2x5IiwiYWRtaW4iOnRydWUsImV4cCI6MTY0MDk2NjQwMH0." +
-				"bXlSnqVeJXWqUIt7HyEhgKNVlIPjkumHlAwFY-5YCtk";
+			"eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6Imxvb2x5IiwiYWRtaW4iOnRydWUsImV4cCI6MTY0MDk2NjQwMH0." +
+			"bXlSnqVeJXWqUIt7HyEhgKNVlIPjkumHlAwFY-5YCtk";
 
 		final String token = jwt.sign();
-		Assert.assertEquals(rightToken, token);
+		assertEquals(rightToken, token);
 
-		Assert.assertTrue(JWT.of(rightToken).setKey(key).verify());
+		assertTrue(JWT.of(rightToken).setKey(key).verify());
 	}
 
 	@Test
-	public void parseTest(){
+	public void parseTest() {
 		final String rightToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9." +
-				"eyJzdWIiOiIxMjM0NTY3ODkwIiwiYWRtaW4iOnRydWUsIm5hbWUiOiJsb29seSJ9." +
-				"U2aQkC2THYV9L0fTN-yBBI7gmo5xhmvMhATtu8v0zEA";
+			"eyJzdWIiOiIxMjM0NTY3ODkwIiwiYWRtaW4iOnRydWUsIm5hbWUiOiJsb29seSJ9." +
+			"U2aQkC2THYV9L0fTN-yBBI7gmo5xhmvMhATtu8v0zEA";
 
 		final JWT jwt = JWT.of(rightToken);
 
-		Assert.assertTrue(jwt.setKey("1234567890".getBytes()).verify());
+		assertTrue(jwt.setKey("1234567890".getBytes()).verify());
 
 		//header
-		Assert.assertEquals("JWT", jwt.getHeader(JWTHeader.TYPE));
-		Assert.assertEquals("HS256", jwt.getHeader(JWTHeader.ALGORITHM));
-		Assert.assertNull(jwt.getHeader(JWTHeader.CONTENT_TYPE));
+		assertEquals("JWT", jwt.getHeader(JWTHeader.TYPE));
+		assertEquals("HS256", jwt.getHeader(JWTHeader.ALGORITHM));
+		assertNull(jwt.getHeader(JWTHeader.CONTENT_TYPE));
 
 		//payload
-		Assert.assertEquals("1234567890", jwt.getPayload("sub"));
-		Assert.assertEquals("looly", jwt.getPayload("name"));
-		Assert.assertEquals(true, jwt.getPayload("admin"));
+		assertEquals("1234567890", jwt.getPayload("sub"));
+		assertEquals("looly", jwt.getPayload("name"));
+		assertEquals(true, jwt.getPayload("admin"));
 	}
 
 	@Test
-	public void createNoneTest(){
+	public void createNoneTest() {
 		final JWT jwt = JWT.create()
-				.setPayload("sub", "1234567890")
-				.setPayload("name", "looly")
-				.setPayload("admin", true)
-				.setSigner(JWTSignerUtil.none());
+			.setPayload("sub", "1234567890")
+			.setPayload("name", "looly")
+			.setPayload("admin", true)
+			.setSigner(JWTSignerUtil.none());
 
 		final String rightToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9." +
-				"eyJzdWIiOiIxMjM0NTY3ODkwIiwiYWRtaW4iOnRydWUsIm5hbWUiOiJsb29seSJ9.";
+			"eyJzdWIiOiIxMjM0NTY3ODkwIiwiYWRtaW4iOnRydWUsIm5hbWUiOiJsb29seSJ9.";
 
 		final String token = jwt.sign();
-		Assert.assertEquals(token, token);
+		assertEquals(rightToken, token);
 
-		Assert.assertTrue(JWT.of(rightToken).setSigner(JWTSignerUtil.none()).verify());
+		assertTrue(JWT.of(rightToken).setSigner(JWTSignerUtil.none()).verify());
 	}
 
 	/**
 	 * 必须定义签名器
 	 */
-	@Test(expected = JWTException.class)
-	public void needSignerTest(){
-		final JWT jwt = JWT.create()
+	@Test
+	public void needSignerTest() {
+		assertThrows(JWTException.class, () -> {
+			final JWT jwt = JWT.create()
 				.setPayload("sub", "1234567890")
 				.setPayload("name", "looly")
 				.setPayload("admin", true);
 
-		jwt.sign();
+			jwt.sign();
+		});
 	}
 
 	@Test
-	public void verifyTest(){
+	public void verifyTest() {
 		final String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9." +
-				"eyJ1c2VyX25hbWUiOiJhZG1pbiIsInNjb3BlIjpbImFsbCJdLCJleHAiOjE2MjQwMDQ4MjIsInVzZXJJZCI6MSwiYXV0aG9yaXRpZXMiOlsiUk9MRV_op5LoibLkuozlj7ciLCJzeXNfbWVudV8xIiwiUk9MRV_op5LoibLkuIDlj7ciLCJzeXNfbWVudV8yIl0sImp0aSI6ImQ0YzVlYjgwLTA5ZTctNGU0ZC1hZTg3LTVkNGI5M2FhNmFiNiIsImNsaWVudF9pZCI6ImhhbmR5LXNob3AifQ." +
-				"aixF1eKlAKS_k3ynFnStE7-IRGiD5YaqznvK2xEjBew";
+			"eyJ1c2VyX25hbWUiOiJhZG1pbiIsInNjb3BlIjpbImFsbCJdLCJleHAiOjE2MjQwMDQ4MjIsInVzZXJJZCI6MSwiYXV0aG9yaXRpZXMiOlsiUk9MRV_op5LoibLkuozlj7ciLCJzeXNfbWVudV8xIiwiUk9MRV_op5LoibLkuIDlj7ciLCJzeXNfbWVudV8yIl0sImp0aSI6ImQ0YzVlYjgwLTA5ZTctNGU0ZC1hZTg3LTVkNGI5M2FhNmFiNiIsImNsaWVudF9pZCI6ImhhbmR5LXNob3AifQ." +
+			"aixF1eKlAKS_k3ynFnStE7-IRGiD5YaqznvK2xEjBew";
 
 		final boolean verify = JWT.of(token).setKey(StrUtil.utf8Bytes("123456")).verify();
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 
 	@Test
-	public void getLongTest(){
+	public void getLongTest() {
 		final String rightToken = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9"
-				+ ".eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhZG1pbiIsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjoxNjc4Mjg1NzEzOTM1LCJyblN0ciI6IkVuMTczWFhvWUNaaVZUWFNGOTNsN1pabGtOalNTd0pmIn0"
-				+ ".wRe2soTaWYPhwcjxdzesDi1BgEm9D61K-mMT3fPc4YM"
-				+ "";
+			+ ".eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhZG1pbiIsImRldmljZSI6ImRlZmF1bHQtZGV2aWNlIiwiZWZmIjoxNjc4Mjg1NzEzOTM1LCJyblN0ciI6IkVuMTczWFhvWUNaaVZUWFNGOTNsN1pabGtOalNTd0pmIn0"
+			+ ".wRe2soTaWYPhwcjxdzesDi1BgEm9D61K-mMT3fPc4YM";
 
 		final JWT jwt = JWTUtil.parseToken(rightToken);
 
-		Assert.assertEquals(
-				"{\"loginType\":\"login\",\"loginId\":\"admin\",\"device\":\"default-device\"," +
-						"\"eff\":1678285713935,\"rnStr\":\"En173XXoYCZiVTXSF93l7ZZlkNjSSwJf\"}",
-				jwt.getPayloads().toString());
-		Assert.assertEquals(Long.valueOf(1678285713935L), jwt.getPayloads().getLong("eff"));
+		assertEquals(
+			"{\"loginType\":\"login\",\"loginId\":\"admin\",\"device\":\"default-device\"," +
+				"\"eff\":1678285713935,\"rnStr\":\"En173XXoYCZiVTXSF93l7ZZlkNjSSwJf\"}",
+			jwt.getPayloads().toString());
+		assertEquals(Long.valueOf(1678285713935L), jwt.getPayloads().getLong("eff"));
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java
index 6a46d0d1b..451d76fbb 100755
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTUtilTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.jwt;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,17 +30,17 @@ public class JWTUtilTest {
 				"U2aQkC2THYV9L0fTN-yBBI7gmo5xhmvMhATtu8v0zEA";
 		final JWT jwt = JWTUtil.parseToken(rightToken);
 
-		Assert.assertTrue(jwt.setKey("1234567890".getBytes()).verify());
+		assertTrue(jwt.setKey("1234567890".getBytes()).verify());
 
 		//header
-		Assert.assertEquals("JWT", jwt.getHeader(JWTHeader.TYPE));
-		Assert.assertEquals("HS256", jwt.getHeader(JWTHeader.ALGORITHM));
-		Assert.assertNull(jwt.getHeader(JWTHeader.CONTENT_TYPE));
+		assertEquals("JWT", jwt.getHeader(JWTHeader.TYPE));
+		assertEquals("HS256", jwt.getHeader(JWTHeader.ALGORITHM));
+		assertNull(jwt.getHeader(JWTHeader.CONTENT_TYPE));
 
 		//payload
-		Assert.assertEquals("1234567890", jwt.getPayload("sub"));
-		Assert.assertEquals("looly", jwt.getPayload("name"));
-		Assert.assertEquals(true, jwt.getPayload("admin"));
+		assertEquals("1234567890", jwt.getPayload("sub"));
+		assertEquals("looly", jwt.getPayload("name"));
+		assertEquals(true, jwt.getPayload("admin"));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -56,6 +56,6 @@ public class JWTUtilTest {
 				"aixF1eKlAKS_k3ynFnStE7-IRGiD5YaqznvK2xEjBew";
 
 		final boolean verify = JWTUtil.verify(token, "123456".getBytes());
-		Assert.assertTrue(verify);
+		assertTrue(verify);
 	}
 }
diff --git a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java
index 15365eeaf..c95cec13d 100755
--- a/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java
+++ b/hutool-jwt/src/test/java/cn/hutool/jwt/JWTValidatorTest.java
@@ -3,87 +3,96 @@ package cn.hutool.jwt;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.jwt.signers.JWTSignerUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class JWTValidatorTest {
 
-	@Test(expected = ValidateException.class)
-	public void expiredAtTest(){
-		String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE0Nzc1OTJ9.isvT0Pqx0yjnZk53mUFSeYFJLDs-Ls9IsNAm86gIdZo";
-		JWTValidator.of(token).validateDate(DateUtil.date());
-	}
-
-	@Test(expected = ValidateException.class)
-	public void issueAtTest(){
-		final String token = JWT.create()
-				.setIssuedAt(DateUtil.date())
-				.setKey("123456".getBytes())
-				.sign();
-
-		// 签发时间早于被检查的时间
-		JWTValidator.of(token).validateDate(DateUtil.yesterday());
+	@Test
+	public void expiredAtTest() {
+		assertThrows(ValidateException.class, () -> {
+			String token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE0Nzc1OTJ9.isvT0Pqx0yjnZk53mUFSeYFJLDs-Ls9IsNAm86gIdZo";
+			JWTValidator.of(token).validateDate(DateUtil.date());
+		});
 	}
 
 	@Test
-	public void issueAtPassTest(){
-		final String token = JWT.create()
+	public void issueAtTest() {
+		assertThrows(ValidateException.class, () -> {
+			final String token = JWT.create()
 				.setIssuedAt(DateUtil.date())
 				.setKey("123456".getBytes())
 				.sign();
 
+			// 签发时间早于被检查的时间
+			JWTValidator.of(token).validateDate(DateUtil.yesterday());
+		});
+	}
+
+	@Test
+	public void issueAtPassTest() {
+		final String token = JWT.create()
+			.setIssuedAt(DateUtil.date())
+			.setKey("123456".getBytes())
+			.sign();
+
 		// 签发时间早于被检查的时间
 		JWTValidator.of(token).validateDate(DateUtil.date());
 	}
 
-	@Test(expected = ValidateException.class)
-	public void notBeforeTest(){
-		final JWT jwt = JWT.create()
+	@Test
+	public void notBeforeTest() {
+		assertThrows(ValidateException.class, () -> {
+			final JWT jwt = JWT.create()
 				.setNotBefore(DateUtil.date());
-
-		JWTValidator.of(jwt).validateDate(DateUtil.yesterday());
+			JWTValidator.of(jwt).validateDate(DateUtil.yesterday());
+		});
 	}
 
 	@Test
-	public void notBeforePassTest(){
+	public void notBeforePassTest() {
 		final JWT jwt = JWT.create()
-				.setNotBefore(DateUtil.date());
+			.setNotBefore(DateUtil.date());
 		JWTValidator.of(jwt).validateDate(DateUtil.date());
 	}
 
 	@Test
-	public void validateAlgorithmTest(){
+	public void validateAlgorithmTest() {
 		final String token = JWT.create()
-				.setNotBefore(DateUtil.date())
-				.setKey("123456".getBytes())
-				.sign();
+			.setNotBefore(DateUtil.date())
+			.setKey("123456".getBytes())
+			.sign();
 
 		// 验证算法
 		JWTValidator.of(token).validateAlgorithm(JWTSignerUtil.hs256("123456".getBytes()));
 	}
 
 	@Test
-	public void validateTest(){
+	public void validateTest() {
 		String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJNb0xpIiwiZXhwIjoxNjI0OTU4MDk0NTI4LCJpYXQiOjE2MjQ5NTgwMzQ1MjAsInVzZXIiOiJ1c2VyIn0.L0uB38p9sZrivbmP0VlDe--j_11YUXTu3TfHhfQhRKc";
 		byte[] key = "1234567890".getBytes();
 		boolean validate = JWT.of(token).setKey(key).validate(0);
-		Assert.assertFalse(validate);
+		assertFalse(validate);
 	}
 
-	@Test(expected = ValidateException.class)
-	public void validateDateTest(){
-		final JWT jwt = JWT.create()
+	@Test
+	public void validateDateTest() {
+		assertThrows(ValidateException.class, () -> {
+			final JWT jwt = JWT.create()
 				.setPayload("id", 123)
 				.setPayload("username", "hutool")
 				.setExpiresAt(DateUtil.parse("2021-10-13 09:59:00"));
 
-		JWTValidator.of(jwt).validateDate(DateUtil.date());
+			JWTValidator.of(jwt).validateDate(DateUtil.date());
+		});
 	}
 
 	@Test
-	public void issue2329Test(){
+	public void issue2329Test() {
 		final long NOW = System.currentTimeMillis();
 		final Date NOW_TIME = new Date(NOW);
 		final long EXPIRED = 3 * 1000L;
@@ -91,7 +100,7 @@ public class JWTValidatorTest {
 
 		// 使用这种方式生成token
 		final String token = JWT.create().setPayload("sub", "blue-light").setIssuedAt(NOW_TIME).setNotBefore(EXPIRED_TIME)
-				.setExpiresAt(EXPIRED_TIME).setKey("123456".getBytes()).sign();
+			.setExpiresAt(EXPIRED_TIME).setKey("123456".getBytes()).sign();
 
 		// 使用这种方式验证token
 		JWTValidator.of(JWT.of(token)).validateDate(DateUtil.date(NOW - 4000), 10);
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index 53e6a616f..b2d060ada 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -24,7 +24,7 @@
 		<logback.version>1.4.14</logback.version>
 		<log4j.version>1.2.17</log4j.version>
 		<log4j2.version>2.20.0</log4j2.version>
-		<commons-logging.version>1.3.0</commons-logging.version>
+		<commons-logging.version>1.3.3</commons-logging.version>
 		<tinylog.version>1.3.6</tinylog.version>
 		<tinylog2.version>2.7.0</tinylog2.version>
 		<!-- 此处固定3.4.x，支持到jdk8 -->
diff --git a/hutool-log/src/test/java/cn/hutool/log/test/CustomLogTest.java b/hutool-log/src/test/java/cn/hutool/log/test/CustomLogTest.java
index ce60ee119..8bb42f511 100644
--- a/hutool-log/src/test/java/cn/hutool/log/test/CustomLogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/log/test/CustomLogTest.java
@@ -11,7 +11,7 @@ import cn.hutool.log.dialect.log4j2.Log4j2LogFactory;
 import cn.hutool.log.dialect.slf4j.Slf4jLogFactory;
 import cn.hutool.log.dialect.tinylog.TinyLog2Factory;
 import cn.hutool.log.dialect.tinylog.TinyLogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * 日志门面单元测试
@@ -19,15 +19,15 @@ import org.junit.Test;
  *
  */
 public class CustomLogTest {
-	
+
 	private static final String LINE = "----------------------------------------------------------------------";
-	
+
 	@Test
 	public void consoleLogTest(){
 		LogFactory factory = new ConsoleLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
 
@@ -40,24 +40,24 @@ public class CustomLogTest {
 		log.info(null);
 		log.info((String)null);
 	}
-	
+
 	@Test
 	public void commonsLogTest(){
 		LogFactory factory = new ApacheCommonsLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
-	
+
 	@Test
 	public void tinyLogTest(){
 		LogFactory factory = new TinyLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
@@ -73,7 +73,7 @@ public class CustomLogTest {
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
-	
+
 	@Test
 	public void log4j2LogTest(){
 		LogFactory factory = new Log4j2LogFactory();
@@ -86,47 +86,47 @@ public class CustomLogTest {
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
-	
+
 	@Test
 	public void log4jLogTest(){
 		LogFactory factory = new Log4jLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
-		
+
 	}
-	
+
 	@Test
 	public void jbossLogTest(){
 		LogFactory factory = new JbossLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
-	
+
 	@Test
 	public void jdkLogTest(){
 		LogFactory factory = new JdkLogFactory();
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
 	}
-	
+
 	@Test
 	public void slf4jTest(){
 		LogFactory factory = new Slf4jLogFactory(false);
 		LogFactory.setCurrentLogFactory(factory);
 		Log log = LogFactory.get();
-		
+
 		log.info(null);
 		log.info((String)null);
 		log.info("This is custom '{}' log\n{}", factory.getName(), LINE);
diff --git a/hutool-log/src/test/java/cn/hutool/log/test/LogTest.java b/hutool-log/src/test/java/cn/hutool/log/test/LogTest.java
index 2855d337e..1dd5db615 100644
--- a/hutool-log/src/test/java/cn/hutool/log/test/LogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/log/test/LogTest.java
@@ -1,7 +1,7 @@
 package cn.hutool.log.test;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
@@ -13,25 +13,25 @@ import cn.hutool.log.level.Level;
  *
  */
 public class LogTest {
-	
+
 	@Test
 	public void logTest(){
 		Log log = LogFactory.get();
-		
+
 		// 自动选择日志实现
 		log.debug("This is {} log", Level.DEBUG);
 		log.info("This is {} log", Level.INFO);
 		log.warn("This is {} log", Level.WARN);
-		
+
 //		Exception e = new Exception("test Exception");
 //		log.error(e, "This is {} log", Level.ERROR);
 	}
-	
+
 	/**
 	 * 兼容slf4j日志消息格式测试，即第二个参数是异常对象时正常输出异常信息
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void logWithExceptionTest() {
 		Log log = LogFactory.get();
 		Exception e = new Exception("test Exception");
diff --git a/hutool-log/src/test/java/cn/hutool/log/test/LogTubeTest.java b/hutool-log/src/test/java/cn/hutool/log/test/LogTubeTest.java
index 073523128..62bd06203 100644
--- a/hutool-log/src/test/java/cn/hutool/log/test/LogTubeTest.java
+++ b/hutool-log/src/test/java/cn/hutool/log/test/LogTubeTest.java
@@ -3,7 +3,7 @@ package cn.hutool.log.test;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
 import cn.hutool.log.dialect.logtube.LogTubeLogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LogTubeTest {
 
diff --git a/hutool-log/src/test/java/cn/hutool/log/test/StaticLogTest.java b/hutool-log/src/test/java/cn/hutool/log/test/StaticLogTest.java
index aeac9854f..5038d804f 100755
--- a/hutool-log/src/test/java/cn/hutool/log/test/StaticLogTest.java
+++ b/hutool-log/src/test/java/cn/hutool/log/test/StaticLogTest.java
@@ -4,7 +4,7 @@ import cn.hutool.log.LogFactory;
 import cn.hutool.log.StaticLog;
 import cn.hutool.log.dialect.console.ConsoleColorLogFactory;
 import cn.hutool.log.dialect.console.ConsoleLogFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StaticLogTest {
 	@Test
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index a53683350..a5d58f7cc 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>org.ofdrw</groupId>
 			<artifactId>ofdrw-full</artifactId>
-			<version>2.2.6</version>
+			<version>2.3.1</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/IssueI5Q1TWTest.java b/hutool-poi/src/test/java/cn/hutool/poi/IssueI5Q1TWTest.java
index edbfad091..98568c0fc 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/IssueI5Q1TWTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/IssueI5Q1TWTest.java
@@ -2,8 +2,9 @@ package cn.hutool.poi;
 
 import cn.hutool.poi.excel.ExcelReader;
 import cn.hutool.poi.excel.ExcelUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class IssueI5Q1TWTest {
 
@@ -12,9 +13,9 @@ public class IssueI5Q1TWTest {
 		final ExcelReader reader = ExcelUtil.getReader("I5Q1TW.xlsx");
 
 		// 自定义时间格式1
-		Assert.assertEquals("18:56", reader.readCellValue(0, 0).toString());
+		assertEquals("18:56", reader.readCellValue(0, 0).toString());
 
 		// 自定义时间格式2
-		Assert.assertEquals("18:56", reader.readCellValue(1, 0).toString());
+		assertEquals("18:56", reader.readCellValue(1, 0).toString());
 	}
 }
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
index 2f4d31d7c..c739176ce 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
@@ -10,8 +10,8 @@ import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,13 +22,13 @@ import java.util.Map;
 
 /**
  * 写出Excel单元测试
- * 
+ *
  * @author looly
  */
 public class BigExcelWriteTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		BigExcelWriter overtimeWriter = ExcelUtil.getBigWriter("e:/excel/single_line.xlsx");
@@ -37,7 +37,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -50,7 +50,7 @@ public class BigExcelWriteTest {
 			//超大列表写出测试
 			rows.add(ObjectUtil.clone(row1));
 		}
-		
+
 		String filePath = "e:/bigWriteTest.xlsx";
 		FileUtil.del(filePath);
 		// 通过工具类创建writer
@@ -66,9 +66,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		List<?> row1 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -89,16 +89,16 @@ public class BigExcelWriteTest {
 		writer.merge(row1.size() - 1, "测试标题");
 		// 一次性写出内容，使用默认样式
 		writer.write(rows);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(7, 10, 4, 10, "测试Merge", false);
-		
+
 		// 关闭writer，释放内存
 		writer.close();
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 		Map<String, Object> row1 = new LinkedHashMap<>();
 		row1.put("姓名", "张三");
@@ -120,14 +120,14 @@ public class BigExcelWriteTest {
 		String path = "e:/bigWriteMapTest.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		//设置内容字体
 		Font font = writer.createFont();
 		font.setBold(true);
-		font.setColor(Font.COLOR_RED); 
-		font.setItalic(true); 
+		font.setColor(Font.COLOR_RED);
+		font.setItalic(true);
 		writer.getStyleSet().setFont(font, true);
-		
+
 		// 合并单元格后的标题行，使用默认标题样式
 		writer.merge(row1.size() - 1, "一班成绩单");
 		// 一次性写出内容，使用默认样式
@@ -135,9 +135,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 		Map<String, Object> row1 = MapUtil.newHashMap(true);
 		row1.put("姓名", "张三");
@@ -145,12 +145,12 @@ public class BigExcelWriteTest {
 		row1.put("成绩", 88.32);
 		row1.put("是否合格", true);
 		row1.put("考试日期", DateUtil.date());
-		
+
 		// 通过工具类创建writer
 		String path = "e:/bigWriteMapTest2.xlsx";
 		FileUtil.del(path);
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path);
-		
+
 		// 一次性写出内容，使用默认样式
 		writer.writeRow(row1, true);
 		// 关闭writer，释放内存
@@ -158,7 +158,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		cn.hutool.poi.excel.TestBean bean1 = new cn.hutool.poi.excel.TestBean();
 		bean1.setName("张三");
@@ -192,9 +192,9 @@ public class BigExcelWriteTest {
 		// 关闭writer，释放内存
 		writer.close();
 	}
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		String path = "d:/test/cellValueTest.xlsx";
 		FileUtil.del(path);
@@ -204,7 +204,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void closeTest() {
 		final Map<String, ?> map1 = MapUtil.of("id", "123456");
 		final Map<String, ?> map2 = MapUtil.of("id", "123457");
@@ -217,7 +217,7 @@ public class BigExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issue1210() {
 		// 通过工具类创建writer
 		String path = "d:/test/issue1210.xlsx";
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java
index 9046324f4..25bb5957e 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellEditorTest.java
@@ -4,30 +4,32 @@ import cn.hutool.poi.excel.cell.CellEditor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.Cell;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
 
 import java.io.Serializable;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class CellEditorTest {
 
-	@org.junit.Test
+	@Test
 	public void readTest(){
 		ExcelReader excelReader= ExcelUtil.getReader("cell_editor_test.xlsx");
 		excelReader.setCellEditor(new ExcelHandler());
-		List<Test> excelReaderObjects=excelReader.readAll(Test.class);
+		List<TestBean> excelReaderObjects=excelReader.readAll(TestBean.class);
 
-		Assert.assertEquals("0", excelReaderObjects.get(0).getTest1());
-		Assert.assertEquals("b", excelReaderObjects.get(0).getTest2());
-		Assert.assertEquals("0", excelReaderObjects.get(1).getTest1());
-		Assert.assertEquals("b1", excelReaderObjects.get(1).getTest2());
-		Assert.assertEquals("0", excelReaderObjects.get(2).getTest1());
-		Assert.assertEquals("c2", excelReaderObjects.get(2).getTest2());
+		assertEquals("0", excelReaderObjects.get(0).getTest1());
+		assertEquals("b", excelReaderObjects.get(0).getTest2());
+		assertEquals("0", excelReaderObjects.get(1).getTest1());
+		assertEquals("b1", excelReaderObjects.get(1).getTest2());
+		assertEquals("0", excelReaderObjects.get(2).getTest1());
+		assertEquals("c2", excelReaderObjects.get(2).getTest2());
 	}
 
 	@AllArgsConstructor
 	@Data
-	public static class Test implements Serializable {
+	public static class TestBean implements Serializable {
 		private static final long serialVersionUID = 1L;
 
 		private String test1;
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java
index e1da42df1..e02fdc412 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/CellUtilTest.java
@@ -1,15 +1,15 @@
 package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.BuiltinFormats;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import cn.hutool.core.lang.Console;
 
 public class CellUtilTest {
-	
+
 	@Test
-	@Ignore
+	@Disabled
 	public void isDateTest() {
 		String[] all = BuiltinFormats.getAll();
 		for(int i = 0 ; i < all.length; i++) {
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java
index eae8aa284..ff476580e 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelFileUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 
@@ -13,8 +13,8 @@ public class ExcelFileUtilTest {
 	public void xlsTest(){
 		InputStream in = FileUtil.getInputStream("aaa.xls");
 		try{
-			Assert.assertTrue(ExcelFileUtil.isXls(in));
-			Assert.assertFalse(ExcelFileUtil.isXlsx(in));
+			assertTrue(ExcelFileUtil.isXls(in));
+			assertFalse(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.close(in);
 		}
@@ -24,8 +24,8 @@ public class ExcelFileUtilTest {
 	public void xlsxTest(){
 		InputStream in = FileUtil.getInputStream("aaa.xlsx");
 		try{
-			Assert.assertFalse(ExcelFileUtil.isXls(in));
-			Assert.assertTrue(ExcelFileUtil.isXlsx(in));
+			assertFalse(ExcelFileUtil.isXls(in));
+			assertTrue(ExcelFileUtil.isXlsx(in));
 		} finally {
 			IoUtil.close(in);
 		}
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
index bb528e197..afeb1a33b 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReadTest.java
@@ -6,9 +6,9 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.poi.excel.cell.CellHandler;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -27,7 +27,7 @@ public class ExcelReadTest {
 
 		//读取单个单元格内容测试
 		Object value = reader.readCellValue(1, 2);
-		Assert.assertEquals("仓库", value);
+		assertEquals("仓库", value);
 
 		Map<String, String> headerAlias = MapUtil.newHashMap();
 		headerAlias.put("用户姓名", "userName");
@@ -38,17 +38,17 @@ public class ExcelReadTest {
 
 		// 读取list时默认首个非空行为标题
 		List<List<Object>> read = reader.read();
-		Assert.assertEquals("userName", read.get(0).get(0));
-		Assert.assertEquals("storageName", read.get(0).get(1));
-		Assert.assertEquals("checkPerm", read.get(0).get(2));
-		Assert.assertEquals("allotAuditPerm", read.get(0).get(3));
+		assertEquals("userName", read.get(0).get(0));
+		assertEquals("storageName", read.get(0).get(1));
+		assertEquals("checkPerm", read.get(0).get(2));
+		assertEquals("allotAuditPerm", read.get(0).get(3));
 
 		List<Map<String, Object>> readAll = reader.readAll();
 		for (Map<String, Object> map : readAll) {
-			Assert.assertTrue(map.containsKey("userName"));
-			Assert.assertTrue(map.containsKey("storageName"));
-			Assert.assertTrue(map.containsKey("checkPerm"));
-			Assert.assertTrue(map.containsKey("allotAuditPerm"));
+			assertTrue(map.containsKey("userName"));
+			assertTrue(map.containsKey("storageName"));
+			assertTrue(map.containsKey("checkPerm"));
+			assertTrue(map.containsKey("allotAuditPerm"));
 		}
 	}
 
@@ -57,7 +57,7 @@ public class ExcelReadTest {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("priceIndex.xls"));
 		List<Map<String, Object>> readAll = reader.readAll();
 
-		Assert.assertEquals(4, readAll.size());
+		assertEquals(4, readAll.size());
 	}
 
 	@Test
@@ -66,22 +66,22 @@ public class ExcelReadTest {
 		List<List<Object>> readAll = reader.read();
 
 		// 标题
-		Assert.assertEquals("姓名", readAll.get(0).get(0));
-		Assert.assertEquals("性别", readAll.get(0).get(1));
-		Assert.assertEquals("年龄", readAll.get(0).get(2));
-		Assert.assertEquals("鞋码", readAll.get(0).get(3));
+		assertEquals("姓名", readAll.get(0).get(0));
+		assertEquals("性别", readAll.get(0).get(1));
+		assertEquals("年龄", readAll.get(0).get(2));
+		assertEquals("鞋码", readAll.get(0).get(3));
 
 		// 第一行
-		Assert.assertEquals("张三", readAll.get(1).get(0));
-		Assert.assertEquals("男", readAll.get(1).get(1));
-		Assert.assertEquals(11L, readAll.get(1).get(2));
-		Assert.assertEquals(41.5D, readAll.get(1).get(3));
+		assertEquals("张三", readAll.get(1).get(0));
+		assertEquals("男", readAll.get(1).get(1));
+		assertEquals(11L, readAll.get(1).get(2));
+		assertEquals(41.5D, readAll.get(1).get(3));
 	}
 
 	@Test
 	public void excelReadAsTextTest() {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
-		Assert.assertNotNull(reader.readAsText(false));
+		assertNotNull(reader.readAsText(false));
 	}
 
 	@Test
@@ -94,16 +94,16 @@ public class ExcelReadTest {
 		// }
 
 		// 标题
-		Assert.assertEquals("姓名", readAll.get(0).get(0));
-		Assert.assertEquals("性别", readAll.get(0).get(1));
-		Assert.assertEquals("年龄", readAll.get(0).get(2));
-		Assert.assertEquals("分数", readAll.get(0).get(3));
+		assertEquals("姓名", readAll.get(0).get(0));
+		assertEquals("性别", readAll.get(0).get(1));
+		assertEquals("年龄", readAll.get(0).get(2));
+		assertEquals("分数", readAll.get(0).get(3));
 
 		// 第一行
-		Assert.assertEquals("张三", readAll.get(1).get(0));
-		Assert.assertEquals("男", readAll.get(1).get(1));
-		Assert.assertEquals(11L, readAll.get(1).get(2));
-		Assert.assertEquals(33.2D, readAll.get(1).get(3));
+		assertEquals("张三", readAll.get(1).get(0));
+		assertEquals("男", readAll.get(1).get(1));
+		assertEquals(11L, readAll.get(1).get(2));
+		assertEquals(33.2D, readAll.get(1).get(3));
 	}
 
 	@Test
@@ -112,11 +112,11 @@ public class ExcelReadTest {
 		List<List<Object>> readAll = reader.read();
 
 		// 标题
-		Assert.assertEquals("班级", readAll.get(0).get(0));
-		Assert.assertEquals("年级", readAll.get(0).get(1));
-		Assert.assertEquals("学校", readAll.get(0).get(2));
-		Assert.assertEquals("入学时间", readAll.get(0).get(3));
-		Assert.assertEquals("更新时间", readAll.get(0).get(4));
+		assertEquals("班级", readAll.get(0).get(0));
+		assertEquals("年级", readAll.get(0).get(1));
+		assertEquals("学校", readAll.get(0).get(2));
+		assertEquals("入学时间", readAll.get(0).get(3));
+		assertEquals("更新时间", readAll.get(0).get(4));
 	}
 
 	@Test
@@ -124,9 +124,9 @@ public class ExcelReadTest {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
 		List<Map<String, Object>> readAll = reader.readAll();
 
-		Assert.assertEquals("张三", readAll.get(0).get("姓名"));
-		Assert.assertEquals("男", readAll.get(0).get("性别"));
-		Assert.assertEquals(11L, readAll.get(0).get("年龄"));
+		assertEquals("张三", readAll.get(0).get("姓名"));
+		assertEquals("男", readAll.get(0).get("性别"));
+		assertEquals(11L, readAll.get(0).get("年龄"));
 	}
 
 	@Test
@@ -138,14 +138,14 @@ public class ExcelReadTest {
 		reader.addHeaderAlias("鞋码", "shoeSize");
 
 		List<Person> all = reader.readAll(Person.class);
-		Assert.assertEquals("张三", all.get(0).getName());
-		Assert.assertEquals("男", all.get(0).getGender());
-		Assert.assertEquals(Integer.valueOf(11), all.get(0).getAge());
-		Assert.assertEquals(new BigDecimal("41.5"), all.get(0).getShoeSize());
+		assertEquals("张三", all.get(0).getName());
+		assertEquals("男", all.get(0).getGender());
+		assertEquals(Integer.valueOf(11), all.get(0).getAge());
+		assertEquals(new BigDecimal("41.5"), all.get(0).getShoeSize());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void excelReadToBeanListTest2() {
 		ExcelReader reader = ExcelUtil.getReader("f:/test/toBean.xlsx");
 		reader.addHeaderAlias("姓名", "name");
@@ -167,7 +167,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readDoubleTest() {
 		ExcelReader reader = ExcelUtil.getReader("f:/test/doubleTest.xls");
 		final List<List<Object>> read = reader.read();
@@ -181,19 +181,19 @@ public class ExcelReadTest {
 		final ExcelReader reader = ExcelUtil.getReader("merge_test.xlsx");
 		final List<List<Object>> read = reader.read();
 		// 验证合并单元格在两行中都可以取到值
-		Assert.assertEquals(11L, read.get(1).get(2));
-		Assert.assertEquals(11L, read.get(2).get(2));
+		assertEquals(11L, read.get(1).get(2));
+		assertEquals(11L, read.get(2).get(2));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readCellsTest() {
 		final ExcelReader reader = ExcelUtil.getReader("merge_test.xlsx");
 		reader.read((cell, value)-> Console.log("{}, {} {}", cell.getRowIndex(), cell.getColumnIndex(), value));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest() {
 		// 测试合并单元格是否可以正常读到第一个单元格的值
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/人员体检信息表.xlsx");
@@ -210,17 +210,17 @@ public class ExcelReadTest {
 		final List<List<Object>> read = reader.read();
 
 		// 对于任意一个单元格有值的情况下，之前的单元格值按照null处理
-		Assert.assertEquals(1, read.get(1).size());
-		Assert.assertEquals(2, read.get(2).size());
-		Assert.assertEquals(3, read.get(3).size());
+		assertEquals(1, read.get(1).size());
+		assertEquals(2, read.get(2).size());
+		assertEquals(3, read.get(3).size());
 
-		Assert.assertEquals("#", read.get(2).get(0));
-		Assert.assertEquals("#", read.get(3).get(0));
-		Assert.assertEquals("#", read.get(3).get(1));
+		assertEquals("#", read.get(2).get(0));
+		assertEquals("#", read.get(3).get(0));
+		assertEquals("#", read.get(3).get(1));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readEmptyTest(){
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/issue.xlsx");
 		final List<Map<String, Object>> maps = reader.readAll();
@@ -228,7 +228,7 @@ public class ExcelReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readNullRowTest(){
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/1.-.xls");
 		reader.read((CellHandler) Console::log);
@@ -239,10 +239,10 @@ public class ExcelReadTest {
 		ExcelReader reader = ExcelUtil.getReader(ResourceUtil.getStream("aaa.xlsx"));
 		final List<Object> objects = reader.readColumn(0, 1);
 
-		Assert.assertEquals(3, objects.size());
-		Assert.assertEquals("张三", objects.get(0));
-		Assert.assertEquals("李四", objects.get(1));
-		Assert.assertEquals("", objects.get(2));
+		assertEquals(3, objects.size());
+		assertEquals("张三", objects.get(0));
+		assertEquals("李四", objects.get(1));
+		assertEquals("", objects.get(2));
 	}
 
 	@Test
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReaderToWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReaderToWriterTest.java
index 1ea1e299a..a7a582cba 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReaderToWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelReaderToWriterTest.java
@@ -13,13 +13,13 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ExcelReaderToWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getWriterTest() {
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/issue3120.xlsx");
 		final ExcelWriter writer = reader.getWriter();
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
index afc7e7646..b54379de2 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
@@ -11,14 +11,15 @@ import cn.hutool.poi.excel.sax.Excel03SaxReader;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.ss.usermodel.CellStyle;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 /**
  * Excel sax方式读取
  *
@@ -65,15 +66,17 @@ public class ExcelSaxReadTest {
 		reader.read("aaa.xls", "sheetName:校园入学");
 	}
 
-	@Test(expected = POIException.class)
+	@Test
 	public void excel03ByNameErrorTest() {
-		// sheet名称不存在则报错
-		final Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
-		reader.read("aaa.xls", "校园入学1");
+		assertThrows(POIException.class, () -> {
+			// sheet名称不存在则报错
+			final Excel03SaxReader reader = new Excel03SaxReader(createRowHandler());
+			reader.read("aaa.xls", "校园入学1");
+		});
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBlankLineTest() {
 		ExcelUtil.readBySax("e:/ExcelBlankLine.xlsx", 0, (sheetIndex, rowIndex, rowList) -> {
 			if (StrUtil.isAllEmpty(Convert.toStrArray(rowList))) {
@@ -99,7 +102,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBySaxTest2() {
 		ExcelUtil.readBySax("d:/test/456789.xlsx", "0", (sheetIndex, rowIndex, rowList) -> Console.log(rowList));
 	}
@@ -109,13 +112,13 @@ public class ExcelSaxReadTest {
 //			Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist);
 			if (5 != rowIndex && 6 != rowIndex) {
 				// 测试样例中除第五行、第六行都为非空行
-				Assert.assertTrue(CollUtil.isNotEmpty(rowlist));
+				assertTrue(CollUtil.isNotEmpty(rowlist));
 			}
 		};
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void handle07CellTest() {
 		ExcelUtil.readBySax("d:/test/test.xlsx", -1, new RowHandler() {
 
@@ -158,7 +161,7 @@ public class ExcelSaxReadTest {
 				rows.add("");
 			}
 		});
-		Assert.assertEquals(50L, rows.get(3));
+		assertEquals(50L, rows.get(3));
 	}
 
 	@Test
@@ -168,7 +171,7 @@ public class ExcelSaxReadTest {
 				rows.add(list.get(1)));
 
 		final FormulaCellValue value = (FormulaCellValue) rows.get(3);
-		Assert.assertEquals(50L, value.getResult());
+		assertEquals(50L, value.getResult());
 	}
 
 	@Test
@@ -178,11 +181,11 @@ public class ExcelSaxReadTest {
 				(i, i1, list) -> rows.add(StrUtil.toString(list.get(0)))
 		);
 
-		Assert.assertEquals("2020-10-09 00:00:00", rows.get(1));
+		assertEquals("2020-10-09 00:00:00", rows.get(1));
 		// 非日期格式不做转换
-		Assert.assertEquals("112233", rows.get(2));
-		Assert.assertEquals("1000.0", rows.get(3));
-		Assert.assertEquals("2012-12-21 00:00:00", rows.get(4));
+		assertEquals("112233", rows.get(2));
+		assertEquals("1000.0", rows.get(3));
+		assertEquals("2012-12-21 00:00:00", rows.get(4));
 	}
 
 	@Test
@@ -192,15 +195,15 @@ public class ExcelSaxReadTest {
 				(i, i1, list) -> rows.add(StrUtil.toString(list.get(0)))
 		);
 
-		Assert.assertEquals("2020-10-09 00:00:00", rows.get(1));
+		assertEquals("2020-10-09 00:00:00", rows.get(1));
 		// 非日期格式不做转换
-		Assert.assertEquals("112233", rows.get(2));
-		Assert.assertEquals("1000.0", rows.get(3));
-		Assert.assertEquals("2012-12-21 00:00:00", rows.get(4));
+		assertEquals("112233", rows.get(2));
+		assertEquals("1000.0", rows.get(3));
+		assertEquals("2012-12-21 00:00:00", rows.get(4));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dateReadXlsxTest2() {
 		ExcelUtil.readBySax("d:/test/custom_date_format2.xlsx", 0,
 				(i, i1, list) -> Console.log(list)
@@ -208,7 +211,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readBlankTest() {
 		final File file = new File("D:/test/b.xlsx");
 
@@ -218,7 +221,7 @@ public class ExcelSaxReadTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readXlsmTest() {
 		ExcelUtil.readBySax("d:/test/WhiteListTemplate.xlsm", -1,
 				(sheetIndex, rowIndex, rowlist) -> Console.log("[{}] [{}] {}", sheetIndex, rowIndex, rowlist));
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
index 06d0bfc76..797b6f1df 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.poi.excel.cell.CellLocation;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -13,39 +13,39 @@ public class ExcelUtilTest {
 
 	@Test
 	public void indexToColNameTest() {
-		Assert.assertEquals("A", ExcelUtil.indexToColName(0));
-		Assert.assertEquals("B", ExcelUtil.indexToColName(1));
-		Assert.assertEquals("C", ExcelUtil.indexToColName(2));
+		assertEquals("A", ExcelUtil.indexToColName(0));
+		assertEquals("B", ExcelUtil.indexToColName(1));
+		assertEquals("C", ExcelUtil.indexToColName(2));
 
-		Assert.assertEquals("AA", ExcelUtil.indexToColName(26));
-		Assert.assertEquals("AB", ExcelUtil.indexToColName(27));
-		Assert.assertEquals("AC", ExcelUtil.indexToColName(28));
+		assertEquals("AA", ExcelUtil.indexToColName(26));
+		assertEquals("AB", ExcelUtil.indexToColName(27));
+		assertEquals("AC", ExcelUtil.indexToColName(28));
 
-		Assert.assertEquals("AAA", ExcelUtil.indexToColName(702));
-		Assert.assertEquals("AAB", ExcelUtil.indexToColName(703));
-		Assert.assertEquals("AAC", ExcelUtil.indexToColName(704));
+		assertEquals("AAA", ExcelUtil.indexToColName(702));
+		assertEquals("AAB", ExcelUtil.indexToColName(703));
+		assertEquals("AAC", ExcelUtil.indexToColName(704));
 	}
 
 	@Test
 	public void colNameToIndexTest() {
-		Assert.assertEquals(704, ExcelUtil.colNameToIndex("AAC"));
-		Assert.assertEquals(703, ExcelUtil.colNameToIndex("AAB"));
-		Assert.assertEquals(702, ExcelUtil.colNameToIndex("AAA"));
+		assertEquals(704, ExcelUtil.colNameToIndex("AAC"));
+		assertEquals(703, ExcelUtil.colNameToIndex("AAB"));
+		assertEquals(702, ExcelUtil.colNameToIndex("AAA"));
 
-		Assert.assertEquals(28, ExcelUtil.colNameToIndex("AC"));
-		Assert.assertEquals(27, ExcelUtil.colNameToIndex("AB"));
-		Assert.assertEquals(26, ExcelUtil.colNameToIndex("AA"));
+		assertEquals(28, ExcelUtil.colNameToIndex("AC"));
+		assertEquals(27, ExcelUtil.colNameToIndex("AB"));
+		assertEquals(26, ExcelUtil.colNameToIndex("AA"));
 
-		Assert.assertEquals(2, ExcelUtil.colNameToIndex("C"));
-		Assert.assertEquals(1, ExcelUtil.colNameToIndex("B"));
-		Assert.assertEquals(0, ExcelUtil.colNameToIndex("A"));
+		assertEquals(2, ExcelUtil.colNameToIndex("C"));
+		assertEquals(1, ExcelUtil.colNameToIndex("B"));
+		assertEquals(0, ExcelUtil.colNameToIndex("A"));
 	}
 
 	@Test
 	public void toLocationTest() {
 		final CellLocation a11 = ExcelUtil.toLocation("A11");
-		Assert.assertEquals(0, a11.getX());
-		Assert.assertEquals(10, a11.getY());
+		assertEquals(0, a11.getX());
+		assertEquals(10, a11.getY());
 	}
 
 	@Test
@@ -61,7 +61,7 @@ public class ExcelUtilTest {
 		final ExcelReader reader = ExcelUtil.getReader("aaa.xlsx", "12");
 		final List<Map<String, Object>> list = reader.readAll();
 		reader.close();
-		Assert.assertEquals(1L, list.get(1).get("鞋码"));
+		assertEquals(1L, list.get(1).get("鞋码"));
 	}
 
 	@Test
@@ -80,7 +80,7 @@ public class ExcelUtilTest {
 			}
 		});
 		//总共2个sheet页，读取所有sheet时，一共执行doAfterAllAnalysed2次。
-		Assert.assertEquals(2, doAfterAllAnalysedTime.intValue());
+		assertEquals(2, doAfterAllAnalysedTime.intValue());
 	}
 
 }
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteBeanTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteBeanTest.java
index d1c3207c5..3034fac04 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteBeanTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteBeanTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.poi.excel;
 
 import lombok.Getter;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ExcelWriteBeanTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeRowTest() {
 		MyBean bean = new MyBean("value1", "value2");
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
index 0276f3385..c0a03fee9 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelWriteTest.java
@@ -15,9 +15,9 @@ import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.*;
@@ -61,7 +61,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void testRowOrColumnCellStyle() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -105,7 +105,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest2() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		ExcelWriter overtimeWriter = ExcelUtil.getWriter("e:/excel/single_line.xlsx");
@@ -114,7 +114,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithSheetTest() {
 		ExcelWriter writer = ExcelUtil.getWriterWithSheet("表格1");
 
@@ -134,7 +134,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -169,7 +169,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest() {
 		List<?> row1 = CollUtil.newArrayList("aa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
@@ -199,7 +199,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest2() {
 
 		ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(MAP_DATA_1, MAP_DATA_2);
@@ -216,7 +216,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest() {
 
 		ArrayList<Map<String, Object>> rows = CollUtil.newArrayList(MAP_DATA_1, MAP_DATA_2);
@@ -240,7 +240,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapTest2() {
 
 		// 通过工具类创建writer
@@ -253,7 +253,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapWithStyleTest() {
 
 		// 通过工具类创建writer
@@ -274,7 +274,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAliasTest() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -309,7 +309,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -342,7 +342,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest2() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -372,7 +372,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapOnlyAliasTest3() {
 		Map<Object, Object> row1 = new LinkedHashMap<>();
 		row1.put("name", "张三");
@@ -406,7 +406,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest() {
 		TestBean bean1 = new TestBean();
 		bean1.setName("张三");
@@ -442,7 +442,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeBeanTest2() {
 		OrderExcel order1 = new OrderExcel();
 		order1.setId("1");
@@ -470,7 +470,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeCellValueTest() {
 		ExcelWriter writer = new ExcelWriter("d:/cellValueTest.xls");
 		writer.writeCellValue(3, 5, "aaa");
@@ -479,7 +479,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest() {
 		List<String> row = CollUtil.newArrayList("姓名", "加班日期", "下班时间", "加班时长", "餐补", "车补次数", "车补", "总计");
 		ExcelWriter overtimeWriter = ExcelUtil.getWriter("d:/test/single_line.xlsx");
@@ -489,7 +489,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void addSelectTest2() {
 		ExcelWriter writer = ExcelUtil.getWriter("d:/test/select.xls");
 		writer.writeCellValue(0, 0, "请选择科目");
@@ -507,7 +507,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest() {
 		List<Map<String, Object>> rows = new LinkedList<>();
 		for (int i = 0; i < 10; i++) {
@@ -542,7 +542,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetTest2() {
 		List<Map<String, Object>> rows = new LinkedList<>();
 		final HashMap<String, Object> map = MapUtil.newHashMap();
@@ -566,7 +566,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMultiSheetWithStyleTest() {
 		ExcelWriter writer = ExcelUtil.getWriter("D:\\test\\multiSheetWithStyle.xlsx", "表格1");
 
@@ -597,7 +597,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapsTest() {
 		List<Map<String, Object>> rows = new ArrayList<>();
 
@@ -625,7 +625,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void formatTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
 		final CellStyle cellStyle = writer.createCellStyle(0, 0);
@@ -634,7 +634,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeNumberFormatTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/formatTest.xlsx");
 		writer.disableDefaultStyle();
@@ -645,7 +645,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeSecHeadRowTest() {
 		List<?> row1 = CollUtil.newArrayList(1, "aa", "bb", "cc", "dd", "ee");
 		List<?> row2 = CollUtil.newArrayList(2, "aa1", "bb1", "cc1", "dd1", "ee1");
@@ -695,7 +695,7 @@ public class ExcelWriteTest {
 	 * 测试使用BigWriter写出，ExcelWriter修改失败
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void editTest() {
 		// 生成文件
 		File file = new File("d:/test/100_.xlsx");
@@ -718,7 +718,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeTest3() {
 		// https://github.com/dromara/hutool/issues/1696
 
@@ -748,7 +748,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeForDateTest() {
 		// https://github.com/dromara/hutool/issues/1911
 
@@ -761,7 +761,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void changeHeaderStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/headerStyle.xlsx");
 		writer.writeHeadRow(ListUtil.of("姓名", "性别", "年龄"));
@@ -773,7 +773,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeFloatTest() {
 		//issue https://gitee.com/dromara/hutool/issues/I43U9G
 		String path = "d:/test/floatTest.xlsx";
@@ -785,7 +785,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void issueI466ZZTest() {
 		// https://gitee.com/dromara/hutool/issues/I466ZZ
 		// 需要输出S_20000314_x5116_0004
@@ -798,7 +798,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeLongTest() {
 		//https://gitee.com/dromara/hutool/issues/I49R6U
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/long.xlsx");
@@ -807,7 +807,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeHyperlinkTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/hyperlink.xlsx");
 
@@ -818,7 +818,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void mergeNumberTest() {
 		File tempFile = new File("d:/test/mergeNumber.xlsx");
 		FileUtil.del(tempFile);
@@ -829,7 +829,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeImgTest() {
 		ExcelWriter writer = ExcelUtil.getWriter(true);
 
@@ -846,11 +846,11 @@ public class ExcelWriteTest {
 	public void getDispositionTest() {
 		ExcelWriter writer = ExcelUtil.getWriter(true);
 		final String disposition = writer.getDisposition("测试A12.xlsx", CharsetUtil.CHARSET_UTF_8);
-		Assert.assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
+		assertEquals("attachment; filename=\"%E6%B5%8B%E8%AF%95A12.xlsx\"", disposition);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeColTest() {
 		ExcelWriter writer = ExcelUtil.getWriter("G:\\test.xlsx");
 		List<Integer> list = new ArrayList<>();
@@ -881,7 +881,7 @@ public class ExcelWriteTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void autoSizeColumnTest() {
 
 		Map<String, Object> map = new LinkedHashMap<>(MAP_DATA_1);
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java
index e693237ab..dde81c6c1 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue1729Test.java
@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel;
 
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -16,9 +16,9 @@ public class Issue1729Test {
 	public void readTest() {
 		final ExcelReader reader = ExcelUtil.getReader("UserProjectDO.xlsx");
 		final List<UserProjectDO> read = reader.read(0, 1, UserProjectDO.class);
-		Assert.assertEquals("aa", read.get(0).getProjectName());
-		Assert.assertNull(read.get(0).getEndTrainTime());
-		Assert.assertEquals("2020-02-02", read.get(0).getEndTestTime().toString());
+		assertEquals("aa", read.get(0).getProjectName());
+		assertNull(read.get(0).getEndTrainTime());
+		assertEquals("2020-02-02", read.get(0).getEndTestTime().toString());
 	}
 
 	@Data
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
index 8b26a38eb..36212dd10 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2221Test.java
@@ -6,8 +6,8 @@ import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -18,7 +18,7 @@ public class Issue2221Test {
 	 * 设置重复别名的时候，通过原key获取写出位置
 	 */
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDuplicateHeaderAliasTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/duplicateAlias.xlsx");
 		// 设置别名
@@ -37,7 +37,7 @@ public class Issue2221Test {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeDuplicateHeaderAliasTest2(){
 		// 获取写Excel的流
 		ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/duplicateAlias2.xlsx");
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2706Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2706Test.java
index 9a7181f15..5b572106d 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2706Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2706Test.java
@@ -1,7 +1,7 @@
 package cn.hutool.poi.excel;
 
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,7 +14,7 @@ import java.util.Set;
 public class Issue2706Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		String path = "d:/test/issue2706.xlsx";
 		BigExcelWriter writer = ExcelUtil.getBigWriter(path, "表格名称");
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2899Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2899Test.java
index ac46db0b3..766d5b6e7 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2899Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2899Test.java
@@ -4,13 +4,13 @@ import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import lombok.Data;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class Issue2899Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void aliasWriteTest() {
 		// Bean中设置@Alias时，setOnlyAlias是无效的，这个参数只和addHeaderAlias配合使用，原因是注解是Bean内部的操作，而addHeaderAlias是Writer的操作，不互通。
 		final TestBean testBean1 = new TestBean();
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2941Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2941Test.java
index 89b872c64..fe4b9ca8f 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2941Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue2941Test.java
@@ -1,15 +1,15 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 
 public class Issue2941Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void excelReadDateTest() {
 		final ExcelReader reader = ExcelUtil.getReader("d:/test/1677649503673.xlsx");
 		final List<Map<String, Object>> maps = reader.readAll();
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue3048Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue3048Test.java
index c780338b2..128a1d18b 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue3048Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/Issue3048Test.java
@@ -2,8 +2,8 @@ package cn.hutool.poi.excel;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.math.BigDecimal;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class Issue3048Test {
 	@Test
-	@Ignore
+	@Disabled
 	public void excelOutPutBeanListToExcel(){
 		List<TestBean> excelExportList = new ArrayList<>();
 		excelExportList.add(new TestBean("1", new BigDecimal("1.22")));
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java
index 0609d18f2..996443914 100755
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI53OSTTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.poi.excel;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,7 +15,7 @@ import java.util.Map;
 public class IssueI53OSTTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void readTest(){
 		Map<String, Object> result = new HashMap<>();
 		List<Object> header = new ArrayList<>();
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI64P2KTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI64P2KTest.java
index bcf4bacb0..6e7820531 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI64P2KTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI64P2KTest.java
@@ -4,13 +4,13 @@ import cn.hutool.core.collection.ListUtil;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.IndexedColors;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI64P2KTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeWithColumnStyleTest() {
 		// 设置默认列样式无效，暂时无解。
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/columnColorTest.xlsx");
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java
index 31c1b5286..ac32aa425 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6MBS5Test.java
@@ -6,8 +6,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.nio.file.Files;
 public class IssueI6MBS5Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCommentTest() {
 		final ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/setCommentTest.xlsx");
 		final Cell cell = writer.getOrCreateCell(0, 0);
@@ -32,7 +32,7 @@ public class IssueI6MBS5Test {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCommentTest2() {
 		final File file = new File("D:\\test\\CellUtilTest.xlsx");
 		try (final Workbook workbook = WorkbookUtil.createBook(true)) {
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6URF3Test.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6URF3Test.java
index 335e5dedb..830cb7168 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6URF3Test.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/IssueI6URF3Test.java
@@ -14,13 +14,13 @@ package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class IssueI6URF3Test {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void setCellStyleTest() {
 		final ExcelWriter writer = ExcelUtil.getWriter("d:/test/issueI6URF3.xlsx");
 		writer.writeCellValue(0, 0, 1);
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
index df3cefeb1..6ff1cc743 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/NumericCellValueTest.java
@@ -3,7 +3,7 @@ package cn.hutool.poi.excel;
 import cn.hutool.poi.excel.cell.values.NumericCellValue;
 import java.util.Date;
 import org.apache.poi.ss.usermodel.Cell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NumericCellValueTest {
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java
index 81917162a..9821e3bd5 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/WorkbookUtilTest.java
@@ -1,17 +1,17 @@
 package cn.hutool.poi.excel;
 
 import org.apache.poi.ss.usermodel.Workbook;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class WorkbookUtilTest {
 
 	@Test
 	public void createBookTest(){
 		Workbook book = WorkbookUtil.createBook(true);
-		Assert.assertNotNull(book);
+		assertNotNull(book);
 
 		book = WorkbookUtil.createBook(false);
-		Assert.assertNotNull(book);
+		assertNotNull(book);
 	}
 }
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteNumberToStringTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteNumberToStringTest.java
index 2f37edf1c..a91abc2de 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteNumberToStringTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteNumberToStringTest.java
@@ -2,12 +2,12 @@ package cn.hutool.poi.excel;
 
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.poi.excel.cell.FormulaCellValue;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class WriteNumberToStringTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void writeNumberTest() {
 		final ExcelWriter writer = ExcelUtil.getBigWriter("d:/test/dataWithNumber.xlsx");
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteStyleTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteStyleTest.java
index 192de0273..f1dd602b1 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteStyleTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/WriteStyleTest.java
@@ -7,8 +7,8 @@ import cn.hutool.poi.excel.style.StyleUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ import java.util.List;
  */
 public class WriteStyleTest {
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		List<?> row1 = CollUtil.newArrayList("aaaaa", "bb", "cc", "dd", DateUtil.date(), 3.22676575765);
 		List<?> row2 = CollUtil.newArrayList("aa1", "bb1", "cc1", "dd1", DateUtil.date(), 250.7676);
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java
index 9600ab3ce..74c1ad64e 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/ofd/OfdWriterTest.java
@@ -1,13 +1,13 @@
 package cn.hutool.poi.ofd;
 
 import cn.hutool.core.io.FileUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class OfdWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest(){
 		final OfdWriter ofdWriter = new OfdWriter(FileUtil.file("d:/test/test.ofd"));
 		ofdWriter.addText(null, "测试文本");
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java b/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
index 5d056a262..078e72a2c 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/word/WordWriterTest.java
@@ -5,8 +5,8 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.awt.Font;
 import java.io.File;
@@ -18,7 +18,7 @@ import java.util.Map;
 public class WordWriterTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTest() {
 		Word07Writer writer = new Word07Writer();
 		writer.addText(new Font("方正小标宋简体", Font.PLAIN, 22), "我是第一部分", "我是第二部分");
@@ -29,7 +29,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writePicTest() {
 		Word07Writer writer = new Word07Writer();
 		writer.addPicture(new File("d:\\test\\qrcodeCustom.jpg"), 100, 200);
@@ -40,7 +40,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeTableTest(){
 		final Word07Writer writer = new Word07Writer();
 		Map<String, Object> map = new LinkedHashMap<>();
@@ -54,7 +54,7 @@ public class WordWriterTest {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void writeMapAsTableTest() {
 		Word07Writer writer = new Word07Writer();
 
diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml
index c711a120c..c4baffa31 100755
--- a/hutool-script/pom.xml
+++ b/hutool-script/pom.xml
@@ -21,7 +21,7 @@
 
 		<jython.version>2.7.3</jython.version>
 		<luaj.version>3.0.1</luaj.version>
-		<groovy.version>3.0.20</groovy.version>
+		<groovy.version>3.0.22</groovy.version>
 	</properties>
 
 	<dependencies>
diff --git a/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java b/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java
index a2499f041..201e1019a 100755
--- a/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java
+++ b/hutool-script/src/test/java/cn/hutool/script/test/NashornDeepTest.java
@@ -2,7 +2,7 @@ package cn.hutool.script.test;
 
 
 import cn.hutool.core.io.resource.ResourceUtil;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.*;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
@@ -17,6 +17,6 @@ public class NashornDeepTest {
 		engine.eval(ResourceUtil.readUtf8Str("filter1.js"));
 
 		final Object filter1 = ((Invocable) engine).invokeFunction("filter1", 1, 2);
-		Assert.assertFalse((Boolean) filter1);
+		assertFalse((Boolean) filter1);
 	}
 }
diff --git a/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java b/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java
index 9da861c4e..e5a4ff628 100755
--- a/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java
+++ b/hutool-script/src/test/java/cn/hutool/script/test/ScriptUtilTest.java
@@ -3,8 +3,8 @@ package cn.hutool.script.test;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.script.ScriptRuntimeException;
 import cn.hutool.script.ScriptUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import javax.script.CompiledScript;
 import javax.script.ScriptEngine;
@@ -12,7 +12,7 @@ import javax.script.ScriptException;
 
 /**
  * 脚本单元测试类
- * 
+ *
  * @author looly
  *
  */
@@ -36,7 +36,7 @@ public class ScriptUtilTest {
 	@Test
 	public void invokeTest() {
 		final Object result = ScriptUtil.invoke(ResourceUtil.readUtf8Str("filter1.js"), "filter1", 2, 1);
-		Assert.assertTrue((Boolean) result);
+		assertTrue((Boolean) result);
 	}
 
 	@Test
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java b/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
index 28d86eddd..82bd53885 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
@@ -4,8 +4,8 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.setting.dialect.Props;
 import cn.hutool.setting.dialect.PropsUtil;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class Issue3008Test {
 
@@ -17,7 +17,7 @@ public class Issue3008Test {
 	public void toBeanTest() {
 		final Props props = PropsUtil.get("issue3008");
 		final MyUser user = props.toBean(MyUser.class, "person");
-		Assert.assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(user.getHobby()));
+		assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(user.getHobby()));
 	}
 
 	@Data
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java b/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
index a6024fbd7..117c9eef7 100755
--- a/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/IssueI7G34ETest.java
@@ -12,8 +12,8 @@
 
 package cn.hutool.setting;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class IssueI7G34ETest {
 
@@ -22,6 +22,6 @@ public class IssueI7G34ETest {
 		final Setting setting = new Setting("test_with_bom.setting");
 		final String s = setting.get("line1", "key1");
 
-		Assert.assertEquals("value1", s);
+		assertEquals("value1", s);
 	}
 }
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java b/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
index 7cf081368..e6cb917a5 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
@@ -5,16 +5,17 @@ import cn.hutool.log.LogFactory;
 import cn.hutool.log.dialect.console.ConsoleLogFactory;
 import cn.hutool.setting.dialect.Props;
 import lombok.Data;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Setting单元测试
  *
@@ -23,7 +24,7 @@ import java.util.Objects;
  */
 public class PropsTest {
 
-	@Before
+	@BeforeEach
 	public void init() {
 		LogFactory.setCurrentLogFactory(ConsoleLogFactory.class);
 	}
@@ -33,22 +34,22 @@ public class PropsTest {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final Props props = new Props("test.properties");
 		final String user = props.getProperty("user");
-		Assert.assertEquals(user, "root");
+		assertEquals(user, "root");
 
 		final String driver = props.getStr("driver");
-		Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
+		assertEquals(driver, "com.mysql.jdbc.Driver");
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void propTestForAbsPAth() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		final Props props = new Props("d:/test.properties");
 		final String user = props.getProperty("user");
-		Assert.assertEquals(user, "root");
+		assertEquals(user, "root");
 
 		final String driver = props.getStr("driver");
-		Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
+		assertEquals(driver, "com.mysql.jdbc.Driver");
 	}
 
 	@Test
@@ -56,19 +57,19 @@ public class PropsTest {
 		final Props props = Props.getProp("to_bean_test.properties");
 
 		final ConfigProperties cfg = props.toBean(ConfigProperties.class, "mail");
-		Assert.assertEquals("mailer@mail.com", cfg.getHost());
-		Assert.assertEquals(9000, cfg.getPort());
-		Assert.assertEquals("mailer@mail.com", cfg.getFrom());
+		assertEquals("mailer@mail.com", cfg.getHost());
+		assertEquals(9000, cfg.getPort());
+		assertEquals("mailer@mail.com", cfg.getFrom());
 
-		Assert.assertEquals("john", cfg.getCredentials().getUsername());
-		Assert.assertEquals("password", cfg.getCredentials().getPassword());
-		Assert.assertEquals("SHA1", cfg.getCredentials().getAuthMethod());
+		assertEquals("john", cfg.getCredentials().getUsername());
+		assertEquals("password", cfg.getCredentials().getPassword());
+		assertEquals("SHA1", cfg.getCredentials().getAuthMethod());
 
-		Assert.assertEquals("true", cfg.getAdditionalHeaders().get("redelivery"));
-		Assert.assertEquals("true", cfg.getAdditionalHeaders().get("secure"));
+		assertEquals("true", cfg.getAdditionalHeaders().get("redelivery"));
+		assertEquals("true", cfg.getAdditionalHeaders().get("secure"));
 
-		Assert.assertEquals("admin@mail.com", cfg.getDefaultRecipients().get(0));
-		Assert.assertEquals("owner@mail.com", cfg.getDefaultRecipients().get(1));
+		assertEquals("admin@mail.com", cfg.getDefaultRecipients().get(0));
+		assertEquals("owner@mail.com", cfg.getDefaultRecipients().get(1));
 	}
 
 	@Test
@@ -82,11 +83,11 @@ public class PropsTest {
 		configProp.setProperty("version", 3);
 		final SystemConfig systemConfig = configProp.toBean(SystemConfig.class);
 
-		Assert.assertEquals(DateUtil.parse("2020-01-01"), systemConfig.getCreateTime());
-		Assert.assertEquals(true, systemConfig.getIsInit());
-		Assert.assertEquals("1", systemConfig.getStairPlan());
-		Assert.assertEquals(new Integer(2), systemConfig.getStageNum());
-		Assert.assertEquals("3", systemConfig.getVersion());
+		assertEquals(DateUtil.parse("2020-01-01"), systemConfig.getCreateTime());
+		assertEquals(true, systemConfig.getIsInit());
+		assertEquals("1", systemConfig.getStairPlan());
+		assertEquals(new Integer(2), systemConfig.getStageNum());
+		assertEquals("3", systemConfig.getVersion());
 	}
 
 	@Data
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
index 054b7f95a..53579b694 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
@@ -1,8 +1,8 @@
 package cn.hutool.setting;
 
 import cn.hutool.setting.dialect.PropsUtil;
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 import java.util.Objects;
 
@@ -11,12 +11,12 @@ public class PropsUtilTest {
 	@Test
 	public void getTest() {
 		String driver = PropsUtil.get("test").getStr("driver");
-		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
+		assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 
 	@Test
 	public void getFirstFoundTest() {
 		String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
-		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
+		assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 }
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java b/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
index f7e4b1fe8..27f5818d0 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
@@ -1,9 +1,9 @@
 package cn.hutool.setting;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Setting单元测试
@@ -18,23 +18,23 @@ public class SettingTest {
 		Setting setting = new Setting("test.setting", true);
 
 		String driver = setting.getByGroup("driver", "demo");
-		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
+		assertEquals("com.mysql.jdbc.Driver", driver);
 
 		//本分组变量替换
 		String user = setting.getByGroup("user", "demo");
-		Assert.assertEquals("rootcom.mysql.jdbc.Driver", user);
+		assertEquals("rootcom.mysql.jdbc.Driver", user);
 
 		//跨分组变量替换
 		String user2 = setting.getByGroup("user2", "demo");
-		Assert.assertEquals("rootcom.mysql.jdbc.Driver", user2);
+		assertEquals("rootcom.mysql.jdbc.Driver", user2);
 
 		//默认值测试
 		String value = setting.getStr("keyNotExist", "defaultTest");
-		Assert.assertEquals("defaultTest", value);
+		assertEquals("defaultTest", value);
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void settingTestForAbsPath() {
 		//noinspection MismatchedQueryAndUpdateOfCollection
 		Setting setting = new Setting("d:\\excel-plugin\\other.setting", true);
@@ -50,10 +50,10 @@ public class SettingTest {
 		setting.setByGroup("user", "group3", "root3");
 		setting.set("user", "root4");
 
-		Assert.assertEquals("root", setting.getByGroup("user", "group1"));
-		Assert.assertEquals("root2", setting.getByGroup("user", "group2"));
-		Assert.assertEquals("root3", setting.getByGroup("user", "group3"));
-		Assert.assertEquals("root4", setting.get("user"));
+		assertEquals("root", setting.getByGroup("user", "group1"));
+		assertEquals("root2", setting.getByGroup("user", "group2"));
+		assertEquals("root3", setting.getByGroup("user", "group3"));
+		assertEquals("root4", setting.get("user"));
 	}
 
 	/**
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
index 6454cb528..5e1956a83 100644
--- a/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
@@ -1,20 +1,20 @@
 package cn.hutool.setting;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 public class SettingUtilTest {
 
 	@Test
 	public void getTest() {
 		String driver = SettingUtil.get("test").get("demo", "driver");
-		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
+		assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 
 	@Test
 	public void getTest2() {
 		String driver = SettingUtil.get("example/example").get("demo", "key");
-		Assert.assertEquals("value", driver);
+		assertEquals("value", driver);
 	}
 
 	@Test
@@ -22,6 +22,6 @@ public class SettingUtilTest {
 		//noinspection ConstantConditions
 		String driver = SettingUtil.getFirstFound("test2", "test")
 				.get("demo", "driver");
-		Assert.assertEquals("com.mysql.jdbc.Driver", driver);
+		assertEquals("com.mysql.jdbc.Driver", driver);
 	}
 }
diff --git a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
index 137fde726..e50d8844d 100755
--- a/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
+++ b/hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
@@ -3,9 +3,9 @@ package cn.hutool.setting.yaml;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.CharsetUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
@@ -15,15 +15,15 @@ public class YamlUtilTest {
 	public void loadByPathTest() {
 		final Dict result = YamlUtil.loadByPath("test.yaml");
 
-		Assert.assertEquals("John", result.getStr("firstName"));
+		assertEquals("John", result.getStr("firstName"));
 
 		final List<Integer> numbers = result.getByPath("contactDetails.number");
-		Assert.assertEquals(123456789, (int) numbers.get(0));
-		Assert.assertEquals(456786868, (int) numbers.get(1));
+		assertEquals(123456789, (int) numbers.get(0));
+		assertEquals(456786868, (int) numbers.get(1));
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dumpTest() {
 		final Dict dict = Dict.create()
 				.set("name", "hutool")
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
index e2b1b6aa9..da988988f 100755
--- a/hutool-system/pom.xml
+++ b/hutool-system/pom.xml
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
-			<version>6.4.10</version>
+			<version>6.6.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java b/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java
index 5be58e42b..addeb2228 100755
--- a/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java
+++ b/hutool-system/src/test/java/cn/hutool/system/OshiPrintTest.java
@@ -2,14 +2,14 @@ package cn.hutool.system;
 
 import cn.hutool.core.lang.Console;
 import cn.hutool.system.oshi.OshiUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore
+@Disabled
 public class OshiPrintTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void printCpuInfo(){
 		Console.log(OshiUtil.getCpuInfo());
 	}
diff --git a/hutool-system/src/test/java/cn/hutool/system/OshiTest.java b/hutool-system/src/test/java/cn/hutool/system/OshiTest.java
index 2bddf3b0b..068b3484a 100755
--- a/hutool-system/src/test/java/cn/hutool/system/OshiTest.java
+++ b/hutool-system/src/test/java/cn/hutool/system/OshiTest.java
@@ -3,9 +3,9 @@ package cn.hutool.system;
 import cn.hutool.core.lang.Console;
 import cn.hutool.system.oshi.CpuInfo;
 import cn.hutool.system.oshi.OshiUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import oshi.software.os.OSProcess;
 
 /**
@@ -16,23 +16,23 @@ public class OshiTest {
 	@Test
 	public void getMemoryTest() {
 		long total = OshiUtil.getMemory().getTotal();
-		Assert.assertTrue(total > 0);
+		assertTrue(total > 0);
 	}
 
 	@Test
 	public void getCupInfo() {
 		CpuInfo cpuInfo = OshiUtil.getCpuInfo();
-		Assert.assertNotNull(cpuInfo);
+		assertNotNull(cpuInfo);
 	}
 
 	@Test
 	public void getCurrentProcessTest() {
 		final OSProcess currentProcess = OshiUtil.getCurrentProcess();
-		Assert.assertEquals("java", currentProcess.getName());
+		assertEquals("java", currentProcess.getName());
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void getUsedTest(){
 		while (true){
 			Console.log(OshiUtil.getCpuInfo().getUsed());
diff --git a/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java b/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java
index 9fa7a3e92..b5db572b2 100755
--- a/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java
+++ b/hutool-system/src/test/java/cn/hutool/system/SystemUtilTest.java
@@ -1,16 +1,16 @@
 package cn.hutool.system;
 
 import cn.hutool.core.lang.Console;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 
 public class SystemUtilTest {
 
 	@Test
-	@Ignore
+	@Disabled
 	public void dumpTest() {
 		SystemUtil.dumpSystemInfo();
 	}
@@ -18,25 +18,25 @@ public class SystemUtilTest {
 	@Test
 	public void getCurrentPidTest() {
 		final long pid = SystemUtil.getCurrentPID();
-		Assert.assertTrue(pid > 0);
+		assertTrue(pid > 0);
 	}
 
 	@Test
 	public void getJavaInfoTest() {
 		final JavaInfo javaInfo = SystemUtil.getJavaInfo();
-		Assert.assertNotNull(javaInfo);
+		assertNotNull(javaInfo);
 	}
 
 	@Test
 	public void getJavaRuntimeInfoTest() {
 		final JavaRuntimeInfo info = SystemUtil.getJavaRuntimeInfo();
-		Assert.assertNotNull(info);
+		assertNotNull(info);
 	}
 
 	@Test
 	public void getOsInfoTest() {
 		final OsInfo osInfo = SystemUtil.getOsInfo();
-		Assert.assertNotNull(osInfo);
+		assertNotNull(osInfo);
 
 		Console.log(osInfo.getName());
 	}
@@ -44,13 +44,13 @@ public class SystemUtilTest {
 	@Test
 	public void getHostInfo() {
 		final HostInfo hostInfo = SystemUtil.getHostInfo();
-		Assert.assertNotNull(hostInfo);
+		assertNotNull(hostInfo);
 	}
 
 	@Test
 	public void getUserInfoTest(){
 		// https://gitee.com/dromara/hutool/issues/I3NM39
 		final UserInfo userInfo = SystemUtil.getUserInfo();
-		Assert.assertTrue(userInfo.getTempDir().endsWith(File.separator));
+		assertTrue(userInfo.getTempDir().endsWith(File.separator));
 	}
 }
diff --git a/pom.xml b/pom.xml
index 597da450a..f4be2871e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,15 +45,15 @@
 
 		<!-- versions -->
 		<compile.version>8</compile.version>
-		<junit.version>5.10.2</junit.version>
-		<lombok.version>1.18.30</lombok.version>
+		<junit.version>5.10.3</junit.version>
+		<lombok.version>1.18.34</lombok.version>
 	</properties>
 
 	<dependencies>
 		<!-- 全局单元测试 -->
 		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>