From dcf80493171366b636bafbb50dded6559c22ced8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 6 Jan 2022 10:23:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9C=A8=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=B8=AD=E4=B8=8D=E4=BD=BF=E7=94=A8hutool=E7=9A=84?= =?UTF-8?q?=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/hutool/core/collection/RingIndexUtilTest.java | 4 ++-- .../src/test/java/cn/hutool/core/thread/AsyncUtilTest.java | 4 ++-- .../src/test/java/cn/hutool/crypto/test/BCUtilTest.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) 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 4ff70cdd1..7ce717aa3 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,7 +1,7 @@ package cn.hutool.core.collection; -import cn.hutool.core.lang.Assert; import cn.hutool.core.thread.ThreadUtil; +import org.junit.Assert; import org.junit.Test; import java.util.Arrays; @@ -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.notNull(s); + Assert.assertNotNull(s); }); } 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 f6a00a486..89d6640d2 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,6 +1,6 @@ package cn.hutool.core.thread; -import cn.hutool.core.lang.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -33,6 +33,6 @@ public class AsyncUtilTest { // 等待完成 AsyncUtil.waitAll(hutool, sweater, warm); // 获取结果 - Assert.isTrue("hutool卫衣真暖和".equals(AsyncUtil.get(hutool) + AsyncUtil.get(sweater) + AsyncUtil.get(warm))); + Assert.assertEquals("hutool卫衣真暖和", AsyncUtil.get(hutool) + AsyncUtil.get(sweater) + AsyncUtil.get(warm)); } } diff --git a/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java b/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java index ce324c6c3..8a922cdef 100644 --- a/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java +++ b/hutool-crypto/src/test/java/cn/hutool/crypto/test/BCUtilTest.java @@ -1,9 +1,9 @@ package cn.hutool.crypto.test; -import cn.hutool.core.lang.Assert; import cn.hutool.crypto.BCUtil; import org.bouncycastle.crypto.params.ECPrivateKeyParameters; import org.bouncycastle.crypto.params.ECPublicKeyParameters; +import org.junit.Assert; import org.junit.Test; public class BCUtilTest { @@ -17,7 +17,7 @@ public class BCUtilTest { String y = "F7E938B02EED7280277493B8556E5B01CB436E018A562DFDC53342BF41FDF728"; final ECPublicKeyParameters keyParameters = BCUtil.toSm2Params(x, y); - Assert.notNull(keyParameters); + Assert.assertNotNull(keyParameters); } @Test @@ -25,6 +25,6 @@ public class BCUtilTest { String privateKeyHex = "5F6CA5BB044C40ED2355F0372BF72A5B3AE6943712F9FDB7C1FFBAECC06F3829"; final ECPrivateKeyParameters keyParameters = BCUtil.toSm2Params(privateKeyHex); - Assert.notNull(keyParameters); + Assert.assertNotNull(keyParameters); } } From 80532e4a7bb6330faed3cd9dbf3866b6c0204e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=89=AF?= <841369634@qq.com> Date: Thu, 6 Jan 2022 10:42:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/cn/hutool/core/util/StrUtilTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 654466dab..d8fd2ea54 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java @@ -89,9 +89,9 @@ public class StrUtilTest { Assert.assertEquals("", split.get(2)); } - @Test(expected = IllegalArgumentException.class) + @Test public void splitNullTest() { - StrUtil.split(null, '.'); + Assert.assertEquals(0, StrUtil.split(null, '.').size()); } @Test(expected = IllegalArgumentException.class)