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

!780 修复Issue #I5OSFC(更友好提示),完善Zodiac单元测试

Browse Source 
Merge pull request !780 from Husky/v6-dev
This commit is contained in:
Looly
2022-08-30 13:48:16 +00:00
committed by Gitee
parent dd3148ca0a 39a618ff10
commit 26d550dbab
6 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java
View File

@@ -4,6 +4,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.time.DayOfWeek;
import java.util.Calendar;
public class WeekTest {
@@ -46,6 +47,9 @@ public class WeekTest {
Assert.assertEquals(Week.THURSDAY, Week.of(DayOfWeek.THURSDAY));
Assert.assertEquals(Week.FRIDAY, Week.of(DayOfWeek.FRIDAY));
Assert.assertEquals(Week.SATURDAY, Week.of(DayOfWeek.SATURDAY));
Assert.assertEquals(Week.SATURDAY, Week.of(Calendar.SATURDAY));
Assert.assertNull(Week.of(10));
Assert.assertNull(Week.of(-1));
}
@Test
@@ -58,4 +62,17 @@ public class WeekTest {
Assert.assertEquals(DayOfWeek.SATURDAY, Week.SATURDAY.toJdkDayOfWeek());
Assert.assertEquals(DayOfWeek.SUNDAY, Week.SUNDAY.toJdkDayOfWeek());
}
@Test
public void toChineseTest(){
Assert.assertEquals("周一",Week.MONDAY.toChinese("周"));
Assert.assertEquals("星期一",Week.MONDAY.toChinese("星期"));
Assert.assertEquals("星期二",Week.TUESDAY.toChinese("星期"));
Assert.assertEquals("星期三",Week.WEDNESDAY.toChinese("星期"));
Assert.assertEquals("星期四",Week.THURSDAY.toChinese("星期"));
Assert.assertEquals("星期五",Week.FRIDAY.toChinese("星期"));
Assert.assertEquals("星期六",Week.SATURDAY.toChinese("星期"));
Assert.assertEquals("星期日",Week.SUNDAY.toChinese("星期"));
Assert.assertEquals("星期一",Week.MONDAY.toChinese());
}
}

14
hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java
View File

@@ -3,6 +3,9 @@ package cn.hutool.core.date;
import org.junit.Assert;
import org.junit.Test;
import java.util.Calendar;
import java.util.Date;
public class ZodiacTest {
@Test
@@ -10,6 +13,11 @@ public class ZodiacTest {
Assert.assertEquals("摩羯座", Zodiac.getZodiac(Month.JANUARY, 19));
Assert.assertEquals("水瓶座", Zodiac.getZodiac(Month.JANUARY, 20));
Assert.assertEquals("巨蟹座", Zodiac.getZodiac(6, 17));
Calendar calendar = Calendar.getInstance();
calendar.set(2022, Calendar.JULY, 17);
Assert.assertEquals("巨蟹座", Zodiac.getZodiac(calendar.getTime()));
Assert.assertEquals("巨蟹座", Zodiac.getZodiac(calendar));
Assert.assertNull(Zodiac.getZodiac((Calendar) null));
}
@Test
@@ -17,5 +25,11 @@ public class ZodiacTest {
Assert.assertEquals("狗", Zodiac.getChineseZodiac(1994));
Assert.assertEquals("狗", Zodiac.getChineseZodiac(2018));
Assert.assertEquals("猪", Zodiac.getChineseZodiac(2019));
Calendar calendar = Calendar.getInstance();
calendar.set(2022, Calendar.JULY, 17);
Assert.assertEquals("虎", Zodiac.getChineseZodiac(calendar.getTime()));
Assert.assertEquals("虎", Zodiac.getChineseZodiac(calendar));
Assert.assertNull(Zodiac.getChineseZodiac(1899));
Assert.assertNull(Zodiac.getChineseZodiac((Calendar) null));
}
}

16
hutool-core/src/test/java/cn/hutool/core/date/ZoneUtilTest.java Normal file
View File

@@ -0,0 +1,16 @@
package cn.hutool.core.date;
import org.junit.Assert;
import org.junit.Test;
import java.time.ZoneId;
import java.util.TimeZone;
public class ZoneUtilTest {
@Test
public void test() {
Assert.assertEquals(ZoneId.systemDefault(), ZoneUtil.toZoneId(null));
Assert.assertEquals(TimeZone.getDefault(), ZoneUtil.toTimeZone(null));
}
}