• file
• revisions
• annotate
• diff
• comparison
• raw

test/tools/javac/generics/diamond/7030687/ParserTest.java@2007998f89f2 (annotated)

test/tools/javac/generics/diamond/7030687/ParserTest.java

Tue, 29 Mar 2011 16:40:07 +0100

author

mcimadamore

date

Tue, 29 Mar 2011 16:40:07 +0100

changeset 948

2007998f89f2

parent 0

959103a6100f

permissions

-rw-r--r--

7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
Summary: Diamond accepts non-parameterized member inner classes with parameterized outer because of a bad check
Reviewed-by: jjg

aoqi@0	1	/*
aoqi@0	2	* Copyright (c) 2011, 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 7030687
aoqi@0	27	* @summary Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class
aoqi@0	28	*/
aoqi@0	29
aoqi@0	30	import com.sun.source.util.JavacTask;
aoqi@0	31	import java.net.URI;
aoqi@0	32	import java.util.Arrays;
aoqi@0	33	import javax.tools.Diagnostic;
aoqi@0	34	import javax.tools.JavaCompiler;
aoqi@0	35	import javax.tools.JavaFileObject;
aoqi@0	36	import javax.tools.SimpleJavaFileObject;
aoqi@0	37	import javax.tools.StandardJavaFileManager;
aoqi@0	38	import javax.tools.ToolProvider;
aoqi@0	39
aoqi@0	40	public class ParserTest {
aoqi@0	41
aoqi@0	42	enum TypeArgumentKind {
aoqi@0	43	NONE(""),
aoqi@0	44	EXPLICIT("<String>"),
aoqi@0	45	DIAMOND("<>");
aoqi@0	46
aoqi@0	47	String typeargStr;
aoqi@0	48
aoqi@0	49	private TypeArgumentKind(String typeargStr) {
aoqi@0	50	this.typeargStr = typeargStr;
aoqi@0	51	}
aoqi@0	52	}
aoqi@0	53
aoqi@0	54	enum TypeQualifierArity {
aoqi@0	55	ONE(1, "A1#TA1"),
aoqi@0	56	TWO(2, "A1#TA1.A2#TA2"),
aoqi@0	57	THREE(3, "A1#TA1.A2#TA2.A3#TA3"),
aoqi@0	58	FOUR(4, "A1#TA1.A2#TA2.A3#TA3.A4#TA4");
aoqi@0	59
aoqi@0	60	int n;
aoqi@0	61	String qualifierStr;
aoqi@0	62
aoqi@0	63	private TypeQualifierArity(int n, String qualifierStr) {
aoqi@0	64	this.n = n;
aoqi@0	65	this.qualifierStr = qualifierStr;
aoqi@0	66	}
aoqi@0	67
aoqi@0	68	String getType(TypeArgumentKind... typeArgumentKinds) {
aoqi@0	69	String res = qualifierStr;
aoqi@0	70	for (int i = 1 ; i <= typeArgumentKinds.length ; i++) {
aoqi@0	71	res = res.replace("#TA" + i, typeArgumentKinds[i-1].typeargStr);
aoqi@0	72	}
aoqi@0	73	return res;
aoqi@0	74	}
aoqi@0	75	}
aoqi@0	76
aoqi@0	77	public static void main(String... args) throws Exception {
aoqi@0	78
aoqi@0	79	//create default shared JavaCompiler - reused across multiple compilations
aoqi@0	80	JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
aoqi@0	81	StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
aoqi@0	82
aoqi@0	83	for (TypeQualifierArity arity : TypeQualifierArity.values()) {
aoqi@0	84	for (TypeArgumentKind tak1 : TypeArgumentKind.values()) {
aoqi@0	85	if (arity == TypeQualifierArity.ONE) {
aoqi@0	86	new ParserTest(arity, tak1).run(comp, fm);
aoqi@0	87	continue;
aoqi@0	88	}
aoqi@0	89	for (TypeArgumentKind tak2 : TypeArgumentKind.values()) {
aoqi@0	90	if (arity == TypeQualifierArity.TWO) {
aoqi@0	91	new ParserTest(arity, tak1, tak2).run(comp, fm);
aoqi@0	92	continue;
aoqi@0	93	}
aoqi@0	94	for (TypeArgumentKind tak3 : TypeArgumentKind.values()) {
aoqi@0	95	if (arity == TypeQualifierArity.THREE) {
aoqi@0	96	new ParserTest(arity, tak1, tak2, tak3).run(comp, fm);
aoqi@0	97	continue;
aoqi@0	98	}
aoqi@0	99	for (TypeArgumentKind tak4 : TypeArgumentKind.values()) {
aoqi@0	100	new ParserTest(arity, tak1, tak2, tak3, tak4).run(comp, fm);
aoqi@0	101	}
aoqi@0	102	}
aoqi@0	103	}
aoqi@0	104	}
aoqi@0	105	}
aoqi@0	106	}
aoqi@0	107
aoqi@0	108	TypeQualifierArity qualifierArity;
aoqi@0	109	TypeArgumentKind[] typeArgumentKinds;
aoqi@0	110	JavaSource source;
aoqi@0	111	DiagnosticChecker diagChecker;
aoqi@0	112
aoqi@0	113	ParserTest(TypeQualifierArity qualifierArity, TypeArgumentKind... typeArgumentKinds) {
aoqi@0	114	this.qualifierArity = qualifierArity;
aoqi@0	115	this.typeArgumentKinds = typeArgumentKinds;
aoqi@0	116	this.source = new JavaSource();
aoqi@0	117	this.diagChecker = new DiagnosticChecker();
aoqi@0	118	}
aoqi@0	119
aoqi@0	120	class JavaSource extends SimpleJavaFileObject {
aoqi@0	121
aoqi@0	122	String template = "class Test {\n" +
aoqi@0	123	"R res = new #T();\n" +
aoqi@0	124	"}\n";
aoqi@0	125
aoqi@0	126	String source;
aoqi@0	127
aoqi@0	128	public JavaSource() {
aoqi@0	129	super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
aoqi@0	130	source = template.replace("#T", qualifierArity.getType(typeArgumentKinds));
aoqi@0	131	}
aoqi@0	132
aoqi@0	133	@Override
aoqi@0	134	public CharSequence getCharContent(boolean ignoreEncodingErrors) {
aoqi@0	135	return source;
aoqi@0	136	}
aoqi@0	137	}
aoqi@0	138
aoqi@0	139	void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
aoqi@0	140	JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
aoqi@0	141	null, null, Arrays.asList(source));
aoqi@0	142	ct.parse();
aoqi@0	143	check();
aoqi@0	144	}
aoqi@0	145
aoqi@0	146	void check() {
aoqi@0	147
aoqi@0	148	boolean errorExpected = false;
aoqi@0	149
aoqi@0	150	for (int i = 0 ; i < qualifierArity.n - 1 ; i++) {
aoqi@0	151	if (typeArgumentKinds[i] == TypeArgumentKind.DIAMOND) {
aoqi@0	152	errorExpected = true;
aoqi@0	153	break;
aoqi@0	154	}
aoqi@0	155	}
aoqi@0	156
aoqi@0	157	if (errorExpected != diagChecker.errorFound) {
aoqi@0	158	throw new Error("invalid diagnostics for source:\n" +
aoqi@0	159	source.getCharContent(true) +
aoqi@0	160	"\nFound error: " + diagChecker.errorFound +
aoqi@0	161	"\nExpected error: " + errorExpected);
aoqi@0	162	}
aoqi@0	163	}
aoqi@0	164
aoqi@0	165	static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
aoqi@0	166
aoqi@0	167	boolean errorFound;
aoqi@0	168
aoqi@0	169	public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
aoqi@0	170	if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
aoqi@0	171	errorFound = true;
aoqi@0	172	}
aoqi@0	173	}
aoqi@0	174	}
aoqi@0	175	}