From e48c0f85b22995e210c1304c5853fcaae114caad Mon Sep 17 00:00:00 2001 From: Joe Darcy Date: Wed, 1 Jun 2016 11:22:06 -0700 Subject: [PATCH] 8158430: Push tests for JDK-5040830 Reviewed-by: psandoz --- .../ExceptionalToString/AnnotationHost.java | 29 ++++++++ .../ExceptionalToStringTest.java | 72 +++++++++++++++++++ .../version1/DangerousAnnotation.java | 33 +++++++++ .../version1/Fleeting.java | 29 ++++++++ .../ExceptionalToString/version1/Utopia.java | 27 +++++++ .../version2/DangerousAnnotation.java | 33 +++++++++ .../ExceptionalToString/version2/Utopia.java | 27 +++++++ 7 files changed, 250 insertions(+) create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java create mode 100644 jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java b/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java new file mode 100644 index 00000000000..3bb5eb156a9 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/AnnotationHost.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016, 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. + */ + +@DangerousAnnotation(utopia=Utopia.BRIGADOON, + thirtyTwoBitsAreNotEnough=42, + classy=Fleeting.class, + classies={Object.class, int.class}, + moreClassies={}) +public class AnnotationHost {} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java b/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java new file mode 100644 index 00000000000..8169c8d8235 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/ExceptionalToStringTest.java @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2016, 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. + */ + +/* + * @test + * @bug 5040830 + * @summary Verify information annotation strings with exception proxies + * @compile -sourcepath version1 version1/Fleeting.java version1/Utopia.java version1/DangerousAnnotation.java + * @compile AnnotationHost.java + * @build ExceptionalToStringTest + * @run main ExceptionalToStringTest + * @clean Utopia DangerousAnnotation + * @compile -sourcepath version2 -implicit:none version2/Utopia.java + * @compile -sourcepath version2 -implicit:none version2/DangerousAnnotation.java + * @clean Fleeting + * @run main ExceptionalToStringTest + */ + +/** + * There are three potential exception conditions which can occur + * reading annotations: + * + * EnumConstantNotPresentException - "Thrown when an application tries + * to access an enum constant by name and the enum type contains no + * constant with the specified name." + * + * AnnotationTypeMismatchException - "Thrown to indicate that a + * program has attempted to access an element of an annotation whose + * type has changed after the annotation was compiled (or serialized)" + * + * TypeNotPresentException - "Thrown when an application tries to + * access a type using a string representing the type's name, but no + * definition for the type with the specified name can be found." + * + * The test reads an annotation, DangerousAnnotation, which can + * display all three pathologies. The pathologies are not + * present when the version1 sources are used but are present with the + * version2 sources. The version2 sources remove an enum constant + * (EnumConstantNotPresentException), change the return type of an + * annotation method (AnnotationTypeMismatchException), and remove a + * type whose Class literal is referenced (TypeNotPresentException). + */ +public class ExceptionalToStringTest { + public static void main(String... args) { + String annotationAsString = AnnotationHost.class.getAnnotation(DangerousAnnotation.class).toString(); + + // Verify no occurrence of "ExceptionProxy" in the string. + if (annotationAsString.indexOf("ExceptionProxy") != -1) { + throw new RuntimeException(); + } + } +} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java new file mode 100644 index 00000000000..d339e575b65 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/DangerousAnnotation.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2016, 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.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +public @interface DangerousAnnotation { + Utopia utopia(); + int thirtyTwoBitsAreNotEnough(); + Class classy(); + Class[] classies(); + Class[] moreClassies(); +} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java new file mode 100644 index 00000000000..3c74c6513b7 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Fleeting.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016, 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.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +public @interface Fleeting { + int value(); +} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java new file mode 100644 index 00000000000..536b15a7cdf --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/version1/Utopia.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, 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. + */ + +public enum Utopia { + SHANGRI_LA, + BRIGADOON; // Only there one day out of every 100 years. +} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java b/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java new file mode 100644 index 00000000000..a6e4d3d8bd1 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/version2/DangerousAnnotation.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2016, 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.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) +public @interface DangerousAnnotation { + Utopia utopia(); + long thirtyTwoBitsAreNotEnough(); + Class classy(); + Class[] classies(); + Class[] moreClassies(); +} diff --git a/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java b/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java new file mode 100644 index 00000000000..05ff37677e8 --- /dev/null +++ b/jdk/test/java/lang/annotation/ExceptionalToString/version2/Utopia.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, 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. + */ + +public enum Utopia { + SHANGRI_LA; + //BRIGADOON -- Only there one day out of every 100 years. +}