equal
deleted
inserted
replaced
91 tb.writeJavaFiles(m1, |
91 tb.writeJavaFiles(m1, |
92 "module m1 { requires test.api; requires java.desktop; }", |
92 "module m1 { requires test.api; requires java.desktop; }", |
93 "package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }"); |
93 "package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }"); |
94 |
94 |
95 new JavacTask(tb) |
95 new JavacTask(tb) |
96 .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString()) |
96 .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString()) |
97 .outdir(classes) |
97 .outdir(classes) |
98 .files(findJavaFiles(moduleSrc)) |
98 .files(findJavaFiles(moduleSrc)) |
99 .run() |
99 .run() |
100 .writeAll(); |
100 .writeAll(); |
101 } |
101 } |
149 tb.writeJavaFiles(m1, |
149 tb.writeJavaFiles(m1, |
150 "module m1 { requires test.api; }", |
150 "module m1 { requires test.api; }", |
151 "package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }"); |
151 "package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }"); |
152 |
152 |
153 new JavacTask(tb) |
153 new JavacTask(tb) |
154 .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString(), "-classpath", baseJar.toString()) |
154 .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString(), "--class-path", baseJar.toString()) |
155 .outdir(classes) |
155 .outdir(classes) |
156 .files(findJavaFiles(moduleSrc)) |
156 .files(findJavaFiles(moduleSrc)) |
157 .run() |
157 .run() |
158 .writeAll(); |
158 .writeAll(); |
159 } |
159 } |
195 tb.writeJavaFiles(depSrc, |
195 tb.writeJavaFiles(depSrc, |
196 "module m1 { requires public automatic; }", |
196 "module m1 { requires public automatic; }", |
197 "package dep; public class Dep { api.Api api; }"); |
197 "package dep; public class Dep { api.Api api; }"); |
198 |
198 |
199 new JavacTask(tb) |
199 new JavacTask(tb) |
200 .options("-modulepath", modulePath.toString()) |
200 .options("--module-path", modulePath.toString()) |
201 .outdir(depClasses) |
201 .outdir(depClasses) |
202 .files(findJavaFiles(depSrc)) |
202 .files(findJavaFiles(depSrc)) |
203 .run() |
203 .run() |
204 .writeAll(); |
204 .writeAll(); |
205 |
205 |
219 tb.writeJavaFiles(testSrc, |
219 tb.writeJavaFiles(testSrc, |
220 "module m2 { requires automatic; }", |
220 "module m2 { requires automatic; }", |
221 "package test; public class Test { }"); |
221 "package test; public class Test { }"); |
222 |
222 |
223 new JavacTask(tb) |
223 new JavacTask(tb) |
224 .options("-modulepath", modulePath.toString()) |
224 .options("--module-path", modulePath.toString()) |
225 .outdir(testClasses) |
225 .outdir(testClasses) |
226 .files(findJavaFiles(testSrc)) |
226 .files(findJavaFiles(testSrc)) |
227 .run() |
227 .run() |
228 .writeAll(); |
228 .writeAll(); |
229 } |
229 } |
271 Path classes = base.resolve("classes"); |
271 Path classes = base.resolve("classes"); |
272 |
272 |
273 Files.createDirectories(classes); |
273 Files.createDirectories(classes); |
274 |
274 |
275 List<String> log = new JavacTask(tb) |
275 List<String> log = new JavacTask(tb) |
276 .options("-modulesourcepath", moduleSrc.toString(), |
276 .options("--module-source-path", moduleSrc.toString(), |
277 "-modulepath", modulePath.toString(), |
277 "--module-path", modulePath.toString(), |
278 "-addmods", "automaticB", |
278 "--add-modules", "automaticB", |
279 "-XDrawDiagnostics") |
279 "-XDrawDiagnostics") |
280 .outdir(classes) |
280 .outdir(classes) |
281 .files(findJavaFiles(moduleSrc)) |
281 .files(findJavaFiles(moduleSrc)) |
282 .run(Task.Expect.FAIL) |
282 .run(Task.Expect.FAIL) |
283 .writeAll() |
283 .writeAll() |
289 if (!expected.equals(log)) { |
289 if (!expected.equals(log)) { |
290 throw new Exception("expected output not found: " + log); |
290 throw new Exception("expected output not found: " + log); |
291 } |
291 } |
292 |
292 |
293 log = new JavacTask(tb) |
293 log = new JavacTask(tb) |
294 .options("-modulesourcepath", moduleSrc.toString(), |
294 .options("--module-source-path", moduleSrc.toString(), |
295 "-modulepath", modulePath.toString(), |
295 "--module-path", modulePath.toString(), |
296 "-XDrawDiagnostics") |
296 "-XDrawDiagnostics") |
297 .outdir(classes) |
297 .outdir(classes) |
298 .files(findJavaFiles(moduleSrc)) |
298 .files(findJavaFiles(moduleSrc)) |
299 .run(Task.Expect.FAIL) |
299 .run(Task.Expect.FAIL) |
300 .writeAll() |
300 .writeAll() |