From f363971187eff4312ae72c21927eff57a4841156 Mon Sep 17 00:00:00 2001 From: Looly Date: Fri, 24 Mar 2023 18:27:47 +0800 Subject: [PATCH] fix code --- .../cn/hutool/core/text/CharSequenceUtil.java | 4 ++-- .../hutool/core/text/CharSequenceUtilTest.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java index e4e2e6988..b8ac672de 100755 --- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java @@ -4141,7 +4141,7 @@ public class CharSequenceUtil extends StrChecker { * @return 字符串1和字符串2的公共前缀 */ public static CharSequence commonPrefix(final CharSequence str1, final CharSequence str2) { - if (isBlank(str1) || isBlank(str2)) { + if (isEmpty(str1) || isEmpty(str2)) { return EMPTY; } final int minLength = Math.min(str1.length(), str2.length()); @@ -4165,7 +4165,7 @@ public class CharSequenceUtil extends StrChecker { * @return 字符串1和字符串2的公共后缀 */ public static CharSequence commonSuffix(final CharSequence str1, final CharSequence str2) { - if (isBlank(str1) || isBlank(str2)) { + if (isEmpty(str1) || isEmpty(str2)) { return EMPTY; } int str1Index = str1.length() - 1; 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 856025db0..81a7bfcc5 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 @@ -243,6 +243,14 @@ public class CharSequenceUtilTest { Assert.assertEquals("中文", CharSequenceUtil.commonPrefix("中文english", "中文french")); + // { space * 10 } + "abc" + final String str1 = CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 10) + "abc"; + + // { space * 5 } + "efg" + final String str2 = CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 5) + "efg"; + + // Expect common prefix: { space * 5 } + Assert.assertEquals(CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 5), CharSequenceUtil.commonPrefix(str1, str2)); } @Test @@ -267,5 +275,13 @@ public class CharSequenceUtilTest { Assert.assertEquals("中文", CharSequenceUtil.commonSuffix("english中文", "Korean中文")); + // "abc" + { space * 10 } + final String str1 = "abc" + CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 10); + + // "efg" + { space * 15 } + final String str2 = "efg" + CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 15); + + // Expect common suffix: { space * 10 } + Assert.assertEquals(CharSequenceUtil.repeat(CharSequenceUtil.SPACE, 10), CharSequenceUtil.commonSuffix(str1, str2)); } }