单元测试由Junit4变更为Junit5

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

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

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

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

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

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

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

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")

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

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

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

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"));
 	}
 }

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

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

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

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

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

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

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

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

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

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

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";

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

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

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

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