Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
6606673: Path2D.Double, Path2D.Float and GeneralPath ctors throw exce…
…ption when initialCapacity is negative Reviewed-by: psadhukhan, kizune
- Loading branch information
Showing
4 changed files
with
218 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
test/jdk/java/awt/geom/GeneralPath/GeneralPathExceptions.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright (c) 2021, 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 | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| import java.awt.geom.GeneralPath; | ||
|
|
||
| import static java.awt.geom.Path2D.WIND_EVEN_ODD; | ||
| import static java.awt.geom.Path2D.WIND_NON_ZERO; | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 6606673 | ||
| * @summary The test checks if correct exceptions are thrown by the constructors | ||
| */ | ||
| public final class GeneralPathExceptions { | ||
|
|
||
| public static void main(String[] args) { | ||
| try { | ||
| new GeneralPath(null); | ||
| throw new RuntimeException("NullPointerException is expected"); | ||
| } catch (NullPointerException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new GeneralPath(-1); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new GeneralPath(-1, 0); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new GeneralPath(WIND_EVEN_ODD, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new GeneralPath(WIND_NON_ZERO, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * Copyright (c) 2021, 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 | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
|
|
||
| import java.awt.geom.Path2D; | ||
|
|
||
| import static java.awt.geom.Path2D.WIND_EVEN_ODD; | ||
| import static java.awt.geom.Path2D.WIND_NON_ZERO; | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 6606673 | ||
| * @summary The test checks if correct exceptions are thrown by the constructors | ||
| */ | ||
| public final class Path2DExceptions { | ||
|
|
||
| public static void main(String[] args) { | ||
| testFloat(); | ||
| testDouble(); | ||
| } | ||
|
|
||
| private static void testFloat() { | ||
| try { | ||
| new Path2D.Float(null); | ||
| throw new RuntimeException("NullPointerException is expected"); | ||
| } catch (NullPointerException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Float(null, null); | ||
| throw new RuntimeException("NullPointerException is expected"); | ||
| } catch (NullPointerException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new Path2D.Float(-1); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Float(-1, 0); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new Path2D.Float(WIND_EVEN_ODD, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Float(WIND_NON_ZERO, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| } | ||
|
|
||
| private static void testDouble() { | ||
| try { | ||
| new Path2D.Double(null); | ||
| throw new RuntimeException("NullPointerException is expected"); | ||
| } catch (NullPointerException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Double(null, null); | ||
| throw new RuntimeException("NullPointerException is expected"); | ||
| } catch (NullPointerException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new Path2D.Double(-1); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Double(-1, 0); | ||
| throw new RuntimeException("IllegalArgumentException is expected"); | ||
| } catch (IllegalArgumentException ignore) { | ||
| // expected | ||
| } | ||
|
|
||
| try { | ||
| new Path2D.Double(WIND_EVEN_ODD, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| try { | ||
| new Path2D.Double(WIND_NON_ZERO, -1); | ||
| throw new RuntimeException("NegativeArraySizeException is expected"); | ||
| } catch (NegativeArraySizeException ignore) { | ||
| // expected | ||
| } | ||
| } | ||
| } |
e1411fdThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues