zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-09-27 23:38:05 +08:00
parent 246e61678e
commit d458b1451c
80 changed files with 227 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-core/src/test/java/cn/hutool/core/builder/GenericBuilderTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.builder;
import cn.hutool.core.lang.builder.GenericBuilder;
import cn.hutool.core.text.StrUtil;
import lombok.Getter;
import lombok.Setter;

2
hutool-core/src/test/java/cn/hutool/core/lang/DictTest.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.core.lang;
import cn.hutool.core.builder.GenericBuilder;
import cn.hutool.core.lang.builder.GenericBuilder;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.map.Dict;
import lombok.AllArgsConstructor;

1
hutool-core/src/test/java/cn/hutool/core/net/FormUrlencodedTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.net;
import cn.hutool.core.net.url.FormUrlencoded;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/net/RFC3986Test.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.net;
import cn.hutool.core.net.url.RFC3986;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;

2
hutool-core/src/test/java/cn/hutool/core/net/URLEncoderTest.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.core.net;
import cn.hutool.core.net.url.URLDecoder;
import cn.hutool.core.net.url.URLEncoder;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/net/URLUtilTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.net;
import cn.hutool.core.net.url.URLUtil;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/net/UrlDecoderTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.net;
import cn.hutool.core.net.url.URLDecoder;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
View File

@@ -1,6 +1,7 @@
package cn.hutool.core.net;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.net.url.URLUtil;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.net.url.UrlQuery;
import cn.hutool.core.util.CharsetUtil;

4
hutool-core/src/test/java/cn/hutool/core/tree/Issue2279Test.java
View File

@@ -19,7 +19,7 @@ public class Issue2279Test {
new TestTree(4, 2, 4, 4)
);
final List<Tree<String>> stringTree = TreeUtil.build(list, "0",
final List<MapTree<String>> stringTree = TreeUtil.build(list, "0",
(object, treeNode) -> {
treeNode.setId(object.getId());
treeNode.setName(object.getName());
@@ -28,7 +28,7 @@ public class Issue2279Test {
}
);
final Tree<String> result = stringTree.get(0);
final MapTree<String> result = stringTree.get(0);
Assert.assertEquals(2, result.getChildren().size());
}

9
hutool-core/src/test/java/cn/hutool/core/tree/TreeSearchTest.java
View File

@@ -1,8 +1,5 @@
package cn.hutool.core.tree;
import cn.hutool.core.tree.Tree;
import cn.hutool.core.tree.TreeNode;
import cn.hutool.core.tree.TreeUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -30,10 +27,10 @@ public class TreeSearchTest {
@Test
public void searchNode() {
final List<Tree<Long>> treeItems= TreeUtil.build(all_menu, 0L);
final List<MapTree<Long>> treeItems= TreeUtil.build(all_menu, 0L);
final Tree<Long> tree=treeItems.get(0);
final Tree<Long> searchResult=tree.getNode(3L);
final MapTree<Long> tree=treeItems.get(0);
final MapTree<Long> searchResult=tree.getNode(3L);
Assert.assertEquals("module-B", searchResult.getName());
}

24
hutool-core/src/test/java/cn/hutool/core/tree/TreeTest.java
View File

@@ -31,16 +31,16 @@ public class TreeTest {
@Test
public void sampleTreeTest() {
final List<Tree<String>> treeList = TreeUtil.build(nodeList, "0");
for (final Tree<String> tree : treeList) {
final List<MapTree<String>> treeList = TreeUtil.build(nodeList, "0");
for (final MapTree<String> tree : treeList) {
Assert.assertNotNull(tree);
Assert.assertEquals("0", tree.getParentId());
// Console.log(tree);
}
// 测试通过子节点查找父节点
final Tree<String> rootNode0 = treeList.get(0);
final Tree<String> parent = rootNode0.getChildren().get(0).getParent();
final MapTree<String> rootNode0 = treeList.get(0);
final MapTree<String> parent = rootNode0.getChildren().get(0).getParent();
Assert.assertEquals(rootNode0, parent);
}
@@ -55,7 +55,7 @@ public class TreeTest {
treeNodeConfig.setDeep(2);
//转换器
final List<Tree<String>> treeNodes = TreeUtil.build(nodeList, "0", treeNodeConfig,
final List<MapTree<String>> treeNodes = TreeUtil.build(nodeList, "0", treeNodeConfig,
(treeNode, tree) -> {
tree.setId(treeNode.getId());
tree.setParentId(treeNode.getParentId());
@@ -72,7 +72,7 @@ public class TreeTest {
@Test
public void walkTest(){
final List<String> ids = new ArrayList<>();
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final MapTree<String> tree = TreeUtil.buildSingle(nodeList, "0");
tree.walk((tr)-> ids.add(tr.getId()));
Assert .assertEquals(7, ids.size());
@@ -81,7 +81,7 @@ public class TreeTest {
@Test
public void walkBroadFirstTest(){
final List<String> ids = new ArrayList<>();
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final MapTree<String> tree = TreeUtil.buildSingle(nodeList, "0");
Console.log(tree);
tree.walk((tr)-> ids.add(tr.getId()), true);
@@ -91,8 +91,8 @@ public class TreeTest {
@Test
public void cloneTreeTest(){
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final Tree<String> cloneTree = tree.cloneTree();
final MapTree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final MapTree<String> cloneTree = tree.cloneTree();
final List<String> ids = new ArrayList<>();
cloneTree.walk((tr)-> ids.add(tr.getId()));
@@ -103,7 +103,7 @@ public class TreeTest {
@Test
public void filterTest(){
// 经过过滤，丢掉"用户添加"节点
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final MapTree<String> tree = TreeUtil.buildSingle(nodeList, "0");
tree.filter((t)->{
final CharSequence name = t.getName();
return null != name && name.toString().contains("店铺");
@@ -116,10 +116,10 @@ public class TreeTest {
@Test
public void filterNewTest(){
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
final MapTree<String> tree = TreeUtil.buildSingle(nodeList, "0");
// 经过过滤，生成新的树
final Tree<String> newTree = tree.filterNew((t)->{
final MapTree<String> newTree = tree.filterNew((t)->{
final CharSequence name = t.getName();
return null != name && name.toString().contains("店铺");
});