equal
deleted
inserted
replaced
44 import javax.lang.model.element.TypeElement; |
44 import javax.lang.model.element.TypeElement; |
45 |
45 |
46 import toolbox.JarTask; |
46 import toolbox.JarTask; |
47 import toolbox.JavacTask; |
47 import toolbox.JavacTask; |
48 import toolbox.Task; |
48 import toolbox.Task; |
49 import toolbox.ToolBox; |
|
50 |
49 |
51 public class ModulesAndClassPathTest extends ModuleTestBase { |
50 public class ModulesAndClassPathTest extends ModuleTestBase { |
52 |
51 |
53 public static void main(String... args) throws Exception { |
52 public static void main(String... args) throws Exception { |
54 new ModulesAndClassPathTest().runTests(); |
53 new ModulesAndClassPathTest().runTests(); |
68 tb.writeJavaFiles(m1, |
67 tb.writeJavaFiles(m1, |
69 "module m1 { }", |
68 "module m1 { }", |
70 "package impl; public class Impl { api.Api api; }"); |
69 "package impl; public class Impl { api.Api api; }"); |
71 |
70 |
72 List<String> modLog = new JavacTask(tb) |
71 List<String> modLog = new JavacTask(tb) |
73 .options("-classpath", jar.toString(), |
72 .options("--class-path", jar.toString(), |
74 "-XDrawDiagnostics") |
73 "-XDrawDiagnostics") |
75 .outdir(classes) |
74 .outdir(classes) |
76 .files(findJavaFiles(moduleSrc)) |
75 .files(findJavaFiles(moduleSrc)) |
77 .run(Task.Expect.FAIL) |
76 .run(Task.Expect.FAIL) |
78 .writeAll() |
77 .writeAll() |
84 if (!expected.equals(modLog)) { |
83 if (!expected.equals(modLog)) { |
85 throw new Exception("unexpected output: " + modLog); |
84 throw new Exception("unexpected output: " + modLog); |
86 } |
85 } |
87 |
86 |
88 new JavacTask(tb) |
87 new JavacTask(tb) |
89 .options("-classpath", jar.toString(), |
88 .options("--class-path", jar.toString(), |
90 "-XaddReads:m1=ALL-UNNAMED") |
89 "--add-reads", "m1=ALL-UNNAMED") |
91 .outdir(classes) |
90 .outdir(classes) |
92 .files(findJavaFiles(moduleSrc)) |
91 .files(findJavaFiles(moduleSrc)) |
93 .run() |
92 .run() |
94 .writeAll() |
93 .writeAll() |
95 .getOutputLines(Task.OutputKind.DIRECT); |
94 .getOutputLines(Task.OutputKind.DIRECT); |
96 |
95 |
97 new JavacTask(tb) |
96 new JavacTask(tb) |
98 .options("-classpath", jar.toString() + File.pathSeparator + System.getProperty("test.classes"), |
97 .options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"), |
99 "-XaddReads:m1=ALL-UNNAMED", |
98 "--add-reads", "m1=ALL-UNNAMED", |
100 "-processor", ProcessorImpl.class.getName()) |
99 "-processor", ProcessorImpl.class.getName()) |
101 .outdir(classes) |
100 .outdir(classes) |
102 .files(findJavaFiles(moduleSrc)) |
101 .files(findJavaFiles(moduleSrc)) |
103 .run() |
102 .run() |
104 .writeAll() |
103 .writeAll() |
119 tb.writeJavaFiles(m1, |
118 tb.writeJavaFiles(m1, |
120 "module m1 { }", |
119 "module m1 { }", |
121 "package impl; public class Impl { api.Api api; }"); |
120 "package impl; public class Impl { api.Api api; }"); |
122 |
121 |
123 List<String> modLog = new JavacTask(tb) |
122 List<String> modLog = new JavacTask(tb) |
124 .options("-classpath", jar.toString(), |
123 .options("--class-path", jar.toString(), |
125 "-sourcepath", m1.toString(), |
124 "-sourcepath", m1.toString(), |
126 "-XDrawDiagnostics") |
125 "-XDrawDiagnostics") |
127 .outdir(classes) |
126 .outdir(classes) |
128 .files(m1.resolve("impl").resolve("Impl.java")) |
127 .files(m1.resolve("impl").resolve("Impl.java")) |
129 .run(Task.Expect.FAIL) |
128 .run(Task.Expect.FAIL) |
152 tb.writeJavaFiles(m1, |
151 tb.writeJavaFiles(m1, |
153 "module m1 { }", |
152 "module m1 { }", |
154 "package impl; public class Impl { api.Api api; }"); |
153 "package impl; public class Impl { api.Api api; }"); |
155 |
154 |
156 new JavacTask(tb) |
155 new JavacTask(tb) |
157 .options("-classpath", jar.toString(), |
156 .options("--class-path", jar.toString(), |
158 "-XDrawDiagnostics") |
157 "-XDrawDiagnostics") |
159 .outdir(classes) |
158 .outdir(classes) |
160 .files(m1.resolve("module-info.java")) |
159 .files(m1.resolve("module-info.java")) |
161 .run() |
160 .run() |
162 .writeAll() |
161 .writeAll() |
163 .getOutputLines(Task.OutputKind.DIRECT); |
162 .getOutputLines(Task.OutputKind.DIRECT); |
164 |
163 |
165 List<String> modLog = new JavacTask(tb) |
164 List<String> modLog = new JavacTask(tb) |
166 .options("-classpath", jar.toString(), |
165 .options("--class-path", jar.toString(), |
167 "-XDrawDiagnostics") |
166 "-XDrawDiagnostics") |
168 .outdir(classes) |
167 .outdir(classes) |
169 .files(m1.resolve("impl").resolve("Impl.java")) |
168 .files(m1.resolve("impl").resolve("Impl.java")) |
170 .run(Task.Expect.FAIL) |
169 .run(Task.Expect.FAIL) |
171 .writeAll() |
170 .writeAll() |