archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8283782: Redundant verification of year in LocalDate::ofEpochDay

Browse source 
Reviewed-by: rriggs, naoto
This commit is contained in:
Claes Redestad 2022-03-29 19:48:43 +00:00
parent 2fef5d4a33
commit 072f2c461e
2 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/java.base/share/classes/java/time/LocalDate.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -367,9 +367,7 @@ public final class LocalDate
int dom = marchDoy0 - (marchMonth0 * 306 + 5) / 10 + 1; int dom = marchDoy0 - (marchMonth0 * 306 + 5) / 10 + 1;
yearEst += marchMonth0 / 10; yearEst += marchMonth0 / 10;
// check year now we are certain it is correct return new LocalDate((int)yearEst, month, dom);
int year = YEAR.checkValidIntValue(yearEst);
return new LocalDate(year, month, dom);
} }
//----------------------------------------------------------------------- //-----------------------------------------------------------------------

36
test/jdk/java/time/test/java/time/TestLocalDate.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -63,9 +63,12 @@ import static java.time.temporal.ChronoField.YEAR;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertSame; import static org.testng.Assert.assertSame;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.time.DateTimeException;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.Month; import java.time.Month;
import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.time.temporal.IsoFields; import java.time.temporal.IsoFields;
@ -420,6 +423,37 @@ public class TestLocalDate extends AbstractTest {
} }
} }
@Test
public void test_ofEpochDay_edges() {
long minDay = ChronoField.EPOCH_DAY.range().getMinimum();
long maxDay = ChronoField.EPOCH_DAY.range().getMaximum();
long minYear = ChronoField.YEAR.range().getMinimum();
long maxYear = ChronoField.YEAR.range().getMinimum();
int[] offsets = new int[] { 0, 1, 2, 3, 28, 29, 30, 31, 32, 363, 364, 365, 366, 367 };
for (int offset : offsets) {
LocalDate minDate = LocalDate.ofEpochDay(minDay + offset);
assertEquals(minDate, LocalDate.MIN.plusDays(offset));
assertTrue(ChronoField.YEAR.range().isValidValue(minDate.getYear()));
LocalDate maxDate = LocalDate.ofEpochDay(maxDay - offset);
assertEquals(maxDate, LocalDate.MAX.minusDays(offset));
assertTrue(ChronoField.YEAR.range().isValidValue(maxDate.getYear()));
try {
LocalDate.ofEpochDay(minDay - 1 - offset);
fail("Expected DateTimeException");
} catch (DateTimeException e) {
// expected
}
try {
LocalDate.ofEpochDay(maxDay + 1 + offset);
fail("Expected DateTimeException");
} catch (DateTimeException e) {
// expected
}
}
}
void doTest_comparisons_LocalDate(LocalDate... localDates) { void doTest_comparisons_LocalDate(LocalDate... localDates) {
for (int i = 0; i < localDates.length; i++) { for (int i = 0; i < localDates.length; i++) {
LocalDate a = localDates[i]; LocalDate a = localDates[i];