单元测试由Junit4变更为Junit5

This commit is contained in:
Looly
2024-08-09 14:32:30 +08:00
parent 155c43a6a3
commit c7e0bc5d9f
568 changed files with 7794 additions and 7671 deletions

View File

@@ -3,13 +3,13 @@ package cn.hutool.cron;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.IdUtil;
import cn.hutool.cron.pattern.CronPattern;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class TaskTableTest {
@Test
@Ignore
@Disabled
public void toStringTest(){
final TaskTable taskTable = new TaskTable();
taskTable.add(IdUtil.fastUUID(), new CronPattern("*/10 * * * * *"), ()-> Console.log("Task 1"));

View File

@@ -6,8 +6,8 @@ import cn.hutool.cron.CronUtil;
import cn.hutool.cron.TaskExecutor;
import cn.hutool.cron.listener.TaskListener;
import cn.hutool.cron.task.Task;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
* 定时任务样例
@@ -15,7 +15,7 @@ import org.junit.Test;
public class CronTest {
@Test
@Ignore
@Disabled
public void customCronTest() {
CronUtil.schedule("*/2 * * * * *", (Task) () -> Console.log("Task excuted."));
@@ -28,7 +28,7 @@ public class CronTest {
}
@Test
@Ignore
@Disabled
public void cronTest() {
// 支持秒级别定时任务
CronUtil.setMatchSecond(true);
@@ -40,7 +40,7 @@ public class CronTest {
}
@Test
@Ignore
@Disabled
public void cronWithListenerTest() {
CronUtil.getScheduler().addListener(new TaskListener() {
@Override
@@ -68,7 +68,7 @@ public class CronTest {
}
@Test
@Ignore
@Disabled
public void addAndRemoveTest() {
String id = CronUtil.schedule("*/2 * * * * *", (Runnable) () -> Console.log("task running : 2s"));

View File

@@ -1,26 +1,26 @@
package cn.hutool.cron.pattern;
import cn.hutool.cron.CronException;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
public class CronPatternBuilderTest {
@Test
public void buildMatchAllTest(){
String build = CronPatternBuilder.of().build();
Assert.assertEquals("* * * * *", build);
assertEquals("* * * * *", build);
build = CronPatternBuilder.of()
.set(Part.SECOND, "*")
.build();
Assert.assertEquals("* * * * * *", build);
assertEquals("* * * * * *", build);
build = CronPatternBuilder.of()
.set(Part.SECOND, "*")
.set(Part.YEAR, "*")
.build();
Assert.assertEquals("* * * * * * *", build);
assertEquals("* * * * * * *", build);
}
@Test
@@ -29,7 +29,7 @@ public class CronPatternBuilderTest {
.set(Part.SECOND, "*")
.setRange(Part.HOUR, 2, 9)
.build();
Assert.assertEquals("* * 2-9 * * *", build);
assertEquals("* * 2-9 * * *", build);
}
@Test(expected = CronException.class)
@@ -39,6 +39,6 @@ public class CronPatternBuilderTest {
// 55无效值
.setRange(Part.HOUR, 2, 55)
.build();
Assert.assertEquals("* * 2-9 * * *", build);
assertEquals("* * 2-9 * * *", build);
}
}

View File

@@ -3,8 +3,8 @@ package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import java.util.Calendar;
@@ -16,35 +16,35 @@ public class CronPatternNextMatchTest {
CronPattern pattern = new CronPattern("* * * * * * *");
DateTime date = DateUtil.truncate(DateUtil.date(), DateField.SECOND);
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
Assert.assertEquals(date.getTime() + 1000, DateUtil.date(calendar).getTime());
assertEquals(date.getTime() + 1000, DateUtil.date(calendar).getTime());
// 匹配所有分,返回下一分钟
pattern = new CronPattern("0 * * * * * *");
date = DateUtil.parse("2022-04-08 07:44:16");
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(date.toCalendar());
Assert.assertEquals(DateUtil.parse("2022-04-08 07:45:00"), DateUtil.date(calendar));
assertEquals(DateUtil.parse("2022-04-08 07:45:00"), DateUtil.date(calendar));
// 匹配所有时,返回下一小时
pattern = new CronPattern("0 0 * * * * *");
date = DateUtil.parse("2022-04-08 07:44:16");
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(date.toCalendar());
Assert.assertEquals(DateUtil.parse("2022-04-08 08:00:00"), DateUtil.date(calendar));
assertEquals(DateUtil.parse("2022-04-08 08:00:00"), DateUtil.date(calendar));
// 匹配所有天,返回明日
pattern = new CronPattern("0 0 0 * * * *");
date = DateUtil.parse("2022-04-08 07:44:16");
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(date.toCalendar());
Assert.assertEquals(DateUtil.parse("2022-04-09 00:00:00"), DateUtil.date(calendar));
assertEquals(DateUtil.parse("2022-04-09 00:00:00"), DateUtil.date(calendar));
// 匹配所有月,返回下一月
pattern = new CronPattern("0 0 0 1 * * *");
date = DateUtil.parse("2022-04-08 07:44:16");
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(date.toCalendar());
Assert.assertEquals(DateUtil.parse("2022-05-01 00:00:00"), DateUtil.date(calendar));
assertEquals(DateUtil.parse("2022-05-01 00:00:00"), DateUtil.date(calendar));
}
@Test
@@ -56,36 +56,36 @@ public class CronPatternNextMatchTest {
Calendar calendar = pattern.nextMatchAfter(
DateUtil.parse("2022-04-12 09:12:12").toCalendar());
Assert.assertTrue(pattern.match(calendar, true));
Assert.assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
assertTrue(pattern.match(calendar, true));
assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
// 秒超出规定值的最大值,分+1秒取最小值
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(
DateUtil.parse("2022-04-12 09:09:24").toCalendar());
Assert.assertTrue(pattern.match(calendar, true));
Assert.assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
assertTrue(pattern.match(calendar, true));
assertEquals("2022-04-12 09:12:23", DateUtil.date(calendar).toString());
// 秒超出规定值的最大值,分不变,小时+1秒和分使用最小值
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(
DateUtil.parse("2022-04-12 09:12:24").toCalendar());
Assert.assertTrue(pattern.match(calendar, true));
Assert.assertEquals("2022-04-12 10:12:23", DateUtil.date(calendar).toString());
assertTrue(pattern.match(calendar, true));
assertEquals("2022-04-12 10:12:23", DateUtil.date(calendar).toString());
// 天超出规定值的最大值,月+1天、时、分、秒取最小值
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(
DateUtil.parse("2022-04-13 09:12:24").toCalendar());
Assert.assertTrue(pattern.match(calendar, true));
Assert.assertEquals("2022-05-12 00:12:23", DateUtil.date(calendar).toString());
assertTrue(pattern.match(calendar, true));
assertEquals("2022-05-12 00:12:23", DateUtil.date(calendar).toString());
// 跨年
//noinspection ConstantConditions
calendar = pattern.nextMatchAfter(
DateUtil.parse("2021-12-22 00:00:00").toCalendar());
Assert.assertTrue(pattern.match(calendar, true));
Assert.assertEquals("2022-01-12 00:12:23", DateUtil.date(calendar).toString());
assertTrue(pattern.match(calendar, true));
assertEquals("2022-01-12 00:12:23", DateUtil.date(calendar).toString());
}
@Test
@@ -95,7 +95,7 @@ public class CronPatternNextMatchTest {
final DateTime time = DateUtil.parse("2022-04-03");
assert time != null;
final Calendar calendar = pattern.nextMatchAfter(time.toCalendar());
Assert.assertEquals("2022-04-09 01:01:01", DateUtil.date(calendar).toString());
assertEquals("2022-04-09 01:01:01", DateUtil.date(calendar).toString());
}
@Test
@@ -108,7 +108,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);
@@ -129,7 +129,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);
@@ -150,7 +150,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);
@@ -171,7 +171,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);
@@ -192,7 +192,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);
@@ -211,7 +211,7 @@ public class CronPatternNextMatchTest {
//noinspection ConstantConditions
Calendar calendar = pattern.nextMatchAfter(date.toCalendar());
date = DateUtil.date(calendar);
Assert.assertEquals(date, result);
assertEquals(date, result);
// 加一秒
date = date.offset(DateField.SECOND, 1);

View File

@@ -2,8 +2,8 @@ package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.cron.CronException;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
/**
* 定时任务单元测试类
@@ -103,11 +103,11 @@ public class CronPatternTest {
@Test
public void CronPatternTest2() {
CronPattern pattern = CronPattern.of("0/30 * * * *");
Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:00:00").getTime(), false));
Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:30:00").getTime(), false));
assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:00:00").getTime(), false));
assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:30:00").getTime(), false));
pattern = CronPattern.of("32 * * * *");
Assert.assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:32:00").getTime(), false));
assertTrue(pattern.match(DateUtil.parse("2018-10-09 12:32:00").getTime(), false));
}
@Test
@@ -173,7 +173,7 @@ public class CronPatternTest {
*/
@SuppressWarnings("ConstantConditions")
private void assertMatch(CronPattern pattern, String date) {
Assert.assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), false));
Assert.assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), true));
assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), false));
assertTrue(pattern.match(DateUtil.parse(date).toCalendar(), true));
}
}

