zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Looly
2020-07-12 09:19:52 +08:00
parent fe6ae2c996
commit 93d91699c1
7 changed files with 171 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,4 +36,13 @@ public class ChineseDateTest {
ChineseDate date = new ChineseDate(DateUtil.parseDate("2020-03-1"));
Assert.assertEquals("2020-02-08", date.toStringNormal());
}
@Test
public void parseTest(){
ChineseDate date = new ChineseDate(DateUtil.parseDate("1996-07-14"));
Assert.assertEquals("丙子鼠年 五月廿九", date.toString());
date = new ChineseDate(DateUtil.parseDate("1996-07-15"));
Assert.assertEquals("丙子鼠年 五月三十", date.toString());
}
}

16
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@@ -73,7 +73,7 @@ public class DateUtilTest {
@Test
public void beginAndEndTest() {
String dateStr = "2017-03-01 22:33:23";
String dateStr = "2017-03-01 00:33:23";
Date date = DateUtil.parse(dateStr);
// 一天的开始
@@ -84,6 +84,12 @@ public class DateUtilTest {
Assert.assertEquals("2017-03-01 23:59:59", endOfDay.toString());
}
@Test
public void endOfDayTest() {
final DateTime parse = DateUtil.parse("2020-05-31 00:00:00");
Assert.assertEquals("2020-05-31 23:59:59", DateUtil.endOfDay(parse).toString());
}
@Test
public void truncateTest(){
String dateStr2 = "2020-02-29 12:59:34";
@@ -587,6 +593,14 @@ public class DateUtilTest {
Assert.assertEquals("2019-12-31 23:59:59", endOfYear.toString());
}
@Test
public void endOfQuarterTest() {
Date date = DateUtil.endOfQuarter(
DateUtil.parse("2020-05-31 00:00:00"));
Assert.assertEquals("2020-06-30 23:59:59", DateUtil.format(date,"yyyy-MM-dd HH:mm:ss"));
}
@Test
public void endOfWeekTest() {
// 周日

40
hutool-core/src/test/java/cn/hutool/core/date/MonthTest.java Normal file
View File

@@ -0,0 +1,40 @@
package cn.hutool.core.date;
import org.junit.Assert;
import org.junit.Test;
import java.util.Calendar;
public class MonthTest {
@SuppressWarnings("ConstantConditions")
@Test
public void getLastDayTest(){
int lastDay = Month.of(Calendar.JANUARY).getLastDay(false);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.FEBRUARY).getLastDay(false);
Assert.assertEquals(28, lastDay);
lastDay = Month.of(Calendar.FEBRUARY).getLastDay(true);
Assert.assertEquals(29, lastDay);
lastDay = Month.of(Calendar.MARCH).getLastDay(true);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.APRIL).getLastDay(true);
Assert.assertEquals(30, lastDay);
lastDay = Month.of(Calendar.MAY).getLastDay(true);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.JUNE).getLastDay(true);
Assert.assertEquals(30, lastDay);
lastDay = Month.of(Calendar.JULY).getLastDay(true);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.AUGUST).getLastDay(true);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.SEPTEMBER).getLastDay(true);
Assert.assertEquals(30, lastDay);
lastDay = Month.of(Calendar.OCTOBER).getLastDay(true);
Assert.assertEquals(31, lastDay);
lastDay = Month.of(Calendar.NOVEMBER).getLastDay(true);
Assert.assertEquals(30, lastDay);
lastDay = Month.of(Calendar.DECEMBER).getLastDay(true);
Assert.assertEquals(31, lastDay);
}
}