Mon, 02 Sep 2013 22:38:36 +0100
8016177: structural most specific and stuckness
Reviewed-by: jjg, vromero
Contributed-by: maurizio.cimadamore@oracle.com
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 7116676 |
aoqi@0 | 27 | * @summary RichDiagnosticFormatter throws NPE when formatMessage is called directly |
aoqi@0 | 28 | */ |
aoqi@0 | 29 | |
aoqi@0 | 30 | import com.sun.source.util.JavacTask; |
aoqi@0 | 31 | import com.sun.tools.javac.api.ClientCodeWrapper.Trusted; |
aoqi@0 | 32 | import com.sun.tools.javac.api.DiagnosticFormatter; |
aoqi@0 | 33 | import com.sun.tools.javac.api.JavacTaskImpl; |
aoqi@0 | 34 | import com.sun.tools.javac.util.Assert; |
aoqi@0 | 35 | import com.sun.tools.javac.util.JCDiagnostic; |
aoqi@0 | 36 | import com.sun.tools.javac.util.Log; |
aoqi@0 | 37 | import java.io.IOException; |
aoqi@0 | 38 | import java.net.URI; |
aoqi@0 | 39 | import java.util.ArrayList; |
aoqi@0 | 40 | import java.util.Arrays; |
aoqi@0 | 41 | import java.util.List; |
aoqi@0 | 42 | import java.util.Locale; |
aoqi@0 | 43 | import javax.tools.Diagnostic; |
aoqi@0 | 44 | import javax.tools.DiagnosticListener; |
aoqi@0 | 45 | import javax.tools.JavaCompiler; |
aoqi@0 | 46 | import javax.tools.JavaFileObject; |
aoqi@0 | 47 | import javax.tools.SimpleJavaFileObject; |
aoqi@0 | 48 | import javax.tools.ToolProvider; |
aoqi@0 | 49 | |
aoqi@0 | 50 | public class T7116676 { |
aoqi@0 | 51 | |
aoqi@0 | 52 | public static void main(String[] args) throws Exception { |
aoqi@0 | 53 | T7116676 test = new T7116676(); |
aoqi@0 | 54 | test.testThroughFormatterFormat(); |
aoqi@0 | 55 | } |
aoqi@0 | 56 | |
aoqi@0 | 57 | static class JavaSource extends SimpleJavaFileObject { |
aoqi@0 | 58 | private String text = "package test;\n" + |
aoqi@0 | 59 | "public class Test {\n" + |
aoqi@0 | 60 | " private void t(java.util.List<? extends String> l) {\n" + |
aoqi@0 | 61 | " t(java.util.Collections.singleton(l));\n" + |
aoqi@0 | 62 | "} }"; |
aoqi@0 | 63 | |
aoqi@0 | 64 | public JavaSource() { |
aoqi@0 | 65 | super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
aoqi@0 | 66 | } |
aoqi@0 | 67 | @Override |
aoqi@0 | 68 | public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
aoqi@0 | 69 | return text; |
aoqi@0 | 70 | } |
aoqi@0 | 71 | } |
aoqi@0 | 72 | |
aoqi@0 | 73 | void assertEquals(String req, String found) { |
aoqi@0 | 74 | if (!found.equals(req)) { |
aoqi@0 | 75 | throw new AssertionError(String.format("Error. Found: \n\n%s ; Expected: \n\n%s", found, req)); |
aoqi@0 | 76 | } |
aoqi@0 | 77 | } |
aoqi@0 | 78 | |
aoqi@0 | 79 | public void testThroughFormatterFormat() throws IOException { |
aoqi@0 | 80 | final JavaCompiler tool = ToolProvider.getSystemJavaCompiler(); |
aoqi@0 | 81 | DiagnosticChecker dc = new DiagnosticChecker("compiler.err.prob.found.req"); |
aoqi@0 | 82 | JavacTask ct = (JavacTask)tool.getTask(null, null, dc, null, null, Arrays.asList(new JavaSource())); |
aoqi@0 | 83 | ct.analyze(); |
aoqi@0 | 84 | DiagnosticFormatter<JCDiagnostic> formatter = |
aoqi@0 | 85 | Log.instance(((JavacTaskImpl) ct).getContext()).getDiagnosticFormatter(); |
aoqi@0 | 86 | String msg = formatter.formatMessage(dc.diag, Locale.getDefault()); |
aoqi@0 | 87 | //no redundant package qualifiers |
aoqi@0 | 88 | Assert.check(msg.indexOf("java.") == -1, msg); |
aoqi@0 | 89 | } |
aoqi@0 | 90 | |
aoqi@0 | 91 | @Trusted |
aoqi@0 | 92 | private static final class DiagnosticChecker implements DiagnosticListener<JavaFileObject> { |
aoqi@0 | 93 | |
aoqi@0 | 94 | String expectedKey; |
aoqi@0 | 95 | JCDiagnostic diag; |
aoqi@0 | 96 | |
aoqi@0 | 97 | DiagnosticChecker(String expectedKey) { |
aoqi@0 | 98 | this.expectedKey = expectedKey; |
aoqi@0 | 99 | } |
aoqi@0 | 100 | |
aoqi@0 | 101 | @Override |
aoqi@0 | 102 | public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
aoqi@0 | 103 | JCDiagnostic diag = (JCDiagnostic)diagnostic; |
aoqi@0 | 104 | if (diagnostic.getCode().equals(expectedKey)) { |
aoqi@0 | 105 | this.diag = diag; |
aoqi@0 | 106 | } |
aoqi@0 | 107 | } |
aoqi@0 | 108 | } |
aoqi@0 | 109 | } |