View File

@@ -1,8 +1,8 @@
package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.List;
@@ -13,35 +13,35 @@ public class CronPatternUtilTest {
public void matchedDatesTest() {
//测试每30秒执行
List<Date> matchedDates = CronPatternUtil.matchedDates("0/30 * 8-18 * * ?", DateUtil.parse("2018-10-15 14:33:22"), 5, true);
Assert.assertEquals(5, matchedDates.size());
Assert.assertEquals("2018-10-15 14:33:30", matchedDates.get(0).toString());
Assert.assertEquals("2018-10-15 14:34:00", matchedDates.get(1).toString());
Assert.assertEquals("2018-10-15 14:34:30", matchedDates.get(2).toString());
Assert.assertEquals("2018-10-15 14:35:00", matchedDates.get(3).toString());
Assert.assertEquals("2018-10-15 14:35:30", matchedDates.get(4).toString());
assertEquals(5, matchedDates.size());
assertEquals("2018-10-15 14:33:30", matchedDates.get(0).toString());
assertEquals("2018-10-15 14:34:00", matchedDates.get(1).toString());
assertEquals("2018-10-15 14:34:30", matchedDates.get(2).toString());
assertEquals("2018-10-15 14:35:00", matchedDates.get(3).toString());
assertEquals("2018-10-15 14:35:30", matchedDates.get(4).toString());
}
@Test
public void matchedDatesTest2() {
//测试每小时执行
List<Date> matchedDates = CronPatternUtil.matchedDates("0 0 */1 * * *", DateUtil.parse("2018-10-15 14:33:22"), 5, true);
Assert.assertEquals(5, matchedDates.size());
Assert.assertEquals("2018-10-15 15:00:00", matchedDates.get(0).toString());
Assert.assertEquals("2018-10-15 16:00:00", matchedDates.get(1).toString());
Assert.assertEquals("2018-10-15 17:00:00", matchedDates.get(2).toString());
Assert.assertEquals("2018-10-15 18:00:00", matchedDates.get(3).toString());
Assert.assertEquals("2018-10-15 19:00:00", matchedDates.get(4).toString());
assertEquals(5, matchedDates.size());
assertEquals("2018-10-15 15:00:00", matchedDates.get(0).toString());
assertEquals("2018-10-15 16:00:00", matchedDates.get(1).toString());
assertEquals("2018-10-15 17:00:00", matchedDates.get(2).toString());
assertEquals("2018-10-15 18:00:00", matchedDates.get(3).toString());
assertEquals("2018-10-15 19:00:00", matchedDates.get(4).toString());
}
@Test
public void matchedDatesTest3() {
//测试最后一天
List<Date> matchedDates = CronPatternUtil.matchedDates("0 0 */1 L * *", DateUtil.parse("2018-10-30 23:33:22"), 5, true);
Assert.assertEquals(5, matchedDates.size());
Assert.assertEquals("2018-10-31 00:00:00", matchedDates.get(0).toString());
Assert.assertEquals("2018-10-31 01:00:00", matchedDates.get(1).toString());
Assert.assertEquals("2018-10-31 02:00:00", matchedDates.get(2).toString());
Assert.assertEquals("2018-10-31 03:00:00", matchedDates.get(3).toString());
Assert.assertEquals("2018-10-31 04:00:00", matchedDates.get(4).toString());
assertEquals(5, matchedDates.size());
assertEquals("2018-10-31 00:00:00", matchedDates.get(0).toString());
assertEquals("2018-10-31 01:00:00", matchedDates.get(1).toString());
assertEquals("2018-10-31 02:00:00", matchedDates.get(2).toString());
assertEquals("2018-10-31 03:00:00", matchedDates.get(3).toString());
assertEquals("2018-10-31 04:00:00", matchedDates.get(4).toString());
}
}

