ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix test

Browse Source
This commit is contained in:
Looly 2020-04-11 13:58:41 +08:00
parent 4a574e3241
commit 660b64daf6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/cn/hutool/core/date/CalendarUtil.java
View File

@ -396,13 +396,13 @@ public class CalendarUtil {
* @return 年龄 * @return 年龄
*/ */
protected static int age(long birthday, long dateToCompare) { protected static int age(long birthday, long dateToCompare) {
Calendar cal = Calendar.getInstance(); if (birthday > dateToCompare) {
cal.setTimeInMillis(dateToCompare);
if (cal.before(birthday)) {
throw new IllegalArgumentException("Birthday is after dateToCompare!"); throw new IllegalArgumentException("Birthday is after dateToCompare!");
} }
final Calendar cal = Calendar.getInstance();
cal.setTimeInMillis(dateToCompare);
final int year = cal.get(Calendar.YEAR); final int year = cal.get(Calendar.YEAR);
final int month = cal.get(Calendar.MONTH); final int month = cal.get(Calendar.MONTH);
final int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH); final int dayOfMonth = cal.get(Calendar.DAY_OF_MONTH);

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

@ -700,8 +700,7 @@ public class DateUtilTest {
public void ageTest2(){ public void ageTest2(){
String d1 = "2019-02-29"; String d1 = "2019-02-29";
String d2 = "2018-02-28"; String d2 = "2018-02-28";
final int age = DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2)); DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
Assert.assertEquals(18, age);
} }
@Test @Test