iSharkFly-Open/jfaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use month values between 0-11 for GregorianCalendar (#243)

Browse Source 
* Use month values between 0-11 for GregorianCalendar

* Update tests to match the changes to GregorianCalendar's use
This commit is contained in:
Bruno P. Kinoshita
2018-04-10 06:09:12 +12:00
committed by Ricky Yim
parent 96c62f8f0c
commit ea60ee3cbf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/github/javafaker/DateAndTime.java
+3 -3
View File
@@ -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());
}
src/test/java/com/github/javafaker/DateAndTimeTest.java
+2 -2
View File
@@ -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));