Wed, 23 Oct 2013 23:02:17 +0200
8027191: Fix for JDK-8026861 refers to an incorrect bug number
Summary: Reverting changeset b05db8c815e8, so that it can be applied again with a correct bug number
Reviewed-by: jjg
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
aoqi@0 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
aoqi@0 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
aoqi@0 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
aoqi@0 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /* |
aoqi@0 | 25 | * @test |
aoqi@0 | 26 | * @bug 6985181 |
aoqi@0 | 27 | * @summary Annotations lost from classfile |
aoqi@0 | 28 | */ |
aoqi@0 | 29 | |
aoqi@0 | 30 | import java.io.*; |
aoqi@0 | 31 | import java.util.*; |
aoqi@0 | 32 | |
aoqi@0 | 33 | public class T6985181 { |
aoqi@0 | 34 | public static void main(String... args) throws Exception{ |
aoqi@0 | 35 | new T6985181().run(); |
aoqi@0 | 36 | } |
aoqi@0 | 37 | |
aoqi@0 | 38 | public void run() throws Exception { |
aoqi@0 | 39 | String code = "@java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE_PARAMETER)\n" + |
aoqi@0 | 40 | "@interface Simple { }\n" + |
aoqi@0 | 41 | "interface Test<@Simple T> { }"; |
aoqi@0 | 42 | |
aoqi@0 | 43 | File srcFile = writeFile("Test.java", code); |
aoqi@0 | 44 | File classesDir = new File("classes"); |
aoqi@0 | 45 | classesDir.mkdirs(); |
aoqi@0 | 46 | compile("-d", classesDir.getPath(), srcFile.getPath()); |
aoqi@0 | 47 | String out = javap(new File(classesDir, srcFile.getName().replace(".java", ".class"))); |
aoqi@0 | 48 | if (!out.contains("RuntimeInvisibleTypeAnnotations")) |
aoqi@0 | 49 | throw new Exception("RuntimeInvisibleTypeAnnotations not found"); |
aoqi@0 | 50 | } |
aoqi@0 | 51 | |
aoqi@0 | 52 | void compile(String... args) throws Exception { |
aoqi@0 | 53 | StringWriter sw = new StringWriter(); |
aoqi@0 | 54 | PrintWriter pw = new PrintWriter(sw); |
aoqi@0 | 55 | int rc = com.sun.tools.javac.Main.compile(args, pw); |
aoqi@0 | 56 | pw.close(); |
aoqi@0 | 57 | String out = sw.toString(); |
aoqi@0 | 58 | if (out.length() > 0) |
aoqi@0 | 59 | System.err.println(out); |
aoqi@0 | 60 | if (rc != 0) |
aoqi@0 | 61 | throw new Exception("Compilation failed: rc=" + rc); |
aoqi@0 | 62 | } |
aoqi@0 | 63 | |
aoqi@0 | 64 | String javap(File classFile) throws Exception { |
aoqi@0 | 65 | StringWriter sw = new StringWriter(); |
aoqi@0 | 66 | PrintWriter pw = new PrintWriter(sw); |
aoqi@0 | 67 | String[] args = { "-v", classFile.getPath() }; |
aoqi@0 | 68 | int rc = com.sun.tools.javap.Main.run(args, pw); |
aoqi@0 | 69 | pw.close(); |
aoqi@0 | 70 | String out = sw.toString(); |
aoqi@0 | 71 | if (out.length() > 0) |
aoqi@0 | 72 | System.err.println(out); |
aoqi@0 | 73 | if (rc != 0) |
aoqi@0 | 74 | throw new Exception("javap failed: rc=" + rc); |
aoqi@0 | 75 | return out; |
aoqi@0 | 76 | } |
aoqi@0 | 77 | |
aoqi@0 | 78 | File writeFile(String path, String body) throws IOException { |
aoqi@0 | 79 | File f = new File(path); |
aoqi@0 | 80 | FileWriter out = new FileWriter(f); |
aoqi@0 | 81 | try { |
aoqi@0 | 82 | out.write(body); |
aoqi@0 | 83 | } finally { |
aoqi@0 | 84 | out.close(); |
aoqi@0 | 85 | } |
aoqi@0 | 86 | return f; |
aoqi@0 | 87 | } |
aoqi@0 | 88 | } |