stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8239520: ValueRange.of(long, long, long) does not throw IAE on invalid inputs

Browse Source 
Reviewed-by: rriggs
This commit is contained in:
Naoto Sato 2020-02-24 14:16:20 -08:00
parent c30f84536e
commit 8493812702
2 changed files with 23 additions and 5 deletions
src/java.base/share/classes/java/time/temporal
ValueRange.java
test/jdk/java/time/test/java/time/temporal
TestDateTimeValueRange.java

15
src/java.base/share/classes/java/time/temporal/ValueRange.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -145,6 +145,9 @@ public final class ValueRange implements Serializable {
* or the smallest maximum is greater than the largest maximum
*/
public static ValueRange of(long min, long maxSmallest, long maxLargest) {
if (min > maxSmallest) {
throw new IllegalArgumentException("Minimum value must be less than smallest maximum value");
}
return of(min, min, maxSmallest, maxLargest);
}
@ -160,8 +163,9 @@ public final class ValueRange implements Serializable {
* @return the ValueRange for smallest min, largest min, smallest max, largest max, not null
* @throws IllegalArgumentException if
* the smallest minimum is greater than the smallest maximum,
* or the smallest maximum is greater than the largest maximum
* or the largest minimum is greater than the largest maximum
* or the smallest maximum is greater than the largest maximum,
* or the largest minimum is greater than the largest maximum,
* or the smallest minimum is greater than the largest minimum
*/
public static ValueRange of(long minSmallest, long minLargest, long maxSmallest, long maxLargest) {
if (minSmallest > minLargest) {
@ -171,7 +175,10 @@ public final class ValueRange implements Serializable {
throw new IllegalArgumentException("Smallest maximum value must be less than largest maximum value");
}
if (minLargest > maxLargest) {
throw new IllegalArgumentException("Minimum value must be less than maximum value");
throw new IllegalArgumentException("Largest minimum value must be less than largest maximum value");
}
if (minSmallest > maxSmallest) {
throw new IllegalArgumentException("Smallest minimum value must be less than smallest maximum value");
}
return new ValueRange(minSmallest, minLargest, maxSmallest, maxLargest);
}

13
test/jdk/java/time/test/java/time/temporal/TestDateTimeValueRange.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -75,6 +75,7 @@ import test.java.time.AbstractTest;
/**
* Test.
* @bug 8239520
*/
@Test
public class TestDateTimeValueRange extends AbstractTest {
@ -138,6 +139,11 @@ public class TestDateTimeValueRange extends AbstractTest {
ValueRange.of(1, 31, 28);
}
@Test(expectedExceptions = IllegalArgumentException.class)
public void test_of_longlonglong_minGtSmallestMax() {
ValueRange.of(5, 2, 10);
}
//-----------------------------------------------------------------------
// of(long,long,long,long)
//-----------------------------------------------------------------------
@ -178,6 +184,11 @@ public class TestDateTimeValueRange extends AbstractTest {
{2, 1, 28, 31},
{2, 1, 31, 28},
{12, 13, 1, 2},
{10, 11, 0, 12}, // smallest minimum is greater than the smallest maximum
{0, 1, 11, 10}, // smallest maximum is greater than the largest maximum
{0, 11, 1, 10}, // largest minimum is greater than the largest maximum
{1, 0, 10, 11}, // smallest minimum is greater than the largest minimum
};
}