diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java index 108083139..a0e69489e 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/net/url/UrlQueryUtil.java @@ -216,8 +216,6 @@ public class UrlQueryUtil { return MapUtil.empty(); } - Console.log(queryMap); - final Map> params = new LinkedHashMap<>(); queryMap.forEach((key, value) -> { if(null != key){ diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java index d06d8a8bf..e43413d6a 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/stream/AbstractEnhancedWrappedStreamTest.java @@ -23,6 +23,7 @@ import lombok.Setter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.io.Serial; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; @@ -79,6 +80,7 @@ public class AbstractEnhancedWrappedStreamTest { final List list = asList(1, 2, 3); final Map identityMap = wrap(list).toMap(String::valueOf); Assertions.assertEquals(new HashMap() { + @Serial private static final long serialVersionUID = 1L; { @@ -103,6 +105,7 @@ public class AbstractEnhancedWrappedStreamTest { final List list = asList("bugotech", "hutool", "sweet"); final Map toZip = wrap(orders).toZip(list); Assertions.assertEquals(new HashMap() { + @Serial private static final long serialVersionUID = 1L; { @@ -169,6 +172,7 @@ public class AbstractEnhancedWrappedStreamTest { public void testGrouping() { final List list = asList(1, 2, 3); final Map> map = new HashMap>() { + @Serial private static final long serialVersionUID = 1L; { @@ -190,6 +194,7 @@ public class AbstractEnhancedWrappedStreamTest { public void testPartitioning() { final List list = asList(1, 2, 3); final Map> map = new HashMap>() { + @Serial private static final long serialVersionUID = 1L; { @@ -632,6 +637,7 @@ public class AbstractEnhancedWrappedStreamTest { @Test public void testToEntries() { final Map expect = new HashMap() { + @Serial private static final long serialVersionUID = 1L; { @@ -730,7 +736,7 @@ public class AbstractEnhancedWrappedStreamTest { void test() { final List>> list = Arrays.asList( Arrays.asList( - Arrays.asList("a"), + List.of("a"), Arrays.asList("b", "c"), Arrays.asList("d", "e", "f") ), diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java index 26f36531e..39fcc4c1b 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/finder/MultiStrFinderTest.java @@ -16,6 +16,8 @@ package cn.hutool.v7.core.text.finder; +import cn.hutool.v7.core.lang.Console; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -24,43 +26,34 @@ import java.util.Map; /** * @author cmm - * @date 2024/8/12 11:16 */ public class MultiStrFinderTest { @Test public void test1(){ - ArrayList strings = new ArrayList<>(); + final ArrayList strings = new ArrayList<>(); strings.add("sha"); strings.add("asa"); strings.add("ha"); strings.add("hex"); - MultiStrFinder finder = MultiStrFinder.of(strings); - String text = "asdasahhxxeshaaahexaaasa"; - Map> match = finder.findMatch(text); - System.out.println(text); - match.forEach((k,v) -> { - System.out.println(k + ":" + v); - }); - + final MultiStrFinder finder = MultiStrFinder.of(strings); + final String text = "asdasahhxxeshaaahexaaasa"; + final Map> match = finder.findMatch(text); + Assertions.assertEquals(3, match.size()); } @Test public void test2(){ - ArrayList strings = new ArrayList<>(); + final ArrayList strings = new ArrayList<>(); strings.add("沙漠"); strings.add("撒"); strings.add("哈"); strings.add("害克斯"); - MultiStrFinder finder = MultiStrFinder.of(strings); - String text = "撒哈拉大沙漠,你看哈哈哈。hex码中文写成海克斯科技"; - Map> match = finder.findMatch(text); - System.out.println(text); - match.forEach((k,v) -> { - System.out.println(k + ":" + v); - }); - + final MultiStrFinder finder = MultiStrFinder.of(strings); + final String text = "撒哈拉大沙漠,你看哈哈哈。hex码中文写成海克斯科技"; + final Map> match = finder.findMatch(text); + Assertions.assertEquals(3, match.size()); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java index fbc879fc1..a8a0266da 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/text/replacer/HighMultiReplacerV2Test.java @@ -16,13 +16,10 @@ package cn.hutool.v7.core.text.replacer; -import cn.hutool.v7.core.text.finder.MultiStrFinder; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * @author cmm @@ -31,37 +28,34 @@ import java.util.Map; public class HighMultiReplacerV2Test { @Test public void test1(){ - HashMap replaceMap = new HashMap<>(); + final HashMap replaceMap = new HashMap<>(); replaceMap.put("sha","SHA"); replaceMap.put("asa","ASA"); replaceMap.put("ha","HA"); replaceMap.put("hex","HEX"); - HighMultiReplacerV2 replacer = new HighMultiReplacerV2(replaceMap); - String text = "asdasahhxxeshaaahexaaasa"; - CharSequence apply = replacer.apply(text); - replaceMap.forEach((k,v) -> { - System.out.println(k + ":" + v); - }); - System.out.println(text); - System.out.println(apply); + final HighMultiReplacerV2 replacer = new HighMultiReplacerV2(replaceMap); + final String text = "asdasahhxxeshaaahexaaasa"; + final CharSequence apply = replacer.apply(text); +// replaceMap.forEach((k,v) -> { +// System.out.println(k + ":" + v); +// }); + Assertions.assertEquals("asdASAhhxxeSHAaaHEXaaASA", apply.toString()); } @Test public void test2(){ - HashMap replaceMap = new HashMap<>(); + final HashMap replaceMap = new HashMap<>(); replaceMap.put("沙漠","什么"); replaceMap.put("撒","厦"); replaceMap.put("哈","蛤"); replaceMap.put("海克斯","害可是"); - HighMultiReplacerV2 replacer = new HighMultiReplacerV2(replaceMap); - String text = "撒哈拉大沙漠,你看哈哈哈。hex码中文写成海克斯科技,海克,沙子收拾收拾,撤退,撒下了句点"; - CharSequence apply = replacer.apply(text); - replaceMap.forEach((k,v) -> { - System.out.println(k + ":" + v); - }); - System.out.println(text); - System.out.println(apply); - + final HighMultiReplacerV2 replacer = new HighMultiReplacerV2(replaceMap); + final String text = "撒哈拉大沙漠,你看哈哈哈。hex码中文写成海克斯科技,海克,沙子收拾收拾,撤退,撒下了句点"; + final CharSequence apply = replacer.apply(text); +// replaceMap.forEach((k,v) -> { +// System.out.println(k + ":" + v); +// }); + Assertions.assertEquals("厦蛤拉大什么,你看蛤蛤蛤。hex码中文写成害可是科技,海克,沙子收拾收拾,撤退,厦下了句点", apply.toString()); } } diff --git a/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java index a546c1acc..5dc82f3dd 100644 --- a/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java +++ b/hutool-core/src/test/java/cn/hutool/v7/core/tree/TreeTest.java @@ -16,10 +16,9 @@ package cn.hutool.v7.core.tree; -import lombok.Data; import cn.hutool.v7.core.collection.ListUtil; -import cn.hutool.v7.core.lang.Console; import cn.hutool.v7.core.tree.parser.DefaultNodeParser; +import lombok.Data; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -84,7 +83,7 @@ public class TreeTest { tree.putExtra("other", new Object()); }); - Assertions.assertEquals(treeNodes.size(), 2); + Assertions.assertEquals(2, treeNodes.size()); } @Test @@ -100,7 +99,7 @@ public class TreeTest { public void walkBroadFirstTest() { final List ids = new ArrayList<>(); final MapTree tree = TreeUtil.buildSingle(nodeList, "0"); - Console.log(tree); + //Console.log(tree); tree.walk((tr) -> ids.add(tr.getId()), true); Assertions.assertEquals(7, ids.size()); @@ -166,11 +165,11 @@ public class TreeTest { treeNodeConfig.setDeep(3); final List> treeNodes = TreeUtil.build(nodeList, "0", treeNodeConfig, new DefaultNodeParser<>()); - Assertions.assertEquals(treeNodes.size(), 2); + Assertions.assertEquals(2, treeNodes.size()); final MapTree treeNode1 = treeNodes.get(1); Assertions.assertNotNull(treeNode1); Assertions.assertNotNull(treeNode1.getConfig()); - Assertions.assertEquals(treeNode1.getChildren().size(), 1); + Assertions.assertEquals(1, treeNode1.getChildren().size()); } /**