author | sadayapalam |
Mon, 02 Mar 2015 10:41:08 +0530 | |
changeset 29293 | 1583c6dd6df7 |
parent 27319 | 030080f03e4f |
child 30730 | d3ce7619db2c |
permissions | -rw-r--r-- |
14267 | 1 |
/* |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
2 |
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. |
14267 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
/* |
|
25 |
* @test |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
26 |
* @bug 7192245 8005851 8005166 8071453 |
14267 | 27 |
* @summary Automatic test for checking set of allowed modifiers on interface methods |
28 |
*/ |
|
29 |
||
30 |
import com.sun.source.util.JavacTask; |
|
31 |
import java.net.URI; |
|
32 |
import java.util.Arrays; |
|
33 |
import java.util.List; |
|
34 |
import javax.tools.Diagnostic; |
|
35 |
import javax.tools.JavaCompiler; |
|
36 |
import javax.tools.JavaFileObject; |
|
37 |
import javax.tools.SimpleJavaFileObject; |
|
38 |
import javax.tools.StandardJavaFileManager; |
|
39 |
import javax.tools.ToolProvider; |
|
40 |
||
41 |
||
42 |
public class TestDefaultMethodsSyntax { |
|
43 |
||
44 |
static int checkCount = 0; |
|
45 |
||
46 |
enum VersionKind { |
|
47 |
PRE_LAMBDA("7"), |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
48 |
LAMBDA("8"), |
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
49 |
POST_LAMBDA("9"); |
14267 | 50 |
|
51 |
String versionString; |
|
52 |
||
53 |
VersionKind(String versionString) { |
|
54 |
this.versionString = versionString; |
|
55 |
} |
|
56 |
||
57 |
List<String> getOptions() { |
|
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15376
diff
changeset
|
58 |
return Arrays.asList("-XDallowStaticInterfaceMethods", "-source", versionString); |
14267 | 59 |
} |
60 |
} |
|
61 |
||
62 |
enum ModifierKind { |
|
63 |
NONE(""), |
|
64 |
PUBLIC("public"), |
|
65 |
PROTECTED("protected"), |
|
66 |
PRIVATE("private"), |
|
67 |
ABSTRACT("abstract"), |
|
68 |
STATIC("static"), |
|
69 |
NATIVE("native"), |
|
70 |
SYNCHRONIZED("synchronized"), |
|
71 |
FINAL("final"), |
|
72 |
STRICTFP("strictfp"), |
|
73 |
DEFAULT("default"); |
|
74 |
||
75 |
String modStr; |
|
76 |
||
77 |
private ModifierKind(String modStr) { |
|
78 |
this.modStr = modStr; |
|
79 |
} |
|
80 |
||
81 |
static boolean intersect(ModifierKind mk, ModifierKind... mks) { |
|
82 |
for (ModifierKind mk2 : mks) { |
|
83 |
if (mk == mk2) return true; |
|
84 |
} |
|
85 |
return false; |
|
86 |
} |
|
87 |
||
88 |
static boolean compatible(MethodKind mk, ModifierKind mod1, ModifierKind mod2, EnclosingKind ek) { |
|
89 |
if (intersect(ABSTRACT, mod1, mod2) || intersect(NATIVE, mod1, mod2)) { |
|
90 |
return mk == MethodKind.NO_BODY; |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
91 |
} else if (intersect(DEFAULT, mod1, mod2) || intersect(STATIC, mod1, mod2) |
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
92 |
|| intersect(PRIVATE, mod1, mod2)) { |
14267 | 93 |
return mk == MethodKind.BODY; |
94 |
} else { |
|
95 |
return ek == EnclosingKind.INTERFACE ? |
|
96 |
mk == MethodKind.NO_BODY : mk == MethodKind.BODY; |
|
97 |
} |
|
98 |
} |
|
99 |
||
100 |
boolean compatible(EnclosingKind ek) { |
|
101 |
switch (this) { |
|
102 |
case PROTECTED: |
|
103 |
return ek != EnclosingKind.INTERFACE; |
|
104 |
default: |
|
105 |
return true; |
|
106 |
} |
|
107 |
} |
|
108 |
||
109 |
static boolean compatible(ModifierKind m1, ModifierKind m2, EnclosingKind ek) { |
|
110 |
Result res1 = allowedModifierPairs[m1.ordinal()][m2.ordinal()]; |
|
111 |
Result res2 = allowedModifierPairs[m2.ordinal()][m1.ordinal()]; |
|
112 |
if (res1 != res2) { |
|
113 |
throw new AssertionError(String.format("Ill-formed table: [%s,%s] != [%s,%s]", m1, m2, m2, m1)); |
|
114 |
} else { |
|
115 |
return res1.compatible(ek, m1, m2); |
|
116 |
} |
|
117 |
} |
|
118 |
||
119 |
interface Result { |
|
120 |
boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2); |
|
121 |
} |
|
122 |
||
123 |
static final Result T = new Result() { |
|
124 |
@Override |
|
125 |
public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) { |
|
126 |
return true; |
|
127 |
} |
|
128 |
}; |
|
129 |
||
130 |
static final Result F = new Result() { |
|
131 |
@Override |
|
132 |
public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) { |
|
133 |
return false; |
|
134 |
} |
|
135 |
}; |
|
136 |
||
137 |
static final Result C = new Result() { |
|
138 |
@Override |
|
139 |
public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) { |
|
140 |
return ek != EnclosingKind.INTERFACE; |
|
141 |
} |
|
142 |
}; |
|
143 |
||
144 |
static final Result I = new Result() { |
|
145 |
@Override |
|
146 |
public boolean compatible(EnclosingKind ek, ModifierKind m1, ModifierKind m2) { |
|
147 |
return ek == EnclosingKind.INTERFACE; |
|
148 |
} |
|
149 |
}; |
|
150 |
||
151 |
static Result[][] allowedModifierPairs = { |
|
152 |
/* NONE PUBLIC PROTECTED PRIVATE ABSTRACT STATIC NATIVE SYNCHRONIZED FINAL STRICTFP DEFAULT */ |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
153 |
/* NONE */ { T , T , C , T , T , T , C , C , C , C , I }, |
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15376
diff
changeset
|
154 |
/* PUBLIC */ { T , F , F , F , T , T , C , C , C , C , I }, |
14267 | 155 |
/* PROTECTED */ { C , F , F , F , C , C , C , C , C , C , F }, |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
156 |
/* PRIVATE */ { T , F , F , F , F , T , C , C , C , T , F }, |
14267 | 157 |
/* ABSTRACT */ { T , T , C , F , F , F , F , F , F , F , F }, |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
158 |
/* STATIC */ { T , T , C , T , F , F , C , C , C , T , F }, |
14267 | 159 |
/* NATIVE */ { C , C , C , C , F , C , F , C , C , F , F }, |
15376
32b49791817d
8005851: Remove support for synchronized interface methods
mcimadamore
parents:
14547
diff
changeset
|
160 |
/* SYNCHRONIZED */ { C , C , C , C , F , C , C , F , C , C , F }, |
14267 | 161 |
/* FINAL */ { C , C , C , C , F , C , C , C , F , C , F }, |
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
162 |
/* STRICTFP */ { C , C , C , T , F , T , F , C , C , F , I }, |
15376
32b49791817d
8005851: Remove support for synchronized interface methods
mcimadamore
parents:
14547
diff
changeset
|
163 |
/* DEFAULT */ { I , I , F , F , F , F , F , F , F , I , F }}; |
14267 | 164 |
} |
165 |
||
166 |
enum MethodKind { |
|
167 |
NO_BODY("void m();"), |
|
168 |
BODY("void m() { }"); |
|
169 |
||
170 |
String methStr; |
|
171 |
||
172 |
private MethodKind(String methStr) { |
|
173 |
this.methStr = methStr; |
|
174 |
} |
|
175 |
} |
|
176 |
||
177 |
enum EnclosingKind { |
|
178 |
ABSTRACT_CLASS("abstract class Test "), |
|
179 |
INTERFACE("interface Test "); |
|
180 |
||
181 |
String enclStr; |
|
182 |
||
183 |
EnclosingKind(String enclStr) { |
|
184 |
this.enclStr = enclStr; |
|
185 |
} |
|
186 |
} |
|
187 |
||
188 |
public static void main(String... args) throws Exception { |
|
189 |
||
190 |
//create default shared JavaCompiler - reused across multiple compilations |
|
191 |
JavaCompiler comp = ToolProvider.getSystemJavaCompiler(); |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
192 |
try (StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null)) { |
14267 | 193 |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
194 |
for (VersionKind vk : VersionKind.values()) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
195 |
for (EnclosingKind ek : EnclosingKind.values()) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
196 |
for (MethodKind mk : MethodKind.values()) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
197 |
for (ModifierKind modk1 : ModifierKind.values()) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
198 |
for (ModifierKind modk2 : ModifierKind.values()) { |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
199 |
new TestDefaultMethodsSyntax(vk, ek, mk, modk1, modk2).run(comp, fm); |
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
200 |
} |
14267 | 201 |
} |
202 |
} |
|
203 |
} |
|
204 |
} |
|
27319
030080f03e4f
8062348: langtools tests should close file manager (group 1)
jjg
parents:
22448
diff
changeset
|
205 |
System.out.println("Total check executed: " + checkCount); |
14267 | 206 |
} |
207 |
} |
|
208 |
||
209 |
VersionKind vk; |
|
210 |
EnclosingKind ek; |
|
211 |
MethodKind mk; |
|
212 |
ModifierKind modk1, modk2; |
|
213 |
JavaSource source; |
|
214 |
DiagnosticChecker diagChecker; |
|
215 |
||
216 |
TestDefaultMethodsSyntax(VersionKind vk, EnclosingKind ek, MethodKind mk, ModifierKind modk1, ModifierKind modk2) { |
|
217 |
this.vk = vk; |
|
218 |
this.ek = ek; |
|
219 |
this.mk = mk; |
|
220 |
this.modk1 = modk1; |
|
221 |
this.modk2 = modk2; |
|
222 |
this.source = new JavaSource(); |
|
223 |
this.diagChecker = new DiagnosticChecker(); |
|
224 |
} |
|
225 |
||
226 |
class JavaSource extends SimpleJavaFileObject { |
|
227 |
||
228 |
String template = "#EK {\n" + |
|
229 |
" #MOD1 #MOD2 #METH\n" + |
|
230 |
"}\n"; |
|
231 |
||
232 |
String source; |
|
233 |
||
234 |
public JavaSource() { |
|
235 |
super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE); |
|
236 |
source = template.replaceAll("#EK", ek.enclStr) |
|
237 |
.replaceAll("#MOD1", modk1.modStr) |
|
238 |
.replaceAll("#MOD2", modk2.modStr) |
|
239 |
.replaceAll("#METH", mk.methStr); |
|
240 |
} |
|
241 |
||
242 |
@Override |
|
243 |
public CharSequence getCharContent(boolean ignoreEncodingErrors) { |
|
244 |
return source; |
|
245 |
} |
|
246 |
} |
|
247 |
||
248 |
void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception { |
|
249 |
JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker, |
|
250 |
vk.getOptions(), null, Arrays.asList(source)); |
|
251 |
try { |
|
252 |
ct.analyze(); |
|
253 |
} catch (Throwable ex) { |
|
254 |
throw new AssertionError("Error thrown when analyzing the following source:\n" + source.getCharContent(true)); |
|
255 |
} |
|
256 |
check(); |
|
257 |
} |
|
258 |
||
259 |
void check() { |
|
260 |
boolean errorExpected = !ModifierKind.compatible(modk1, modk2, ek); |
|
261 |
||
262 |
errorExpected |= !ModifierKind.compatible(mk, modk1, modk2, ek); |
|
263 |
||
264 |
errorExpected |= !modk1.compatible(ek) || !modk2.compatible(ek); |
|
265 |
||
266 |
errorExpected |= ModifierKind.intersect(ModifierKind.DEFAULT, modk1, modk2) && |
|
267 |
vk == VersionKind.PRE_LAMBDA; |
|
268 |
||
15377
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15376
diff
changeset
|
269 |
errorExpected |= ModifierKind.intersect(ModifierKind.STATIC, modk1, modk2) && |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15376
diff
changeset
|
270 |
ek == EnclosingKind.INTERFACE && vk == VersionKind.PRE_LAMBDA; |
515846bb6637
8005166: Add support for static interface methods
mcimadamore
parents:
15376
diff
changeset
|
271 |
|
29293
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
272 |
errorExpected |= ModifierKind.intersect(ModifierKind.PRIVATE, modk1, modk2) && |
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
273 |
ek == EnclosingKind.INTERFACE && (vk == VersionKind.LAMBDA || vk == VersionKind.PRE_LAMBDA); |
1583c6dd6df7
8071453: Allow interface methods to be private
sadayapalam
parents:
27319
diff
changeset
|
274 |
|
14267 | 275 |
checkCount++; |
276 |
if (diagChecker.errorFound != errorExpected) { |
|
277 |
throw new AssertionError("Problem when compiling source:\n" + source.getCharContent(true) + |
|
278 |
"\nfound error: " + diagChecker.errorFound); |
|
279 |
} |
|
280 |
} |
|
281 |
||
282 |
static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> { |
|
283 |
||
284 |
boolean errorFound; |
|
285 |
||
286 |
public void report(Diagnostic<? extends JavaFileObject> diagnostic) { |
|
287 |
if (diagnostic.getKind() == Diagnostic.Kind.ERROR) { |
|
288 |
errorFound = true; |
|
289 |
} |
|
290 |
} |
|
291 |
} |
|
292 |
} |