Tue, 31 May 2016 10:20:43 -0700
Merge
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 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 8025087 |
aoqi@0 | 27 | * @summary Verify that pre-JDK8 classfiles with default and/or static methods |
aoqi@0 | 28 | * are refused correctly. |
aoqi@0 | 29 | * @build BadClassfile |
aoqi@0 | 30 | * @run main BadClassfile |
aoqi@0 | 31 | */ |
aoqi@0 | 32 | |
aoqi@0 | 33 | import com.sun.tools.classfile.*; |
aoqi@0 | 34 | import com.sun.tools.javac.api.JavacTaskImpl; |
aoqi@0 | 35 | import com.sun.tools.javac.code.Symbol; |
aoqi@0 | 36 | import com.sun.tools.javac.jvm.ClassReader.BadClassFile; |
aoqi@0 | 37 | import com.sun.tools.javac.jvm.Target; |
aoqi@0 | 38 | import com.sun.tools.javac.util.Assert; |
aoqi@0 | 39 | import com.sun.tools.javac.util.JCDiagnostic; |
aoqi@0 | 40 | import java.io.File; |
aoqi@0 | 41 | import java.util.Arrays; |
aoqi@0 | 42 | import java.util.Objects; |
aoqi@0 | 43 | import javax.tools.JavaCompiler; |
aoqi@0 | 44 | import javax.tools.ToolProvider; |
aoqi@0 | 45 | |
aoqi@0 | 46 | public class BadClassfile { |
aoqi@0 | 47 | public static void main(String... args) throws Exception { |
aoqi@0 | 48 | test("BadClassfile$DefaultMethodTest", "compiler.misc.invalid.default.interface"); |
aoqi@0 | 49 | test("BadClassfile$StaticMethodTest", "compiler.misc.invalid.static.interface"); |
aoqi@0 | 50 | } |
aoqi@0 | 51 | |
aoqi@0 | 52 | private static void test(String classname, String expected) throws Exception { |
aoqi@0 | 53 | File classfile = new File(System.getProperty("test.classes", "."), classname + ".class"); |
aoqi@0 | 54 | ClassFile cf = ClassFile.read(classfile); |
aoqi@0 | 55 | |
aoqi@0 | 56 | cf = new ClassFile(cf.magic, Target.JDK1_7.minorVersion, |
aoqi@0 | 57 | Target.JDK1_7.majorVersion, cf.constant_pool, cf.access_flags, |
aoqi@0 | 58 | cf.this_class, cf.super_class, cf.interfaces, cf.fields, |
aoqi@0 | 59 | cf.methods, cf.attributes); |
aoqi@0 | 60 | |
aoqi@0 | 61 | new ClassWriter().write(cf, classfile); |
aoqi@0 | 62 | |
aoqi@0 | 63 | JavaCompiler c = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 64 | JavacTaskImpl task = (JavacTaskImpl) c.getTask(null, null, null, Arrays.asList("-classpath", System.getProperty("test.classes", ".")), null, null); |
aoqi@0 | 65 | |
aoqi@0 | 66 | try { |
aoqi@0 | 67 | Symbol clazz = com.sun.tools.javac.main.JavaCompiler.instance(task.getContext()).resolveIdent(classname); |
aoqi@0 | 68 | |
aoqi@0 | 69 | clazz.complete(); |
aoqi@0 | 70 | } catch (BadClassFile f) { |
aoqi@0 | 71 | JCDiagnostic embeddedDiag = (JCDiagnostic) f.diag.getArgs()[1]; |
aoqi@0 | 72 | assertEquals(expected, embeddedDiag.getCode()); |
aoqi@0 | 73 | assertEquals(Integer.toString(Target.JDK1_7.majorVersion), embeddedDiag.getArgs()[0]); |
aoqi@0 | 74 | assertEquals(Integer.toString(Target.JDK1_7.minorVersion), embeddedDiag.getArgs()[1]); |
aoqi@0 | 75 | } |
aoqi@0 | 76 | } |
aoqi@0 | 77 | |
aoqi@0 | 78 | private static void assertEquals(Object expected, Object actual) { |
aoqi@0 | 79 | Assert.check(Objects.equals(expected, actual), |
aoqi@0 | 80 | "expected: " + expected + ", but was: " + actual); |
aoqi@0 | 81 | } |
aoqi@0 | 82 | |
aoqi@0 | 83 | interface DefaultMethodTest { |
aoqi@0 | 84 | default void test() { } |
aoqi@0 | 85 | } |
aoqi@0 | 86 | interface StaticMethodTest { |
aoqi@0 | 87 | static void test() { } |
aoqi@0 | 88 | } |
aoqi@0 | 89 | } |