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

update to junit5

Browse Source
This commit is contained in:
Looly
2023-03-31 02:56:36 +08:00
parent 210fed9621
commit c14390dd6d
507 changed files with 8903 additions and 8847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-setting/src/test/java/cn/hutool/setting/Issue3008Test.java
View File

@@ -4,8 +4,8 @@ import cn.hutool.core.array.ArrayUtil;
import cn.hutool.setting.dialect.Props;
import cn.hutool.setting.dialect.PropsUtil;
import lombok.Data;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class Issue3008Test {
/**
@@ -16,7 +16,7 @@ public class Issue3008Test {
public void toBeanTest() {
final Props props = PropsUtil.get("issue3008");
final MyUser user = props.toBean(MyUser.class, "person");
Assert.assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(user.getHobby()));
Assertions.assertEquals("[LOL, KFC, COFFE]", ArrayUtil.toString(user.getHobby()));
}
@Data

46
hutool-setting/src/test/java/cn/hutool/setting/PropsTest.java
View File

@@ -3,9 +3,9 @@ package cn.hutool.setting;
import cn.hutool.core.date.DateUtil;
import cn.hutool.setting.dialect.Props;
import lombok.Data;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.List;
@@ -25,22 +25,22 @@ public class PropsTest {
//noinspection MismatchedQueryAndUpdateOfCollection
final Props props = new Props("test.properties");
final String user = props.getProperty("user");
Assert.assertEquals(user, "root");
Assertions.assertEquals(user, "root");
final String driver = props.getStr("driver");
Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
Assertions.assertEquals(driver, "com.mysql.jdbc.Driver");
}
@Test
@Ignore
@Disabled
public void propTestForAbsPAth() {
//noinspection MismatchedQueryAndUpdateOfCollection
final Props props = new Props("d:/test.properties");
final String user = props.getProperty("user");
Assert.assertEquals(user, "root");
Assertions.assertEquals(user, "root");
final String driver = props.getStr("driver");
Assert.assertEquals(driver, "com.mysql.jdbc.Driver");
Assertions.assertEquals(driver, "com.mysql.jdbc.Driver");
}
@Test
@@ -48,19 +48,19 @@ public class PropsTest {
final Props props = Props.of("to_bean_test.properties");
final ConfigProperties cfg = props.toBean(ConfigProperties.class, "mail");
Assert.assertEquals("mailer@mail.com", cfg.getHost());
Assert.assertEquals(9000, cfg.getPort());
Assert.assertEquals("mailer@mail.com", cfg.getFrom());
Assertions.assertEquals("mailer@mail.com", cfg.getHost());
Assertions.assertEquals(9000, cfg.getPort());
Assertions.assertEquals("mailer@mail.com", cfg.getFrom());
Assert.assertEquals("john", cfg.getCredentials().getUsername());
Assert.assertEquals("password", cfg.getCredentials().getPassword());
Assert.assertEquals("SHA1", cfg.getCredentials().getAuthMethod());
Assertions.assertEquals("john", cfg.getCredentials().getUsername());
Assertions.assertEquals("password", cfg.getCredentials().getPassword());
Assertions.assertEquals("SHA1", cfg.getCredentials().getAuthMethod());
Assert.assertEquals("true", cfg.getAdditionalHeaders().get("redelivery"));
Assert.assertEquals("true", cfg.getAdditionalHeaders().get("secure"));
Assertions.assertEquals("true", cfg.getAdditionalHeaders().get("redelivery"));
Assertions.assertEquals("true", cfg.getAdditionalHeaders().get("secure"));
Assert.assertEquals("admin@mail.com", cfg.getDefaultRecipients().get(0));
Assert.assertEquals("owner@mail.com", cfg.getDefaultRecipients().get(1));
Assertions.assertEquals("admin@mail.com", cfg.getDefaultRecipients().get(0));
Assertions.assertEquals("owner@mail.com", cfg.getDefaultRecipients().get(1));
}
@Test
@@ -74,11 +74,11 @@ public class PropsTest {
configProp.set("version", 3);
final SystemConfig systemConfig = configProp.toBean(SystemConfig.class);
Assert.assertEquals(DateUtil.parse("2020-01-01"), systemConfig.getCreateTime());
Assert.assertEquals(true, systemConfig.getIsInit());
Assert.assertEquals("1", systemConfig.getStairPlan());
Assert.assertEquals(new Integer(2), systemConfig.getStageNum());
Assert.assertEquals("3", systemConfig.getVersion());
Assertions.assertEquals(DateUtil.parse("2020-01-01"), systemConfig.getCreateTime());
Assertions.assertEquals(true, systemConfig.getIsInit());
Assertions.assertEquals("1", systemConfig.getStairPlan());
Assertions.assertEquals(new Integer(2), systemConfig.getStageNum());
Assertions.assertEquals("3", systemConfig.getVersion());
}
@Data

8
hutool-setting/src/test/java/cn/hutool/setting/PropsUtilTest.java
View File

@@ -1,8 +1,8 @@
package cn.hutool.setting;
import cn.hutool.setting.dialect.PropsUtil;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Objects;
@@ -11,12 +11,12 @@ public class PropsUtilTest {
@Test
public void getTest() {
final String driver = PropsUtil.get("test").getStr("driver");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
@Test
public void getFirstFoundTest() {
final String driver = Objects.requireNonNull(PropsUtil.getFirstFound("test2", "test")).getStr("driver");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
}

24
hutool-setting/src/test/java/cn/hutool/setting/SettingTest.java
View File

@@ -1,9 +1,9 @@
package cn.hutool.setting;
import cn.hutool.core.lang.Console;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* Setting单元测试
@@ -18,23 +18,23 @@ public class SettingTest {
final Setting setting = new Setting("test.setting", true);
final String driver = setting.getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
//本分组变量替换
final String user = setting.getStrByGroup("user", "demo");
Assert.assertEquals("rootcom.mysql.jdbc.Driver", user);
Assertions.assertEquals("rootcom.mysql.jdbc.Driver", user);
//跨分组变量替换
final String user2 = setting.getStrByGroup("user2", "demo");
Assert.assertEquals("rootcom.mysql.jdbc.Driver", user2);
Assertions.assertEquals("rootcom.mysql.jdbc.Driver", user2);
//默认值测试
final String value = setting.getStr("keyNotExist", "defaultTest");
Assert.assertEquals("defaultTest", value);
Assertions.assertEquals("defaultTest", value);
}
@Test
@Ignore
@Disabled
public void settingTestForAbsPath() {
//noinspection MismatchedQueryAndUpdateOfCollection
final Setting setting = new Setting("d:\\excel-plugin\\other.setting", true);
@@ -50,10 +50,10 @@ public class SettingTest {
setting.setByGroup("user", "group3", "root3");
setting.set("user", "root4");
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"));
Assertions.assertEquals("root", setting.getStrByGroup("user", "group1"));
Assertions.assertEquals("root2", setting.getStrByGroup("user", "group2"));
Assertions.assertEquals("root3", setting.getStrByGroup("user", "group3"));
Assertions.assertEquals("root4", setting.get("user"));
}
/**

10
hutool-setting/src/test/java/cn/hutool/setting/SettingUtilTest.java
View File

@@ -1,20 +1,20 @@
package cn.hutool.setting;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class SettingUtilTest {
@Test
public void getTest() {
final String driver = SettingUtil.get("test").getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
@Test
public void getTest2() {
final String driver = SettingUtil.get("example/example").getStrByGroup("key", "demo");
Assert.assertEquals("value", driver);
Assertions.assertEquals("value", driver);
}
@Test
@@ -22,6 +22,6 @@ public class SettingUtilTest {
//noinspection ConstantConditions
final String driver = SettingUtil.getFirstFound("test2", "test")
.getStrByGroup("driver", "demo");
Assert.assertEquals("com.mysql.jdbc.Driver", driver);
Assertions.assertEquals("com.mysql.jdbc.Driver", driver);
}
}

6
hutool-setting/src/test/java/cn/hutool/setting/toml/TomlTest.java
View File

@@ -13,8 +13,8 @@
package cn.hutool.setting.toml;
import cn.hutool.core.io.resource.ResourceUtil;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Map;
@@ -22,6 +22,6 @@ public class TomlTest {
@Test
public void readTest() {
final Map<String, Object> read = Toml.read(ResourceUtil.getResource("test.toml"));
Assert.assertEquals(5, read.size());
Assertions.assertEquals(5, read.size());
}
}

14
hutool-setting/src/test/java/cn/hutool/setting/yaml/YamlUtilTest.java
View File

@@ -3,9 +3,9 @@ package cn.hutool.setting.yaml;
import cn.hutool.core.io.file.FileUtil;
import cn.hutool.core.map.Dict;
import cn.hutool.core.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -15,15 +15,15 @@ public class YamlUtilTest {
public void loadByPathTest() {
final Dict result = YamlUtil.loadByPath("test.yaml");
Assert.assertEquals("John", result.getStr("firstName"));
Assertions.assertEquals("John", result.getStr("firstName"));
final List<Integer> numbers = result.getByPath("contactDetails.number");
Assert.assertEquals(123456789, (int) numbers.get(0));
Assert.assertEquals(456786868, (int) numbers.get(1));
Assertions.assertEquals(123456789, (int) numbers.get(0));
Assertions.assertEquals(456786868, (int) numbers.get(1));
}
@Test
@Ignore
@Disabled
public void dumpTest() {
final Dict dict = Dict.of()
.set("name", "hutool")