| author | mli |
| Mon, 20 Jun 2016 18:30:57 -0700 | |
| changeset 39124 | 2f46f5082cd7 |
| parent 38457 | 3d019217e322 |
| child 42338 | a60f280f803c |
| permissions | -rw-r--r-- |
| 36511 | 1 |
/* |
2 |
* Copyright (c) 2014, 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 |
* @library /lib/testlibrary |
|
27 |
* @build ConfigurationTest ModuleUtils |
|
28 |
* @run testng ConfigurationTest |
|
29 |
* @summary Basic tests for java.lang.module.Configuration |
|
30 |
*/ |
|
31 |
||
32 |
import java.lang.module.Configuration; |
|
33 |
import java.lang.module.ModuleDescriptor; |
|
34 |
import java.lang.module.ModuleDescriptor.Requires.Modifier; |
|
35 |
import java.lang.module.ModuleFinder; |
|
36 |
import java.lang.module.ResolutionException; |
|
37 |
import java.lang.module.ResolvedModule; |
|
38 |
import java.lang.reflect.Layer; |
|
39 |
import java.util.Optional; |
|
40 |
import java.util.Set; |
|
41 |
||
42 |
import org.testng.annotations.DataProvider; |
|
43 |
import org.testng.annotations.Test; |
|
44 |
import static org.testng.Assert.*; |
|
45 |
||
46 |
@Test |
|
47 |
public class ConfigurationTest {
|
|
48 |
||
49 |
||
50 |
/** |
|
51 |
* Basic test of resolver |
|
52 |
* m1 requires m2, m2 requires m3 |
|
53 |
*/ |
|
54 |
public void testBasic() {
|
|
55 |
ModuleDescriptor descriptor1 |
|
56 |
= new ModuleDescriptor.Builder("m1")
|
|
57 |
.requires("m2")
|
|
58 |
.build(); |
|
59 |
||
60 |
ModuleDescriptor descriptor2 |
|
61 |
= new ModuleDescriptor.Builder("m2")
|
|
62 |
.requires("m3")
|
|
63 |
.build(); |
|
64 |
||
65 |
ModuleDescriptor descriptor3 |
|
66 |
= new ModuleDescriptor.Builder("m3")
|
|
67 |
.build(); |
|
68 |
||
69 |
ModuleFinder finder |
|
70 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
71 |
||
72 |
Configuration cf = resolveRequires(finder, "m1"); |
|
73 |
||
74 |
assertTrue(cf.modules().size() == 3); |
|
75 |
||
76 |
assertTrue(cf.findModule("m1").isPresent());
|
|
77 |
assertTrue(cf.findModule("m2").isPresent());
|
|
78 |
assertTrue(cf.findModule("m3").isPresent());
|
|
79 |
||
80 |
assertTrue(cf.parent().get() == Configuration.empty()); |
|
81 |
||
82 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
83 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
84 |
ResolvedModule m3 = cf.findModule("m3").get();
|
|
85 |
||
86 |
// m1 reads m2 |
|
87 |
assertTrue(m1.reads().size() == 1); |
|
88 |
assertTrue(m1.reads().contains(m2)); |
|
89 |
||
90 |
// m2 reads m3 |
|
91 |
assertTrue(m2.reads().size() == 1); |
|
92 |
assertTrue(m2.reads().contains(m3)); |
|
93 |
||
94 |
// m3 reads nothing |
|
95 |
assertTrue(m3.reads().size() == 0); |
|
96 |
||
97 |
// toString |
|
98 |
assertTrue(cf.toString().contains("m1"));
|
|
99 |
assertTrue(cf.toString().contains("m2"));
|
|
100 |
assertTrue(cf.toString().contains("m3"));
|
|
101 |
} |
|
102 |
||
103 |
||
104 |
/** |
|
105 |
* Basic test of "requires public": |
|
106 |
* m1 requires m2, m2 requires public m3 |
|
107 |
*/ |
|
108 |
public void testRequiresPublic1() {
|
|
109 |
// m1 requires m2, m2 requires public m3 |
|
110 |
ModuleDescriptor descriptor1 |
|
111 |
= new ModuleDescriptor.Builder("m1")
|
|
112 |
.requires("m2")
|
|
113 |
.build(); |
|
114 |
||
115 |
ModuleDescriptor descriptor2 |
|
116 |
= new ModuleDescriptor.Builder("m2")
|
|
117 |
.requires(Modifier.PUBLIC, "m3") |
|
118 |
.build(); |
|
119 |
||
120 |
ModuleDescriptor descriptor3 |
|
121 |
= new ModuleDescriptor.Builder("m3")
|
|
122 |
.build(); |
|
123 |
||
124 |
ModuleFinder finder |
|
125 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
126 |
||
127 |
Configuration cf = resolveRequires(finder, "m1"); |
|
128 |
||
129 |
assertTrue(cf.modules().size() == 3); |
|
130 |
||
131 |
assertTrue(cf.findModule("m1").isPresent());
|
|
132 |
assertTrue(cf.findModule("m2").isPresent());
|
|
133 |
assertTrue(cf.findModule("m3").isPresent());
|
|
134 |
||
135 |
assertTrue(cf.parent().get() == Configuration.empty()); |
|
136 |
||
137 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
138 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
139 |
ResolvedModule m3 = cf.findModule("m3").get();
|
|
140 |
||
141 |
// m1 reads m2 and m3 |
|
142 |
assertTrue(m1.reads().size() == 2); |
|
143 |
assertTrue(m1.reads().contains(m2)); |
|
144 |
assertTrue(m1.reads().contains(m3)); |
|
145 |
||
146 |
// m2 reads m3 |
|
147 |
assertTrue(m2.reads().size() == 1); |
|
148 |
assertTrue(m2.reads().contains(m3)); |
|
149 |
||
150 |
// m3 reads nothing |
|
151 |
assertTrue(m3.reads().size() == 0); |
|
152 |
} |
|
153 |
||
154 |
||
155 |
/** |
|
156 |
* Basic test of "requires public" with configurations. |
|
157 |
* |
|
158 |
* The test consists of three configurations: |
|
159 |
* - Configuration cf1: m1, m2 requires public m1 |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
160 |
* - Configuration cf2: m3 requires m2 |
| 36511 | 161 |
*/ |
162 |
public void testRequiresPublic2() {
|
|
163 |
||
164 |
// cf1: m1 and m2, m2 requires public m1 |
|
165 |
||
166 |
ModuleDescriptor descriptor1 |
|
167 |
= new ModuleDescriptor.Builder("m1")
|
|
168 |
.build(); |
|
169 |
||
170 |
ModuleDescriptor descriptor2 |
|
171 |
= new ModuleDescriptor.Builder("m2")
|
|
172 |
.requires(Modifier.PUBLIC, "m1") |
|
173 |
.build(); |
|
174 |
||
175 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
176 |
||
177 |
Configuration cf1 = resolveRequires(finder1, "m2"); |
|
178 |
||
179 |
assertTrue(cf1.modules().size() == 2); |
|
180 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
181 |
assertTrue(cf1.findModule("m2").isPresent());
|
|
182 |
assertTrue(cf1.parent().get() == Configuration.empty()); |
|
183 |
||
184 |
ResolvedModule m1 = cf1.findModule("m1").get();
|
|
185 |
ResolvedModule m2 = cf1.findModule("m2").get();
|
|
186 |
||
187 |
assertTrue(m1.reads().size() == 0); |
|
188 |
assertTrue(m2.reads().size() == 1); |
|
189 |
assertTrue(m2.reads().contains(m1)); |
|
190 |
||
191 |
||
192 |
// cf2: m3, m3 requires m2 |
|
193 |
||
194 |
ModuleDescriptor descriptor3 |
|
195 |
= new ModuleDescriptor.Builder("m3")
|
|
196 |
.requires("m2")
|
|
197 |
.build(); |
|
198 |
||
199 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3); |
|
200 |
||
201 |
Configuration cf2 = resolveRequires(cf1, finder2, "m3"); |
|
202 |
||
203 |
assertTrue(cf2.modules().size() == 1); |
|
204 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent
|
|
205 |
assertTrue(cf2.findModule("m2").isPresent()); // in parent
|
|
206 |
assertTrue(cf2.findModule("m3").isPresent());
|
|
207 |
assertTrue(cf2.parent().get() == cf1); |
|
208 |
||
209 |
ResolvedModule m3 = cf2.findModule("m3").get();
|
|
210 |
assertTrue(m3.configuration() == cf2); |
|
211 |
assertTrue(m3.reads().size() == 2); |
|
212 |
assertTrue(m3.reads().contains(m1)); |
|
213 |
assertTrue(m3.reads().contains(m2)); |
|
214 |
} |
|
215 |
||
216 |
||
217 |
/** |
|
218 |
* Basic test of "requires public" with configurations. |
|
219 |
* |
|
220 |
* The test consists of three configurations: |
|
221 |
* - Configuration cf1: m1 |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
222 |
* - Configuration cf2: m2 requires public m1, m3 requires m2 |
| 36511 | 223 |
*/ |
224 |
public void testRequiresPublic3() {
|
|
225 |
||
226 |
// cf1: m1 |
|
227 |
||
228 |
ModuleDescriptor descriptor1 |
|
229 |
= new ModuleDescriptor.Builder("m1")
|
|
230 |
.build(); |
|
231 |
||
232 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
233 |
||
234 |
Configuration cf1 = resolveRequires(finder1, "m1"); |
|
235 |
||
236 |
assertTrue(cf1.modules().size() == 1); |
|
237 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
238 |
assertTrue(cf1.parent().get() == Configuration.empty()); |
|
239 |
||
240 |
ResolvedModule m1 = cf1.findModule("m1").get();
|
|
241 |
assertTrue(m1.reads().size() == 0); |
|
242 |
||
243 |
||
244 |
// cf2: m2, m3: m2 requires public m1, m3 requires m2 |
|
245 |
||
246 |
ModuleDescriptor descriptor2 |
|
247 |
= new ModuleDescriptor.Builder("m2")
|
|
248 |
.requires(Modifier.PUBLIC, "m1") |
|
249 |
.build(); |
|
250 |
||
251 |
ModuleDescriptor descriptor3 |
|
252 |
= new ModuleDescriptor.Builder("m3")
|
|
253 |
.requires("m2")
|
|
254 |
.build(); |
|
255 |
||
256 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2, descriptor3); |
|
257 |
||
258 |
Configuration cf2 = resolveRequires(cf1, finder2, "m3"); |
|
259 |
||
260 |
assertTrue(cf2.modules().size() == 2); |
|
261 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent
|
|
262 |
assertTrue(cf2.findModule("m2").isPresent());
|
|
263 |
assertTrue(cf2.findModule("m3").isPresent());
|
|
264 |
assertTrue(cf2.parent().get() == cf1); |
|
265 |
||
266 |
ResolvedModule m2 = cf2.findModule("m2").get();
|
|
267 |
ResolvedModule m3 = cf2.findModule("m3").get();
|
|
268 |
||
269 |
assertTrue(m2.configuration() == cf2); |
|
270 |
assertTrue(m2.reads().size() == 1); |
|
271 |
assertTrue(m2.reads().contains(m1)); |
|
272 |
||
273 |
assertTrue(m3.configuration() == cf2); |
|
274 |
assertTrue(m3.reads().size() == 2); |
|
275 |
assertTrue(m3.reads().contains(m1)); |
|
276 |
assertTrue(m3.reads().contains(m2)); |
|
277 |
} |
|
278 |
||
279 |
||
280 |
/** |
|
281 |
* Basic test of "requires public" with configurations. |
|
282 |
* |
|
283 |
* The test consists of three configurations: |
|
284 |
* - Configuration cf1: m1 |
|
285 |
* - Configuration cf2: m2 requires public m1 |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
286 |
* - Configuraiton cf3: m3 requires m2 |
| 36511 | 287 |
*/ |
288 |
public void testRequiresPublic4() {
|
|
289 |
||
290 |
// cf1: m1 |
|
291 |
||
292 |
ModuleDescriptor descriptor1 |
|
293 |
= new ModuleDescriptor.Builder("m1")
|
|
294 |
.build(); |
|
295 |
||
296 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
297 |
||
298 |
Configuration cf1 = resolveRequires(finder1, "m1"); |
|
299 |
||
300 |
assertTrue(cf1.modules().size() == 1); |
|
301 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
302 |
assertTrue(cf1.parent().get() == Configuration.empty()); |
|
303 |
||
304 |
ResolvedModule m1 = cf1.findModule("m1").get();
|
|
305 |
assertTrue(m1.reads().size() == 0); |
|
306 |
||
307 |
||
308 |
// cf2: m2 requires public m1 |
|
309 |
||
310 |
ModuleDescriptor descriptor2 |
|
311 |
= new ModuleDescriptor.Builder("m2")
|
|
312 |
.requires(Modifier.PUBLIC, "m1") |
|
313 |
.build(); |
|
314 |
||
315 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
316 |
||
317 |
Configuration cf2 = resolveRequires(cf1, finder2, "m2"); |
|
318 |
||
319 |
assertTrue(cf2.modules().size() == 1); |
|
320 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent
|
|
321 |
assertTrue(cf2.findModule("m2").isPresent());
|
|
322 |
assertTrue(cf2.parent().get() == cf1); |
|
323 |
||
324 |
ResolvedModule m2 = cf2.findModule("m2").get();
|
|
325 |
||
326 |
assertTrue(m2.configuration() == cf2); |
|
327 |
assertTrue(m2.reads().size() == 1); |
|
328 |
assertTrue(m2.reads().contains(m1)); |
|
329 |
||
330 |
||
331 |
// cf3: m3 requires m2 |
|
332 |
||
333 |
ModuleDescriptor descriptor3 |
|
334 |
= new ModuleDescriptor.Builder("m3")
|
|
335 |
.requires("m2")
|
|
336 |
.build(); |
|
337 |
||
338 |
ModuleFinder finder3 = ModuleUtils.finderOf(descriptor3); |
|
339 |
||
340 |
Configuration cf3 = resolveRequires(cf2, finder3, "m3"); |
|
341 |
||
342 |
assertTrue(cf3.modules().size() == 1); |
|
343 |
assertTrue(cf3.findModule("m1").isPresent()); // in parent
|
|
344 |
assertTrue(cf3.findModule("m2").isPresent()); // in parent
|
|
345 |
assertTrue(cf3.findModule("m3").isPresent());
|
|
346 |
assertTrue(cf3.parent().get() == cf2); |
|
347 |
||
348 |
ResolvedModule m3 = cf3.findModule("m3").get();
|
|
349 |
||
350 |
assertTrue(m3.configuration() == cf3); |
|
351 |
assertTrue(m3.reads().size() == 2); |
|
352 |
assertTrue(m3.reads().contains(m1)); |
|
353 |
assertTrue(m3.reads().contains(m2)); |
|
354 |
} |
|
355 |
||
356 |
||
357 |
/** |
|
358 |
* Basic test of "requires public" with configurations. |
|
359 |
* |
|
360 |
* The test consists of two configurations: |
|
361 |
* - Configuration cf1: m1, m2 requires public m1 |
|
362 |
* - Configuration cf2: m3 requires public m2, m4 requires m3 |
|
363 |
*/ |
|
364 |
public void testRequiresPublic5() {
|
|
365 |
||
366 |
// cf1: m1, m2 requires public m1 |
|
367 |
||
368 |
ModuleDescriptor descriptor1 |
|
369 |
= new ModuleDescriptor.Builder("m1")
|
|
370 |
.build(); |
|
371 |
||
372 |
ModuleDescriptor descriptor2 |
|
373 |
= new ModuleDescriptor.Builder("m2")
|
|
374 |
.requires(Modifier.PUBLIC, "m1") |
|
375 |
.build(); |
|
376 |
||
377 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
378 |
||
379 |
Configuration cf1 = resolveRequires(finder1, "m2"); |
|
380 |
||
381 |
assertTrue(cf1.modules().size() == 2); |
|
382 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
383 |
assertTrue(cf1.findModule("m2").isPresent());
|
|
384 |
assertTrue(cf1.parent().get() == Configuration.empty()); |
|
385 |
||
386 |
ResolvedModule m1 = cf1.findModule("m1").get();
|
|
387 |
ResolvedModule m2 = cf1.findModule("m2").get();
|
|
388 |
||
389 |
assertTrue(m1.configuration() == cf1); |
|
390 |
assertTrue(m1.reads().size() == 0); |
|
391 |
||
392 |
assertTrue(m2.configuration() == cf1); |
|
393 |
assertTrue(m2.reads().size() == 1); |
|
394 |
assertTrue(m2.reads().contains(m1)); |
|
395 |
||
396 |
||
397 |
// cf2: m3 requires public m2, m4 requires m3 |
|
398 |
||
399 |
ModuleDescriptor descriptor3 |
|
400 |
= new ModuleDescriptor.Builder("m3")
|
|
401 |
.requires(Modifier.PUBLIC, "m2") |
|
402 |
.build(); |
|
403 |
||
404 |
ModuleDescriptor descriptor4 |
|
405 |
= new ModuleDescriptor.Builder("m4")
|
|
406 |
.requires("m3")
|
|
407 |
.build(); |
|
408 |
||
409 |
||
410 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4); |
|
411 |
||
412 |
Configuration cf2 = resolveRequires(cf1, finder2, "m3", "m4"); |
|
413 |
||
414 |
assertTrue(cf2.modules().size() == 2); |
|
415 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent
|
|
416 |
assertTrue(cf2.findModule("m2").isPresent()); // in parent
|
|
417 |
assertTrue(cf2.findModule("m3").isPresent());
|
|
418 |
assertTrue(cf2.findModule("m4").isPresent());
|
|
419 |
assertTrue(cf2.parent().get() == cf1); |
|
420 |
||
421 |
ResolvedModule m3 = cf2.findModule("m3").get();
|
|
422 |
ResolvedModule m4 = cf2.findModule("m4").get();
|
|
423 |
||
424 |
assertTrue(m3.configuration() == cf2); |
|
425 |
assertTrue(m3.reads().size() == 2); |
|
426 |
assertTrue(m3.reads().contains(m1)); |
|
427 |
assertTrue(m3.reads().contains(m2)); |
|
428 |
||
429 |
assertTrue(m4.configuration() == cf2); |
|
430 |
assertTrue(m4.reads().size() == 3); |
|
431 |
assertTrue(m4.reads().contains(m1)); |
|
432 |
assertTrue(m4.reads().contains(m2)); |
|
433 |
assertTrue(m4.reads().contains(m3)); |
|
434 |
} |
|
435 |
||
436 |
||
437 |
/** |
|
438 |
* Basic test of binding services |
|
439 |
* m1 uses p.S |
|
440 |
* m2 provides p.S |
|
441 |
*/ |
|
442 |
public void testServiceBinding1() {
|
|
443 |
||
444 |
ModuleDescriptor descriptor1 |
|
445 |
= new ModuleDescriptor.Builder("m1")
|
|
446 |
.exports("p")
|
|
447 |
.uses("p.S")
|
|
448 |
.build(); |
|
449 |
||
450 |
ModuleDescriptor descriptor2 |
|
451 |
= new ModuleDescriptor.Builder("m2")
|
|
452 |
.requires("m1")
|
|
453 |
.conceals("q")
|
|
454 |
.provides("p.S", "q.T")
|
|
455 |
.build(); |
|
456 |
||
457 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
458 |
||
459 |
Configuration cf = resolveRequiresAndUses(finder, "m1"); |
|
460 |
||
461 |
assertTrue(cf.modules().size() == 2); |
|
462 |
assertTrue(cf.findModule("m1").isPresent());
|
|
463 |
assertTrue(cf.findModule("m2").isPresent());
|
|
464 |
assertTrue(cf.parent().get() == Configuration.empty()); |
|
465 |
||
466 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
467 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
468 |
||
469 |
assertTrue(m1.configuration() == cf); |
|
470 |
assertTrue(m1.reads().size() == 0); |
|
471 |
||
472 |
assertTrue(m2.configuration() == cf); |
|
473 |
assertTrue(m2.reads().size() == 1); |
|
474 |
assertTrue(m2.reads().contains(m1)); |
|
475 |
} |
|
476 |
||
477 |
||
478 |
/** |
|
479 |
* Basic test of binding services |
|
480 |
* m1 uses p.S1 |
|
481 |
* m2 provides p.S1, m2 uses p.S2 |
|
482 |
* m3 provides p.S2 |
|
483 |
*/ |
|
484 |
public void testServiceBinding2() {
|
|
485 |
||
486 |
ModuleDescriptor descriptor1 |
|
487 |
= new ModuleDescriptor.Builder("m1")
|
|
488 |
.exports("p")
|
|
489 |
.uses("p.S1")
|
|
490 |
.build(); |
|
491 |
||
492 |
ModuleDescriptor descriptor2 |
|
493 |
= new ModuleDescriptor.Builder("m2")
|
|
494 |
.requires("m1")
|
|
495 |
.uses("p.S2")
|
|
496 |
.conceals("q")
|
|
497 |
.provides("p.S1", "q.Service1Impl")
|
|
498 |
.build(); |
|
499 |
||
500 |
ModuleDescriptor descriptor3 |
|
501 |
= new ModuleDescriptor.Builder("m3")
|
|
502 |
.requires("m1")
|
|
503 |
.conceals("q")
|
|
504 |
.provides("p.S2", "q.Service2Impl")
|
|
505 |
.build(); |
|
506 |
||
507 |
ModuleFinder finder |
|
508 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
509 |
||
510 |
Configuration cf = resolveRequiresAndUses(finder, "m1"); |
|
511 |
||
512 |
assertTrue(cf.modules().size() == 3); |
|
513 |
assertTrue(cf.findModule("m1").isPresent());
|
|
514 |
assertTrue(cf.findModule("m2").isPresent());
|
|
515 |
assertTrue(cf.findModule("m3").isPresent());
|
|
516 |
assertTrue(cf.parent().get() == Configuration.empty()); |
|
517 |
||
518 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
519 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
520 |
ResolvedModule m3 = cf.findModule("m3").get();
|
|
521 |
||
522 |
assertTrue(m1.configuration() == cf); |
|
523 |
assertTrue(m1.reads().size() == 0); |
|
524 |
||
525 |
assertTrue(m2.configuration() == cf); |
|
526 |
assertTrue(m2.reads().size() == 1); |
|
527 |
assertTrue(m2.reads().contains(m1)); |
|
528 |
||
529 |
assertTrue(m3.configuration() == cf); |
|
530 |
assertTrue(m3.reads().size() == 1); |
|
531 |
assertTrue(m3.reads().contains(m1)); |
|
532 |
} |
|
533 |
||
534 |
||
535 |
/** |
|
536 |
* Basic test of binding services with configurations. |
|
537 |
* |
|
538 |
* The test consists of two configurations: |
|
539 |
* - Configuration cf1: m1 uses p.S |
|
540 |
* - Configuration cf2: m2 provides p.S |
|
541 |
*/ |
|
542 |
public void testServiceBindingWithConfigurations1() {
|
|
543 |
||
544 |
ModuleDescriptor descriptor1 |
|
545 |
= new ModuleDescriptor.Builder("m1")
|
|
546 |
.exports("p")
|
|
547 |
.uses("p.S")
|
|
548 |
.build(); |
|
549 |
||
550 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
551 |
||
552 |
Configuration cf1 = resolveRequires(finder1, "m1"); |
|
553 |
||
554 |
assertTrue(cf1.modules().size() == 1); |
|
555 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
556 |
||
557 |
ModuleDescriptor descriptor2 |
|
558 |
= new ModuleDescriptor.Builder("m2")
|
|
559 |
.requires("m1")
|
|
560 |
.conceals("q")
|
|
561 |
.provides("p.S", "q.T")
|
|
562 |
.build(); |
|
563 |
||
564 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
565 |
||
566 |
Configuration cf2 = resolveRequiresAndUses(cf1, finder2); // no roots |
|
567 |
||
568 |
assertTrue(cf2.parent().get() == cf1); |
|
569 |
assertTrue(cf2.modules().size() == 1); |
|
570 |
assertTrue(cf2.findModule("m2").isPresent());
|
|
571 |
||
572 |
ResolvedModule m1 = cf1.findModule("m1").get();
|
|
573 |
ResolvedModule m2 = cf2.findModule("m2").get();
|
|
574 |
||
575 |
assertTrue(m2.reads().size() == 1); |
|
576 |
assertTrue(m2.reads().contains(m1)); |
|
577 |
} |
|
578 |
||
579 |
||
580 |
/** |
|
581 |
* Basic test of binding services with configurations. |
|
582 |
* |
|
583 |
* The test consists of two configurations: |
|
584 |
* - Configuration cf1: m1 uses p.S && provides p.S, |
|
585 |
* m2 provides p.S |
|
586 |
* - Configuration cf2: m3 provides p.S |
|
587 |
* m4 provides p.S |
|
588 |
*/ |
|
589 |
public void testServiceBindingWithConfigurations2() {
|
|
590 |
||
591 |
ModuleDescriptor descriptor1 |
|
592 |
= new ModuleDescriptor.Builder("m1")
|
|
593 |
.exports("p")
|
|
594 |
.uses("p.S")
|
|
595 |
.conceals("p1")
|
|
596 |
.provides("p.S", "p1.ServiceImpl")
|
|
597 |
.build(); |
|
598 |
||
599 |
ModuleDescriptor descriptor2 |
|
600 |
= new ModuleDescriptor.Builder("m2")
|
|
601 |
.requires("m1")
|
|
602 |
.conceals("p2")
|
|
603 |
.provides("p.S", "p2.ServiceImpl")
|
|
604 |
.build(); |
|
605 |
||
606 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
607 |
||
608 |
Configuration cf1 = resolveRequiresAndUses(finder1, "m1"); |
|
609 |
||
610 |
assertTrue(cf1.modules().size() == 2); |
|
611 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
612 |
assertTrue(cf1.findModule("m2").isPresent());
|
|
613 |
||
614 |
||
615 |
ModuleDescriptor descriptor3 |
|
616 |
= new ModuleDescriptor.Builder("m3")
|
|
617 |
.requires("m1")
|
|
618 |
.conceals("p3")
|
|
619 |
.provides("p.S", "p3.ServiceImpl")
|
|
620 |
.build(); |
|
621 |
||
622 |
ModuleDescriptor descriptor4 |
|
623 |
= new ModuleDescriptor.Builder("m4")
|
|
624 |
.requires("m1")
|
|
625 |
.conceals("p4")
|
|
626 |
.provides("p.S", "p4.ServiceImpl")
|
|
627 |
.build(); |
|
628 |
||
629 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4); |
|
630 |
||
631 |
Configuration cf2 = resolveRequiresAndUses(cf1, finder2); // no roots |
|
632 |
||
633 |
assertTrue(cf2.parent().get() == cf1); |
|
634 |
assertTrue(cf2.modules().size() == 2); |
|
635 |
assertTrue(cf2.findModule("m3").isPresent());
|
|
636 |
assertTrue(cf2.findModule("m4").isPresent());
|
|
637 |
||
638 |
ResolvedModule m1 = cf2.findModule("m1").get(); // should find in parent
|
|
639 |
ResolvedModule m2 = cf2.findModule("m2").get();
|
|
640 |
ResolvedModule m3 = cf2.findModule("m3").get();
|
|
641 |
ResolvedModule m4 = cf2.findModule("m4").get();
|
|
642 |
||
643 |
assertTrue(m1.reads().size() == 0); |
|
644 |
||
645 |
assertTrue(m2.reads().size() == 1); |
|
646 |
assertTrue(m2.reads().contains(m1)); |
|
647 |
||
648 |
assertTrue(m3.reads().size() == 1); |
|
649 |
assertTrue(m3.reads().contains(m1)); |
|
650 |
||
651 |
assertTrue(m4.reads().size() == 1); |
|
652 |
assertTrue(m4.reads().contains(m1)); |
|
653 |
} |
|
654 |
||
655 |
||
656 |
/** |
|
657 |
* Basic test of binding services with configurations. |
|
658 |
* |
|
659 |
* Configuration cf1: p@1.0 provides p.S |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
660 |
* Test configuration cf2: m1 uses p.S, p@2.0 provides p.S |
| 36511 | 661 |
* Test configuration cf2: m1 uses p.S |
662 |
*/ |
|
663 |
public void testServiceBindingWithConfigurations3() {
|
|
664 |
||
665 |
ModuleDescriptor service |
|
666 |
= new ModuleDescriptor.Builder("s")
|
|
667 |
.exports("p")
|
|
668 |
.build(); |
|
669 |
||
670 |
ModuleDescriptor provider_v1 |
|
671 |
= new ModuleDescriptor.Builder("p")
|
|
672 |
.version("1.0")
|
|
673 |
.requires("s")
|
|
674 |
.conceals("q")
|
|
675 |
.provides("p.S", "q.T")
|
|
676 |
.build(); |
|
677 |
||
678 |
ModuleFinder finder1 = ModuleUtils.finderOf(service, provider_v1); |
|
679 |
||
680 |
Configuration cf1 = resolveRequires(finder1, "p"); |
|
681 |
||
682 |
assertTrue(cf1.modules().size() == 2); |
|
683 |
assertTrue(cf1.findModule("s").isPresent());
|
|
684 |
assertTrue(cf1.findModule("p").isPresent());
|
|
685 |
||
686 |
// p@1.0 in cf1 |
|
687 |
ResolvedModule p = cf1.findModule("p").get();
|
|
688 |
assertEquals(p.reference().descriptor(), provider_v1); |
|
689 |
||
690 |
||
691 |
ModuleDescriptor descriptor1 |
|
692 |
= new ModuleDescriptor.Builder("m1")
|
|
693 |
.requires("s")
|
|
694 |
.uses("p.S")
|
|
695 |
.build(); |
|
696 |
||
697 |
ModuleDescriptor provider_v2 |
|
698 |
= new ModuleDescriptor.Builder("p")
|
|
699 |
.version("2.0")
|
|
700 |
.requires("s")
|
|
701 |
.conceals("q")
|
|
702 |
.provides("p.S", "q.T")
|
|
703 |
.build(); |
|
704 |
||
705 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, provider_v2); |
|
706 |
||
707 |
||
708 |
// finder2 is the before ModuleFinder and so p@2.0 should be located |
|
709 |
||
710 |
Configuration cf2 = resolveRequiresAndUses(cf1, finder2, "m1"); |
|
711 |
||
712 |
assertTrue(cf2.parent().get() == cf1); |
|
713 |
assertTrue(cf2.modules().size() == 2); |
|
714 |
||
715 |
// p should be found in cf2 |
|
716 |
p = cf2.findModule("p").get();
|
|
717 |
assertTrue(p.configuration() == cf2); |
|
718 |
assertEquals(p.reference().descriptor(), provider_v2); |
|
719 |
||
720 |
||
721 |
// finder2 is the after ModuleFinder and so p@2.0 should not be located |
|
722 |
// as module p is in parent configuration. |
|
723 |
||
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
724 |
cf2 = resolveRequiresAndUses(cf1, ModuleFinder.of(), finder2, "m1"); |
| 36511 | 725 |
|
726 |
assertTrue(cf2.parent().get() == cf1); |
|
727 |
assertTrue(cf2.modules().size() == 1); |
|
728 |
||
729 |
// p should be found in cf1 |
|
730 |
p = cf2.findModule("p").get();
|
|
731 |
assertTrue(p.configuration() == cf1); |
|
732 |
assertEquals(p.reference().descriptor(), provider_v1); |
|
733 |
} |
|
734 |
||
735 |
||
736 |
/** |
|
737 |
* Basic test with two module finders. |
|
738 |
* |
|
739 |
* Module m2 can be found by both the before and after finders. |
|
740 |
*/ |
|
741 |
public void testWithTwoFinders1() {
|
|
742 |
||
743 |
ModuleDescriptor descriptor1 |
|
744 |
= new ModuleDescriptor.Builder("m1")
|
|
745 |
.requires("m2")
|
|
746 |
.build(); |
|
747 |
||
748 |
ModuleDescriptor descriptor2_v1 |
|
749 |
= new ModuleDescriptor.Builder("m2")
|
|
750 |
.version("1.0")
|
|
751 |
.build(); |
|
752 |
||
753 |
ModuleDescriptor descriptor2_v2 |
|
754 |
= new ModuleDescriptor.Builder("m2")
|
|
755 |
.version("2.0")
|
|
756 |
.build(); |
|
757 |
||
758 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor2_v1); |
|
759 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, descriptor2_v2); |
|
760 |
||
761 |
Configuration cf = resolveRequires(finder1, finder2, "m1"); |
|
762 |
||
763 |
assertTrue(cf.modules().size() == 2); |
|
764 |
assertTrue(cf.findModule("m1").isPresent());
|
|
765 |
assertTrue(cf.findModule("m2").isPresent());
|
|
766 |
||
767 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
768 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
769 |
||
770 |
assertEquals(m1.reference().descriptor(), descriptor1); |
|
771 |
assertEquals(m2.reference().descriptor(), descriptor2_v1); |
|
772 |
} |
|
773 |
||
774 |
||
775 |
/** |
|
776 |
* Basic test with two modules finders and service binding. |
|
777 |
* |
|
778 |
* The before and after ModuleFinders both locate a service provider module |
|
779 |
* named "m2" that provide implementations of the same service type. |
|
780 |
*/ |
|
781 |
public void testWithTwoFinders2() {
|
|
782 |
||
783 |
ModuleDescriptor descriptor1 |
|
784 |
= new ModuleDescriptor.Builder("m1")
|
|
785 |
.exports("p")
|
|
786 |
.uses("p.S")
|
|
787 |
.build(); |
|
788 |
||
789 |
ModuleDescriptor descriptor2_v1 |
|
790 |
= new ModuleDescriptor.Builder("m2")
|
|
791 |
.requires("m1")
|
|
792 |
.conceals("q")
|
|
793 |
.provides("p.S", "q.T")
|
|
794 |
.build(); |
|
795 |
||
796 |
ModuleDescriptor descriptor2_v2 |
|
797 |
= new ModuleDescriptor.Builder("m2")
|
|
798 |
.requires("m1")
|
|
799 |
.conceals("q")
|
|
800 |
.provides("p.S", "q.T")
|
|
801 |
.build(); |
|
802 |
||
803 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2_v1); |
|
804 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2_v2); |
|
805 |
||
806 |
Configuration cf = resolveRequiresAndUses(finder1, finder2, "m1"); |
|
807 |
||
808 |
assertTrue(cf.modules().size() == 2); |
|
809 |
assertTrue(cf.findModule("m1").isPresent());
|
|
810 |
assertTrue(cf.findModule("m2").isPresent());
|
|
811 |
||
812 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
813 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
814 |
||
815 |
assertEquals(m1.reference().descriptor(), descriptor1); |
|
816 |
assertEquals(m2.reference().descriptor(), descriptor2_v1); |
|
817 |
} |
|
818 |
||
819 |
||
820 |
/** |
|
821 |
* Basic test for resolving a module that is located in the parent |
|
822 |
* configuration. |
|
823 |
*/ |
|
824 |
public void testResolvedInParent1() {
|
|
825 |
||
826 |
ModuleDescriptor descriptor1 |
|
827 |
= new ModuleDescriptor.Builder("m1")
|
|
828 |
.build(); |
|
829 |
||
830 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
831 |
||
832 |
Configuration cf1 = resolveRequires(finder, "m1"); |
|
833 |
||
834 |
assertTrue(cf1.modules().size() == 1); |
|
835 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
836 |
||
837 |
Configuration cf2 = resolveRequires(cf1, finder, "m1"); |
|
838 |
||
839 |
assertTrue(cf2.modules().size() == 1); |
|
840 |
} |
|
841 |
||
842 |
||
843 |
/** |
|
844 |
* Basic test for resolving a module that has a dependency on a module |
|
845 |
* in the parent configuration. |
|
846 |
*/ |
|
847 |
public void testResolvedInParent2() {
|
|
848 |
||
849 |
ModuleDescriptor descriptor1 |
|
850 |
= new ModuleDescriptor.Builder("m1")
|
|
851 |
.build(); |
|
852 |
||
853 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
854 |
||
855 |
Configuration cf1 = resolveRequires(finder1, "m1"); |
|
856 |
||
857 |
assertTrue(cf1.modules().size() == 1); |
|
858 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
859 |
||
860 |
||
861 |
ModuleDescriptor descriptor2 |
|
862 |
= new ModuleDescriptor.Builder("m2")
|
|
863 |
.requires("m1")
|
|
864 |
.build(); |
|
865 |
||
866 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
867 |
||
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
868 |
Configuration cf2 = resolveRequires(cf1, ModuleFinder.of(), finder2, "m2"); |
| 36511 | 869 |
|
870 |
assertTrue(cf2.modules().size() == 1); |
|
871 |
assertTrue(cf2.findModule("m2").isPresent());
|
|
872 |
||
873 |
ResolvedModule m1 = cf2.findModule("m1").get(); // find in parent
|
|
874 |
ResolvedModule m2 = cf2.findModule("m2").get();
|
|
875 |
||
876 |
assertTrue(m1.reads().size() == 0); |
|
877 |
assertTrue(m2.reads().size() == 1); |
|
878 |
assertTrue(m2.reads().contains(m1)); |
|
879 |
} |
|
880 |
||
881 |
||
882 |
/** |
|
883 |
* Basic test of using the beforeFinder to override a module in the parent |
|
884 |
* configuration. |
|
885 |
*/ |
|
886 |
public void testOverriding1() {
|
|
887 |
ModuleDescriptor descriptor1 |
|
888 |
= new ModuleDescriptor.Builder("m1")
|
|
889 |
.build(); |
|
890 |
||
891 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
892 |
||
893 |
Configuration cf1 = resolveRequires(finder, "m1"); |
|
894 |
assertTrue(cf1.modules().size() == 1); |
|
895 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
896 |
||
897 |
Configuration cf2 = resolveRequires(cf1, finder, "m1"); |
|
898 |
assertTrue(cf2.modules().size() == 1); |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
899 |
assertTrue(cf2.findModule("m1").isPresent());
|
| 36511 | 900 |
} |
901 |
||
902 |
||
903 |
/** |
|
904 |
* Basic test of using the beforeFinder to override a module in the parent |
|
905 |
* configuration but where implied readability in the picture so that the |
|
906 |
* module in the parent is read. |
|
907 |
* |
|
908 |
* The test consists of two configurations: |
|
909 |
* - Configuration cf1: m1, m2 requires public m1 |
|
910 |
* - Configuration cf2: m1, m3 requires m2 |
|
911 |
*/ |
|
912 |
public void testOverriding2() {
|
|
913 |
||
914 |
ModuleDescriptor descriptor1 |
|
915 |
= new ModuleDescriptor.Builder("m1")
|
|
916 |
.build(); |
|
917 |
||
918 |
ModuleDescriptor descriptor2 |
|
919 |
= new ModuleDescriptor.Builder("m2")
|
|
920 |
.requires(Modifier.PUBLIC, "m1") |
|
921 |
.build(); |
|
922 |
||
923 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
924 |
||
925 |
Configuration cf1 = resolveRequires(finder1, "m2"); |
|
926 |
||
927 |
assertTrue(cf1.modules().size() == 2); |
|
928 |
assertTrue(cf1.findModule("m1").isPresent());
|
|
929 |
assertTrue(cf1.findModule("m2").isPresent());
|
|
930 |
||
931 |
// cf2: m3 requires m2, m1 |
|
932 |
||
933 |
ModuleDescriptor descriptor3 |
|
934 |
= new ModuleDescriptor.Builder("m3")
|
|
935 |
.requires("m2")
|
|
936 |
.build(); |
|
937 |
||
938 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, descriptor3); |
|
939 |
||
940 |
Configuration cf2 = resolveRequires(cf1, finder2, "m1", "m3"); |
|
941 |
||
942 |
assertTrue(cf2.parent().get() == cf1); |
|
943 |
||
944 |
assertTrue(cf2.modules().size() == 2); |
|
945 |
assertTrue(cf2.findModule("m1").isPresent());
|
|
946 |
assertTrue(cf2.findModule("m3").isPresent());
|
|
947 |
||
948 |
ResolvedModule m1_1 = cf1.findModule("m1").get();
|
|
949 |
ResolvedModule m1_2 = cf2.findModule("m1").get();
|
|
950 |
ResolvedModule m2 = cf1.findModule("m2").get();
|
|
951 |
ResolvedModule m3 = cf2.findModule("m3").get();
|
|
952 |
||
953 |
assertTrue(m1_1.configuration() == cf1); |
|
954 |
assertTrue(m1_2.configuration() == cf2); |
|
955 |
assertTrue(m3.configuration() == cf2); |
|
956 |
||
957 |
||
958 |
// check that m3 reads cf1/m1 and cf2/m2 |
|
959 |
assertTrue(m3.reads().size() == 2); |
|
960 |
assertTrue(m3.reads().contains(m1_1)); |
|
961 |
assertTrue(m3.reads().contains(m2)); |
|
962 |
} |
|
963 |
||
964 |
||
965 |
/** |
|
966 |
* Root module not found |
|
967 |
*/ |
|
968 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
969 |
public void testRootNotFound() {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
970 |
resolveRequires(ModuleFinder.of(), "m1"); |
| 36511 | 971 |
} |
972 |
||
973 |
||
974 |
/** |
|
975 |
* Direct dependency not found |
|
976 |
*/ |
|
977 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
978 |
public void testDirectDependencyNotFound() {
|
|
979 |
ModuleDescriptor descriptor1 |
|
980 |
= new ModuleDescriptor.Builder("m1").requires("m2").build();
|
|
981 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
982 |
resolveRequires(finder, "m1"); |
|
983 |
} |
|
984 |
||
985 |
||
986 |
/** |
|
987 |
* Transitive dependency not found |
|
988 |
*/ |
|
989 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
990 |
public void testTransitiveDependencyNotFound() {
|
|
991 |
ModuleDescriptor descriptor1 |
|
992 |
= new ModuleDescriptor.Builder("m1").requires("m2").build();
|
|
993 |
ModuleDescriptor descriptor2 |
|
994 |
= new ModuleDescriptor.Builder("m2").requires("m3").build();
|
|
995 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
996 |
resolveRequires(finder, "m1"); |
|
997 |
} |
|
998 |
||
999 |
||
1000 |
/** |
|
1001 |
* Service provider dependency not found |
|
1002 |
*/ |
|
1003 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1004 |
public void testServiceProviderDependencyNotFound() {
|
|
1005 |
||
1006 |
// service provider dependency (on m3) not found |
|
1007 |
||
1008 |
ModuleDescriptor descriptor1 |
|
1009 |
= new ModuleDescriptor.Builder("m1")
|
|
1010 |
.exports("p")
|
|
1011 |
.uses("p.S")
|
|
1012 |
.build(); |
|
1013 |
||
1014 |
ModuleDescriptor descriptor2 |
|
1015 |
= new ModuleDescriptor.Builder("m2")
|
|
1016 |
.requires("m1")
|
|
1017 |
.requires("m3")
|
|
1018 |
.conceals("q")
|
|
1019 |
.provides("p.S", "q.T")
|
|
1020 |
.build(); |
|
1021 |
||
1022 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1023 |
||
1024 |
// should throw ResolutionException because m3 is not found |
|
1025 |
Configuration cf = resolveRequiresAndUses(finder, "m1"); |
|
1026 |
} |
|
1027 |
||
1028 |
||
1029 |
/** |
|
1030 |
* Simple cycle. |
|
1031 |
*/ |
|
1032 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1033 |
public void testSimpleCycle() {
|
|
1034 |
ModuleDescriptor descriptor1 |
|
1035 |
= new ModuleDescriptor.Builder("m1").requires("m2").build();
|
|
1036 |
ModuleDescriptor descriptor2 |
|
1037 |
= new ModuleDescriptor.Builder("m2").requires("m3").build();
|
|
1038 |
ModuleDescriptor descriptor3 |
|
1039 |
= new ModuleDescriptor.Builder("m3").requires("m1").build();
|
|
1040 |
ModuleFinder finder |
|
1041 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
1042 |
resolveRequires(finder, "m1"); |
|
1043 |
} |
|
1044 |
||
1045 |
/** |
|
1046 |
* Basic test for detecting cycles involving a service provider module |
|
1047 |
*/ |
|
1048 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1049 |
public void testCycleInProvider() {
|
|
1050 |
||
1051 |
ModuleDescriptor descriptor1 |
|
1052 |
= new ModuleDescriptor.Builder("m1")
|
|
1053 |
.exports("p")
|
|
1054 |
.uses("p.S")
|
|
1055 |
.build(); |
|
1056 |
ModuleDescriptor descriptor2 |
|
1057 |
= new ModuleDescriptor.Builder("m2")
|
|
1058 |
.requires("m1")
|
|
1059 |
.requires("m3")
|
|
1060 |
.conceals("q")
|
|
1061 |
.provides("p.S", "q.T")
|
|
1062 |
.build(); |
|
1063 |
ModuleDescriptor descriptor3 |
|
1064 |
= new ModuleDescriptor.Builder("m3")
|
|
1065 |
.requires("m2")
|
|
1066 |
.build(); |
|
1067 |
||
1068 |
ModuleFinder finder |
|
1069 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
1070 |
||
1071 |
// should throw ResolutionException because of the m2 <--> m3 cycle |
|
1072 |
resolveRequiresAndUses(finder, "m1"); |
|
1073 |
} |
|
1074 |
||
1075 |
||
1076 |
/** |
|
1077 |
* Test two modules exporting package p to a module that reads both. |
|
1078 |
*/ |
|
1079 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1080 |
public void testPackageSuppliedByTwoOthers() {
|
|
1081 |
||
1082 |
ModuleDescriptor descriptor1 |
|
1083 |
= new ModuleDescriptor.Builder("m1")
|
|
1084 |
.requires("m2")
|
|
1085 |
.requires("m3")
|
|
1086 |
.build(); |
|
1087 |
||
1088 |
ModuleDescriptor descriptor2 |
|
1089 |
= new ModuleDescriptor.Builder("m2")
|
|
1090 |
.exports("p")
|
|
1091 |
.build(); |
|
1092 |
||
1093 |
ModuleDescriptor descriptor3 |
|
1094 |
= new ModuleDescriptor.Builder("m3")
|
|
1095 |
.exports("p", "m1")
|
|
1096 |
.build(); |
|
1097 |
||
1098 |
ModuleFinder finder |
|
1099 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
1100 |
||
1101 |
// m2 and m3 export package p to module m1 |
|
1102 |
resolveRequires(finder, "m1"); |
|
1103 |
} |
|
1104 |
||
1105 |
||
1106 |
/** |
|
1107 |
* Test the scenario where a module has a concealed package p and reads |
|
1108 |
* a module that exports package p. |
|
1109 |
*/ |
|
1110 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1111 |
public void testPackageSuppliedBySelfAndOther() {
|
|
1112 |
||
1113 |
ModuleDescriptor descriptor1 |
|
1114 |
= new ModuleDescriptor.Builder("m1")
|
|
1115 |
.requires("m2")
|
|
1116 |
.conceals("p")
|
|
1117 |
.build(); |
|
1118 |
||
1119 |
ModuleDescriptor descriptor2 |
|
1120 |
= new ModuleDescriptor.Builder("m2")
|
|
1121 |
.exports("p")
|
|
1122 |
.build(); |
|
1123 |
||
1124 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1125 |
||
1126 |
// m1 contains package p, module m2 exports package p to m1 |
|
1127 |
resolveRequires(finder, "m1"); |
|
1128 |
} |
|
1129 |
||
1130 |
||
1131 |
/** |
|
1132 |
* Test the scenario where a module has a concealed package p and reads |
|
1133 |
* a module that also has a concealed package p. |
|
1134 |
*/ |
|
1135 |
public void testPackagePrivateToSelfAndOther() {
|
|
1136 |
||
1137 |
ModuleDescriptor descriptor1 |
|
1138 |
= new ModuleDescriptor.Builder("m1")
|
|
1139 |
.requires("m2")
|
|
1140 |
.conceals("p")
|
|
1141 |
.build(); |
|
1142 |
||
1143 |
ModuleDescriptor descriptor2 |
|
1144 |
= new ModuleDescriptor.Builder("m2")
|
|
1145 |
.conceals("p")
|
|
1146 |
.build(); |
|
1147 |
||
1148 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1149 |
||
1150 |
Configuration cf = resolveRequires(finder, "m1"); |
|
1151 |
||
1152 |
assertTrue(cf.modules().size() == 2); |
|
1153 |
assertTrue(cf.findModule("m1").isPresent());
|
|
1154 |
assertTrue(cf.findModule("m2").isPresent());
|
|
1155 |
||
1156 |
// m1 reads m2, m2 reads nothing |
|
1157 |
ResolvedModule m1 = cf.findModule("m1").get();
|
|
1158 |
ResolvedModule m2 = cf.findModule("m2").get();
|
|
1159 |
assertTrue(m1.reads().size() == 1); |
|
1160 |
assertTrue(m1.reads().contains(m2)); |
|
1161 |
assertTrue(m2.reads().size() == 0); |
|
1162 |
} |
|
1163 |
||
1164 |
||
1165 |
/** |
|
1166 |
* Test the scenario where a module that exports a package that is also |
|
1167 |
* exported by a module that it reads in a parent layer. |
|
1168 |
*/ |
|
1169 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1170 |
public void testExportSamePackageAsBootLayer() {
|
|
1171 |
ModuleDescriptor descriptor |
|
1172 |
= new ModuleDescriptor.Builder("m1")
|
|
1173 |
.requires("java.base")
|
|
1174 |
.exports("java.lang")
|
|
1175 |
.build(); |
|
1176 |
||
1177 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor); |
|
1178 |
||
1179 |
Configuration bootConfiguration = Layer.boot().configuration(); |
|
1180 |
||
1181 |
// m1 contains package java.lang, java.base exports package java.lang to m1 |
|
1182 |
resolveRequires(bootConfiguration, finder, "m1"); |
|
1183 |
} |
|
1184 |
||
1185 |
||
1186 |
/** |
|
1187 |
* Test "uses p.S" where p is a concealed package in the same module. |
|
1188 |
*/ |
|
1189 |
public void testConcealedService1() {
|
|
1190 |
ModuleDescriptor descriptor1 |
|
1191 |
= new ModuleDescriptor.Builder("m1")
|
|
1192 |
.conceals("p")
|
|
1193 |
.uses("p.S")
|
|
1194 |
.build(); |
|
1195 |
||
1196 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1197 |
||
1198 |
Configuration cf = resolveRequires(finder, "m1"); |
|
1199 |
||
1200 |
assertTrue(cf.modules().size() == 1); |
|
1201 |
assertTrue(cf.findModule("m1").isPresent());
|
|
1202 |
} |
|
1203 |
||
1204 |
||
1205 |
/** |
|
1206 |
* Test "uses p.S" where p is a concealed package in a different module. |
|
1207 |
*/ |
|
1208 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1209 |
public void testConcealedService2() {
|
|
1210 |
ModuleDescriptor descriptor1 |
|
1211 |
= new ModuleDescriptor.Builder("m1")
|
|
1212 |
.conceals("p")
|
|
1213 |
.build(); |
|
1214 |
||
1215 |
ModuleDescriptor descriptor2 |
|
1216 |
= new ModuleDescriptor.Builder("m2")
|
|
1217 |
.requires("m1")
|
|
1218 |
.uses("p.S")
|
|
1219 |
.build(); |
|
1220 |
||
1221 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1222 |
||
1223 |
// m2 does not read a module that exports p |
|
1224 |
resolveRequires(finder, "m2"); |
|
1225 |
} |
|
1226 |
||
1227 |
||
1228 |
/** |
|
1229 |
* Test "provides p.S" where p is a concealed package in the same module. |
|
1230 |
*/ |
|
1231 |
public void testConcealedService3() {
|
|
1232 |
ModuleDescriptor descriptor1 |
|
1233 |
= new ModuleDescriptor.Builder("m1")
|
|
1234 |
.conceals("p")
|
|
1235 |
.conceals("q")
|
|
1236 |
.provides("p.S", "q.S1")
|
|
1237 |
.build(); |
|
1238 |
||
1239 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1240 |
||
1241 |
Configuration cf = resolveRequires(finder, "m1"); |
|
1242 |
||
1243 |
assertTrue(cf.modules().size() == 1); |
|
1244 |
assertTrue(cf.findModule("m1").isPresent());
|
|
1245 |
} |
|
1246 |
||
1247 |
||
1248 |
/** |
|
1249 |
* Test "provides p.S" where p is a concealed package in a different module. |
|
1250 |
*/ |
|
1251 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1252 |
public void testConcealedService4() {
|
|
1253 |
ModuleDescriptor descriptor1 |
|
1254 |
= new ModuleDescriptor.Builder("m1")
|
|
1255 |
.conceals("p")
|
|
1256 |
.build(); |
|
1257 |
||
1258 |
ModuleDescriptor descriptor2 |
|
1259 |
= new ModuleDescriptor.Builder("m2")
|
|
1260 |
.requires("m1")
|
|
1261 |
.conceals("q")
|
|
1262 |
.provides("p.S", "q.S1")
|
|
1263 |
.build(); |
|
1264 |
||
1265 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1266 |
||
1267 |
// m2 does not read a module that exports p |
|
1268 |
resolveRequires(finder, "m2"); |
|
1269 |
} |
|
1270 |
||
1271 |
||
1272 |
/** |
|
1273 |
* Test "uses p.S" where p is not exported to the module. |
|
1274 |
*/ |
|
1275 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1276 |
public void testServiceTypePackageNotExported1() {
|
|
1277 |
ModuleDescriptor descriptor1 |
|
1278 |
= new ModuleDescriptor.Builder("m1")
|
|
1279 |
.uses("p.S")
|
|
1280 |
.build(); |
|
1281 |
||
1282 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1283 |
||
1284 |
// m1 does not read a module that exports p |
|
1285 |
resolveRequires(finder, "m1"); |
|
1286 |
} |
|
1287 |
||
1288 |
||
1289 |
/** |
|
1290 |
* Test "provides p.S" where p is not exported to the module. |
|
1291 |
*/ |
|
1292 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1293 |
public void testServiceTypePackageNotExported2() {
|
|
1294 |
ModuleDescriptor descriptor1 |
|
1295 |
= new ModuleDescriptor.Builder("m1")
|
|
1296 |
.conceals("q")
|
|
1297 |
.provides("p.S", "q.T")
|
|
1298 |
.build(); |
|
1299 |
||
1300 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1301 |
||
1302 |
// m1 does not read a module that exports p |
|
1303 |
resolveRequires(finder, "m1"); |
|
1304 |
} |
|
1305 |
||
1306 |
||
1307 |
/** |
|
|
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
1308 |
* Test "provides p.S with q.T" where q.T is not local |
| 36511 | 1309 |
*/ |
1310 |
@Test(expectedExceptions = { ResolutionException.class })
|
|
1311 |
public void testProviderPackageNotLocal() {
|
|
1312 |
ModuleDescriptor descriptor1 |
|
1313 |
= new ModuleDescriptor.Builder("m1")
|
|
1314 |
.exports("p")
|
|
1315 |
.exports("q")
|
|
1316 |
.build(); |
|
1317 |
||
1318 |
ModuleDescriptor descriptor2 |
|
1319 |
= new ModuleDescriptor.Builder("m2")
|
|
1320 |
.requires("m1")
|
|
1321 |
.provides("p.S", "q.T")
|
|
1322 |
.build(); |
|
1323 |
||
1324 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1325 |
||
1326 |
// q.T not in module m2 |
|
1327 |
resolveRequires(finder, "m2"); |
|
1328 |
} |
|
1329 |
||
1330 |
||
1331 |
/** |
|
1332 |
* Test the empty configuration. |
|
1333 |
*/ |
|
1334 |
public void testEmptyConfiguration() {
|
|
1335 |
Configuration cf = Configuration.empty(); |
|
1336 |
||
1337 |
assertFalse(cf.parent().isPresent()); |
|
1338 |
||
1339 |
assertTrue(cf.modules().isEmpty()); |
|
1340 |
assertFalse(cf.findModule("java.base").isPresent());
|
|
1341 |
} |
|
1342 |
||
1343 |
||
1344 |
// platform specific modules |
|
1345 |
||
1346 |
@DataProvider(name = "platformmatch") |
|
1347 |
public Object[][] createPlatformMatches() {
|
|
1348 |
return new Object[][]{
|
|
1349 |
||
1350 |
{ "linux-*-*", "*-*-*" },
|
|
1351 |
{ "*-arm-*", "*-*-*" },
|
|
1352 |
{ "*-*-2.6", "*-*-*" },
|
|
1353 |
||
1354 |
{ "linux-arm-*", "*-*-*" },
|
|
1355 |
{ "linux-*-2.6", "*-*-*" },
|
|
1356 |
{ "*-arm-2.6", "*-*-*" },
|
|
1357 |
||
1358 |
{ "linux-arm-2.6", "*-*-*" },
|
|
1359 |
||
1360 |
{ "linux-*-*", "linux-*-*" },
|
|
1361 |
{ "*-arm-*", "*-arm-*" },
|
|
1362 |
{ "*-*-2.6", "*-*-2.6" },
|
|
1363 |
||
1364 |
{ "linux-arm-*", "linux-arm-*" },
|
|
1365 |
{ "linux-arm-*", "linux-*-*" },
|
|
1366 |
{ "linux-*-2.6", "linux-*-2.6" },
|
|
1367 |
{ "linux-*-2.6", "linux-arm-*" },
|
|
1368 |
||
1369 |
{ "linux-arm-2.6", "linux-arm-2.6" },
|
|
1370 |
||
1371 |
}; |
|
1372 |
||
1373 |
}; |
|
1374 |
||
1375 |
@DataProvider(name = "platformmismatch") |
|
1376 |
public Object[][] createBad() {
|
|
1377 |
return new Object[][] {
|
|
1378 |
||
1379 |
{ "linux-*-*", "solaris-*-*" },
|
|
1380 |
{ "linux-x86-*", "linux-arm-*" },
|
|
1381 |
{ "linux-*-2.4", "linux-x86-2.6" },
|
|
1382 |
}; |
|
1383 |
} |
|
1384 |
||
1385 |
/** |
|
1386 |
* Test creating a configuration containing platform specific modules. |
|
1387 |
*/ |
|
1388 |
@Test(dataProvider = "platformmatch") |
|
1389 |
public void testPlatformMatch(String s1, String s2) {
|
|
1390 |
||
1391 |
ModuleDescriptor.Builder builder |
|
1392 |
= new ModuleDescriptor.Builder("m1").requires("m2");
|
|
1393 |
||
1394 |
String[] s = s1.split("-");
|
|
1395 |
if (!s[0].equals("*"))
|
|
1396 |
builder.osName(s[0]); |
|
1397 |
if (!s[1].equals("*"))
|
|
1398 |
builder.osArch(s[1]); |
|
1399 |
if (!s[2].equals("*"))
|
|
1400 |
builder.osVersion(s[2]); |
|
1401 |
||
1402 |
ModuleDescriptor descriptor1 = builder.build(); |
|
1403 |
||
1404 |
builder = new ModuleDescriptor.Builder("m2");
|
|
1405 |
||
1406 |
s = s2.split("-");
|
|
1407 |
if (!s[0].equals("*"))
|
|
1408 |
builder.osName(s[0]); |
|
1409 |
if (!s[1].equals("*"))
|
|
1410 |
builder.osArch(s[1]); |
|
1411 |
if (!s[2].equals("*"))
|
|
1412 |
builder.osVersion(s[2]); |
|
1413 |
||
1414 |
ModuleDescriptor descriptor2 = builder.build(); |
|
1415 |
||
1416 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1417 |
||
1418 |
Configuration cf = resolveRequires(finder, "m1"); |
|
1419 |
||
1420 |
assertTrue(cf.modules().size() == 2); |
|
1421 |
assertTrue(cf.findModule("m1").isPresent());
|
|
1422 |
assertTrue(cf.findModule("m2").isPresent());
|
|
1423 |
} |
|
1424 |
||
1425 |
/** |
|
1426 |
* Test attempting to create a configuration with modules for different |
|
1427 |
* platforms. |
|
1428 |
*/ |
|
1429 |
@Test(dataProvider = "platformmismatch", |
|
1430 |
expectedExceptions = ResolutionException.class ) |
|
1431 |
public void testPlatformMisMatch(String s1, String s2) {
|
|
1432 |
testPlatformMatch(s1, s2); |
|
1433 |
} |
|
1434 |
||
1435 |
||
1436 |
// null handling |
|
1437 |
||
1438 |
// finder1, finder2, roots |
|
1439 |
||
1440 |
||
1441 |
@Test(expectedExceptions = { NullPointerException.class })
|
|
1442 |
public void testResolveRequiresWithNull1() {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1443 |
resolveRequires((ModuleFinder)null, ModuleFinder.of()); |
| 36511 | 1444 |
} |
1445 |
||
1446 |
@Test(expectedExceptions = { NullPointerException.class })
|
|
1447 |
public void testResolveRequiresWithNull2() {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1448 |
resolveRequires(ModuleFinder.of(), (ModuleFinder)null); |
| 36511 | 1449 |
} |
1450 |
||
1451 |
@Test(expectedExceptions = { NullPointerException.class })
|
|
1452 |
public void testResolveRequiresAndUsesWithNull1() {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1453 |
resolveRequiresAndUses((ModuleFinder) null, ModuleFinder.of()); |
| 36511 | 1454 |
} |
1455 |
||
1456 |
@Test(expectedExceptions = { NullPointerException.class })
|
|
1457 |
public void testResolveRequiresAndUsesWithNull2() {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1458 |
resolveRequiresAndUses(ModuleFinder.of(), (ModuleFinder) null); |
| 36511 | 1459 |
} |
1460 |
||
1461 |
@Test(expectedExceptions = { NullPointerException.class })
|
|
1462 |
public void testFindModuleWithNull() {
|
|
1463 |
Configuration.empty().findModule(null); |
|
1464 |
} |
|
1465 |
||
1466 |
// immutable sets |
|
1467 |
||
1468 |
@Test(expectedExceptions = { UnsupportedOperationException.class })
|
|
1469 |
public void testImmutableSet1() {
|
|
1470 |
Configuration cf = Layer.boot().configuration(); |
|
1471 |
ResolvedModule base = cf.findModule("java.base").get();
|
|
1472 |
cf.modules().add(base); |
|
1473 |
} |
|
1474 |
||
1475 |
@Test(expectedExceptions = { UnsupportedOperationException.class })
|
|
1476 |
public void testImmutableSet2() {
|
|
1477 |
Configuration cf = Layer.boot().configuration(); |
|
1478 |
ResolvedModule base = cf.findModule("java.base").get();
|
|
1479 |
base.reads().add(base); |
|
1480 |
} |
|
1481 |
||
1482 |
||
1483 |
/** |
|
1484 |
* Invokes parent.resolveRequires(...) |
|
1485 |
*/ |
|
1486 |
private Configuration resolveRequires(Configuration parent, |
|
1487 |
ModuleFinder before, |
|
1488 |
ModuleFinder after, |
|
1489 |
String... roots) {
|
|
1490 |
return parent.resolveRequires(before, after, Set.of(roots)); |
|
1491 |
} |
|
1492 |
||
1493 |
private Configuration resolveRequires(Configuration parent, |
|
1494 |
ModuleFinder before, |
|
1495 |
String... roots) {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1496 |
return resolveRequires(parent, before, ModuleFinder.of(), roots); |
| 36511 | 1497 |
} |
1498 |
||
1499 |
private Configuration resolveRequires(ModuleFinder before, |
|
1500 |
ModuleFinder after, |
|
1501 |
String... roots) {
|
|
1502 |
return resolveRequires(Configuration.empty(), before, after, roots); |
|
1503 |
} |
|
1504 |
||
1505 |
private Configuration resolveRequires(ModuleFinder before, |
|
1506 |
String... roots) {
|
|
1507 |
return resolveRequires(Configuration.empty(), before, roots); |
|
1508 |
} |
|
1509 |
||
1510 |
||
1511 |
/** |
|
1512 |
* Invokes parent.resolveRequiresAndUses(...) |
|
1513 |
*/ |
|
1514 |
private Configuration resolveRequiresAndUses(Configuration parent, |
|
1515 |
ModuleFinder before, |
|
1516 |
ModuleFinder after, |
|
1517 |
String... roots) {
|
|
1518 |
return parent.resolveRequiresAndUses(before, after, Set.of(roots)); |
|
1519 |
} |
|
1520 |
||
1521 |
private Configuration resolveRequiresAndUses(Configuration parent, |
|
1522 |
ModuleFinder before, |
|
1523 |
String... roots) {
|
|
|
38457
3d019217e322
8152650: ModuleFinder.compose should accept varargs
alanb
parents:
36511
diff
changeset
|
1524 |
return resolveRequiresAndUses(parent, before, ModuleFinder.of(), roots); |
| 36511 | 1525 |
} |
1526 |
||
1527 |
private Configuration resolveRequiresAndUses(ModuleFinder before, |
|
1528 |
ModuleFinder after, |
|
1529 |
String... roots) {
|
|
1530 |
return resolveRequiresAndUses(Configuration.empty(), before, after, roots); |
|
1531 |
} |
|
1532 |
||
1533 |
private Configuration resolveRequiresAndUses(ModuleFinder before, |
|
1534 |
String... roots) {
|
|
1535 |
return resolveRequiresAndUses(Configuration.empty(), before, roots); |
|
1536 |
} |
|
1537 |
||
1538 |
||
1539 |
/** |
|
1540 |
* Returns {@code true} if the configuration contains module mn1
|
|
1541 |
* that reads module mn2. |
|
1542 |
*/ |
|
1543 |
static boolean reads(Configuration cf, String mn1, String mn2) {
|
|
1544 |
Optional<ResolvedModule> om1 = cf.findModule(mn1); |
|
1545 |
if (!om1.isPresent()) |
|
1546 |
return false; |
|
1547 |
||
1548 |
return om1.get().reads().stream() |
|
1549 |
.map(ResolvedModule::name) |
|
1550 |
.anyMatch(mn2::equals); |
|
1551 |
} |
|
1552 |
||
1553 |
||
1554 |
} |