精简XXXTypeGetter

This commit is contained in:
Looly
2022-09-22 02:31:28 +08:00
parent b13329d781
commit f2629f775b
39 changed files with 969 additions and 1841 deletions

View File

@@ -1,8 +1,6 @@
package cn.hutool.setting;
import cn.hutool.core.date.DateUtil;
import cn.hutool.log.LogFactory;
import cn.hutool.log.dialect.console.ConsoleLogFactory;
import cn.hutool.setting.dialect.Props;
import lombok.Data;
import org.junit.Assert;
@@ -16,7 +14,7 @@ import java.util.Map;
import java.util.Objects;
/**
* Setting单元测试
* Props单元测试
*
* @author Looly
*
@@ -25,7 +23,7 @@ public class PropsTest {
@Before
public void init() {
LogFactory.setCurrentLogFactory(ConsoleLogFactory.class);
//LogFactory.setCurrentLogFactory(ConsoleLogFactory.class);
}
@Test
@@ -53,7 +51,7 @@ public class PropsTest {
@Test
public void toBeanTest() {
final Props props = Props.getProp("to_bean_test.properties");
final Props props = Props.of("to_bean_test.properties");
final ConfigProperties cfg = props.toBean(ConfigProperties.class, "mail");
Assert.assertEquals("mailer@mail.com", cfg.getHost());

View File

@@ -17,15 +17,15 @@ public class SettingTest {
//noinspection MismatchedQueryAndUpdateOfCollection
final Setting setting = new Setting("test.setting", true);
final String driver = setting.getByGroup("driver", "demo");
final String driver = setting.getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
//本分组变量替换
final String user = setting.getByGroup("user", "demo");
final String user = setting.getStrByGroup("user", "demo");
Assert.assertEquals("rootcom.mysql.jdbc.Driver", user);
//跨分组变量替换
final String user2 = setting.getByGroup("user2", "demo");
final String user2 = setting.getStrByGroup("user2", "demo");
Assert.assertEquals("rootcom.mysql.jdbc.Driver", user2);
//默认值测试
@@ -50,9 +50,9 @@ public class SettingTest {
setting.setByGroup("user", "group3", "root3");
setting.set("user", "root4");
Assert.assertEquals("root", setting.getByGroup("user", "group1"));
Assert.assertEquals("root2", setting.getByGroup("user", "group2"));
Assert.assertEquals("root3", setting.getByGroup("user", "group3"));
Assert.assertEquals("root", setting.getStrByGroup("user", "group1"));
Assert.assertEquals("root2", setting.getStrByGroup("user", "group2"));
Assert.assertEquals("root3", setting.getStrByGroup("user", "group3"));
Assert.assertEquals("root4", setting.get("user"));
}

View File

@@ -7,13 +7,13 @@ public class SettingUtilTest {
@Test
public void getTest() {
final String driver = SettingUtil.get("test").get("demo", "driver");
final String driver = SettingUtil.get("test").getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
}
@Test
public void getTest2() {
final String driver = SettingUtil.get("example/example").get("demo", "key");
final String driver = SettingUtil.get("example/example").getStrByGroup("key", "demo");
Assert.assertEquals("value", driver);
}
@@ -21,7 +21,7 @@ public class SettingUtilTest {
public void getFirstFoundTest() {
//noinspection ConstantConditions
final String driver = SettingUtil.getFirstFound("test2", "test")
.get("demo", "driver");
.getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
}
}