author | jlahoda |
Mon, 16 Jul 2018 16:31:33 +0200 | |
changeset 51123 | d7c4c42ab260 |
parent 49822 | 53aae0c219e6 |
permissions | -rw-r--r-- |
41938 | 1 |
/* |
49822
53aae0c219e6
8196433: use the new error diagnostic approach at javac.Main
vromero
parents:
47216
diff
changeset
|
2 |
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. |
41938 | 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 |
|
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
26 |
* @bug 8207032 |
41938 | 27 |
* @summary Test the --add-exports option |
28 |
* @library /tools/lib |
|
29 |
* @modules jdk.compiler/com.sun.tools.javac.api |
|
30 |
* jdk.compiler/com.sun.tools.javac.main |
|
31 |
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase |
|
32 |
* @run main AddExportsTest |
|
33 |
*/ |
|
34 |
||
35 |
import java.nio.file.Path; |
|
36 |
||
37 |
import toolbox.JavacTask; |
|
38 |
import toolbox.Task; |
|
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
39 |
import toolbox.Task.Expect; |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
40 |
import toolbox.Task.OutputKind; |
41938 | 41 |
|
42 |
public class AddExportsTest extends ModuleTestBase { |
|
43 |
||
44 |
public static void main(String... args) throws Exception { |
|
45 |
new AddExportsTest().runTests(); |
|
46 |
} |
|
47 |
||
48 |
@Test |
|
49 |
public void testEmpty(Path base) throws Exception { |
|
50 |
Path src = base.resolve("src"); |
|
51 |
tb.writeJavaFiles(src, "class Dummy { }"); |
|
52 |
Path classes = base.resolve("classes"); |
|
53 |
tb.createDirectories(classes); |
|
54 |
testEmpty(src, classes, "--add-exports", ""); |
|
55 |
testEmpty(src, classes, "--add-exports="); |
|
56 |
} |
|
57 |
||
58 |
private void testEmpty(Path src, Path classes, String... options) throws Exception { |
|
59 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
60 |
.options(options) |
|
61 |
.outdir(classes) |
|
62 |
.files(findJavaFiles(src)) |
|
63 |
.run(Task.Expect.FAIL) |
|
64 |
.writeAll() |
|
65 |
.getOutput(Task.OutputKind.DIRECT); |
|
66 |
||
67 |
checkOutputContains(log, |
|
49822
53aae0c219e6
8196433: use the new error diagnostic approach at javac.Main
vromero
parents:
47216
diff
changeset
|
68 |
"error: no value for --add-exports option"); |
41938 | 69 |
} |
70 |
||
71 |
@Test |
|
72 |
public void testEmptyItem(Path base) throws Exception { |
|
73 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
74 |
Path src_m1 = src.resolve("m1x"); |
41938 | 75 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
76 |
"module m1x { }", |
41938 | 77 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
78 |
Path src_m2 = src.resolve("m2x"); |
41938 | 79 |
tb.writeJavaFiles(src_m2, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
80 |
"module m2x { requires m1x; }", |
41938 | 81 |
"package p2; class C2 { p1.C1 c1; }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
82 |
Path src_m3 = src.resolve("m3x"); |
41938 | 83 |
tb.writeJavaFiles(src_m3, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
84 |
"module m3x { requires m1x; }", |
41938 | 85 |
"package p3; class C3 { p1.C1 c1; }"); |
86 |
Path classes = base.resolve("classes"); |
|
87 |
tb.createDirectories(classes); |
|
88 |
||
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
89 |
testEmptyItem(src, classes, "m1x/p1=,m2x,m3x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
90 |
testEmptyItem(src, classes, "m1x/p1=m2x,,m3x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
91 |
testEmptyItem(src, classes, "m1x/p1=m2x,m3x,"); |
41938 | 92 |
} |
93 |
||
94 |
void testEmptyItem(Path src, Path classes, String option) throws Exception { |
|
95 |
new JavacTask(tb) |
|
96 |
.options("--module-source-path", src.toString(), |
|
97 |
"--add-exports", option) |
|
98 |
.outdir(classes) |
|
99 |
.files(findJavaFiles(src)) |
|
100 |
.run() |
|
101 |
.writeAll(); |
|
102 |
} |
|
103 |
||
104 |
@Test |
|
105 |
public void testEmptyList(Path base) throws Exception { |
|
106 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
107 |
Path src_m1 = src.resolve("m1x"); |
41938 | 108 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
109 |
"module m1x { exports p1; }", |
41938 | 110 |
"package p1; public class C1 { }"); |
111 |
Path classes = base.resolve("classes"); |
|
112 |
tb.createDirectories(classes); |
|
113 |
||
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
114 |
testEmptyList(src, classes, "m1x/p1="); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
115 |
testEmptyList(src, classes, "m1x/p1=,"); |
41938 | 116 |
} |
117 |
||
118 |
void testEmptyList(Path src, Path classes, String option) throws Exception { |
|
119 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
120 |
.options("--module-source-path", src.toString(), |
|
121 |
"--add-exports", option) |
|
122 |
.outdir(classes) |
|
123 |
.files(findJavaFiles(src)) |
|
124 |
.run(Task.Expect.FAIL) |
|
125 |
.writeAll() |
|
126 |
.getOutput(Task.OutputKind.DIRECT); |
|
127 |
||
128 |
checkOutputContains(log, |
|
49822
53aae0c219e6
8196433: use the new error diagnostic approach at javac.Main
vromero
parents:
47216
diff
changeset
|
129 |
"error: bad value for --add-exports option: '" + option + "'"); |
41938 | 130 |
} |
131 |
||
132 |
@Test |
|
133 |
public void testMissingSourceParts(Path base) throws Exception { |
|
134 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
135 |
Path src_m1 = src.resolve("m1x"); |
41938 | 136 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
137 |
"module m1x { exports p1; }", |
41938 | 138 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
139 |
Path src_m2 = src.resolve("m2x"); |
41938 | 140 |
tb.writeJavaFiles(src_m2, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
141 |
"module m2x { }", |
41938 | 142 |
"package p2; class C2 { p1.C1 c1; }"); |
143 |
Path classes = base.resolve("classes"); |
|
144 |
tb.createDirectories(classes); |
|
145 |
||
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
146 |
testMissingSourcePart(src, classes, "=m2x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
147 |
testMissingSourcePart(src, classes, "/=m2x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
148 |
testMissingSourcePart(src, classes, "m1x/=m2x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
149 |
testMissingSourcePart(src, classes, "/p1=m2x"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
150 |
testMissingSourcePart(src, classes, "m1xp1=m2x"); |
41938 | 151 |
} |
152 |
||
153 |
private void testMissingSourcePart(Path src, Path classes, String option) throws Exception { |
|
154 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
155 |
.options("--module-source-path", src.toString(), |
|
156 |
"--add-exports", option) |
|
157 |
.outdir(classes) |
|
158 |
.files(findJavaFiles(src)) |
|
159 |
.run(Task.Expect.FAIL) |
|
160 |
.writeAll() |
|
161 |
.getOutput(Task.OutputKind.DIRECT); |
|
162 |
||
163 |
checkOutputContains(log, |
|
49822
53aae0c219e6
8196433: use the new error diagnostic approach at javac.Main
vromero
parents:
47216
diff
changeset
|
164 |
"error: bad value for --add-exports option: '" + option + "'"); |
41938 | 165 |
} |
166 |
||
167 |
@Test |
|
168 |
public void testBadSourceParts(Path base) throws Exception { |
|
169 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
170 |
Path src_m1 = src.resolve("m1x"); |
41938 | 171 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
172 |
"module m1x { exports p1; }", |
41938 | 173 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
174 |
Path src_m2 = src.resolve("m2x"); |
41938 | 175 |
tb.writeJavaFiles(src_m2, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
176 |
"module m2x { }", |
41938 | 177 |
"package p2; class C2 { p1.C1 c1; }"); |
178 |
Path classes = base.resolve("classes"); |
|
179 |
tb.createDirectories(classes); |
|
180 |
||
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
181 |
testBadSourcePart(src, classes, "m!/p1=m2x", "m!"); |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
182 |
testBadSourcePart(src, classes, "m1x/p!=m2x", "p!"); |
41938 | 183 |
} |
184 |
||
185 |
private void testBadSourcePart(Path src, Path classes, String option, String badName) |
|
186 |
throws Exception { |
|
187 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
188 |
.options("-XDrawDiagnostics", |
|
189 |
"--module-source-path", src.toString(), |
|
190 |
"--add-exports", option) |
|
191 |
.outdir(classes) |
|
192 |
.files(findJavaFiles(src)) |
|
193 |
.run(Task.Expect.FAIL) |
|
194 |
.writeAll() |
|
195 |
.getOutput(Task.OutputKind.DIRECT); |
|
196 |
||
197 |
checkOutputContains(log, |
|
198 |
"- compiler.warn.bad.name.for.option: --add-exports, " + badName); |
|
199 |
} |
|
200 |
||
201 |
@Test |
|
202 |
public void testBadTarget(Path base) throws Exception { |
|
203 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
204 |
Path src_m1 = src.resolve("m1x"); |
41938 | 205 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
206 |
"module m1x { exports p1; }", |
41938 | 207 |
"package p1; public class C1 { }"); |
208 |
Path classes = base.resolve("classes"); |
|
209 |
tb.createDirectories(classes); |
|
210 |
||
211 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
212 |
.options("-XDrawDiagnostics", |
|
213 |
"--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
214 |
"--add-exports", "m1x/p1=m!") |
41938 | 215 |
.outdir(classes) |
216 |
.files(findJavaFiles(src)) |
|
217 |
.run() |
|
218 |
.writeAll() |
|
219 |
.getOutput(Task.OutputKind.DIRECT); |
|
220 |
||
221 |
checkOutputContains(log, |
|
222 |
"- compiler.warn.bad.name.for.option: --add-exports, m!"); |
|
223 |
} |
|
224 |
||
225 |
@Test |
|
226 |
public void testSourceNotFound(Path base) throws Exception { |
|
227 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
228 |
Path src_m1 = src.resolve("m1x"); |
41938 | 229 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
230 |
"module m1x { }"); |
41938 | 231 |
Path classes = base.resolve("classes"); |
232 |
tb.createDirectories(classes); |
|
233 |
||
234 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
235 |
.options("-XDrawDiagnostics", |
|
236 |
"--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
237 |
"--add-exports", "DoesNotExist/p=m1x") |
41938 | 238 |
.outdir(classes) |
239 |
.files(findJavaFiles(src)) |
|
240 |
.run() |
|
241 |
.writeAll() |
|
242 |
.getOutput(Task.OutputKind.DIRECT); |
|
243 |
||
244 |
checkOutputContains(log, |
|
245 |
"- compiler.warn.module.for.option.not.found: --add-exports, DoesNotExist"); |
|
246 |
} |
|
247 |
||
248 |
@Test |
|
249 |
public void testTargetNotFound(Path base) throws Exception { |
|
250 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
251 |
Path src_m1 = src.resolve("m1x"); |
41938 | 252 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
253 |
"module m1x { }", |
41938 | 254 |
"package p1; class C1 { }"); |
255 |
Path classes = base.resolve("classes"); |
|
256 |
tb.createDirectories(classes); |
|
257 |
||
258 |
String log = new JavacTask(tb, Task.Mode.CMDLINE) |
|
259 |
.options("-XDrawDiagnostics", |
|
260 |
"--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
261 |
"--add-exports", "m1x/p1=DoesNotExist") |
41938 | 262 |
.outdir(classes) |
263 |
.files(findJavaFiles(src)) |
|
264 |
.run() |
|
265 |
.writeAll() |
|
266 |
.getOutput(Task.OutputKind.DIRECT); |
|
267 |
||
268 |
checkOutputContains(log, |
|
269 |
"- compiler.warn.module.for.option.not.found: --add-exports, DoesNotExist"); |
|
270 |
} |
|
271 |
||
272 |
@Test |
|
273 |
public void testDuplicate(Path base) throws Exception { |
|
274 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
275 |
Path src_m1 = src.resolve("m1x"); |
41938 | 276 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
277 |
"module m1x { }", |
41938 | 278 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
279 |
Path src_m2 = src.resolve("m2x"); |
41938 | 280 |
tb.writeJavaFiles(src_m2, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
281 |
"module m2x { requires m1x; }", |
41938 | 282 |
"package p2; class C2 { p1.C1 c1; }"); |
283 |
Path classes = base.resolve("classes"); |
|
284 |
tb.createDirectories(classes); |
|
285 |
||
286 |
new JavacTask(tb) |
|
287 |
.options("--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
288 |
"--add-exports", "m1x/p1=m2x,m2x") |
41938 | 289 |
.outdir(classes) |
290 |
.files(findJavaFiles(src)) |
|
291 |
.run() |
|
292 |
.writeAll(); |
|
293 |
} |
|
294 |
||
295 |
@Test |
|
296 |
public void testRepeated_SameTarget(Path base) throws Exception { |
|
297 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
298 |
Path src_m1 = src.resolve("m1x"); |
41938 | 299 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
300 |
"module m1x { }", |
41938 | 301 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
302 |
Path src_m2 = src.resolve("m2x"); |
41938 | 303 |
tb.writeJavaFiles(src_m2, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
304 |
"module m2x { requires m1x; }", |
41938 | 305 |
"package p2; class C2 { p1.C1 c1; }"); |
306 |
Path classes = base.resolve("classes"); |
|
307 |
tb.createDirectories(classes); |
|
308 |
||
309 |
new JavacTask(tb) |
|
310 |
.options("--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
311 |
"--add-exports", "m1x/p1=m2x", |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
312 |
"--add-exports", "m1x/p1=m2x") |
41938 | 313 |
.outdir(classes) |
314 |
.files(findJavaFiles(src)) |
|
315 |
.run() |
|
316 |
.writeAll(); |
|
317 |
} |
|
318 |
||
319 |
@Test |
|
320 |
public void testRepeated_DifferentTarget(Path base) throws Exception { |
|
321 |
Path src = base.resolve("src"); |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
322 |
Path src_m1 = src.resolve("m1x"); |
41938 | 323 |
tb.writeJavaFiles(src_m1, |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
324 |
"module m1x { }", |
41938 | 325 |
"package p1; public class C1 { }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
326 |
Path src_m2 = src.resolve("m2x"); |
41938 | 327 |
tb.writeJavaFiles(src_m2, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
328 |
"module m2x { requires m1x; }", |
41938 | 329 |
"package p2; class C2 { p1.C1 c1; }"); |
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
330 |
Path src_m3 = src.resolve("m3x"); |
41938 | 331 |
tb.writeJavaFiles(src_m3, |
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
332 |
"module m3x { requires m1x; }", |
41938 | 333 |
"package p3; class C3 { p1.C1 c1; }"); |
334 |
Path classes = base.resolve("classes"); |
|
335 |
tb.createDirectories(classes); |
|
336 |
||
337 |
new JavacTask(tb) |
|
338 |
.options("--module-source-path", src.toString(), |
|
42822
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
339 |
"--add-exports", "m1x/p1=m2x", |
a84956e7ee4d
8170987: Module system implementation refresh (12/2016)
alanb
parents:
41938
diff
changeset
|
340 |
"--add-exports", "m1x/p1=m3x") |
41938 | 341 |
.outdir(classes) |
342 |
.files(findJavaFiles(src)) |
|
343 |
.run() |
|
344 |
.writeAll(); |
|
345 |
} |
|
51123
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
346 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
347 |
@Test |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
348 |
public void testNoReads(Path base) throws Exception { |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
349 |
Path src = base.resolve("src"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
350 |
Path src_m1 = src.resolve("m1x"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
351 |
tb.writeJavaFiles(src_m1, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
352 |
"module m1x { }", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
353 |
"package p1; public class C1 { }"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
354 |
Path src_m2 = src.resolve("m2x"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
355 |
tb.writeJavaFiles(src_m2, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
356 |
"module m2x { }", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
357 |
"package p2; class C2 { p1.C1 c1; }"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
358 |
Path classes = base.resolve("classes"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
359 |
tb.createDirectories(classes); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
360 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
361 |
String log; |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
362 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
363 |
log = new JavacTask(tb) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
364 |
.options("--module-source-path", src.toString(), |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
365 |
"-XDrawDiagnostics") |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
366 |
.outdir(classes) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
367 |
.files(findJavaFiles(src)) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
368 |
.run(Expect.FAIL) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
369 |
.writeAll() |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
370 |
.getOutput(OutputKind.DIRECT); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
371 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
372 |
checkOutputContains(log, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
373 |
"C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
374 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
375 |
log = new JavacTask(tb) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
376 |
.options("--module-source-path", src.toString(), |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
377 |
"-XDrawDiagnostics", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
378 |
"--add-exports", "m1x/p1=m2x") |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
379 |
.outdir(classes) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
380 |
.files(findJavaFiles(src)) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
381 |
.run(Expect.FAIL) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
382 |
.writeAll() |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
383 |
.getOutput(OutputKind.DIRECT); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
384 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
385 |
checkOutputContains(log, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
386 |
"C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
387 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
388 |
Path mp = base.resolve("mp"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
389 |
tb.createDirectories(mp); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
390 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
391 |
new JavacTask(tb) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
392 |
.options("--module-source-path", src.toString(), |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
393 |
"-XDrawDiagnostics", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
394 |
"--add-exports", "m1x/p1=m2x", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
395 |
"--add-reads", "m2x=m1x") |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
396 |
.outdir(mp) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
397 |
.files(findJavaFiles(src)) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
398 |
.run(Expect.SUCCESS) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
399 |
.writeAll(); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
400 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
401 |
log = new JavacTask(tb) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
402 |
.options("-XDrawDiagnostics", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
403 |
"--add-exports", "m1x/p1=m2x", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
404 |
"--add-reads", "m2x=m1x", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
405 |
"--module-path", mp.toString()) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
406 |
.outdir(classes) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
407 |
.files(findJavaFiles(src_m2)) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
408 |
.run(Expect.FAIL) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
409 |
.writeAll() |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
410 |
.getOutput(OutputKind.DIRECT); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
411 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
412 |
checkOutputContains(log, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
413 |
"C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
414 |
checkOutputContains(log, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
415 |
"- compiler.warn.module.for.option.not.found: --add-reads, m1x"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
416 |
checkOutputContains(log, |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
417 |
"- compiler.warn.module.for.option.not.found: --add-exports, m1x"); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
418 |
|
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
419 |
new JavacTask(tb) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
420 |
.options("-XDrawDiagnostics", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
421 |
"--add-exports", "m1x/p1=m2x", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
422 |
"--add-reads", "m2x=m1x", |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
423 |
"--module-path", mp.toString(), |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
424 |
"--add-modules", "m1x") |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
425 |
.outdir(classes) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
426 |
.files(findJavaFiles(src_m2)) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
427 |
.run(Expect.SUCCESS) |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
428 |
.writeAll() |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
429 |
.getOutput(OutputKind.DIRECT); |
d7c4c42ab260
8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents:
49822
diff
changeset
|
430 |
} |
41938 | 431 |
} |