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

test/tools/javac/innerClassFile/InnerClassFileTest.java@9f0ec00514b6 (annotated)

test/tools/javac/innerClassFile/InnerClassFileTest.java

Thu, 21 Feb 2013 15:26:46 +0000

author

mcimadamore

date

Thu, 21 Feb 2013 15:26:46 +0000

changeset 1599

9f0ec00514b6

parent 0

959103a6100f

permissions

-rw-r--r--

8007461: Regression: bad overload resolution when inner class and outer class have method with same name
Summary: Fix regression in varargs method resolution introduced by bad refactoring
Reviewed-by: jjg

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 4491755 4785453
aoqi@0	27	* @summary Prob w/static inner class with same name as a regular class
aoqi@0	28	* @library /tools/javac/lib
aoqi@0	29	* @build ToolBox
aoqi@0	30	* @run main InnerClassFileTest
aoqi@0	31	*/
aoqi@0	32
aoqi@0	33	import java.nio.file.Paths;
aoqi@0	34
aoqi@0	35	//original test: test/tools/javac/innerClassFile/Driver.sh
aoqi@0	36	public class InnerClassFileTest {
aoqi@0	37
aoqi@0	38	private static final String BSrc =
aoqi@0	39	"package x;\n" +
aoqi@0	40	"\n" +
aoqi@0	41	"import x.*;\n" +
aoqi@0	42	"\n" +
aoqi@0	43	"public class B {\n" +
aoqi@0	44	" public static class C {}\n" +
aoqi@0	45	"}";
aoqi@0	46
aoqi@0	47	private static final String CSrc =
aoqi@0	48	"package x;\n" +
aoqi@0	49	"\n" +
aoqi@0	50	"import x.*;\n" +
aoqi@0	51	"\n" +
aoqi@0	52	"public class C {}";
aoqi@0	53
aoqi@0	54	private static final String MainSrc =
aoqi@0	55	"package y;\n" +
aoqi@0	56	"\n" +
aoqi@0	57	"class Main {\n" +
aoqi@0	58	" private R1 a;\n" +
aoqi@0	59	" private R2 b;\n" +
aoqi@0	60	" private R3 c;\n" +
aoqi@0	61	"}";
aoqi@0	62
aoqi@0	63	private static final String R1Src =
aoqi@0	64	"package y;\n" +
aoqi@0	65	"\n" +
aoqi@0	66	"public final class R1 {\n" +
aoqi@0	67	" x.B.C a = null;\n" +
aoqi@0	68	" x.C b = null;\n" +
aoqi@0	69	" R2 c = new R2();\n" +
aoqi@0	70	"}";
aoqi@0	71
aoqi@0	72	private static final String R2Src =
aoqi@0	73	"package y;\n" +
aoqi@0	74	"\n" +
aoqi@0	75	"public final class R2 {\n" +
aoqi@0	76	" x.B.C a = null;\n" +
aoqi@0	77	" x.C b = null;\n" +
aoqi@0	78	"}";
aoqi@0	79
aoqi@0	80	private static final String R3Src =
aoqi@0	81	"package y;\n" +
aoqi@0	82	"\n" +
aoqi@0	83	"public final class R3 {\n" +
aoqi@0	84	" x.B.C a = null;\n" +
aoqi@0	85	" x.C b = null;\n" +
aoqi@0	86	" R1 c = new R1();\n" +
aoqi@0	87	"}";
aoqi@0	88
aoqi@0	89	public static void main(String args[]) throws Exception {
aoqi@0	90	new InnerClassFileTest().run();
aoqi@0	91	}
aoqi@0	92
aoqi@0	93	void run() throws Exception {
aoqi@0	94	createFiles();
aoqi@0	95	compileFiles();
aoqi@0	96	}
aoqi@0	97
aoqi@0	98	void createFiles() throws Exception {
aoqi@0	99	// mkdir src
aoqi@0	100	// cp -r ${TESTSRC}${FS}* src
aoqi@0	101	ToolBox.createJavaFileFromSource(Paths.get("src"), BSrc);
aoqi@0	102	ToolBox.createJavaFileFromSource(Paths.get("src"), CSrc);
aoqi@0	103	ToolBox.createJavaFileFromSource(Paths.get("src"), MainSrc);
aoqi@0	104	ToolBox.createJavaFileFromSource(Paths.get("src"), R1Src);
aoqi@0	105	ToolBox.createJavaFileFromSource(Paths.get("src"), R2Src);
aoqi@0	106	ToolBox.createJavaFileFromSource(Paths.get("src"), R3Src);
aoqi@0	107	}
aoqi@0	108
aoqi@0	109	void compileFiles() throws Exception {
aoqi@0	110	// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath .
aoqi@0	111	// -sourcepath src src/x/B.java src/x/C.java src/y/Main.java
aoqi@0	112	ToolBox.JavaToolArgs args =
aoqi@0	113	new ToolBox.JavaToolArgs()
aoqi@0	114	.setAllArgs("-d", ".", "-cp" , ".", "-sourcepath", "src",
aoqi@0	115	"src/x/B.java", "src/x/C.java", "src/y/Main.java");
aoqi@0	116	ToolBox.javac(args);
aoqi@0	117
aoqi@0	118	// rm y/R3.class
aoqi@0	119	ToolBox.rm(Paths.get("y", "R3.class"));
aoqi@0	120
aoqi@0	121	// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath .
aoqi@0	122	// -sourcepath src src/y/Main.java
aoqi@0	123	args.setAllArgs("-d", ".", "-cp", ".", "-sourcepath", "src", "src/y/Main.java");
aoqi@0	124	ToolBox.javac(args);
aoqi@0	125	}
aoqi@0	126
aoqi@0	127	}