1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @summary tests for --upgrade-module-path
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
* @run main UpgradeModulePathTest
*/
import java.io.File;
import java.nio.file.Path;
import toolbox.JavacTask;
import toolbox.ModuleBuilder;
import toolbox.Task;
public class UpgradeModulePathTest extends ModuleTestBase {
public static void main(String... args) throws Exception {
UpgradeModulePathTest t = new UpgradeModulePathTest();
t.runTests();
}
@Test
public void simpleUsage(Path base) throws Exception {
Path modules = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(modules);
final Path upgradeModules = base.resolve("upgradeModules");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModules);
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--module-path", modules.toString(),
"--upgrade-module-path", upgradeModules.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
@Test
public void onlyUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--upgrade-module-path", upgradeModule + File.pathSeparator + module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
@Test
public void withModuleSourcePath(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
final Path s = base.resolve("source");
tb.writeJavaFiles(s.resolve("m3x"), "module m3x { }");
final Path upgradeModule3 = base.resolve("upgradeModule");
new ModuleBuilder(tb, "m3x")
.exports("pkg3")
.classes("package pkg3; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
tb.writeJavaFiles(src.resolve("m2x"), "module m2x { requires m1x; requires m3x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--module-path", module.toString(),
"--module-source-path", src + File.pathSeparator + s,
"--upgrade-module-path", upgradeModule + File.pathSeparator + upgradeModule3)
.outdir(module)
.files(findJavaFiles(src))
.run()
.writeAll();
}
@Test
public void sameUpgradeAndModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule = base.resolve("upgradeModule");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class E { }")
.build(upgradeModule);
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--module-path", upgradeModule + File.pathSeparator + module,
"--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
}
@Test
public void dummyFileInUpgradeModulePath(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
Path dummy = base.resolve("dummy.txt");
tb.writeFile(dummy, "");
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.E.class.getName(); } }");
String output = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"--module-path", module.toString(),
"--upgrade-module-path", dummy.toString())
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!output.contains("compiler.err.illegal.argument.for.option: --upgrade-module-path, " + dummy)) {
throw new Exception("Expected output was not found");
}
}
@Test
public void severalUpgradeModules(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class A { }")
.build(module);
new ModuleBuilder(tb, "m2x")
.exports("pkg2")
.classes("package pkg2; public class B { }")
.build(module);
Path upgradeModule = base.resolve("upgradeModule");
new ModuleBuilder(tb, "m2x")
.exports("pkg2")
.classes("package pkg2; public class BC { }")
.build(upgradeModule);
new ModuleBuilder(tb, "m3x")
.exports("pkg3")
.classes("package pkg3; public class DC { }")
.build(upgradeModule);
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m4x { requires m1x; requires m2x; requires m3x; }",
"package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--module-path", module.toString(),
"--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m4x { requires m1x; }",
"package p; class A { void main() { pkg2.B.class.getName(); } }");
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"--module-path", module.toString(),
"--upgrade-module-path", upgradeModule.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("compiler.err.doesnt.exist: pkg2")) {
throw new Exception("Expected output was not found");
}
}
@Test
public void severalUpgradeModulePathsLastWin(Path base) throws Exception {
final Path module = base.resolve("modules");
new ModuleBuilder(tb, "m1x")
.exports("pkg1")
.classes("package pkg1; public class E { }")
.build(module);
final Path upgradeModule1 = base.resolve("upgradeModule1");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class EC1 { }")
.build(upgradeModule1);
final Path upgradeModule2 = base.resolve("upgradeModule2");
new ModuleBuilder(tb, "m1x")
.exports("pkg2")
.classes("package pkg2; public class EC2 { }")
.build(upgradeModule2);
Path src = base.resolve("src");
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.EC2.class.getName(); } }");
new JavacTask(tb, Task.Mode.CMDLINE)
.options("--module-path", module.toString(),
"--upgrade-module-path", upgradeModule1.toString(),
"--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src))
.run()
.writeAll();
Path src2 = base.resolve("src2");
tb.writeJavaFiles(src2, "module m2x { requires m1x; }",
"package p; class A { void main() { pkg2.EC1.class.getName(); } }");
final String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
"--module-path", module.toString(),
"--upgrade-module-path", upgradeModule1.toString(),
"--upgrade-module-path", upgradeModule2.toString())
.files(findJavaFiles(src2))
.run(Task.Expect.FAIL)
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
if (!log.contains("compiler.err.cant.resolve.location: kindname.class, EC1, , , (compiler.misc.location: kindname.package, pkg2, null)")) {
throw new Exception("Expected output was not found");
}
}
}
|