View File

@@ -1,7 +1,7 @@
package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateUtil;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Date;

View File

@@ -14,8 +14,8 @@ package cn.hutool.cron.pattern;
import cn.hutool.cron.pattern.matcher.PatternMatcher;
import cn.hutool.cron.pattern.parser.PatternParser;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -23,6 +23,6 @@ public class IssueI7SMP7Test {
@Test
public void parseTest() {
final List<PatternMatcher> parse = PatternParser.parse("0 0 3 1 1 ? */1");
Assert.assertNotNull(parse);
assertNotNull(parse);
}
}

View File

@@ -2,8 +2,8 @@ package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.List;
@@ -16,6 +16,6 @@ public class IssueI82CSHTest {
final DateTime end = DateUtil.parse("2025-09-20");
final List<Date> dates = CronPatternUtil.matchedDates("0 0 1 3-3,9 *", begin, end, 20, false);
//dates.forEach(Console::log);
Assert.assertEquals(4, dates.size());
assertEquals(4, dates.size());
}
}

View File

@@ -1,8 +1,8 @@
package cn.hutool.cron.pattern;
import cn.hutool.core.date.DateUtil;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import java.util.Calendar;
@@ -14,6 +14,6 @@ public class IssueI9FQUATest {
DateUtil.parse("2024-01-01 00:00:00").toCalendar());
//Console.log(DateUtil.date(calendar));
Assert.assertEquals("2024-01-01 00:00:05", DateUtil.date(calendar).toString());
assertEquals("2024-01-01 00:00:05", DateUtil.date(calendar).toString());
}
}