235 throw new Exception("expected output not found: " + log); |
235 throw new Exception("expected output not found: " + log); |
236 } |
236 } |
237 |
237 |
238 @Test |
238 @Test |
239 public void testWithModulePath(Path base) throws Exception { |
239 public void testWithModulePath(Path base) throws Exception { |
240 Path module = base.resolve("modules"); |
240 Path modSrc = base.resolve("modSrc"); |
|
241 Path modules = base.resolve("modules"); |
241 new ModuleBuilder(tb, "m1") |
242 new ModuleBuilder(tb, "m1") |
242 .classes("package pkg1; public interface E { }") |
243 .classes("package pkg1; public interface E { }") |
243 .build(module); |
244 .build(modSrc, modules); |
244 |
245 |
245 Path src = base.resolve("src"); |
246 Path src = base.resolve("src"); |
246 tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }"); |
247 tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }"); |
247 |
248 |
248 new JavacTask(tb, Task.Mode.CMDLINE) |
249 new JavacTask(tb, Task.Mode.CMDLINE) |
249 .options("-modulepath", module.toString(), |
250 .options("-modulepath", modules.toString(), |
250 "-Xmodule:m1") |
251 "-Xmodule:m1") |
251 .files(findJavaFiles(src)) |
252 .files(findJavaFiles(src)) |
252 .run() |
253 .run() |
253 .writeAll(); |
254 .writeAll(); |
254 |
255 |
255 //checks module bounds still exist |
256 //checks module bounds still exist |
256 new ModuleBuilder(tb, "m2") |
257 new ModuleBuilder(tb, "m2") |
257 .classes("package pkg2; public interface D { }") |
258 .classes("package pkg2; public interface D { }") |
258 .build(module); |
259 .build(modSrc, modules); |
259 |
260 |
260 Path src2 = base.resolve("src2"); |
261 Path src2 = base.resolve("src2"); |
261 tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }"); |
262 tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }"); |
262 |
263 |
263 List<String> log = new JavacTask(tb, Task.Mode.CMDLINE) |
264 List<String> log = new JavacTask(tb, Task.Mode.CMDLINE) |
264 .options("-XDrawDiagnostics", |
265 .options("-XDrawDiagnostics", |
265 "-modulepath", module.toString(), |
266 "-modulepath", modules.toString(), |
266 "-Xmodule:m1") |
267 "-Xmodule:m1") |
267 .files(findJavaFiles(src2)) |
268 .files(findJavaFiles(src2)) |
268 .run(Task.Expect.FAIL) |
269 .run(Task.Expect.FAIL) |
269 .writeAll() |
270 .writeAll() |
270 .getOutputLines(Task.OutputKind.DIRECT); |
271 .getOutputLines(Task.OutputKind.DIRECT); |
276 throw new Exception("expected output not found: " + log); |
277 throw new Exception("expected output not found: " + log); |
277 } |
278 } |
278 |
279 |
279 @Test |
280 @Test |
280 public void testWithUpgradeModulePath(Path base) throws Exception { |
281 public void testWithUpgradeModulePath(Path base) throws Exception { |
281 Path module = base.resolve("modules"); |
282 Path modSrc = base.resolve("modSrc"); |
|
283 Path modules = base.resolve("modules"); |
282 new ModuleBuilder(tb, "m1") |
284 new ModuleBuilder(tb, "m1") |
283 .classes("package pkg1; public interface E { }") |
285 .classes("package pkg1; public interface E { }") |
284 .build(module); |
286 .build(modSrc, modules); |
285 |
287 |
|
288 Path upgrSrc = base.resolve("upgradeSrc"); |
286 Path upgrade = base.resolve("upgrade"); |
289 Path upgrade = base.resolve("upgrade"); |
287 new ModuleBuilder(tb, "m1") |
290 new ModuleBuilder(tb, "m1") |
288 .classes("package pkg1; public interface D { }") |
291 .classes("package pkg1; public interface D { }") |
289 .build(upgrade); |
292 .build(upgrSrc, upgrade); |
290 |
293 |
291 Path src = base.resolve("src"); |
294 Path src = base.resolve("src"); |
292 tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }"); |
295 tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }"); |
293 |
296 |
294 new JavacTask(tb, Task.Mode.CMDLINE) |
297 new JavacTask(tb, Task.Mode.CMDLINE) |
295 .options("-modulepath", module.toString(), |
298 .options("-modulepath", modules.toString(), |
296 "-upgrademodulepath", upgrade.toString(), |
299 "-upgrademodulepath", upgrade.toString(), |
297 "-Xmodule:m1") |
300 "-Xmodule:m1") |
298 .files(findJavaFiles(src)) |
301 .files(findJavaFiles(src)) |
299 .run() |
302 .run() |
300 .writeAll(); |
303 .writeAll(); |