author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 44545 | jdk/test/java/lang/module/ModuleFinderTest.java@83b611b88ac8 |
permissions | -rw-r--r-- |
36511 | 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 |
* @modules java.base/jdk.internal.module |
|
27 |
* @build ModuleFinderTest |
|
28 |
* @run testng ModuleFinderTest |
|
29 |
* @summary Basic tests for java.lang.module.ModuleFinder |
|
30 |
*/ |
|
31 |
||
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
32 |
import java.io.File; |
36511 | 33 |
import java.io.OutputStream; |
34 |
import java.lang.module.FindException; |
|
35 |
import java.lang.module.InvalidModuleDescriptorException; |
|
36 |
import java.lang.module.ModuleDescriptor; |
|
37 |
import java.lang.module.ModuleFinder; |
|
38 |
import java.lang.module.ModuleReference; |
|
39 |
import java.nio.file.Files; |
|
40 |
import java.nio.file.Path; |
|
41 |
import java.nio.file.Paths; |
|
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
42 |
import java.util.Optional; |
36511 | 43 |
import java.util.Set; |
44 |
import java.util.jar.JarEntry; |
|
45 |
import java.util.jar.JarOutputStream; |
|
46 |
import java.util.stream.Collectors; |
|
47 |
||
48 |
import jdk.internal.module.ModuleInfoWriter; |
|
49 |
||
50 |
import org.testng.annotations.Test; |
|
51 |
import static org.testng.Assert.*; |
|
52 |
||
53 |
@Test |
|
54 |
public class ModuleFinderTest { |
|
55 |
||
56 |
private static final Path USER_DIR |
|
57 |
= Paths.get(System.getProperty("user.dir")); |
|
58 |
||
59 |
||
60 |
/** |
|
61 |
* Test ModuleFinder.ofSystem |
|
62 |
*/ |
|
63 |
public void testOfSystem() { |
|
64 |
ModuleFinder finder = ModuleFinder.ofSystem(); |
|
65 |
||
66 |
assertTrue(finder.find("java.se").isPresent()); |
|
67 |
assertTrue(finder.find("java.base").isPresent()); |
|
68 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
69 |
||
70 |
Set<String> names = finder.findAll().stream() |
|
71 |
.map(ModuleReference::descriptor) |
|
72 |
.map(ModuleDescriptor::name) |
|
73 |
.collect(Collectors.toSet()); |
|
74 |
assertTrue(names.contains("java.se")); |
|
75 |
assertTrue(names.contains("java.base")); |
|
76 |
assertFalse(names.contains("java.rhubarb")); |
|
77 |
} |
|
78 |
||
79 |
||
80 |
/** |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
81 |
* Test ModuleFinder.of with no entries |
36511 | 82 |
*/ |
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
83 |
public void testOfNoEntries() { |
36511 | 84 |
ModuleFinder finder = ModuleFinder.of(); |
85 |
assertTrue(finder.findAll().isEmpty()); |
|
86 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
87 |
} |
|
88 |
||
89 |
||
90 |
/** |
|
91 |
* Test ModuleFinder.of with one directory of modules |
|
92 |
*/ |
|
93 |
public void testOfOneDirectory() throws Exception { |
|
94 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
95 |
createExplodedModule(dir.resolve("m1"), "m1"); |
|
96 |
createModularJar(dir.resolve("m2.jar"), "m2"); |
|
97 |
||
98 |
ModuleFinder finder = ModuleFinder.of(dir); |
|
99 |
assertTrue(finder.findAll().size() == 2); |
|
100 |
assertTrue(finder.find("m1").isPresent()); |
|
101 |
assertTrue(finder.find("m2").isPresent()); |
|
102 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
103 |
} |
|
104 |
||
105 |
||
106 |
/** |
|
107 |
* Test ModuleFinder.of with two directories |
|
108 |
*/ |
|
109 |
public void testOfTwoDirectories() throws Exception { |
|
110 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
|
111 |
createExplodedModule(dir1.resolve("m1"), "m1@1.0"); |
|
112 |
createModularJar(dir1.resolve("m2.jar"), "m2@1.0"); |
|
113 |
||
114 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
|
115 |
createExplodedModule(dir2.resolve("m1"), "m1@2.0"); |
|
116 |
createModularJar(dir2.resolve("m2.jar"), "m2@2.0"); |
|
117 |
createExplodedModule(dir2.resolve("m3"), "m3"); |
|
118 |
createModularJar(dir2.resolve("m4.jar"), "m4"); |
|
119 |
||
120 |
ModuleFinder finder = ModuleFinder.of(dir1, dir2); |
|
121 |
assertTrue(finder.findAll().size() == 4); |
|
122 |
assertTrue(finder.find("m1").isPresent()); |
|
123 |
assertTrue(finder.find("m2").isPresent()); |
|
124 |
assertTrue(finder.find("m3").isPresent()); |
|
125 |
assertTrue(finder.find("m4").isPresent()); |
|
126 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
127 |
||
128 |
// check that m1@1.0 (and not m1@2.0) is found |
|
129 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
|
130 |
assertEquals(m1.version().get().toString(), "1.0"); |
|
131 |
||
132 |
// check that m2@1.0 (and not m2@2.0) is found |
|
133 |
ModuleDescriptor m2 = finder.find("m2").get().descriptor(); |
|
134 |
assertEquals(m2.version().get().toString(), "1.0"); |
|
135 |
} |
|
136 |
||
137 |
||
138 |
/** |
|
139 |
* Test ModuleFinder.of with one JAR file |
|
140 |
*/ |
|
141 |
public void testOfOneJarFile() throws Exception { |
|
142 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
143 |
Path jar1 = createModularJar(dir.resolve("m1.jar"), "m1"); |
|
144 |
||
145 |
ModuleFinder finder = ModuleFinder.of(jar1); |
|
146 |
assertTrue(finder.findAll().size() == 1); |
|
147 |
assertTrue(finder.find("m1").isPresent()); |
|
148 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
149 |
} |
|
150 |
||
151 |
||
152 |
/** |
|
153 |
* Test ModuleFinder.of with two JAR files |
|
154 |
*/ |
|
155 |
public void testOfTwoJarFiles() throws Exception { |
|
156 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
157 |
||
158 |
Path jar1 = createModularJar(dir.resolve("m1.jar"), "m1"); |
|
159 |
Path jar2 = createModularJar(dir.resolve("m2.jar"), "m2"); |
|
160 |
||
161 |
ModuleFinder finder = ModuleFinder.of(jar1, jar2); |
|
162 |
assertTrue(finder.findAll().size() == 2); |
|
163 |
assertTrue(finder.find("m1").isPresent()); |
|
164 |
assertTrue(finder.find("m2").isPresent()); |
|
165 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
166 |
} |
|
167 |
||
168 |
||
169 |
/** |
|
170 |
* Test ModuleFinder.of with many JAR files |
|
171 |
*/ |
|
172 |
public void testOfManyJarFiles() throws Exception { |
|
173 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
174 |
||
175 |
Path jar1 = createModularJar(dir.resolve("m1@1.0.jar"), "m1@1.0"); |
|
176 |
Path jar2 = createModularJar(dir.resolve("m2@1.0.jar"), "m2"); |
|
177 |
Path jar3 = createModularJar(dir.resolve("m1@2.0.jar"), "m1@2.0"); // shadowed |
|
178 |
Path jar4 = createModularJar(dir.resolve("m3@1.0.jar"), "m3"); |
|
179 |
||
180 |
ModuleFinder finder = ModuleFinder.of(jar1, jar2, jar3, jar4); |
|
181 |
assertTrue(finder.findAll().size() == 3); |
|
182 |
assertTrue(finder.find("m1").isPresent()); |
|
183 |
assertTrue(finder.find("m2").isPresent()); |
|
184 |
assertTrue(finder.find("m3").isPresent()); |
|
185 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
186 |
||
187 |
// check that m1@1.0 (and not m1@2.0) is found |
|
188 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
|
189 |
assertEquals(m1.version().get().toString(), "1.0"); |
|
190 |
} |
|
191 |
||
192 |
||
193 |
/** |
|
194 |
* Test ModuleFinder.of with one exploded module. |
|
195 |
*/ |
|
196 |
public void testOfOneExplodedModule() throws Exception { |
|
197 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
198 |
Path m1_dir = createExplodedModule(dir.resolve("m1"), "m1"); |
|
199 |
||
200 |
ModuleFinder finder = ModuleFinder.of(m1_dir); |
|
201 |
assertTrue(finder.findAll().size() == 1); |
|
202 |
assertTrue(finder.find("m1").isPresent()); |
|
203 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
204 |
} |
|
205 |
||
206 |
||
207 |
/** |
|
208 |
* Test ModuleFinder.of with two exploded modules. |
|
209 |
*/ |
|
210 |
public void testOfTwoExplodedModules() throws Exception { |
|
211 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
212 |
Path m1_dir = createExplodedModule(dir.resolve("m1"), "m1"); |
|
213 |
Path m2_dir = createExplodedModule(dir.resolve("m2"), "m2"); |
|
214 |
||
215 |
ModuleFinder finder = ModuleFinder.of(m1_dir, m2_dir); |
|
216 |
assertTrue(finder.findAll().size() == 2); |
|
217 |
assertTrue(finder.find("m1").isPresent()); |
|
218 |
assertTrue(finder.find("m2").isPresent()); |
|
219 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
220 |
} |
|
221 |
||
222 |
||
223 |
/** |
|
224 |
* Test ModuleFinder.of with a mix of module directories and JAR files. |
|
225 |
*/ |
|
226 |
public void testOfMixDirectoriesAndJars() throws Exception { |
|
227 |
||
228 |
// directory with m1@1.0 and m2@1.0 |
|
229 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
|
230 |
createExplodedModule(dir1.resolve("m1"), "m1@1.0"); |
|
231 |
createModularJar(dir1.resolve("m2.jar"), "m2@1.0"); |
|
232 |
||
233 |
// JAR files: m1@2.0, m2@2.0, m3@2.0, m4@2.0 |
|
234 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
|
235 |
Path jar1 = createModularJar(dir2.resolve("m1.jar"), "m1@2.0"); |
|
236 |
Path jar2 = createModularJar(dir2.resolve("m2.jar"), "m2@2.0"); |
|
237 |
Path jar3 = createModularJar(dir2.resolve("m3.jar"), "m3@2.0"); |
|
238 |
Path jar4 = createModularJar(dir2.resolve("m4.jar"), "m4@2.0"); |
|
239 |
||
240 |
// directory with m3@3.0 and m4@3.0 |
|
241 |
Path dir3 = Files.createTempDirectory(USER_DIR, "mods3"); |
|
242 |
createExplodedModule(dir3.resolve("m3"), "m3@3.0"); |
|
243 |
createModularJar(dir3.resolve("m4.jar"), "m4@3.0"); |
|
244 |
||
245 |
// JAR files: m5 and m6 |
|
246 |
Path dir4 = Files.createTempDirectory(USER_DIR, "mods4"); |
|
247 |
Path jar5 = createModularJar(dir4.resolve("m5.jar"), "m5@4.0"); |
|
248 |
Path jar6 = createModularJar(dir4.resolve("m6.jar"), "m6@4.0"); |
|
249 |
||
250 |
||
251 |
ModuleFinder finder |
|
252 |
= ModuleFinder.of(dir1, jar1, jar2, jar3, jar4, dir3, jar5, jar6); |
|
253 |
assertTrue(finder.findAll().size() == 6); |
|
254 |
assertTrue(finder.find("m1").isPresent()); |
|
255 |
assertTrue(finder.find("m2").isPresent()); |
|
256 |
assertTrue(finder.find("m3").isPresent()); |
|
257 |
assertTrue(finder.find("m4").isPresent()); |
|
258 |
assertTrue(finder.find("m5").isPresent()); |
|
259 |
assertTrue(finder.find("m6").isPresent()); |
|
260 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
261 |
||
262 |
// m1 and m2 should be located in dir1 |
|
263 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
|
264 |
assertEquals(m1.version().get().toString(), "1.0"); |
|
265 |
ModuleDescriptor m2 = finder.find("m2").get().descriptor(); |
|
266 |
assertEquals(m2.version().get().toString(), "1.0"); |
|
267 |
||
268 |
// m3 and m4 should be located in JAR files |
|
269 |
ModuleDescriptor m3 = finder.find("m3").get().descriptor(); |
|
270 |
assertEquals(m3.version().get().toString(), "2.0"); |
|
271 |
ModuleDescriptor m4 = finder.find("m4").get().descriptor(); |
|
272 |
assertEquals(m4.version().get().toString(), "2.0"); |
|
273 |
||
274 |
// m5 and m6 should be located in JAR files |
|
275 |
ModuleDescriptor m5 = finder.find("m5").get().descriptor(); |
|
276 |
assertEquals(m5.version().get().toString(), "4.0"); |
|
277 |
ModuleDescriptor m6 = finder.find("m6").get().descriptor(); |
|
278 |
assertEquals(m6.version().get().toString(), "4.0"); |
|
279 |
} |
|
280 |
||
281 |
||
282 |
/** |
|
283 |
* Test ModuleFinder.of with a mix of module directories and exploded |
|
284 |
* modules. |
|
285 |
*/ |
|
286 |
public void testOfMixDirectoriesAndExplodedModules() throws Exception { |
|
287 |
// directory with m1@1.0 and m2@1.0 |
|
288 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
|
289 |
createExplodedModule(dir1.resolve("m1"), "m1@1.0"); |
|
290 |
createModularJar(dir1.resolve("m2.jar"), "m2@1.0"); |
|
291 |
||
292 |
// exploded modules: m1@2.0, m2@2.0, m3@2.0, m4@2.0 |
|
293 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
|
294 |
Path m1_dir = createExplodedModule(dir2.resolve("m1"), "m1@2.0"); |
|
295 |
Path m2_dir = createExplodedModule(dir2.resolve("m2"), "m2@2.0"); |
|
296 |
Path m3_dir = createExplodedModule(dir2.resolve("m3"), "m3@2.0"); |
|
297 |
Path m4_dir = createExplodedModule(dir2.resolve("m4"), "m4@2.0"); |
|
298 |
||
299 |
ModuleFinder finder = ModuleFinder.of(dir1, m1_dir, m2_dir, m3_dir, m4_dir); |
|
300 |
assertTrue(finder.findAll().size() == 4); |
|
301 |
assertTrue(finder.find("m1").isPresent()); |
|
302 |
assertTrue(finder.find("m2").isPresent()); |
|
303 |
assertTrue(finder.find("m3").isPresent()); |
|
304 |
assertTrue(finder.find("m4").isPresent()); |
|
305 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
306 |
||
307 |
// m1 and m2 should be located in dir1 |
|
308 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
|
309 |
assertEquals(m1.version().get().toString(), "1.0"); |
|
310 |
ModuleDescriptor m2 = finder.find("m2").get().descriptor(); |
|
311 |
assertEquals(m2.version().get().toString(), "1.0"); |
|
312 |
||
313 |
// m3 and m4 should be located in dir2 |
|
314 |
ModuleDescriptor m3 = finder.find("m3").get().descriptor(); |
|
315 |
assertEquals(m3.version().get().toString(), "2.0"); |
|
316 |
ModuleDescriptor m4 = finder.find("m4").get().descriptor(); |
|
317 |
assertEquals(m4.version().get().toString(), "2.0"); |
|
318 |
} |
|
319 |
||
320 |
||
321 |
/** |
|
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
322 |
* Test ModuleFinder with a JAR file containing a mix of class and |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
323 |
* non-class resources. |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
324 |
*/ |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
325 |
public void testOfOneJarFileWithResources() throws Exception { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
326 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
327 |
Path jar = createModularJar(dir.resolve("m.jar"), "m", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
328 |
"LICENSE", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
329 |
"README", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
330 |
"WEB-INF/tags", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
331 |
"p/Type.class", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
332 |
"p/resources/m.properties", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
333 |
"q-/Type.class", // not a legal package name |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
334 |
"q-/resources/m/properties"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
335 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
336 |
ModuleFinder finder = ModuleFinder.of(jar); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
337 |
Optional<ModuleReference> mref = finder.find("m"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41817
diff
changeset
|
338 |
assertTrue(mref.isPresent(), "m1 not found"); |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
339 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
340 |
ModuleDescriptor descriptor = mref.get().descriptor(); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
341 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
342 |
assertTrue(descriptor.packages().size() == 2); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
343 |
assertTrue(descriptor.packages().contains("p")); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
344 |
assertTrue(descriptor.packages().contains("p.resources")); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
345 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
346 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
347 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
348 |
/** |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
349 |
* Test ModuleFinder with an exploded module containing a mix of class |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
350 |
* and non-class resources |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
351 |
*/ |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
352 |
public void testOfOneExplodedModuleWithResources() throws Exception { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
353 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
354 |
Path m_dir = createExplodedModule(dir.resolve("m"), "m", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
355 |
"LICENSE", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
356 |
"README", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
357 |
"WEB-INF/tags", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
358 |
"p/Type.class", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
359 |
"p/resources/m.properties", |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
360 |
"q-/Type.class", // not a legal package name |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
361 |
"q-/resources/m/properties"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
362 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
363 |
ModuleFinder finder = ModuleFinder.of(m_dir); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
364 |
Optional<ModuleReference> mref = finder.find("m"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
365 |
assertTrue(mref.isPresent(), "m not found"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
366 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
367 |
ModuleDescriptor descriptor = mref.get().descriptor(); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
368 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
369 |
assertTrue(descriptor.packages().size() == 2); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
370 |
assertTrue(descriptor.packages().contains("p")); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
371 |
assertTrue(descriptor.packages().contains("p.resources")); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
372 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
373 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
374 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
375 |
/** |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
376 |
* Test ModuleFinder with a JAR file containing a .class file in the top |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
377 |
* level directory. |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
378 |
*/ |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
379 |
public void testOfOneJarFileWithTopLevelClass() throws Exception { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
380 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
381 |
Path jar = createModularJar(dir.resolve("m.jar"), "m", "Mojo.class"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
382 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
383 |
ModuleFinder finder = ModuleFinder.of(jar); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
384 |
try { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
385 |
finder.find("m"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
386 |
assertTrue(false); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
387 |
} catch (FindException e) { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
388 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
389 |
assertTrue(e.getCause().getMessage().contains("Mojo.class")); |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
390 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
391 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
392 |
finder = ModuleFinder.of(jar); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
393 |
try { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
394 |
finder.findAll(); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
395 |
assertTrue(false); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
396 |
} catch (FindException e) { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
397 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
398 |
assertTrue(e.getCause().getMessage().contains("Mojo.class")); |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
399 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
400 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
401 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
402 |
/** |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
403 |
* Test ModuleFinder with a JAR file containing a .class file in the top |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
404 |
* level directory. |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
405 |
*/ |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
406 |
public void testOfOneExplodedModuleWithTopLevelClass() throws Exception { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
407 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
408 |
Path m_dir = createExplodedModule(dir.resolve("m"), "m", "Mojo.class"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
409 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
410 |
ModuleFinder finder = ModuleFinder.of(m_dir); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
411 |
try { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
412 |
finder.find("m"); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
413 |
assertTrue(false); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
414 |
} catch (FindException e) { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
415 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
416 |
assertTrue(e.getCause().getMessage().contains("Mojo.class")); |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
417 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
418 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
419 |
finder = ModuleFinder.of(m_dir); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
420 |
try { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
421 |
finder.findAll(); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
422 |
assertTrue(false); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
423 |
} catch (FindException e) { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
424 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
425 |
assertTrue(e.getCause().getMessage().contains("Mojo.class")); |
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
426 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
427 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
428 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
429 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
430 |
/** |
36511 | 431 |
* Test ModuleFinder.of with a path to a file that does not exist. |
432 |
*/ |
|
433 |
public void testOfWithDoesNotExistEntry() throws Exception { |
|
434 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
|
435 |
||
436 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
|
437 |
createModularJar(dir2.resolve("m2.jar"), "m2@1.0"); |
|
438 |
||
439 |
Files.delete(dir1); |
|
440 |
||
441 |
ModuleFinder finder = ModuleFinder.of(dir1, dir2); |
|
442 |
||
443 |
assertTrue(finder.find("m2").isPresent()); |
|
444 |
assertTrue(finder.findAll().size() == 1); |
|
445 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
446 |
} |
|
447 |
||
448 |
||
449 |
/** |
|
450 |
* Test ModuleFinder.of with a file path to an unrecognized file type. |
|
451 |
*/ |
|
452 |
public void testOfWithUnrecognizedEntry() throws Exception { |
|
453 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
454 |
Path mod = Files.createTempFile(dir, "m", ".junk"); |
36511 | 455 |
|
456 |
ModuleFinder finder = ModuleFinder.of(mod); |
|
457 |
try { |
|
458 |
finder.find("java.rhubarb"); |
|
459 |
assertTrue(false); |
|
460 |
} catch (FindException e) { |
|
461 |
// expected |
|
462 |
} |
|
463 |
||
464 |
finder = ModuleFinder.of(mod); |
|
465 |
try { |
|
466 |
finder.findAll(); |
|
467 |
assertTrue(false); |
|
468 |
} catch (FindException e) { |
|
469 |
// expected |
|
470 |
} |
|
471 |
} |
|
472 |
||
473 |
||
474 |
/** |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
475 |
* Test ModuleFinder.of with a file path to a directory containing a file |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
476 |
* that will not be recognized as a module. |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
477 |
*/ |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
478 |
public void testOfWithUnrecognizedEntryInDirectory1() throws Exception { |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
479 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
480 |
Files.createTempFile(dir, "m", ".junk"); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
481 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
482 |
ModuleFinder finder = ModuleFinder.of(dir); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
483 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
484 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
485 |
finder = ModuleFinder.of(dir); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
486 |
assertTrue(finder.findAll().isEmpty()); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
487 |
} |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
488 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
489 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
490 |
/** |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
491 |
* Test ModuleFinder.of with a file path to a directory containing a file |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
492 |
* that will not be recognized as a module. |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
493 |
*/ |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
494 |
public void testOfWithUnrecognizedEntryInDirectory2() throws Exception { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
495 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
496 |
createModularJar(dir.resolve("m1.jar"), "m1"); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
497 |
Files.createTempFile(dir, "m2", ".junk"); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
498 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
499 |
ModuleFinder finder = ModuleFinder.of(dir); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
500 |
assertTrue(finder.find("m1").isPresent()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
501 |
assertFalse(finder.find("m2").isPresent()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
502 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
503 |
finder = ModuleFinder.of(dir); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
504 |
assertTrue(finder.findAll().size() == 1); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
505 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
506 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
507 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
508 |
/** |
36511 | 509 |
* Test ModuleFinder.of with a directory that contains two |
510 |
* versions of the same module |
|
511 |
*/ |
|
512 |
public void testOfDuplicateModulesInDirectory() throws Exception { |
|
513 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
514 |
createModularJar(dir.resolve("m1@1.0.jar"), "m1"); |
|
515 |
createModularJar(dir.resolve("m1@2.0.jar"), "m1"); |
|
516 |
||
517 |
ModuleFinder finder = ModuleFinder.of(dir); |
|
518 |
try { |
|
519 |
finder.find("m1"); |
|
520 |
assertTrue(false); |
|
521 |
} catch (FindException expected) { } |
|
522 |
||
523 |
finder = ModuleFinder.of(dir); |
|
524 |
try { |
|
525 |
finder.findAll(); |
|
526 |
assertTrue(false); |
|
527 |
} catch (FindException expected) { } |
|
528 |
} |
|
529 |
||
530 |
||
531 |
/** |
|
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
532 |
* Test ModuleFinder.of with a directory containing hidden files |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
533 |
*/ |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
534 |
public void testOfWithHiddenFiles() throws Exception { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
535 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
536 |
createExplodedModule(dir.resolve("m"), "m", |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
537 |
"com/.ignore", |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
538 |
"com/foo/.ignore", |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
539 |
"com/foo/foo.properties"); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
540 |
|
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
541 |
ModuleFinder finder = ModuleFinder.of(dir); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
542 |
ModuleReference mref = finder.find("m").orElse(null); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
543 |
assertNotNull(mref); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
544 |
|
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
545 |
Set<String> expectedPackages; |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
546 |
if (System.getProperty("os.name").startsWith("Windows")) { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
547 |
expectedPackages = Set.of("com", "com.foo"); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
548 |
} else { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
549 |
expectedPackages = Set.of("com.foo"); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
550 |
} |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
551 |
assertEquals(mref.descriptor().packages(), expectedPackages); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
552 |
} |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
553 |
|
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
554 |
|
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
555 |
/** |
36511 | 556 |
* Test ModuleFinder.of with a truncated module-info.class |
557 |
*/ |
|
558 |
public void testOfWithTruncatedModuleInfo() throws Exception { |
|
559 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
|
560 |
||
561 |
// create an empty <dir>/rhubarb/module-info.class |
|
562 |
Path subdir = Files.createDirectory(dir.resolve("rhubarb")); |
|
563 |
Files.createFile(subdir.resolve("module-info.class")); |
|
564 |
||
565 |
ModuleFinder finder = ModuleFinder.of(dir); |
|
566 |
try { |
|
567 |
finder.find("rhubarb"); |
|
568 |
assertTrue(false); |
|
569 |
} catch (FindException e) { |
|
570 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
|
571 |
} |
|
572 |
||
573 |
finder = ModuleFinder.of(dir); |
|
574 |
try { |
|
575 |
finder.findAll(); |
|
576 |
assertTrue(false); |
|
577 |
} catch (FindException e) { |
|
578 |
assertTrue(e.getCause() instanceof InvalidModuleDescriptorException); |
|
579 |
} |
|
580 |
} |
|
581 |
||
582 |
||
583 |
/** |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
584 |
* Test ModuleFinder.compose with no module finders |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
585 |
*/ |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
586 |
public void testComposeOfNone() throws Exception { |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
587 |
ModuleFinder finder = ModuleFinder.of(); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
588 |
assertTrue(finder.findAll().isEmpty()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
589 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
590 |
} |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
591 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
592 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
593 |
/** |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
594 |
* Test ModuleFinder.compose with one module finder |
36511 | 595 |
*/ |
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
596 |
public void testComposeOfOne() throws Exception { |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
597 |
Path dir = Files.createTempDirectory(USER_DIR, "mods"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
598 |
createModularJar(dir.resolve("m1.jar"), "m1"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
599 |
createModularJar(dir.resolve("m2.jar"), "m2"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
600 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
601 |
ModuleFinder finder1 = ModuleFinder.of(dir); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
602 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
603 |
ModuleFinder finder = ModuleFinder.compose(finder1); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
604 |
assertTrue(finder.findAll().size() == 2); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
605 |
assertTrue(finder.find("m1").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
606 |
assertTrue(finder.find("m2").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
607 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
608 |
} |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
609 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
610 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
611 |
/** |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
612 |
* Test ModuleFinder.compose with two module finders |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
613 |
*/ |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
614 |
public void testComposeOfTwo() throws Exception { |
36511 | 615 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
616 |
createModularJar(dir1.resolve("m1.jar"), "m1@1.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
617 |
createModularJar(dir1.resolve("m2.jar"), "m2@1.0"); |
36511 | 618 |
|
619 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
620 |
createModularJar(dir2.resolve("m1.jar"), "m1@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
621 |
createModularJar(dir2.resolve("m2.jar"), "m2@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
622 |
createModularJar(dir2.resolve("m3.jar"), "m3"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
623 |
createModularJar(dir2.resolve("m4.jar"), "m4"); |
36511 | 624 |
|
625 |
ModuleFinder finder1 = ModuleFinder.of(dir1); |
|
626 |
ModuleFinder finder2 = ModuleFinder.of(dir2); |
|
627 |
||
628 |
ModuleFinder finder = ModuleFinder.compose(finder1, finder2); |
|
629 |
assertTrue(finder.findAll().size() == 4); |
|
630 |
assertTrue(finder.find("m1").isPresent()); |
|
631 |
assertTrue(finder.find("m2").isPresent()); |
|
632 |
assertTrue(finder.find("m3").isPresent()); |
|
633 |
assertTrue(finder.find("m4").isPresent()); |
|
634 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
|
635 |
||
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
636 |
// check that m1@1.0 is found |
36511 | 637 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
638 |
assertEquals(m1.version().get().toString(), "1.0"); |
|
639 |
||
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
640 |
// check that m2@1.0 is found |
36511 | 641 |
ModuleDescriptor m2 = finder.find("m2").get().descriptor(); |
642 |
assertEquals(m2.version().get().toString(), "1.0"); |
|
643 |
} |
|
644 |
||
645 |
||
646 |
/** |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
647 |
* Test ModuleFinder.compose with three module finders |
36511 | 648 |
*/ |
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
649 |
public void testComposeOfThree() throws Exception { |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
650 |
Path dir1 = Files.createTempDirectory(USER_DIR, "mods1"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
651 |
createModularJar(dir1.resolve("m1.jar"), "m1@1.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
652 |
createModularJar(dir1.resolve("m2.jar"), "m2@1.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
653 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
654 |
Path dir2 = Files.createTempDirectory(USER_DIR, "mods2"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
655 |
createModularJar(dir2.resolve("m1.jar"), "m1@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
656 |
createModularJar(dir2.resolve("m2.jar"), "m2@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
657 |
createModularJar(dir2.resolve("m3.jar"), "m3@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
658 |
createModularJar(dir2.resolve("m4.jar"), "m4@2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
659 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
660 |
Path dir3 = Files.createTempDirectory(USER_DIR, "mods3"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
661 |
createModularJar(dir3.resolve("m3.jar"), "m3@3.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
662 |
createModularJar(dir3.resolve("m4.jar"), "m4@3.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
663 |
createModularJar(dir3.resolve("m5.jar"), "m5"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
664 |
createModularJar(dir3.resolve("m6.jar"), "m6"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
665 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
666 |
ModuleFinder finder1 = ModuleFinder.of(dir1); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
667 |
ModuleFinder finder2 = ModuleFinder.of(dir2); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
668 |
ModuleFinder finder3 = ModuleFinder.of(dir3); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
669 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
670 |
ModuleFinder finder = ModuleFinder.compose(finder1, finder2, finder3); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
671 |
assertTrue(finder.findAll().size() == 6); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
672 |
assertTrue(finder.find("m1").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
673 |
assertTrue(finder.find("m2").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
674 |
assertTrue(finder.find("m3").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
675 |
assertTrue(finder.find("m4").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
676 |
assertTrue(finder.find("m5").isPresent()); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
677 |
assertTrue(finder.find("m6").isPresent()); |
36511 | 678 |
assertFalse(finder.find("java.rhubarb").isPresent()); |
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
679 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
680 |
// check that m1@1.0 is found |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
681 |
ModuleDescriptor m1 = finder.find("m1").get().descriptor(); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
682 |
assertEquals(m1.version().get().toString(), "1.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
683 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
684 |
// check that m2@1.0 is found |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
685 |
ModuleDescriptor m2 = finder.find("m2").get().descriptor(); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
686 |
assertEquals(m2.version().get().toString(), "1.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
687 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
688 |
// check that m3@2.0 is found |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
689 |
ModuleDescriptor m3 = finder.find("m3").get().descriptor(); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
690 |
assertEquals(m3.version().get().toString(), "2.0"); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
691 |
|
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
692 |
// check that m4@2.0 is found |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
693 |
ModuleDescriptor m4 = finder.find("m4").get().descriptor(); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
694 |
assertEquals(m4.version().get().toString(), "2.0"); |
36511 | 695 |
} |
696 |
||
697 |
||
698 |
/** |
|
699 |
* Test null handling |
|
700 |
*/ |
|
701 |
public void testNulls() { |
|
702 |
||
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
703 |
// ofSystem |
36511 | 704 |
try { |
705 |
ModuleFinder.ofSystem().find(null); |
|
706 |
assertTrue(false); |
|
707 |
} catch (NullPointerException expected) { } |
|
708 |
||
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
709 |
// of |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
710 |
Path dir = Paths.get("d"); |
36511 | 711 |
try { |
712 |
ModuleFinder.of().find(null); |
|
713 |
assertTrue(false); |
|
714 |
} catch (NullPointerException expected) { } |
|
715 |
try { |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
716 |
ModuleFinder.of((Path)null); |
36511 | 717 |
assertTrue(false); |
718 |
} catch (NullPointerException expected) { } |
|
719 |
try { |
|
720 |
ModuleFinder.of((Path[])null); |
|
721 |
assertTrue(false); |
|
722 |
} catch (NullPointerException expected) { } |
|
723 |
try { |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
724 |
ModuleFinder.of(dir, null); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
725 |
assertTrue(false); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
726 |
} catch (NullPointerException expected) { } |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
727 |
try { |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
728 |
ModuleFinder.of(null, dir); |
36511 | 729 |
assertTrue(false); |
730 |
} catch (NullPointerException expected) { } |
|
731 |
||
732 |
// compose |
|
733 |
ModuleFinder finder = ModuleFinder.of(); |
|
734 |
try { |
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
735 |
ModuleFinder.compose((ModuleFinder)null); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
736 |
assertTrue(false); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
737 |
} catch (NullPointerException expected) { } |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
738 |
try { |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
739 |
ModuleFinder.compose((ModuleFinder[])null); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
740 |
assertTrue(false); |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
741 |
} catch (NullPointerException expected) { } |
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
37779
diff
changeset
|
742 |
try { |
36511 | 743 |
ModuleFinder.compose(finder, null); |
744 |
assertTrue(false); |
|
745 |
} catch (NullPointerException expected) { } |
|
746 |
try { |
|
747 |
ModuleFinder.compose(null, finder); |
|
748 |
assertTrue(false); |
|
749 |
} catch (NullPointerException expected) { } |
|
750 |
||
751 |
} |
|
752 |
||
753 |
||
754 |
/** |
|
755 |
* Parses a string of the form {@code name[@version]} and returns a |
|
756 |
* ModuleDescriptor with that name and version. The ModuleDescriptor |
|
757 |
* will have a requires on java.base. |
|
758 |
*/ |
|
759 |
static ModuleDescriptor newModuleDescriptor(String mid) { |
|
760 |
String mn; |
|
761 |
String vs; |
|
762 |
int i = mid.indexOf("@"); |
|
763 |
if (i == -1) { |
|
764 |
mn = mid; |
|
765 |
vs = null; |
|
766 |
} else { |
|
767 |
mn = mid.substring(0, i); |
|
768 |
vs = mid.substring(i+1); |
|
769 |
} |
|
770 |
ModuleDescriptor.Builder builder |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
771 |
= ModuleDescriptor.newModule(mn).requires("java.base"); |
36511 | 772 |
if (vs != null) |
773 |
builder.version(vs); |
|
774 |
return builder.build(); |
|
775 |
} |
|
776 |
||
777 |
/** |
|
778 |
* Creates an exploded module in the given directory and containing a |
|
779 |
* module descriptor with the given module name/version. |
|
780 |
*/ |
|
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
781 |
static Path createExplodedModule(Path dir, String mid, String... entries) |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
782 |
throws Exception |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
783 |
{ |
36511 | 784 |
ModuleDescriptor descriptor = newModuleDescriptor(mid); |
785 |
Files.createDirectories(dir); |
|
786 |
Path mi = dir.resolve("module-info.class"); |
|
787 |
try (OutputStream out = Files.newOutputStream(mi)) { |
|
788 |
ModuleInfoWriter.write(descriptor, out); |
|
789 |
} |
|
41817
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
790 |
|
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
791 |
for (String entry : entries) { |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
792 |
Path file = dir.resolve(entry.replace('/', File.separatorChar)); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
793 |
Files.createDirectories(file.getParent()); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
794 |
Files.createFile(file); |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
795 |
} |
b90ad1de93ea
8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents:
38457
diff
changeset
|
796 |
|
36511 | 797 |
return dir; |
798 |
} |
|
799 |
||
800 |
/** |
|
801 |
* Creates a JAR file with the given file path and containing a module |
|
802 |
* descriptor with the given module name/version. |
|
803 |
*/ |
|
804 |
static Path createModularJar(Path file, String mid, String ... entries) |
|
805 |
throws Exception |
|
806 |
{ |
|
807 |
ModuleDescriptor descriptor = newModuleDescriptor(mid); |
|
808 |
try (OutputStream out = Files.newOutputStream(file)) { |
|
809 |
try (JarOutputStream jos = new JarOutputStream(out)) { |
|
810 |
||
811 |
JarEntry je = new JarEntry("module-info.class"); |
|
812 |
jos.putNextEntry(je); |
|
813 |
ModuleInfoWriter.write(descriptor, jos); |
|
814 |
jos.closeEntry(); |
|
815 |
||
816 |
for (String entry : entries) { |
|
817 |
je = new JarEntry(entry); |
|
818 |
jos.putNextEntry(je); |
|
819 |
jos.closeEntry(); |
|
820 |
} |
|
821 |
} |
|
822 |
||
823 |
} |
|
824 |
return file; |
|
825 |
} |
|
826 |
||
827 |
} |
|
828 |