author | jjg |
Fri, 17 Jun 2016 17:40:01 -0700 | |
changeset 39103 | 91a64ec5b970 |
parent 37758 | 3ecf9b414e05 |
child 40308 | 274367a99f98 |
permissions | -rw-r--r-- |
36526 | 1 |
/* |
2 |
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
|
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 |
|
26 |
* @summary tests for multi-module mode compilation |
|
27 |
* @library /tools/lib |
|
28 |
* @modules |
|
29 |
* jdk.compiler/com.sun.tools.javac.api |
|
30 |
* jdk.compiler/com.sun.tools.javac.main |
|
37758 | 31 |
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase |
36526 | 32 |
* @run main XModuleTest |
33 |
*/ |
|
34 |
||
35 |
import java.nio.file.Path; |
|
36 |
import java.util.Arrays; |
|
37 |
import java.util.List; |
|
38 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
39 |
import toolbox.JavacTask; |
37758 | 40 |
import toolbox.ModuleBuilder; |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
41 |
import toolbox.Task; |
37758 | 42 |
import toolbox.TestRunner; |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
43 |
import toolbox.ToolBox; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
44 |
|
36526 | 45 |
public class XModuleTest extends ModuleTestBase { |
46 |
||
47 |
public static void main(String... args) throws Exception { |
|
48 |
new XModuleTest().runTests(); |
|
49 |
} |
|
50 |
||
51 |
@Test |
|
37758 | 52 |
public void testCorrectXModule(Path base) throws Exception { |
36526 | 53 |
//note: avoiding use of java.base, as that gets special handling on some places: |
54 |
Path src = base.resolve("src"); |
|
55 |
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }"); |
|
56 |
Path classes = base.resolve("classes"); |
|
57 |
tb.createDirectories(classes); |
|
58 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
59 |
String log = new JavacTask(tb) |
36526 | 60 |
.options("-Xmodule:java.compiler") |
61 |
.outdir(classes) |
|
62 |
.files(findJavaFiles(src)) |
|
63 |
.run() |
|
64 |
.writeAll() |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
65 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 66 |
|
67 |
if (!log.isEmpty()) |
|
68 |
throw new Exception("expected output not found: " + log); |
|
69 |
} |
|
70 |
||
71 |
@Test |
|
37758 | 72 |
public void testSourcePath(Path base) throws Exception { |
36526 | 73 |
//note: avoiding use of java.base, as that gets special handling on some places: |
74 |
Path src = base.resolve("src"); |
|
75 |
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, Other { }", "package javax.lang.model.element; interface Other { }"); |
|
76 |
Path classes = base.resolve("classes"); |
|
77 |
tb.createDirectories(classes); |
|
78 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
79 |
String log = new JavacTask(tb) |
36526 | 80 |
.options("-Xmodule:java.compiler", "-sourcepath", src.toString()) |
81 |
.outdir(classes) |
|
82 |
.files(src.resolve("javax/lang/model/element/Extra.java")) |
|
83 |
.run() |
|
84 |
.writeAll() |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
85 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 86 |
|
87 |
if (!log.isEmpty()) |
|
88 |
throw new Exception("expected output not found: " + log); |
|
89 |
} |
|
90 |
||
91 |
@Test |
|
37758 | 92 |
public void testClassPath(Path base) throws Exception { |
36526 | 93 |
Path cpSrc = base.resolve("cpSrc"); |
94 |
tb.writeJavaFiles(cpSrc, "package p; public interface Other { }"); |
|
95 |
Path cpClasses = base.resolve("cpClasses"); |
|
96 |
tb.createDirectories(cpClasses); |
|
97 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
98 |
String cpLog = new JavacTask(tb) |
36526 | 99 |
.outdir(cpClasses) |
100 |
.files(findJavaFiles(cpSrc)) |
|
101 |
.run() |
|
102 |
.writeAll() |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
103 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 104 |
|
105 |
if (!cpLog.isEmpty()) |
|
106 |
throw new Exception("expected output not found: " + cpLog); |
|
107 |
||
108 |
Path src = base.resolve("src"); |
|
109 |
//note: avoiding use of java.base, as that gets special handling on some places: |
|
110 |
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, p.Other { }"); |
|
111 |
Path classes = base.resolve("classes"); |
|
112 |
tb.createDirectories(classes); |
|
113 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
114 |
String log = new JavacTask(tb) |
36526 | 115 |
.options("-Xmodule:java.compiler", "-classpath", cpClasses.toString()) |
116 |
.outdir(classes) |
|
117 |
.files(src.resolve("javax/lang/model/element/Extra.java")) |
|
118 |
.run() |
|
119 |
.writeAll() |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
120 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 121 |
|
122 |
if (!log.isEmpty()) |
|
123 |
throw new Exception("expected output not found: " + log); |
|
124 |
} |
|
125 |
||
126 |
@Test |
|
37758 | 127 |
public void testNoModuleInfoOnSourcePath(Path base) throws Exception { |
36526 | 128 |
//note: avoiding use of java.base, as that gets special handling on some places: |
129 |
Path src = base.resolve("src"); |
|
130 |
tb.writeJavaFiles(src, |
|
131 |
"module java.compiler {}", |
|
132 |
"package javax.lang.model.element; public interface Extra { }"); |
|
133 |
Path classes = base.resolve("classes"); |
|
134 |
tb.createDirectories(classes); |
|
135 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
136 |
List<String> log = new JavacTask(tb) |
36526 | 137 |
.options("-XDrawDiagnostics", "-Xmodule:java.compiler") |
138 |
.outdir(classes) |
|
139 |
.files(findJavaFiles(src)) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
140 |
.run(Task.Expect.FAIL) |
36526 | 141 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
142 |
.getOutputLines(Task.OutputKind.DIRECT); |
36526 | 143 |
|
144 |
List<String> expected = Arrays.asList("Extra.java:1:1: compiler.err.module-info.with.xmodule.sourcepath", |
|
145 |
"1 error"); |
|
146 |
||
147 |
if (!expected.equals(log)) |
|
148 |
throw new Exception("expected output not found: " + log); |
|
149 |
} |
|
150 |
||
151 |
@Test |
|
37758 | 152 |
public void testNoModuleInfoInClassOutput(Path base) throws Exception { |
36526 | 153 |
//note: avoiding use of java.base, as that gets special handling on some places: |
154 |
Path srcMod = base.resolve("src-mod"); |
|
155 |
tb.writeJavaFiles(srcMod, |
|
156 |
"module mod {}"); |
|
157 |
Path classes = base.resolve("classes"); |
|
158 |
tb.createDirectories(classes); |
|
159 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
160 |
String logMod = new JavacTask(tb) |
36526 | 161 |
.options() |
162 |
.outdir(classes) |
|
163 |
.files(findJavaFiles(srcMod)) |
|
164 |
.run() |
|
165 |
.writeAll() |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
166 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 167 |
|
168 |
if (!logMod.isEmpty()) |
|
169 |
throw new Exception("unexpected output found: " + logMod); |
|
170 |
||
171 |
Path src = base.resolve("src"); |
|
172 |
tb.writeJavaFiles(src, |
|
173 |
"package javax.lang.model.element; public interface Extra { }"); |
|
174 |
tb.createDirectories(classes); |
|
175 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
176 |
List<String> log = new JavacTask(tb) |
36526 | 177 |
.options("-XDrawDiagnostics", "-Xmodule:java.compiler") |
178 |
.outdir(classes) |
|
179 |
.files(findJavaFiles(src)) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
180 |
.run(Task.Expect.FAIL) |
36526 | 181 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
182 |
.getOutputLines(Task.OutputKind.DIRECT); |
36526 | 183 |
|
184 |
List<String> expected = Arrays.asList("Extra.java:1:1: compiler.err.module-info.with.xmodule.classpath", |
|
185 |
"1 error"); |
|
186 |
||
187 |
if (!expected.equals(log)) |
|
188 |
throw new Exception("expected output not found: " + log); |
|
189 |
} |
|
190 |
||
191 |
@Test |
|
37758 | 192 |
public void testModuleSourcePathXModule(Path base) throws Exception { |
36526 | 193 |
//note: avoiding use of java.base, as that gets special handling on some places: |
194 |
Path src = base.resolve("src"); |
|
195 |
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }"); |
|
196 |
Path classes = base.resolve("classes"); |
|
197 |
tb.createDirectories(classes); |
|
198 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
199 |
List<String> log = new JavacTask(tb) |
36526 | 200 |
.options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-modulesourcepath", src.toString()) |
201 |
.outdir(classes) |
|
202 |
.files(findJavaFiles(src)) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
203 |
.run(Task.Expect.FAIL) |
36526 | 204 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
205 |
.getOutputLines(Task.OutputKind.DIRECT); |
36526 | 206 |
|
207 |
List<String> expected = Arrays.asList("- compiler.err.xmodule.no.module.sourcepath", |
|
208 |
"1 error"); |
|
209 |
||
210 |
if (!expected.equals(log)) |
|
211 |
throw new Exception("expected output not found: " + log); |
|
212 |
} |
|
213 |
||
214 |
@Test |
|
37758 | 215 |
public void testXModuleTooMany(Path base) throws Exception { |
36526 | 216 |
//note: avoiding use of java.base, as that gets special handling on some places: |
217 |
Path src = base.resolve("src"); |
|
218 |
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }"); |
|
219 |
Path classes = base.resolve("classes"); |
|
220 |
tb.createDirectories(classes); |
|
221 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
222 |
List<String> log = new JavacTask(tb, Task.Mode.CMDLINE) |
36526 | 223 |
.options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-Xmodule:java.compiler") |
224 |
.outdir(classes) |
|
225 |
.files(findJavaFiles(src)) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
226 |
.run(Task.Expect.FAIL) |
36526 | 227 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
228 |
.getOutputLines(Task.OutputKind.DIRECT); |
36526 | 229 |
|
230 |
List<String> expected = Arrays.asList("javac: option -Xmodule: can only be specified once", |
|
231 |
"Usage: javac <options> <source files>", |
|
232 |
"use -help for a list of possible options"); |
|
233 |
||
234 |
if (!expected.equals(log)) |
|
235 |
throw new Exception("expected output not found: " + log); |
|
236 |
} |
|
237 |
||
238 |
@Test |
|
37758 | 239 |
public void testWithModulePath(Path base) throws Exception { |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
240 |
Path modSrc = base.resolve("modSrc"); |
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
241 |
Path modules = base.resolve("modules"); |
37758 | 242 |
new ModuleBuilder(tb, "m1") |
36526 | 243 |
.classes("package pkg1; public interface E { }") |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
244 |
.build(modSrc, modules); |
36526 | 245 |
|
246 |
Path src = base.resolve("src"); |
|
247 |
tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }"); |
|
248 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
249 |
new JavacTask(tb, Task.Mode.CMDLINE) |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
250 |
.options("-modulepath", modules.toString(), |
36526 | 251 |
"-Xmodule:m1") |
252 |
.files(findJavaFiles(src)) |
|
253 |
.run() |
|
254 |
.writeAll(); |
|
255 |
||
256 |
//checks module bounds still exist |
|
37758 | 257 |
new ModuleBuilder(tb, "m2") |
36526 | 258 |
.classes("package pkg2; public interface D { }") |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
259 |
.build(modSrc, modules); |
36526 | 260 |
|
261 |
Path src2 = base.resolve("src2"); |
|
262 |
tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }"); |
|
263 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
264 |
List<String> log = new JavacTask(tb, Task.Mode.CMDLINE) |
36526 | 265 |
.options("-XDrawDiagnostics", |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
266 |
"-modulepath", modules.toString(), |
36526 | 267 |
"-Xmodule:m1") |
268 |
.files(findJavaFiles(src2)) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
269 |
.run(Task.Expect.FAIL) |
36526 | 270 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
271 |
.getOutputLines(Task.OutputKind.DIRECT); |
36526 | 272 |
|
273 |
List<String> expected = Arrays.asList("A.java:1:36: compiler.err.doesnt.exist: pkg2", |
|
274 |
"1 error"); |
|
275 |
||
276 |
if (!expected.equals(log)) |
|
277 |
throw new Exception("expected output not found: " + log); |
|
278 |
} |
|
279 |
||
280 |
@Test |
|
37758 | 281 |
public void testWithUpgradeModulePath(Path base) throws Exception { |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
282 |
Path modSrc = base.resolve("modSrc"); |
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
283 |
Path modules = base.resolve("modules"); |
37758 | 284 |
new ModuleBuilder(tb, "m1") |
36526 | 285 |
.classes("package pkg1; public interface E { }") |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
286 |
.build(modSrc, modules); |
36526 | 287 |
|
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
288 |
Path upgrSrc = base.resolve("upgradeSrc"); |
36526 | 289 |
Path upgrade = base.resolve("upgrade"); |
37758 | 290 |
new ModuleBuilder(tb, "m1") |
36526 | 291 |
.classes("package pkg1; public interface D { }") |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
292 |
.build(upgrSrc, upgrade); |
36526 | 293 |
|
294 |
Path src = base.resolve("src"); |
|
295 |
tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }"); |
|
296 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
297 |
new JavacTask(tb, Task.Mode.CMDLINE) |
39103
91a64ec5b970
8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents:
37758
diff
changeset
|
298 |
.options("-modulepath", modules.toString(), |
36526 | 299 |
"-upgrademodulepath", upgrade.toString(), |
300 |
"-Xmodule:m1") |
|
301 |
.files(findJavaFiles(src)) |
|
302 |
.run() |
|
303 |
.writeAll(); |
|
304 |
} |
|
305 |
} |