From 5a4ed96e0dca88c53596a3d162dab64dc27496e5 Mon Sep 17 00:00:00 2001 From: VampireAchao Date: Wed, 15 Mar 2023 09:59:44 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"[enhancement]=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5cd64819535054d90c10c933104f35ba76f67ec1. --- .../java/cn/hutool/core/util/BooleanUtil.java | 6 +-- .../cn/hutool/core/util/BooleanUtilTest.java | 50 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java index 47a23738e..79f5a74ca 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/BooleanUtil.java @@ -532,7 +532,7 @@ public class BooleanUtil { * @return 是否为假值 * 定义{@see https://developer.mozilla.org/zh-CN/docs/Glossary/Falsy} */ - public static boolean isFalsy(Object value) { + public static boolean isJsFalsy(Object value) { if (FALSY_SET.contains(value)) { return true; } @@ -551,7 +551,7 @@ public class BooleanUtil { * @return 是否为真值 * 定义{@see https://developer.mozilla.org/zh-CN/docs/Glossary/Truthy} */ - public static boolean isTruthy(Object value) { - return false == isFalsy(value); + public static boolean isJsTruthy(Object value) { + return false == isJsFalsy(value); } } 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 a4c468575..75120c36f 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 @@ -97,33 +97,33 @@ public class BooleanUtilTest { } @Test - public void isFalsyTest() { - Assert.assertTrue(BooleanUtil.isFalsy(false)); - Assert.assertTrue(BooleanUtil.isFalsy(0)); - Assert.assertTrue(BooleanUtil.isFalsy(-0)); - Assert.assertTrue(BooleanUtil.isFalsy(0L)); - Assert.assertTrue(BooleanUtil.isFalsy(0.0D)); - Assert.assertTrue(BooleanUtil.isFalsy(0.00D)); - Assert.assertTrue(BooleanUtil.isFalsy(-0.00D)); - Assert.assertTrue(BooleanUtil.isFalsy(0.0F)); - Assert.assertTrue(BooleanUtil.isFalsy(0.00F)); - Assert.assertTrue(BooleanUtil.isFalsy(-0.00F)); - Assert.assertTrue(BooleanUtil.isFalsy("")); - Assert.assertTrue(BooleanUtil.isFalsy(null)); - Assert.assertTrue(BooleanUtil.isFalsy(Math.sqrt(-1))); + public void isJsFalsyTest() { + Assert.assertTrue(BooleanUtil.isJsFalsy(false)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0)); + Assert.assertTrue(BooleanUtil.isJsFalsy(-0)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0L)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0.0D)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0.00D)); + Assert.assertTrue(BooleanUtil.isJsFalsy(-0.00D)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0.0F)); + Assert.assertTrue(BooleanUtil.isJsFalsy(0.00F)); + Assert.assertTrue(BooleanUtil.isJsFalsy(-0.00F)); + Assert.assertTrue(BooleanUtil.isJsFalsy("")); + Assert.assertTrue(BooleanUtil.isJsFalsy(null)); + Assert.assertTrue(BooleanUtil.isJsFalsy(Math.sqrt(-1))); } @Test - public void isTruthyTest() { - Assert.assertTrue(BooleanUtil.isTruthy(true)); - Assert.assertTrue(BooleanUtil.isTruthy(1)); - Assert.assertTrue(BooleanUtil.isTruthy(-1)); - Assert.assertTrue(BooleanUtil.isTruthy("0")); - Assert.assertTrue(BooleanUtil.isTruthy("null")); - Assert.assertTrue(BooleanUtil.isTruthy("undefined")); - Assert.assertTrue(BooleanUtil.isTruthy(1L)); - Assert.assertTrue(BooleanUtil.isTruthy(0.1D)); - Assert.assertTrue(BooleanUtil.isTruthy(-0.01D)); - Assert.assertTrue(BooleanUtil.isTruthy(-0.01F)); + public void isJsTruthyTest() { + Assert.assertTrue(BooleanUtil.isJsTruthy(true)); + Assert.assertTrue(BooleanUtil.isJsTruthy(1)); + Assert.assertTrue(BooleanUtil.isJsTruthy(-1)); + Assert.assertTrue(BooleanUtil.isJsTruthy("0")); + Assert.assertTrue(BooleanUtil.isJsTruthy("null")); + Assert.assertTrue(BooleanUtil.isJsTruthy("undefined")); + Assert.assertTrue(BooleanUtil.isJsTruthy(1L)); + Assert.assertTrue(BooleanUtil.isJsTruthy(0.1D)); + Assert.assertTrue(BooleanUtil.isJsTruthy(-0.01D)); + Assert.assertTrue(BooleanUtil.isJsTruthy(-0.01F)); } }