author | akulyakh |
Thu, 21 May 2015 11:41:04 -0700 | |
changeset 30730 | d3ce7619db2c |
parent 22167 | e0ba35f27975 |
permissions | -rw-r--r-- |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
1 |
/* |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
22167
diff
changeset
|
2 |
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
4 |
* |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
8 |
* |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
13 |
* accompanied this code). |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
14 |
* |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
18 |
* |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
21 |
* questions. |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
22 |
*/ |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
23 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
24 |
/** |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
25 |
* @test |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
26 |
* @bug 7046348 |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
27 |
* @summary Regression: javac complains of missing classfile for a seemingly unrelated interface |
30730
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
22167
diff
changeset
|
28 |
* @modules java.compiler |
d3ce7619db2c
8076543: Add @modules as needed to the langtools tests
akulyakh
parents:
22167
diff
changeset
|
29 |
* jdk.compiler |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
30 |
*/ |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
31 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
32 |
import java.io.File; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
33 |
import java.net.URI; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
34 |
import java.util.Arrays; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
35 |
import java.util.List; |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
36 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
37 |
import javax.tools.Diagnostic; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
38 |
import javax.tools.DiagnosticListener; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
39 |
import javax.tools.JavaCompiler; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
40 |
import javax.tools.JavaCompiler.CompilationTask; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
41 |
import javax.tools.JavaFileObject; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
42 |
import javax.tools.SimpleJavaFileObject; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
43 |
import javax.tools.ToolProvider; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
44 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
45 |
public class EagerInterfaceCompletionTest { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
46 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
47 |
JavaCompiler javacTool; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
48 |
File testDir; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
49 |
VersionKind versionKind; |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
50 |
HierarchyKind hierarchyKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
51 |
TestKind testKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
52 |
ActionKind actionKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
53 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
54 |
EagerInterfaceCompletionTest(JavaCompiler javacTool, File testDir, VersionKind versionKind, |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
55 |
HierarchyKind hierarchyKind, TestKind testKind, ActionKind actionKind) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
56 |
this.javacTool = javacTool; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
57 |
this.versionKind = versionKind; |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
58 |
this.hierarchyKind = hierarchyKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
59 |
this.testDir = testDir; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
60 |
this.testKind = testKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
61 |
this.actionKind = actionKind; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
62 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
63 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
64 |
void test() { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
65 |
testDir.mkdirs(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
66 |
compile(null, hierarchyKind.source); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
67 |
actionKind.doAction(this); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
68 |
DiagnosticChecker dc = new DiagnosticChecker(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
69 |
compile(dc, testKind.source); |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
70 |
if (testKind.completionFailure(versionKind, actionKind, hierarchyKind) != dc.errorFound) { |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
71 |
if (dc.errorFound) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
72 |
error("Unexpected completion failure" + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
73 |
"\nhierarhcyKind " + hierarchyKind + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
74 |
"\ntestKind " + testKind + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
75 |
"\nactionKind " + actionKind); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
76 |
} else { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
77 |
error("Missing completion failure " + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
78 |
"\nhierarhcyKind " + hierarchyKind + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
79 |
"\ntestKind " + testKind + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
80 |
"\nactionKind " + actionKind); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
81 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
82 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
83 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
84 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
85 |
void compile(DiagnosticChecker dc, JavaSource... sources) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
86 |
try { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
87 |
CompilationTask ct = javacTool.getTask(null, null, dc, |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
88 |
Arrays.asList("-d", testDir.getAbsolutePath(), "-cp", |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
89 |
testDir.getAbsolutePath(), versionKind.optsArr[0], versionKind.optsArr[1]), |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
90 |
null, Arrays.asList(sources)); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
91 |
ct.call(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
92 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
93 |
catch (Exception e) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
94 |
e.printStackTrace(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
95 |
error("Internal compilation error"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
96 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
97 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
98 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
99 |
void removeClass(String classToRemoveStr) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
100 |
File classToRemove = new File(testDir, classToRemoveStr); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
101 |
if (!classToRemove.exists()) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
102 |
error("Expected file " + classToRemove + " does not exists in folder " + testDir); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
103 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
104 |
classToRemove.delete(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
105 |
}; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
106 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
107 |
void error(String msg) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
108 |
System.err.println(msg); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
109 |
nerrors++; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
110 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
111 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
112 |
class DiagnosticChecker implements DiagnosticListener<JavaFileObject> { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
113 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
114 |
boolean errorFound = false; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
115 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
116 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
117 |
if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
118 |
errorFound = true; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
119 |
} |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
120 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
121 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
122 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
123 |
//global declarations |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
124 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
125 |
enum VersionKind { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
126 |
PRE_LAMBDA("-source", "7"), |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
127 |
LAMBDA("-source", "8"); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
128 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
129 |
String[] optsArr; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
130 |
|
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
131 |
VersionKind(String... optsArr) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
132 |
this.optsArr = optsArr; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
133 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
134 |
} |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
135 |
|
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
136 |
enum HierarchyKind { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
137 |
INTERFACE("interface A { boolean f = false; void m(); }\n" + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
138 |
"class B implements A { public void m() {} }"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
139 |
CLASS("class A { boolean f; void m() {} }\n" + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
140 |
"class B extends A { void m() {} }"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
141 |
ABSTRACT_CLASS("abstract class A { boolean f; abstract void m(); }\n" + |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
142 |
"class B extends A { void m() {} }"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
143 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
144 |
JavaSource source; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
145 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
146 |
private HierarchyKind(String code) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
147 |
this.source = new JavaSource("Test1.java", code); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
148 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
149 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
150 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
151 |
enum ActionKind { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
152 |
REMOVE_A("A.class"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
153 |
REMOVE_B("B.class"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
154 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
155 |
String classFile; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
156 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
157 |
private ActionKind(String classFile) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
158 |
this.classFile = classFile; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
159 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
160 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
161 |
void doAction(EagerInterfaceCompletionTest test) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
162 |
test.removeClass(classFile); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
163 |
}; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
164 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
165 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
166 |
enum TestKind { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
167 |
ACCESS_ONLY("class C { B b; }"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
168 |
SUPER("class C extends B {}"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
169 |
METHOD("class C { void test(B b) { b.m(); } }"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
170 |
FIELD("class C { void test(B b) { boolean b2 = b.f; } }"), |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
171 |
CONSTR("class C { void test() { new B(); } }"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
172 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
173 |
JavaSource source; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
174 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
175 |
private TestKind(final String code) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
176 |
this.source = new JavaSource("Test2.java", code); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
177 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
178 |
|
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
179 |
boolean completionFailure(VersionKind vk, ActionKind ak, HierarchyKind hk) { |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
180 |
switch (this) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
181 |
case ACCESS_ONLY: |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
182 |
case CONSTR: return ak == ActionKind.REMOVE_B; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
183 |
case FIELD: |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
184 |
case SUPER: return true; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
185 |
case METHOD: return hk != HierarchyKind.INTERFACE || ak == ActionKind.REMOVE_B || |
22167
e0ba35f27975
8029240: Default methods not always visible under -source 7
vromero
parents:
14443
diff
changeset
|
186 |
(hk == HierarchyKind.INTERFACE && ak == ActionKind.REMOVE_A); |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
187 |
default: throw new AssertionError("Unexpected test kind " + this); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
188 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
189 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
190 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
191 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
192 |
public static void main(String[] args) throws Exception { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
193 |
String SCRATCH_DIR = System.getProperty("user.dir"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
194 |
JavaCompiler javacTool = ToolProvider.getSystemJavaCompiler(); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
195 |
int n = 0; |
14443
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
196 |
for (VersionKind versionKind : VersionKind.values()) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
197 |
for (HierarchyKind hierarchyKind : HierarchyKind.values()) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
198 |
for (TestKind testKind : TestKind.values()) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
199 |
for (ActionKind actionKind : ActionKind.values()) { |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
200 |
File testDir = new File(SCRATCH_DIR, "test"+n); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
201 |
new EagerInterfaceCompletionTest(javacTool, testDir, versionKind, |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
202 |
hierarchyKind, testKind, actionKind).test(); |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
203 |
n++; |
91c05eb19277
7192246: Add type-checking support for default methods
mcimadamore
parents:
9812
diff
changeset
|
204 |
} |
9812
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
205 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
206 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
207 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
208 |
if (nerrors > 0) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
209 |
throw new AssertionError("Some errors have been detected"); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
210 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
211 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
212 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
213 |
static class JavaSource extends SimpleJavaFileObject { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
214 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
215 |
String source; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
216 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
217 |
public JavaSource(String filename, String source) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
218 |
super(URI.create("myfo:/" + filename), JavaFileObject.Kind.SOURCE); |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
219 |
this.source = source; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
220 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
221 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
222 |
@Override |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
223 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
224 |
return source; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
225 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
226 |
} |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
227 |
|
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
228 |
static int nerrors = 0; |
f716e42cb230
7046348: Regression: javac complains of missing classfile for a seemingly unrelated interface
mcimadamore
parents:
diff
changeset
|
229 |
} |