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-06-21 18:42:52 +08:00
parent 8080a1cd83
commit 1ee014bdae
123 changed files with 275 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
View File

@@ -79,7 +79,7 @@ public class BeanUtilTest {
@Test
public void fillBeanWithMapIgnoreCaseTest() {
final Map<String, Object> map = MapBuilder.<String, Object>create()
final Map<String, Object> map = MapBuilder.<String, Object>of()
.put("Name", "Joe")
.put("aGe", 12)
.put("openId", "DFDFSDFWERWER")

6
hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
View File

@@ -234,8 +234,8 @@ public class CollUtilTest {
@Test
public void getFieldValuesTest() {
final Dict v1 = Dict.create().set("id", 12).set("name", "张三").set("age", 23);
final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四");
final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", 23);
final Dict v2 = Dict.of().set("age", 13).set("id", 15).set("name", "李四");
final ArrayList<Dict> list = ListUtil.of(v1, v2);
final List<Object> fieldValues = (List<Object>) CollUtil.getFieldValues(list, "name");
@@ -783,7 +783,7 @@ public class CollUtilTest {
public void pageTest() {
final List<Dict> objects = ListUtil.of();
for (int i = 0; i < 10; i++) {
objects.add(Dict.create().set("name", "姓名：" + i));
objects.add(Dict.of().set("name", "姓名：" + i));
}
Assert.assertEquals(0, CollUtil.page(3, 5, objects).size());

2
hutool-core/src/test/java/cn/hutool/core/collection/MapProxyTest.java
View File

@@ -39,7 +39,7 @@ public class MapProxyTest {
@Test
public void classProxyTest() {
final Student student = MapProxy.create(new HashMap<>()).toProxyBean(Student.class);
final Student student = MapProxy.of(new HashMap<>()).toProxyBean(Student.class);
student.setName("小明").setAge(18);
Assert.assertEquals(student.getAge(), 18);
Assert.assertEquals(student.getName(), "小明");

2
hutool-core/src/test/java/cn/hutool/core/convert/MapConvertTest.java
View File

@@ -30,7 +30,7 @@ public class MapConvertTest {
@Test
public void mapToMapTest() {
final Map<String, Object> srcMap = MapBuilder
.create(new HashMap<String, Object>())
.of(new HashMap<String, Object>())
.put("name", "AAA")
.put("age", 45).map();

1
hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.date;
import cn.hutool.core.date.chinese.ChineseDate;
import cn.hutool.core.text.StrUtil;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/date/GanzhiTest.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.date;
import cn.hutool.core.date.chinese.ChineseDate;
import cn.hutool.core.date.chinese.GanZhi;
import org.junit.Assert;
import org.junit.Test;

1
hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java
View File

@@ -1,6 +1,5 @@
package cn.hutool.core.date.chinese;
import cn.hutool.core.date.ChineseDate;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;

2
hutool-core/src/test/java/cn/hutool/core/io/WatchMonitorTest.java
View File

@@ -44,7 +44,7 @@ public class WatchMonitorTest {
}
};
final WatchMonitor monitor = WatchMonitor.createAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500));
final WatchMonitor monitor = WatchMonitor.ofAll("d:/test/aaa.txt", new DelayWatcher(watcher, 500));
monitor.setMaxDepth(0);
monitor.start();

10
hutool-core/src/test/java/cn/hutool/core/lang/ConsoleTableTest.java
View File

@@ -8,7 +8,7 @@ public class ConsoleTableTest {
@Test
@Ignore
public void printSBCTest() {
ConsoleTable t = ConsoleTable.create();
ConsoleTable t = ConsoleTable.of();
t.addHeader("姓名", "年龄");
t.addBody("张三", "15");
t.addBody("李四", "29");
@@ -17,7 +17,7 @@ public class ConsoleTableTest {
Console.log();
t = ConsoleTable.create();
t = ConsoleTable.of();
t.addHeader("体温", "占比");
t.addHeader("℃", "%");
t.addBody("36.8", "10");
@@ -26,7 +26,7 @@ public class ConsoleTableTest {
Console.log();
t = ConsoleTable.create();
t = ConsoleTable.of();
t.addHeader("标题1", "标题2");
t.addBody("12345", "混合321654asdfcSDF");
t.addBody("sd e3ee ff22", "ff值");
@@ -36,7 +36,7 @@ public class ConsoleTableTest {
@Test
@Ignore
public void printDBCTest() {
ConsoleTable t = ConsoleTable.create().setSBCMode(false);
ConsoleTable t = ConsoleTable.of().setSBCMode(false);
t.addHeader("姓名", "年龄");
t.addBody("张三", "15");
t.addBody("李四", "29");
@@ -45,7 +45,7 @@ public class ConsoleTableTest {
Console.log();
t = ConsoleTable.create().setSBCMode(false);
t = ConsoleTable.of().setSBCMode(false);
t.addHeader("体温", "占比");
t.addHeader("℃", "%");
t.addBody("36.8", "10");

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

@@ -14,7 +14,7 @@ import static cn.hutool.core.lang.OptTest.User;
public class DictTest {
@Test
public void dictTest(){
final Dict dict = Dict.create()
final Dict dict = Dict.of()
.set("key1", 1)//int
.set("key2", 1000L)//long
.set("key3", DateTime.now());//Date
@@ -66,7 +66,7 @@ public class DictTest {
@Test
public void setFieldsTest() {
final User user = GenericBuilder.of(User::new).with(User::setUsername, "hutool").build();
final Dict dict = Dict.create();
final Dict dict = Dict.of();
dict.setFields(user::getNickname, user::getUsername);
Assert.assertEquals("hutool", dict.get("username"));
Assert.assertNull(dict.get("nickname"));

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

@@ -8,7 +8,7 @@ public class WeightRandomTest {
@Test
public void weightRandomTest() {
final WeightRandom<String> random = WeightRandom.create();
final WeightRandom<String> random = WeightRandom.of();
random.add("A", 10);
random.add("B", 50);
random.add("C", 100);

2
hutool-core/src/test/java/cn/hutool/core/map/MapBuilderTest.java
View File

@@ -9,7 +9,7 @@ public class MapBuilderTest {
@Test
public void conditionPutTest() {
final Map<String, String> map = MapBuilder.<String, String>create()
final Map<String, String> map = MapBuilder.<String, String>of()
.put(true, "a", "1")
.put(false, "b", "2")
.put(true, "c", () -> getValue(3))

4
hutool-core/src/test/java/cn/hutool/core/map/MapUtilTest.java
View File

@@ -226,8 +226,8 @@ public class MapUtilTest {
@Test
public void valuesOfKeysTest() {
final Dict v1 = Dict.create().set("id", 12).set("name", "张三").set("age", 23);
final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四");
final Dict v1 = Dict.of().set("id", 12).set("name", "张三").set("age", 23);
final Dict v2 = Dict.of().set("age", 13).set("id", 15).set("name", "李四");
final String[] keys = v1.keySet().toArray(new String[0]);
final ArrayList<Object> v1s = MapUtil.valuesOfKeys(v1, keys);

16
hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
View File

@@ -16,7 +16,7 @@ public class UrlBuilderTest {
@Test
public void buildTest() {
final String buildUrl = UrlBuilder.create().setHost("www.hutool.cn").build();
final String buildUrl = UrlBuilder.of().setHost("www.hutool.cn").build();
Assert.assertEquals("http://www.hutool.cn/", buildUrl);
}
@@ -29,7 +29,7 @@ public class UrlBuilderTest {
@Test
public void testHost() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn").build();
Assert.assertEquals("https://www.hutool.cn/", buildUrl);
@@ -37,7 +37,7 @@ public class UrlBuilderTest {
@Test
public void testHostPort() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.setPort(8080)
@@ -47,7 +47,7 @@ public class UrlBuilderTest {
@Test
public void testPathAndQuery() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/aaa").addPath("bbb")
@@ -60,7 +60,7 @@ public class UrlBuilderTest {
@Test
public void testQueryWithChinese() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/aaa").addPath("bbb")
@@ -73,7 +73,7 @@ public class UrlBuilderTest {
@Test
public void testMultiQueryWithChinese() {
final String buildUrl = UrlBuilder.create()
final String buildUrl = UrlBuilder.of()
.setScheme("https")
.setHost("www.hutool.cn")
.addPath("/s")
@@ -303,7 +303,7 @@ public class UrlBuilderTest {
@Test
public void addPathEncodeTest(){
final String url = UrlBuilder.create()
final String url = UrlBuilder.of()
.setScheme("https")
.setHost("domain.cn")
.addPath("api")
@@ -317,7 +317,7 @@ public class UrlBuilderTest {
@Test
public void addPathEncodeTest2(){
// https://github.com/dromara/hutool/issues/1912
final String url = UrlBuilder.create()
final String url = UrlBuilder.of()
.setScheme("https")
.setHost("domain.cn")
.addPath("/api/xxx/bbb")

6
hutool-core/src/test/java/cn/hutool/core/text/NamingCaseTest.java
View File

@@ -9,7 +9,7 @@ public class NamingCaseTest {
@Test
public void toCamelCaseTest() {
Dict.create()
Dict.of()
.set("Table_Test_Of_day","tableTestOfDay")
.set("TableTestOfDay","TableTestOfDay")
.set("abc_1d","abc1d")
@@ -18,14 +18,14 @@ public class NamingCaseTest {
@Test
public void toCamelCaseFromDashedTest() {
Dict.create()
Dict.of()
.set("Table-Test-Of-day","tableTestOfDay")
.forEach((key, value) -> Assert.assertEquals(value, NamingCase.toCamelCase(key, CharUtil.DASHED)));
}
@Test
public void toUnderLineCaseTest() {
Dict.create()
Dict.of()
.set("Table_Test_Of_day", "table_test_of_day")
.set("_Table_Test_Of_day_", "_table_test_of_day_")
.set("_Table_Test_Of_DAY_", "_table_test_of_DAY_")

6
hutool-core/src/test/java/cn/hutool/core/util/ReferenceUtilTest.java
View File

@@ -15,21 +15,21 @@ public class ReferenceUtilTest {
@Test
public void createWeakTest(){
final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.WEAK, 1);
final Reference<Integer> integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.WEAK, 1);
Assert.assertTrue(integerReference instanceof WeakReference);
Assert.assertEquals(new Integer(1), integerReference.get());
}
@Test
public void createSoftTest(){
final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.SOFT, 1);
final Reference<Integer> integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.SOFT, 1);
Assert.assertTrue(integerReference instanceof SoftReference);
Assert.assertEquals(new Integer(1), integerReference.get());
}
@Test
public void createPhantomTest(){
final Reference<Integer> integerReference = ReferenceUtil.create(ReferenceUtil.ReferenceType.PHANTOM, 1);
final Reference<Integer> integerReference = ReferenceUtil.of(ReferenceUtil.ReferenceType.PHANTOM, 1);
Assert.assertTrue(integerReference instanceof PhantomReference);
// get方法永远都返回null，PhantomReference只能用来监控对象的GC状况
Assert.assertNull(integerReference.get());

4
hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
View File

@@ -123,10 +123,10 @@ public class StrUtilTest {
@Test
public void formatTest() {
final String template = "你好，我是{name}，我的电话是：{phone}";
final String result = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", "13888881111"));
final String result = StrUtil.format(template, Dict.of().set("name", "张三").set("phone", "13888881111"));
Assert.assertEquals("你好，我是张三，我的电话是：13888881111", result);
final String result2 = StrUtil.format(template, Dict.create().set("name", "张三").set("phone", null));
final String result2 = StrUtil.format(template, Dict.of().set("name", "张三").set("phone", null));
Assert.assertEquals("你好，我是张三，我的电话是：{phone}", result2);
}

6
hutool-core/src/test/java/cn/hutool/core/util/XmlUtilTest.java
View File

@@ -115,7 +115,7 @@ public class XmlUtilTest {
@Test
public void mapToXmlTest() {
final Map<String, Object> map = MapBuilder.create(new LinkedHashMap<String, Object>())//
final Map<String, Object> map = MapBuilder.of(new LinkedHashMap<String, Object>())//
.put("name", "张三")//
.put("age", 12)//
.put("game", MapUtil.builder(new LinkedHashMap<String, Object>()).put("昵称", "Looly").put("level", 14).build())//
@@ -137,7 +137,7 @@ public class XmlUtilTest {
@Test
public void mapToXmlTest2() {
// 测试List
final Map<String, Object> map = MapBuilder.create(new LinkedHashMap<String, Object>())
final Map<String, Object> map = MapBuilder.of(new LinkedHashMap<String, Object>())
.put("Town", ListUtil.of("town1", "town2"))
.build();
@@ -171,7 +171,7 @@ public class XmlUtilTest {
@Test
public void mapToXmlTestWithOmitXmlDeclaration() {
final Map<String, Object> map = MapBuilder.create(new LinkedHashMap<String, Object>())
final Map<String, Object> map = MapBuilder.of(new LinkedHashMap<String, Object>())
.put("name", "ddatsh")
.build();
final String xml = XmlUtil.mapToXmlStr(map, true);