From ea60ee3cbfa76ce75cc7c676bec44f7eaf027ba6 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Tue, 10 Apr 2018 06:09:12 +1200 Subject: [PATCH] Use month values between 0-11 for GregorianCalendar (#243) * Use month values between 0-11 for GregorianCalendar * Update tests to match the changes to GregorianCalendar's use --- src/main/java/com/github/javafaker/DateAndTime.java | 6 +++--- src/test/java/com/github/javafaker/DateAndTimeTest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/javafaker/DateAndTime.java b/src/main/java/com/github/javafaker/DateAndTime.java index 24a89571..68f0ac1a 100644 --- a/src/main/java/com/github/javafaker/DateAndTime.java +++ b/src/main/java/com/github/javafaker/DateAndTime.java @@ -119,7 +119,7 @@ public class DateAndTime { * * @return a random birthday between 65 and 18 years ago. */ - public java.util.Date birthday() { + public Date birthday() { return birthday(DEFAULT_MIN_AGE, DEFAULT_MAX_AGE); } @@ -134,10 +134,10 @@ public class DateAndTime { * @throws IllegalArgumentException * if the {@code maxAge} is lower than {@code minAge}. */ - public java.util.Date birthday(int minAge, int maxAge) { + public Date birthday(int minAge, int maxAge) { int currentYear = Calendar.getInstance().get(Calendar.YEAR); Calendar from = new GregorianCalendar(currentYear - maxAge, 0, 1); - Calendar to = new GregorianCalendar(currentYear - minAge, 12, 31); + Calendar to = new GregorianCalendar(currentYear - minAge, 11, 31); return between(from.getTime(), to.getTime()); } diff --git a/src/test/java/com/github/javafaker/DateAndTimeTest.java b/src/test/java/com/github/javafaker/DateAndTimeTest.java index a87518f7..04d09eff 100644 --- a/src/test/java/com/github/javafaker/DateAndTimeTest.java +++ b/src/test/java/com/github/javafaker/DateAndTimeTest.java @@ -63,7 +63,7 @@ public class DateAndTimeTest extends AbstractFakerTest { public void testBirthday() { int currentYear = Calendar.getInstance().get(Calendar.YEAR); long from = new GregorianCalendar(currentYear - 65, 0, 1).getTime().getTime(); - long to = new GregorianCalendar(currentYear - 18, 12, 31).getTime().getTime(); + long to = new GregorianCalendar(currentYear - 18, 11, 31).getTime().getTime(); for (int i = 0; i < 1000; i++) { Date birthday = faker.date().birthday(); @@ -81,7 +81,7 @@ public class DateAndTimeTest extends AbstractFakerTest { int maxAge = faker.number().numberBetween(minAge, 100); long from = new GregorianCalendar(currentYear - maxAge, 0, 1).getTime().getTime(); - long to = new GregorianCalendar(currentYear - minAge, 12, 31).getTime().getTime(); + long to = new GregorianCalendar(currentYear - minAge, 11, 31).getTime().getTime(); Date birthday = faker.date().birthday(minAge, maxAge); assertThat("birthday is after upper bound", birthday.getTime(), lessThan(to));