author | mchung |
Tue, 06 Nov 2018 10:01:16 -0800 | |
changeset 52427 | 3c6aa484536c |
parent 52102 | 19f6b12df31a |
permissions | -rw-r--r-- |
36511 | 1 |
/* |
52427
3c6aa484536c
8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents:
52102
diff
changeset
|
2 |
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. |
36511 | 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 |
|
52102 | 26 |
* @library /test/lib |
52427
3c6aa484536c
8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents:
52102
diff
changeset
|
27 |
* @modules java.base/jdk.internal.access |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
28 |
* java.base/jdk.internal.module |
52102 | 29 |
* @build ConfigurationTest |
30 |
* jdk.test.lib.util.ModuleUtils |
|
36511 | 31 |
* @run testng ConfigurationTest |
32 |
* @summary Basic tests for java.lang.module.Configuration |
|
33 |
*/ |
|
34 |
||
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
35 |
import java.io.IOException; |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
36 |
import java.io.OutputStream; |
36511 | 37 |
import java.lang.module.Configuration; |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
38 |
import java.lang.module.FindException; |
36511 | 39 |
import java.lang.module.ModuleDescriptor; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
40 |
import java.lang.module.ModuleDescriptor.Requires; |
36511 | 41 |
import java.lang.module.ModuleFinder; |
42 |
import java.lang.module.ResolutionException; |
|
43 |
import java.lang.module.ResolvedModule; |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
44 |
import java.nio.file.Files; |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
45 |
import java.nio.file.Path; |
45833
882f4885ec80
8183536: Update jdk tests to allow for unique test classes directory
alanb
parents:
45004
diff
changeset
|
46 |
import java.nio.file.Paths; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
47 |
import java.util.List; |
36511 | 48 |
import java.util.Set; |
49 |
||
52102 | 50 |
import jdk.test.lib.util.ModuleUtils; |
51 |
||
52427
3c6aa484536c
8211122: Reduce the number of internal classes made accessible to jdk.unsupported
mchung
parents:
52102
diff
changeset
|
52 |
import jdk.internal.access.SharedSecrets; |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
53 |
import jdk.internal.module.ModuleInfoWriter; |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
54 |
import jdk.internal.module.ModuleTarget; |
36511 | 55 |
import org.testng.annotations.DataProvider; |
56 |
import org.testng.annotations.Test; |
|
57 |
import static org.testng.Assert.*; |
|
58 |
||
59 |
@Test |
|
60 |
public class ConfigurationTest { |
|
61 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
62 |
/** |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
63 |
* Creates a "non-strict" builder for building a module. This allows the |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
64 |
* test the create ModuleDescriptor objects that do not require java.base. |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
65 |
*/ |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
66 |
private static ModuleDescriptor.Builder newBuilder(String mn) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
67 |
return SharedSecrets.getJavaLangModuleAccess() |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
68 |
.newModuleBuilder(mn, false, Set.of()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
69 |
} |
36511 | 70 |
|
71 |
/** |
|
72 |
* Basic test of resolver |
|
73 |
* m1 requires m2, m2 requires m3 |
|
74 |
*/ |
|
75 |
public void testBasic() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
76 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 77 |
.requires("m2") |
78 |
.build(); |
|
79 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
80 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 81 |
.requires("m3") |
82 |
.build(); |
|
83 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
84 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 85 |
.build(); |
86 |
||
87 |
ModuleFinder finder |
|
88 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
89 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
90 |
Configuration cf = resolve(finder, "m1"); |
36511 | 91 |
|
92 |
assertTrue(cf.modules().size() == 3); |
|
93 |
||
94 |
assertTrue(cf.findModule("m1").isPresent()); |
|
95 |
assertTrue(cf.findModule("m2").isPresent()); |
|
96 |
assertTrue(cf.findModule("m3").isPresent()); |
|
97 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
98 |
assertTrue(cf.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
99 |
assertTrue(cf.parents().get(0) == Configuration.empty()); |
36511 | 100 |
|
101 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
102 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
103 |
ResolvedModule m3 = cf.findModule("m3").get(); |
|
104 |
||
105 |
// m1 reads m2 |
|
106 |
assertTrue(m1.reads().size() == 1); |
|
107 |
assertTrue(m1.reads().contains(m2)); |
|
108 |
||
109 |
// m2 reads m3 |
|
110 |
assertTrue(m2.reads().size() == 1); |
|
111 |
assertTrue(m2.reads().contains(m3)); |
|
112 |
||
113 |
// m3 reads nothing |
|
114 |
assertTrue(m3.reads().size() == 0); |
|
115 |
||
116 |
// toString |
|
117 |
assertTrue(cf.toString().contains("m1")); |
|
118 |
assertTrue(cf.toString().contains("m2")); |
|
119 |
assertTrue(cf.toString().contains("m3")); |
|
120 |
} |
|
121 |
||
122 |
||
123 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
124 |
* Basic test of "requires transitive": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
125 |
* m1 requires m2, m2 requires transitive m3 |
36511 | 126 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
127 |
public void testRequiresTransitive1() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
128 |
// m1 requires m2, m2 requires transitive m3 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
129 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 130 |
.requires("m2") |
131 |
.build(); |
|
132 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
133 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
134 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m3") |
36511 | 135 |
.build(); |
136 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
137 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 138 |
.build(); |
139 |
||
140 |
ModuleFinder finder |
|
141 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
142 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
143 |
Configuration cf = resolve(finder, "m1"); |
36511 | 144 |
|
145 |
assertTrue(cf.modules().size() == 3); |
|
146 |
||
147 |
assertTrue(cf.findModule("m1").isPresent()); |
|
148 |
assertTrue(cf.findModule("m2").isPresent()); |
|
149 |
assertTrue(cf.findModule("m3").isPresent()); |
|
150 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
151 |
assertTrue(cf.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
152 |
assertTrue(cf.parents().get(0) == Configuration.empty()); |
36511 | 153 |
|
154 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
155 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
156 |
ResolvedModule m3 = cf.findModule("m3").get(); |
|
157 |
||
158 |
// m1 reads m2 and m3 |
|
159 |
assertTrue(m1.reads().size() == 2); |
|
160 |
assertTrue(m1.reads().contains(m2)); |
|
161 |
assertTrue(m1.reads().contains(m3)); |
|
162 |
||
163 |
// m2 reads m3 |
|
164 |
assertTrue(m2.reads().size() == 1); |
|
165 |
assertTrue(m2.reads().contains(m3)); |
|
166 |
||
167 |
// m3 reads nothing |
|
168 |
assertTrue(m3.reads().size() == 0); |
|
169 |
} |
|
170 |
||
171 |
||
172 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
173 |
* Basic test of "requires transitive" with configurations. |
36511 | 174 |
* |
175 |
* The test consists of three configurations: |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
176 |
* - Configuration cf1: m1, m2 requires transitive m1 |
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
177 |
* - Configuration cf2: m3 requires m2 |
36511 | 178 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
179 |
public void testRequiresTransitive2() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
180 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
181 |
// cf1: m1 and m2, m2 requires transitive m1 |
36511 | 182 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
183 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 184 |
.build(); |
185 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
186 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
187 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
36511 | 188 |
.build(); |
189 |
||
190 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
191 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
192 |
Configuration cf1 = resolve(finder1, "m2"); |
36511 | 193 |
|
194 |
assertTrue(cf1.modules().size() == 2); |
|
195 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
196 |
assertTrue(cf1.findModule("m2").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
197 |
assertTrue(cf1.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
198 |
assertTrue(cf1.parents().get(0) == Configuration.empty()); |
36511 | 199 |
|
200 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
|
201 |
ResolvedModule m2 = cf1.findModule("m2").get(); |
|
202 |
||
203 |
assertTrue(m1.reads().size() == 0); |
|
204 |
assertTrue(m2.reads().size() == 1); |
|
205 |
assertTrue(m2.reads().contains(m1)); |
|
206 |
||
207 |
||
208 |
// cf2: m3, m3 requires m2 |
|
209 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
210 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 211 |
.requires("m2") |
212 |
.build(); |
|
213 |
||
214 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3); |
|
215 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
216 |
Configuration cf2 = resolve(cf1, finder2, "m3"); |
36511 | 217 |
|
218 |
assertTrue(cf2.modules().size() == 1); |
|
219 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent |
|
220 |
assertTrue(cf2.findModule("m2").isPresent()); // in parent |
|
221 |
assertTrue(cf2.findModule("m3").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
222 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
223 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 224 |
|
225 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
|
226 |
assertTrue(m3.configuration() == cf2); |
|
227 |
assertTrue(m3.reads().size() == 2); |
|
228 |
assertTrue(m3.reads().contains(m1)); |
|
229 |
assertTrue(m3.reads().contains(m2)); |
|
230 |
} |
|
231 |
||
232 |
||
233 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
234 |
* Basic test of "requires transitive" with configurations. |
36511 | 235 |
* |
236 |
* The test consists of three configurations: |
|
237 |
* - Configuration cf1: m1 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
238 |
* - Configuration cf2: m2 requires transitive m1, m3 requires m2 |
36511 | 239 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
240 |
public void testRequiresTransitive3() { |
36511 | 241 |
|
242 |
// cf1: m1 |
|
243 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
244 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
36511 | 245 |
|
246 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
247 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
248 |
Configuration cf1 = resolve(finder1, "m1"); |
36511 | 249 |
|
250 |
assertTrue(cf1.modules().size() == 1); |
|
251 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
252 |
assertTrue(cf1.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
253 |
assertTrue(cf1.parents().get(0) == Configuration.empty()); |
36511 | 254 |
|
255 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
|
256 |
assertTrue(m1.reads().size() == 0); |
|
257 |
||
258 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
259 |
// cf2: m2, m3: m2 requires transitive m1, m3 requires m2 |
36511 | 260 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
261 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
262 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
36511 | 263 |
.build(); |
264 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
265 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 266 |
.requires("m2") |
267 |
.build(); |
|
268 |
||
269 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2, descriptor3); |
|
270 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
271 |
Configuration cf2 = resolve(cf1, finder2, "m3"); |
36511 | 272 |
|
273 |
assertTrue(cf2.modules().size() == 2); |
|
274 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent |
|
275 |
assertTrue(cf2.findModule("m2").isPresent()); |
|
276 |
assertTrue(cf2.findModule("m3").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
277 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
278 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 279 |
|
280 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
|
281 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
|
282 |
||
283 |
assertTrue(m2.configuration() == cf2); |
|
284 |
assertTrue(m2.reads().size() == 1); |
|
285 |
assertTrue(m2.reads().contains(m1)); |
|
286 |
||
287 |
assertTrue(m3.configuration() == cf2); |
|
288 |
assertTrue(m3.reads().size() == 2); |
|
289 |
assertTrue(m3.reads().contains(m1)); |
|
290 |
assertTrue(m3.reads().contains(m2)); |
|
291 |
} |
|
292 |
||
293 |
||
294 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
295 |
* Basic test of "requires transitive" with configurations. |
36511 | 296 |
* |
297 |
* The test consists of three configurations: |
|
298 |
* - Configuration cf1: m1 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
299 |
* - Configuration cf2: m2 requires transitive m1 |
39124
2f46f5082cd7
8159879: Some typo and minor test bugs in ava/lang/module/ModuleReferenceTest.java and ConfigurationTest.java
mli
parents:
38457
diff
changeset
|
300 |
* - Configuraiton cf3: m3 requires m2 |
36511 | 301 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
302 |
public void testRequiresTransitive4() { |
36511 | 303 |
|
304 |
// cf1: m1 |
|
305 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
306 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
36511 | 307 |
|
308 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
309 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
310 |
Configuration cf1 = resolve(finder1, "m1"); |
36511 | 311 |
|
312 |
assertTrue(cf1.modules().size() == 1); |
|
313 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
314 |
assertTrue(cf1.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
315 |
assertTrue(cf1.parents().get(0) == Configuration.empty()); |
36511 | 316 |
|
317 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
|
318 |
assertTrue(m1.reads().size() == 0); |
|
319 |
||
320 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
321 |
// cf2: m2 requires transitive m1 |
36511 | 322 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
323 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
324 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
36511 | 325 |
.build(); |
326 |
||
327 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
328 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
329 |
Configuration cf2 = resolve(cf1, finder2, "m2"); |
36511 | 330 |
|
331 |
assertTrue(cf2.modules().size() == 1); |
|
332 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent |
|
333 |
assertTrue(cf2.findModule("m2").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
334 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
335 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 336 |
|
337 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
|
338 |
||
339 |
assertTrue(m2.configuration() == cf2); |
|
340 |
assertTrue(m2.reads().size() == 1); |
|
341 |
assertTrue(m2.reads().contains(m1)); |
|
342 |
||
343 |
||
344 |
// cf3: m3 requires m2 |
|
345 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
346 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 347 |
.requires("m2") |
348 |
.build(); |
|
349 |
||
350 |
ModuleFinder finder3 = ModuleUtils.finderOf(descriptor3); |
|
351 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
352 |
Configuration cf3 = resolve(cf2, finder3, "m3"); |
36511 | 353 |
|
354 |
assertTrue(cf3.modules().size() == 1); |
|
355 |
assertTrue(cf3.findModule("m1").isPresent()); // in parent |
|
356 |
assertTrue(cf3.findModule("m2").isPresent()); // in parent |
|
357 |
assertTrue(cf3.findModule("m3").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
358 |
assertTrue(cf3.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
359 |
assertTrue(cf3.parents().get(0) == cf2); |
36511 | 360 |
|
361 |
ResolvedModule m3 = cf3.findModule("m3").get(); |
|
362 |
||
363 |
assertTrue(m3.configuration() == cf3); |
|
364 |
assertTrue(m3.reads().size() == 2); |
|
365 |
assertTrue(m3.reads().contains(m1)); |
|
366 |
assertTrue(m3.reads().contains(m2)); |
|
367 |
} |
|
368 |
||
369 |
||
370 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
371 |
* Basic test of "requires transitive" with configurations. |
36511 | 372 |
* |
373 |
* The test consists of two configurations: |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
374 |
* - Configuration cf1: m1, m2 requires transitive m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
375 |
* - Configuration cf2: m3 requires transitive m2, m4 requires m3 |
36511 | 376 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
377 |
public void testRequiresTransitive5() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
378 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
379 |
// cf1: m1, m2 requires transitive m1 |
36511 | 380 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
381 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 382 |
.build(); |
383 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
384 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
385 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
36511 | 386 |
.build(); |
387 |
||
388 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
389 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
390 |
Configuration cf1 = resolve(finder1, "m2"); |
36511 | 391 |
|
392 |
assertTrue(cf1.modules().size() == 2); |
|
393 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
394 |
assertTrue(cf1.findModule("m2").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
395 |
assertTrue(cf1.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
396 |
assertTrue(cf1.parents().get(0) == Configuration.empty()); |
36511 | 397 |
|
398 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
|
399 |
ResolvedModule m2 = cf1.findModule("m2").get(); |
|
400 |
||
401 |
assertTrue(m1.configuration() == cf1); |
|
402 |
assertTrue(m1.reads().size() == 0); |
|
403 |
||
404 |
assertTrue(m2.configuration() == cf1); |
|
405 |
assertTrue(m2.reads().size() == 1); |
|
406 |
assertTrue(m2.reads().contains(m1)); |
|
407 |
||
408 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
409 |
// cf2: m3 requires transitive m2, m4 requires m3 |
36511 | 410 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
411 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
412 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m2") |
36511 | 413 |
.build(); |
414 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
415 |
ModuleDescriptor descriptor4 = newBuilder("m4") |
36511 | 416 |
.requires("m3") |
417 |
.build(); |
|
418 |
||
419 |
||
420 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4); |
|
421 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
422 |
Configuration cf2 = resolve(cf1, finder2, "m3", "m4"); |
36511 | 423 |
|
424 |
assertTrue(cf2.modules().size() == 2); |
|
425 |
assertTrue(cf2.findModule("m1").isPresent()); // in parent |
|
426 |
assertTrue(cf2.findModule("m2").isPresent()); // in parent |
|
427 |
assertTrue(cf2.findModule("m3").isPresent()); |
|
428 |
assertTrue(cf2.findModule("m4").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
429 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
430 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 431 |
|
432 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
|
433 |
ResolvedModule m4 = cf2.findModule("m4").get(); |
|
434 |
||
435 |
assertTrue(m3.configuration() == cf2); |
|
436 |
assertTrue(m3.reads().size() == 2); |
|
437 |
assertTrue(m3.reads().contains(m1)); |
|
438 |
assertTrue(m3.reads().contains(m2)); |
|
439 |
||
440 |
assertTrue(m4.configuration() == cf2); |
|
441 |
assertTrue(m4.reads().size() == 3); |
|
442 |
assertTrue(m4.reads().contains(m1)); |
|
443 |
assertTrue(m4.reads().contains(m2)); |
|
444 |
assertTrue(m4.reads().contains(m3)); |
|
445 |
} |
|
446 |
||
447 |
||
448 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
449 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
450 |
* m1 requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
451 |
* m2 is not observable |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
452 |
* resolve m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
453 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
454 |
public void testRequiresStatic1() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
455 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
456 |
.requires(Set.of(Requires.Modifier.STATIC), "m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
457 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
458 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
459 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
460 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
461 |
Configuration cf = resolve(finder, "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
462 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
463 |
assertTrue(cf.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
464 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
465 |
ResolvedModule m1 = cf.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
466 |
assertTrue(m1.reads().size() == 0); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
467 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
468 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
469 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
470 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
471 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
472 |
* m1 requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
473 |
* m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
474 |
* resolve m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
475 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
476 |
public void testRequiresStatic2() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
477 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
478 |
.requires(Set.of(Requires.Modifier.STATIC), "m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
479 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
480 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
481 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
482 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
483 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
484 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
485 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
486 |
Configuration cf = resolve(finder, "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
487 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
488 |
assertTrue(cf.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
489 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
490 |
ResolvedModule m1 = cf.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
491 |
assertTrue(m1.reads().size() == 0); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
492 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
493 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
494 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
495 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
496 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
497 |
* m1 requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
498 |
* m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
499 |
* resolve m1, m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
500 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
501 |
public void testRequiresStatic3() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
502 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
503 |
.requires(Set.of(Requires.Modifier.STATIC), "m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
504 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
505 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
506 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
507 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
508 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
509 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
510 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
511 |
Configuration cf = resolve(finder, "m1", "m2"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
512 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
513 |
assertTrue(cf.modules().size() == 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
514 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
515 |
ResolvedModule m1 = cf.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
516 |
ResolvedModule m2 = cf.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
517 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
518 |
assertTrue(m1.reads().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
519 |
assertTrue(m1.reads().contains(m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
520 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
521 |
assertTrue(m2.reads().size() == 0); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
522 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
523 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
524 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
525 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
526 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
527 |
* m1 requires m2, m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
528 |
* m2 requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
529 |
* m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
530 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
531 |
public void testRequiresStatic4() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
532 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
533 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
534 |
.requires("m3") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
535 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
536 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
537 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
538 |
.requires(Set.of(Requires.Modifier.STATIC), "m3") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
539 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
540 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
541 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
542 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
543 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
544 |
ModuleFinder finder |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
545 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
546 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
547 |
Configuration cf = resolve(finder, "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
548 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
549 |
assertTrue(cf.modules().size() == 3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
550 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
551 |
ResolvedModule m1 = cf.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
552 |
ResolvedModule m2 = cf.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
553 |
ResolvedModule m3 = cf.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
554 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
555 |
assertTrue(m1.reads().size() == 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
556 |
assertTrue(m1.reads().contains(m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
557 |
assertTrue(m1.reads().contains(m3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
558 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
559 |
assertTrue(m2.reads().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
560 |
assertTrue(m2.reads().contains(m3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
561 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
562 |
assertTrue(m3.reads().size() == 0); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
563 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
564 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
565 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
566 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
567 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
568 |
* The test consists of three configurations: |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
569 |
* - Configuration cf1: m1, m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
570 |
* - Configuration cf2: m3 requires m1, requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
571 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
572 |
public void testRequiresStatic5() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
573 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
574 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
575 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
576 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
577 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
578 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
579 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
580 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
581 |
Configuration cf1 = resolve(finder1, "m1", "m2"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
582 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
583 |
assertTrue(cf1.modules().size() == 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
584 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
585 |
assertTrue(cf1.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
586 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
587 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
588 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
589 |
.requires(Set.of(Requires.Modifier.STATIC), "m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
590 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
591 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
592 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
593 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
594 |
Configuration cf2 = resolve(cf1, finder2, "m3"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
595 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
596 |
assertTrue(cf2.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
597 |
assertTrue(cf2.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
598 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
599 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
600 |
ResolvedModule m2 = cf1.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
601 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
602 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
603 |
assertTrue(m3.reads().size() == 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
604 |
assertTrue(m3.reads().contains(m1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
605 |
assertTrue(m3.reads().contains(m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
606 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
607 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
608 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
609 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
610 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
611 |
* The test consists of three configurations: |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
612 |
* - Configuration cf1: m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
613 |
* - Configuration cf2: m3 requires m1, requires static m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
614 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
615 |
public void testRequiresStatic6() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
616 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
617 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
618 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
619 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
620 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
621 |
Configuration cf1 = resolve(finder1, "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
622 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
623 |
assertTrue(cf1.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
624 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
625 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
626 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
627 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
628 |
.requires(Set.of(Requires.Modifier.STATIC), "m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
629 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
630 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
631 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
632 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
633 |
Configuration cf2 = resolve(cf1, finder2, "m3"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
634 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
635 |
assertTrue(cf2.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
636 |
assertTrue(cf2.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
637 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
638 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
639 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
640 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
641 |
assertTrue(m3.reads().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
642 |
assertTrue(m3.reads().contains(m1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
643 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
644 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
645 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
646 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
647 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
648 |
* (m1 not observable) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
649 |
* m2 requires transitive static m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
650 |
* m3 requires m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
651 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
652 |
public void testRequiresStatic7() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
653 |
ModuleDescriptor descriptor1 = null; // not observable |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
654 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
655 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
656 |
.requires(Set.of(Requires.Modifier.TRANSITIVE, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
657 |
Requires.Modifier.STATIC), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
658 |
"m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
659 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
660 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
661 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
662 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
663 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
664 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
665 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor2, descriptor3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
666 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
667 |
Configuration cf = resolve(finder, "m3"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
668 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
669 |
assertTrue(cf.modules().size() == 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
670 |
assertTrue(cf.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
671 |
assertTrue(cf.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
672 |
ResolvedModule m2 = cf.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
673 |
ResolvedModule m3 = cf.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
674 |
assertTrue(m2.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
675 |
assertTrue(m3.reads().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
676 |
assertTrue(m3.reads().contains(m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
677 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
678 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
679 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
680 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
681 |
* Basic test of "requires static": |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
682 |
* - Configuration cf1: m2 requires transitive static m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
683 |
* - Configuration cf2: m3 requires m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
684 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
685 |
public void testRequiresStatic8() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
686 |
ModuleDescriptor descriptor1 = null; // not observable |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
687 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
688 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
689 |
.requires(Set.of(Requires.Modifier.TRANSITIVE, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
690 |
Requires.Modifier.STATIC), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
691 |
"m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
692 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
693 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
694 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
695 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
696 |
Configuration cf1 = resolve(finder1, "m2"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
697 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
698 |
assertTrue(cf1.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
699 |
assertTrue(cf1.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
700 |
ResolvedModule m2 = cf1.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
701 |
assertTrue(m2.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
702 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
703 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
704 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
705 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
706 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
707 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
708 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
709 |
Configuration cf2 = resolve(cf1, finder2, "m3"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
710 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
711 |
assertTrue(cf2.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
712 |
assertTrue(cf2.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
713 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
714 |
assertTrue(m3.reads().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
715 |
assertTrue(m3.reads().contains(m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
716 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
717 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
718 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
719 |
/** |
36511 | 720 |
* Basic test of binding services |
721 |
* m1 uses p.S |
|
722 |
* m2 provides p.S |
|
723 |
*/ |
|
724 |
public void testServiceBinding1() { |
|
725 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
726 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 727 |
.exports("p") |
728 |
.uses("p.S") |
|
729 |
.build(); |
|
730 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
731 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 732 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
733 |
.provides("p.S", List.of("q.T")) |
36511 | 734 |
.build(); |
735 |
||
736 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
737 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
738 |
Configuration cf = resolveAndBind(finder, "m1"); |
36511 | 739 |
|
740 |
assertTrue(cf.modules().size() == 2); |
|
741 |
assertTrue(cf.findModule("m1").isPresent()); |
|
742 |
assertTrue(cf.findModule("m2").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
743 |
assertTrue(cf.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
744 |
assertTrue(cf.parents().get(0) == Configuration.empty()); |
36511 | 745 |
|
746 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
747 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
748 |
||
749 |
assertTrue(m1.configuration() == cf); |
|
750 |
assertTrue(m1.reads().size() == 0); |
|
751 |
||
752 |
assertTrue(m2.configuration() == cf); |
|
753 |
assertTrue(m2.reads().size() == 1); |
|
754 |
assertTrue(m2.reads().contains(m1)); |
|
755 |
} |
|
756 |
||
757 |
||
758 |
/** |
|
759 |
* Basic test of binding services |
|
760 |
* m1 uses p.S1 |
|
761 |
* m2 provides p.S1, m2 uses p.S2 |
|
762 |
* m3 provides p.S2 |
|
763 |
*/ |
|
764 |
public void testServiceBinding2() { |
|
765 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
766 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 767 |
.exports("p") |
768 |
.uses("p.S1") |
|
769 |
.build(); |
|
770 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
771 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 772 |
.requires("m1") |
773 |
.uses("p.S2") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
774 |
.provides("p.S1", List.of("q.Service1Impl")) |
36511 | 775 |
.build(); |
776 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
777 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 778 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
779 |
.provides("p.S2", List.of("q.Service2Impl")) |
36511 | 780 |
.build(); |
781 |
||
782 |
ModuleFinder finder |
|
783 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
784 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
785 |
Configuration cf = resolveAndBind(finder, "m1"); |
36511 | 786 |
|
787 |
assertTrue(cf.modules().size() == 3); |
|
788 |
assertTrue(cf.findModule("m1").isPresent()); |
|
789 |
assertTrue(cf.findModule("m2").isPresent()); |
|
790 |
assertTrue(cf.findModule("m3").isPresent()); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
791 |
assertTrue(cf.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
792 |
assertTrue(cf.parents().get(0) == Configuration.empty()); |
36511 | 793 |
|
794 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
795 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
796 |
ResolvedModule m3 = cf.findModule("m3").get(); |
|
797 |
||
798 |
assertTrue(m1.configuration() == cf); |
|
799 |
assertTrue(m1.reads().size() == 0); |
|
800 |
||
801 |
assertTrue(m2.configuration() == cf); |
|
802 |
assertTrue(m2.reads().size() == 1); |
|
803 |
assertTrue(m2.reads().contains(m1)); |
|
804 |
||
805 |
assertTrue(m3.configuration() == cf); |
|
806 |
assertTrue(m3.reads().size() == 1); |
|
807 |
assertTrue(m3.reads().contains(m1)); |
|
808 |
} |
|
809 |
||
810 |
||
811 |
/** |
|
812 |
* Basic test of binding services with configurations. |
|
813 |
* |
|
814 |
* The test consists of two configurations: |
|
815 |
* - Configuration cf1: m1 uses p.S |
|
816 |
* - Configuration cf2: m2 provides p.S |
|
817 |
*/ |
|
818 |
public void testServiceBindingWithConfigurations1() { |
|
819 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
820 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 821 |
.exports("p") |
822 |
.uses("p.S") |
|
823 |
.build(); |
|
824 |
||
825 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
826 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
827 |
Configuration cf1 = resolve(finder1, "m1"); |
36511 | 828 |
|
829 |
assertTrue(cf1.modules().size() == 1); |
|
830 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
831 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
832 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 833 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
834 |
.provides("p.S", List.of("q.T")) |
36511 | 835 |
.build(); |
836 |
||
837 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
838 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
839 |
Configuration cf2 = resolveAndBind(cf1, finder2); // no roots |
36511 | 840 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
841 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
842 |
assertTrue(cf2.parents().get(0) == cf1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
843 |
|
36511 | 844 |
assertTrue(cf2.modules().size() == 1); |
845 |
assertTrue(cf2.findModule("m2").isPresent()); |
|
846 |
||
847 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
|
848 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
|
849 |
||
850 |
assertTrue(m2.reads().size() == 1); |
|
851 |
assertTrue(m2.reads().contains(m1)); |
|
852 |
} |
|
853 |
||
854 |
||
855 |
/** |
|
856 |
* Basic test of binding services with configurations. |
|
857 |
* |
|
858 |
* The test consists of two configurations: |
|
859 |
* - Configuration cf1: m1 uses p.S && provides p.S, |
|
860 |
* m2 provides p.S |
|
861 |
* - Configuration cf2: m3 provides p.S |
|
862 |
* m4 provides p.S |
|
863 |
*/ |
|
864 |
public void testServiceBindingWithConfigurations2() { |
|
865 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
866 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 867 |
.exports("p") |
868 |
.uses("p.S") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
869 |
.provides("p.S", List.of("p1.ServiceImpl")) |
36511 | 870 |
.build(); |
871 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
872 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 873 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
874 |
.provides("p.S", List.of("p2.ServiceImpl")) |
36511 | 875 |
.build(); |
876 |
||
877 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
878 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
879 |
Configuration cf1 = resolveAndBind(finder1, "m1"); |
36511 | 880 |
|
881 |
assertTrue(cf1.modules().size() == 2); |
|
882 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
883 |
assertTrue(cf1.findModule("m2").isPresent()); |
|
884 |
||
885 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
886 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 887 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
888 |
.provides("p.S", List.of("p3.ServiceImpl")) |
36511 | 889 |
.build(); |
890 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
891 |
ModuleDescriptor descriptor4 = newBuilder("m4") |
36511 | 892 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
893 |
.provides("p.S", List.of("p4.ServiceImpl")) |
36511 | 894 |
.build(); |
895 |
||
896 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4); |
|
897 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
898 |
Configuration cf2 = resolveAndBind(cf1, finder2); // no roots |
36511 | 899 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
900 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
901 |
assertTrue(cf2.parents().get(0) == cf1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
902 |
|
36511 | 903 |
assertTrue(cf2.modules().size() == 2); |
904 |
assertTrue(cf2.findModule("m3").isPresent()); |
|
905 |
assertTrue(cf2.findModule("m4").isPresent()); |
|
906 |
||
907 |
ResolvedModule m1 = cf2.findModule("m1").get(); // should find in parent |
|
908 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
|
909 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
|
910 |
ResolvedModule m4 = cf2.findModule("m4").get(); |
|
911 |
||
912 |
assertTrue(m1.reads().size() == 0); |
|
913 |
||
914 |
assertTrue(m2.reads().size() == 1); |
|
915 |
assertTrue(m2.reads().contains(m1)); |
|
916 |
||
917 |
assertTrue(m3.reads().size() == 1); |
|
918 |
assertTrue(m3.reads().contains(m1)); |
|
919 |
||
920 |
assertTrue(m4.reads().size() == 1); |
|
921 |
assertTrue(m4.reads().contains(m1)); |
|
922 |
} |
|
923 |
||
924 |
||
925 |
/** |
|
926 |
* Basic test of binding services with configurations. |
|
927 |
* |
|
928 |
* 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
|
929 |
* Test configuration cf2: m1 uses p.S, p@2.0 provides p.S |
36511 | 930 |
* Test configuration cf2: m1 uses p.S |
931 |
*/ |
|
932 |
public void testServiceBindingWithConfigurations3() { |
|
933 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
934 |
ModuleDescriptor service = newBuilder("s") |
36511 | 935 |
.exports("p") |
936 |
.build(); |
|
937 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
938 |
ModuleDescriptor provider_v1 = newBuilder("p") |
36511 | 939 |
.version("1.0") |
940 |
.requires("s") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
941 |
.provides("p.S", List.of("q.T")) |
36511 | 942 |
.build(); |
943 |
||
944 |
ModuleFinder finder1 = ModuleUtils.finderOf(service, provider_v1); |
|
945 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
946 |
Configuration cf1 = resolve(finder1, "p"); |
36511 | 947 |
|
948 |
assertTrue(cf1.modules().size() == 2); |
|
949 |
assertTrue(cf1.findModule("s").isPresent()); |
|
950 |
assertTrue(cf1.findModule("p").isPresent()); |
|
951 |
||
952 |
// p@1.0 in cf1 |
|
953 |
ResolvedModule p = cf1.findModule("p").get(); |
|
954 |
assertEquals(p.reference().descriptor(), provider_v1); |
|
955 |
||
956 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
957 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 958 |
.requires("s") |
959 |
.uses("p.S") |
|
960 |
.build(); |
|
961 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
962 |
ModuleDescriptor provider_v2 = newBuilder("p") |
36511 | 963 |
.version("2.0") |
964 |
.requires("s") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
965 |
.provides("p.S", List.of("q.T")) |
36511 | 966 |
.build(); |
967 |
||
968 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, provider_v2); |
|
969 |
||
970 |
||
971 |
// finder2 is the before ModuleFinder and so p@2.0 should be located |
|
972 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
973 |
Configuration cf2 = resolveAndBind(cf1, finder2, "m1"); |
36511 | 974 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
975 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
976 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 977 |
assertTrue(cf2.modules().size() == 2); |
978 |
||
979 |
// p should be found in cf2 |
|
980 |
p = cf2.findModule("p").get(); |
|
981 |
assertTrue(p.configuration() == cf2); |
|
982 |
assertEquals(p.reference().descriptor(), provider_v2); |
|
983 |
||
984 |
||
985 |
// finder2 is the after ModuleFinder and so p@2.0 should not be located |
|
986 |
// as module p is in parent configuration. |
|
987 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
988 |
cf2 = resolveAndBind(cf1, ModuleFinder.of(), finder2, "m1"); |
36511 | 989 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
990 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
991 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 992 |
assertTrue(cf2.modules().size() == 1); |
993 |
||
994 |
// p should be found in cf1 |
|
995 |
p = cf2.findModule("p").get(); |
|
996 |
assertTrue(p.configuration() == cf1); |
|
997 |
assertEquals(p.reference().descriptor(), provider_v1); |
|
998 |
} |
|
999 |
||
1000 |
||
1001 |
/** |
|
1002 |
* Basic test with two module finders. |
|
1003 |
* |
|
1004 |
* Module m2 can be found by both the before and after finders. |
|
1005 |
*/ |
|
1006 |
public void testWithTwoFinders1() { |
|
1007 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1008 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1009 |
.requires("m2") |
1010 |
.build(); |
|
1011 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1012 |
ModuleDescriptor descriptor2_v1 = newBuilder("m2") |
36511 | 1013 |
.version("1.0") |
1014 |
.build(); |
|
1015 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1016 |
ModuleDescriptor descriptor2_v2 = newBuilder("m2") |
36511 | 1017 |
.version("2.0") |
1018 |
.build(); |
|
1019 |
||
1020 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor2_v1); |
|
1021 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, descriptor2_v2); |
|
1022 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1023 |
Configuration cf = resolve(finder1, finder2, "m1"); |
36511 | 1024 |
|
1025 |
assertTrue(cf.modules().size() == 2); |
|
1026 |
assertTrue(cf.findModule("m1").isPresent()); |
|
1027 |
assertTrue(cf.findModule("m2").isPresent()); |
|
1028 |
||
1029 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
1030 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
1031 |
||
1032 |
assertEquals(m1.reference().descriptor(), descriptor1); |
|
1033 |
assertEquals(m2.reference().descriptor(), descriptor2_v1); |
|
1034 |
} |
|
1035 |
||
1036 |
||
1037 |
/** |
|
1038 |
* Basic test with two modules finders and service binding. |
|
1039 |
* |
|
1040 |
* The before and after ModuleFinders both locate a service provider module |
|
1041 |
* named "m2" that provide implementations of the same service type. |
|
1042 |
*/ |
|
1043 |
public void testWithTwoFinders2() { |
|
1044 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1045 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1046 |
.exports("p") |
1047 |
.uses("p.S") |
|
1048 |
.build(); |
|
1049 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1050 |
ModuleDescriptor descriptor2_v1 = newBuilder("m2") |
36511 | 1051 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1052 |
.provides("p.S", List.of("q.T")) |
36511 | 1053 |
.build(); |
1054 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1055 |
ModuleDescriptor descriptor2_v2 = newBuilder("m2") |
36511 | 1056 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1057 |
.provides("p.S", List.of("q.T")) |
36511 | 1058 |
.build(); |
1059 |
||
1060 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2_v1); |
|
1061 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2_v2); |
|
1062 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1063 |
Configuration cf = resolveAndBind(finder1, finder2, "m1"); |
36511 | 1064 |
|
1065 |
assertTrue(cf.modules().size() == 2); |
|
1066 |
assertTrue(cf.findModule("m1").isPresent()); |
|
1067 |
assertTrue(cf.findModule("m2").isPresent()); |
|
1068 |
||
1069 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
1070 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
1071 |
||
1072 |
assertEquals(m1.reference().descriptor(), descriptor1); |
|
1073 |
assertEquals(m2.reference().descriptor(), descriptor2_v1); |
|
1074 |
} |
|
1075 |
||
1076 |
||
1077 |
/** |
|
1078 |
* Basic test for resolving a module that is located in the parent |
|
1079 |
* configuration. |
|
1080 |
*/ |
|
1081 |
public void testResolvedInParent1() { |
|
1082 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1083 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1084 |
.build(); |
1085 |
||
1086 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1087 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1088 |
Configuration cf1 = resolve(finder, "m1"); |
36511 | 1089 |
|
1090 |
assertTrue(cf1.modules().size() == 1); |
|
1091 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
1092 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1093 |
Configuration cf2 = resolve(cf1, finder, "m1"); |
36511 | 1094 |
|
1095 |
assertTrue(cf2.modules().size() == 1); |
|
1096 |
} |
|
1097 |
||
1098 |
||
1099 |
/** |
|
1100 |
* Basic test for resolving a module that has a dependency on a module |
|
1101 |
* in the parent configuration. |
|
1102 |
*/ |
|
1103 |
public void testResolvedInParent2() { |
|
1104 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1105 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
36511 | 1106 |
|
1107 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1); |
|
1108 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1109 |
Configuration cf1 = resolve(finder1, "m1"); |
36511 | 1110 |
|
1111 |
assertTrue(cf1.modules().size() == 1); |
|
1112 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
1113 |
||
1114 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1115 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1116 |
.requires("m1") |
1117 |
.build(); |
|
1118 |
||
1119 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor2); |
|
1120 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1121 |
Configuration cf2 = resolve(cf1, ModuleFinder.of(), finder2, "m2"); |
36511 | 1122 |
|
1123 |
assertTrue(cf2.modules().size() == 1); |
|
1124 |
assertTrue(cf2.findModule("m2").isPresent()); |
|
1125 |
||
1126 |
ResolvedModule m1 = cf2.findModule("m1").get(); // find in parent |
|
1127 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
|
1128 |
||
1129 |
assertTrue(m1.reads().size() == 0); |
|
1130 |
assertTrue(m2.reads().size() == 1); |
|
1131 |
assertTrue(m2.reads().contains(m1)); |
|
1132 |
} |
|
1133 |
||
1134 |
||
1135 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1136 |
* Basic test of resolving a module that depends on modules in two parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1137 |
* configurations. |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1138 |
* |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1139 |
* The test consists of three configurations: |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1140 |
* - Configuration cf1: m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1141 |
* - Configuration cf2: m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1142 |
* - Configuration cf3(cf1,cf2): m3 requires m1, m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1143 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1144 |
public void testResolvedInMultipleParents1() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1145 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1146 |
// Configuration cf1: m1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1147 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1148 |
Configuration cf1 = resolve(ModuleUtils.finderOf(descriptor1), "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1149 |
assertEquals(cf1.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1150 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1151 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1152 |
assertTrue(m1.configuration() == cf1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1153 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1154 |
// Configuration cf2: m2 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1155 |
ModuleDescriptor descriptor2 = newBuilder("m2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1156 |
Configuration cf2 = resolve(ModuleUtils.finderOf(descriptor2), "m2"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1157 |
assertEquals(cf2.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1158 |
assertTrue(cf2.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1159 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1160 |
assertTrue(m2.configuration() == cf2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1161 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1162 |
// Configuration cf3(cf1,cf2): m3 requires m1 and m2 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1163 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1164 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1165 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1166 |
.build(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1167 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor3); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1168 |
Configuration cf3 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1169 |
finder, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1170 |
List.of(cf1, cf2), // parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1171 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1172 |
Set.of("m3")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1173 |
assertEquals(cf3.parents(), List.of(cf1, cf2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1174 |
assertTrue(cf3.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1175 |
ResolvedModule m3 = cf3.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1176 |
assertTrue(m3.configuration() == cf3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1177 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1178 |
// check readability |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1179 |
assertTrue(m1.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1180 |
assertTrue(m2.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1181 |
assertEquals(m3.reads(), Set.of(m1, m2)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1182 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1183 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1184 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1185 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1186 |
* Basic test of resolving a module that depends on modules in three parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1187 |
* configurations arranged in a diamond (two direct parents). |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1188 |
* |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1189 |
* The test consists of four configurations: |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1190 |
* - Configuration cf1: m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1191 |
* - Configuration cf2(cf1): m2 requires m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1192 |
* - Configuration cf3(cf3): m3 requires m1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1193 |
* - Configuration cf4(cf2,cf3): m4 requires m1,m2,m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1194 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1195 |
public void testResolvedInMultipleParents2() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1196 |
// Configuration cf1: m1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1197 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1198 |
Configuration cf1 = resolve(ModuleUtils.finderOf(descriptor1), "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1199 |
assertEquals(cf1.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1200 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1201 |
ResolvedModule m1 = cf1.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1202 |
assertTrue(m1.configuration() == cf1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1203 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1204 |
// Configuration cf2(cf1): m2 requires m1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1205 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1206 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1207 |
.build(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1208 |
Configuration cf2 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1209 |
ModuleUtils.finderOf(descriptor2), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1210 |
List.of(cf1), // parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1211 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1212 |
Set.of("m2")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1213 |
assertEquals(cf2.parents(), List.of(cf1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1214 |
assertTrue(cf2.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1215 |
ResolvedModule m2 = cf2.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1216 |
assertTrue(m2.configuration() == cf2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1217 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1218 |
// Configuration cf3(cf1): m3 requires m1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1219 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1220 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1221 |
.build(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1222 |
Configuration cf3 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1223 |
ModuleUtils.finderOf(descriptor3), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1224 |
List.of(cf1), // parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1225 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1226 |
Set.of("m3")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1227 |
assertEquals(cf3.parents(), List.of(cf1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1228 |
assertTrue(cf3.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1229 |
ResolvedModule m3 = cf3.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1230 |
assertTrue(m3.configuration() == cf3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1231 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1232 |
// Configuration cf4(cf2,cf3): m4 requires m1,m2,m3 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1233 |
ModuleDescriptor descriptor4 = newBuilder("m4") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1234 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1235 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1236 |
.requires("m3") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1237 |
.build(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1238 |
Configuration cf4 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1239 |
ModuleUtils.finderOf(descriptor4), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1240 |
List.of(cf2, cf3), // parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1241 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1242 |
Set.of("m4")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1243 |
assertEquals(cf4.parents(), List.of(cf2, cf3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1244 |
assertTrue(cf4.findModule("m4").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1245 |
ResolvedModule m4 = cf4.findModule("m4").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1246 |
assertTrue(m4.configuration() == cf4); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1247 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1248 |
// check readability |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1249 |
assertTrue(m1.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1250 |
assertEquals(m2.reads(), Set.of(m1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1251 |
assertEquals(m3.reads(), Set.of(m1)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1252 |
assertEquals(m4.reads(), Set.of(m1, m2, m3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1253 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1254 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1255 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1256 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1257 |
* Basic test of resolving a module that depends on modules in three parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1258 |
* configurations arranged in a diamond (two direct parents). |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1259 |
* |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1260 |
* The test consists of four configurations: |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1261 |
* - Configuration cf1: m1@1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1262 |
* - Configuration cf2: m1@2, m2@2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1263 |
* - Configuration cf3: m1@3, m2@3, m3@3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1264 |
* - Configuration cf4(cf1,cf2,cf3): m4 requires m1,m2,m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1265 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1266 |
public void testResolvedInMultipleParents3() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1267 |
ModuleDescriptor descriptor1, descriptor2, descriptor3; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1268 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1269 |
// Configuration cf1: m1@1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1270 |
descriptor1 = newBuilder("m1").version("1").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1271 |
Configuration cf1 = resolve(ModuleUtils.finderOf(descriptor1), "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1272 |
assertEquals(cf1.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1273 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1274 |
// Configuration cf2: m1@2, m2@2 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1275 |
descriptor1 = newBuilder("m1").version("2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1276 |
descriptor2 = newBuilder("m2").version("2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1277 |
Configuration cf2 = resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1278 |
ModuleUtils.finderOf(descriptor1, descriptor2), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1279 |
"m1", "m2"); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1280 |
assertEquals(cf2.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1281 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1282 |
// Configuration cf3: m1@3, m2@3, m3@3 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1283 |
descriptor1 = newBuilder("m1").version("3").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1284 |
descriptor2 = newBuilder("m2").version("3").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1285 |
descriptor3 = newBuilder("m3").version("3").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1286 |
Configuration cf3 = resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1287 |
ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1288 |
"m1", "m2", "m3"); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1289 |
assertEquals(cf3.parents(), List.of(Configuration.empty())); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1290 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1291 |
// Configuration cf4(cf1,cf2,cf3): m4 requires m1,m2,m3 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1292 |
ModuleDescriptor descriptor4 = newBuilder("m4") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1293 |
.requires("m1") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1294 |
.requires("m2") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1295 |
.requires("m3") |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1296 |
.build(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1297 |
Configuration cf4 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1298 |
ModuleUtils.finderOf(descriptor4), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1299 |
List.of(cf1, cf2, cf3), // parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1300 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1301 |
Set.of("m4")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1302 |
assertEquals(cf4.parents(), List.of(cf1, cf2, cf3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1303 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1304 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1305 |
assertTrue(cf2.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1306 |
assertTrue(cf2.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1307 |
assertTrue(cf3.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1308 |
assertTrue(cf3.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1309 |
assertTrue(cf3.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1310 |
assertTrue(cf4.findModule("m4").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1311 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1312 |
ResolvedModule m1_1 = cf1.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1313 |
ResolvedModule m1_2 = cf2.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1314 |
ResolvedModule m2_2 = cf2.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1315 |
ResolvedModule m1_3 = cf3.findModule("m1").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1316 |
ResolvedModule m2_3 = cf3.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1317 |
ResolvedModule m3_3 = cf3.findModule("m3").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1318 |
ResolvedModule m4 = cf4.findModule("m4").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1319 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1320 |
assertTrue(m1_1.configuration() == cf1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1321 |
assertTrue(m1_2.configuration() == cf2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1322 |
assertTrue(m2_2.configuration() == cf2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1323 |
assertTrue(m1_3.configuration() == cf3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1324 |
assertTrue(m2_3.configuration() == cf3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1325 |
assertTrue(m3_3.configuration() == cf3); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1326 |
assertTrue(m4.configuration() == cf4); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1327 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1328 |
// check readability |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1329 |
assertTrue(m1_1.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1330 |
assertTrue(m1_2.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1331 |
assertTrue(m2_2.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1332 |
assertTrue(m1_3.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1333 |
assertTrue(m2_3.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1334 |
assertTrue(m3_3.reads().isEmpty()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1335 |
assertEquals(m4.reads(), Set.of(m1_1, m2_2, m3_3)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1336 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1337 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1338 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1339 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1340 |
* Basic test of using the beforeFinder to override a module in a parent |
36511 | 1341 |
* configuration. |
1342 |
*/ |
|
1343 |
public void testOverriding1() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1344 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
36511 | 1345 |
|
1346 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1347 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1348 |
Configuration cf1 = resolve(finder, "m1"); |
36511 | 1349 |
assertTrue(cf1.modules().size() == 1); |
1350 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
1351 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1352 |
Configuration cf2 = resolve(cf1, finder, "m1"); |
36511 | 1353 |
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
|
1354 |
assertTrue(cf2.findModule("m1").isPresent()); |
36511 | 1355 |
} |
1356 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1357 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1358 |
* Basic test of using the beforeFinder to override a module in a parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1359 |
* configuration. |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1360 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1361 |
public void testOverriding2() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1362 |
ModuleDescriptor descriptor1 = newBuilder("m1").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1363 |
Configuration cf1 = resolve(ModuleUtils.finderOf(descriptor1), "m1"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1364 |
assertTrue(cf1.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1365 |
assertTrue(cf1.findModule("m1").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1366 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1367 |
ModuleDescriptor descriptor2 = newBuilder("m2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1368 |
Configuration cf2 = resolve(ModuleUtils.finderOf(descriptor2), "m2"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1369 |
assertTrue(cf2.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1370 |
assertTrue(cf2.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1371 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1372 |
ModuleDescriptor descriptor3 = newBuilder("m3").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1373 |
Configuration cf3 = resolve(ModuleUtils.finderOf(descriptor3), "m3"); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1374 |
assertTrue(cf3.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1375 |
assertTrue(cf3.findModule("m3").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1376 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1377 |
// override m2, m1 and m3 should be found in parent configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1378 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor2); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1379 |
Configuration cf4 = Configuration.resolve( |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1380 |
finder, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1381 |
List.of(cf1, cf2, cf3), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1382 |
ModuleFinder.of(), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1383 |
Set.of("m1", "m2", "m3")); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1384 |
assertTrue(cf4.modules().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1385 |
assertTrue(cf4.findModule("m2").isPresent()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1386 |
ResolvedModule m2 = cf4.findModule("m2").get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1387 |
assertTrue(m2.configuration() == cf4); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1388 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1389 |
|
36511 | 1390 |
|
1391 |
/** |
|
1392 |
* Basic test of using the beforeFinder to override a module in the parent |
|
1393 |
* configuration but where implied readability in the picture so that the |
|
1394 |
* module in the parent is read. |
|
1395 |
* |
|
1396 |
* The test consists of two configurations: |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1397 |
* - Configuration cf1: m1, m2 requires transitive m1 |
36511 | 1398 |
* - Configuration cf2: m1, m3 requires m2 |
1399 |
*/ |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1400 |
public void testOverriding3() { |
36511 | 1401 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1402 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1403 |
.build(); |
1404 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1405 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1406 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
36511 | 1407 |
.build(); |
1408 |
||
1409 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1410 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1411 |
Configuration cf1 = resolve(finder1, "m2"); |
36511 | 1412 |
|
1413 |
assertTrue(cf1.modules().size() == 2); |
|
1414 |
assertTrue(cf1.findModule("m1").isPresent()); |
|
1415 |
assertTrue(cf1.findModule("m2").isPresent()); |
|
1416 |
||
1417 |
// cf2: m3 requires m2, m1 |
|
1418 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1419 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 1420 |
.requires("m2") |
1421 |
.build(); |
|
1422 |
||
1423 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, descriptor3); |
|
1424 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1425 |
Configuration cf2 = resolve(cf1, finder2, "m1", "m3"); |
36511 | 1426 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1427 |
assertTrue(cf2.parents().size() == 1); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1428 |
assertTrue(cf2.parents().get(0) == cf1); |
36511 | 1429 |
|
1430 |
assertTrue(cf2.modules().size() == 2); |
|
1431 |
assertTrue(cf2.findModule("m1").isPresent()); |
|
1432 |
assertTrue(cf2.findModule("m3").isPresent()); |
|
1433 |
||
1434 |
ResolvedModule m1_1 = cf1.findModule("m1").get(); |
|
1435 |
ResolvedModule m1_2 = cf2.findModule("m1").get(); |
|
1436 |
ResolvedModule m2 = cf1.findModule("m2").get(); |
|
1437 |
ResolvedModule m3 = cf2.findModule("m3").get(); |
|
1438 |
||
1439 |
assertTrue(m1_1.configuration() == cf1); |
|
1440 |
assertTrue(m1_2.configuration() == cf2); |
|
1441 |
assertTrue(m3.configuration() == cf2); |
|
1442 |
||
1443 |
||
1444 |
// check that m3 reads cf1/m1 and cf2/m2 |
|
1445 |
assertTrue(m3.reads().size() == 2); |
|
1446 |
assertTrue(m3.reads().contains(m1_1)); |
|
1447 |
assertTrue(m3.reads().contains(m2)); |
|
1448 |
} |
|
1449 |
||
1450 |
||
1451 |
/** |
|
1452 |
* Root module not found |
|
1453 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1454 |
@Test(expectedExceptions = { FindException.class }) |
36511 | 1455 |
public void testRootNotFound() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1456 |
resolve(ModuleFinder.of(), "m1"); |
36511 | 1457 |
} |
1458 |
||
1459 |
||
1460 |
/** |
|
1461 |
* Direct dependency not found |
|
1462 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1463 |
@Test(expectedExceptions = { FindException.class }) |
36511 | 1464 |
public void testDirectDependencyNotFound() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1465 |
ModuleDescriptor descriptor1 = newBuilder("m1").requires("m2").build(); |
36511 | 1466 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1467 |
resolve(finder, "m1"); |
36511 | 1468 |
} |
1469 |
||
1470 |
||
1471 |
/** |
|
1472 |
* Transitive dependency not found |
|
1473 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1474 |
@Test(expectedExceptions = { FindException.class }) |
36511 | 1475 |
public void testTransitiveDependencyNotFound() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1476 |
ModuleDescriptor descriptor1 = newBuilder("m1").requires("m2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1477 |
ModuleDescriptor descriptor2 = newBuilder("m2").requires("m3").build(); |
36511 | 1478 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1479 |
resolve(finder, "m1"); |
36511 | 1480 |
} |
1481 |
||
1482 |
||
1483 |
/** |
|
1484 |
* Service provider dependency not found |
|
1485 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1486 |
@Test(expectedExceptions = { FindException.class }) |
36511 | 1487 |
public void testServiceProviderDependencyNotFound() { |
1488 |
||
1489 |
// service provider dependency (on m3) not found |
|
1490 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1491 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1492 |
.exports("p") |
1493 |
.uses("p.S") |
|
1494 |
.build(); |
|
1495 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1496 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1497 |
.requires("m1") |
1498 |
.requires("m3") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1499 |
.provides("p.S", List.of("q.T")) |
36511 | 1500 |
.build(); |
1501 |
||
1502 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1503 |
||
1504 |
// should throw ResolutionException because m3 is not found |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1505 |
Configuration cf = resolveAndBind(finder, "m1"); |
36511 | 1506 |
} |
1507 |
||
1508 |
||
1509 |
/** |
|
1510 |
* Simple cycle. |
|
1511 |
*/ |
|
1512 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1513 |
public void testSimpleCycle() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1514 |
ModuleDescriptor descriptor1 = newBuilder("m1").requires("m2").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1515 |
ModuleDescriptor descriptor2 = newBuilder("m2").requires("m3").build(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1516 |
ModuleDescriptor descriptor3 = newBuilder("m3").requires("m1").build(); |
36511 | 1517 |
ModuleFinder finder |
1518 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1519 |
resolve(finder, "m1"); |
36511 | 1520 |
} |
1521 |
||
1522 |
/** |
|
1523 |
* Basic test for detecting cycles involving a service provider module |
|
1524 |
*/ |
|
1525 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1526 |
public void testCycleInProvider() { |
|
1527 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1528 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1529 |
.exports("p") |
1530 |
.uses("p.S") |
|
1531 |
.build(); |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1532 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1533 |
.requires("m1") |
1534 |
.requires("m3") |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1535 |
.provides("p.S", List.of("q.T")) |
36511 | 1536 |
.build(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1537 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
36511 | 1538 |
.requires("m2") |
1539 |
.build(); |
|
1540 |
||
1541 |
ModuleFinder finder |
|
1542 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
1543 |
||
1544 |
// should throw ResolutionException because of the m2 <--> m3 cycle |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1545 |
resolveAndBind(finder, "m1"); |
36511 | 1546 |
} |
1547 |
||
1548 |
||
1549 |
/** |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1550 |
* Basic test to detect reading a module with the same name as itself |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1551 |
* |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1552 |
* The test consists of three configurations: |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1553 |
* - Configuration cf1: m1, m2 requires transitive m1 |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1554 |
* - Configuration cf2: m1 requires m2 |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1555 |
*/ |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1556 |
@Test(expectedExceptions = { ResolutionException.class }) |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1557 |
public void testReadModuleWithSameNameAsSelf() { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1558 |
ModuleDescriptor descriptor1_v1 = newBuilder("m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1559 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1560 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1561 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1562 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1563 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1564 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1565 |
ModuleDescriptor descriptor1_v2 = newBuilder("m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1566 |
.requires("m2") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1567 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1568 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1569 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1_v1, descriptor2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1570 |
Configuration cf1 = resolve(finder1, "m2"); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1571 |
assertTrue(cf1.modules().size() == 2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1572 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1573 |
// resolve should throw ResolutionException |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1574 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1_v2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1575 |
resolve(cf1, finder2, "m1"); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1576 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1577 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1578 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1579 |
/** |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1580 |
* Basic test to detect reading two modules with the same name |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1581 |
* |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1582 |
* The test consists of three configurations: |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1583 |
* - Configuration cf1: m1, m2 requires transitive m1 |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1584 |
* - Configuration cf2: m1, m3 requires transitive m1 |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1585 |
* - Configuration cf3(cf1,cf2): m4 requires m2, m3 |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1586 |
*/ |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1587 |
@Test(expectedExceptions = { ResolutionException.class }) |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1588 |
public void testReadTwoModuleWithSameName() { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1589 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1590 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1591 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1592 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1593 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1594 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1595 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1596 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1597 |
.requires(Set.of(Requires.Modifier.TRANSITIVE), "m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1598 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1599 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1600 |
ModuleDescriptor descriptor4 = newBuilder("m4") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1601 |
.requires("m2") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1602 |
.requires("m3") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1603 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1604 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1605 |
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1606 |
Configuration cf1 = resolve(finder1, "m2"); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1607 |
assertTrue(cf1.modules().size() == 2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1608 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1609 |
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor1, descriptor3); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1610 |
Configuration cf2 = resolve(finder2, "m3"); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1611 |
assertTrue(cf2.modules().size() == 2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1612 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1613 |
// should throw ResolutionException as m4 will read modules named "m1". |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1614 |
ModuleFinder finder3 = ModuleUtils.finderOf(descriptor4); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1615 |
Configuration.resolve(finder3, List.of(cf1, cf2), ModuleFinder.of(), Set.of("m4")); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1616 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1617 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1618 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1619 |
/** |
36511 | 1620 |
* Test two modules exporting package p to a module that reads both. |
1621 |
*/ |
|
1622 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1623 |
public void testPackageSuppliedByTwoOthers() { |
|
1624 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1625 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1626 |
.requires("m2") |
1627 |
.requires("m3") |
|
1628 |
.build(); |
|
1629 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1630 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1631 |
.exports("p") |
1632 |
.build(); |
|
1633 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1634 |
ModuleDescriptor descriptor3 = newBuilder("m3") |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1635 |
.exports("p", Set.of("m1")) |
36511 | 1636 |
.build(); |
1637 |
||
1638 |
ModuleFinder finder |
|
1639 |
= ModuleUtils.finderOf(descriptor1, descriptor2, descriptor3); |
|
1640 |
||
1641 |
// m2 and m3 export package p to module m1 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1642 |
resolve(finder, "m1"); |
36511 | 1643 |
} |
1644 |
||
1645 |
||
1646 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1647 |
* Test the scenario where a module contains a package p and reads |
36511 | 1648 |
* a module that exports package p. |
1649 |
*/ |
|
1650 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1651 |
public void testPackageSuppliedBySelfAndOther() { |
|
1652 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1653 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1654 |
.requires("m2") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1655 |
.packages(Set.of("p")) |
36511 | 1656 |
.build(); |
1657 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1658 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1659 |
.exports("p") |
1660 |
.build(); |
|
1661 |
||
1662 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1663 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1664 |
// m1 contains package p, module m2 exports package p to m1 |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1665 |
resolve(finder, "m1"); |
36511 | 1666 |
} |
1667 |
||
1668 |
||
1669 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1670 |
* Test the scenario where a module contains a package p and reads |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1671 |
* a module that also contains a package p. |
36511 | 1672 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1673 |
public void testContainsPackageInSelfAndOther() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1674 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1675 |
.requires("m2") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1676 |
.packages(Set.of("p")) |
36511 | 1677 |
.build(); |
1678 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1679 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1680 |
.packages(Set.of("p")) |
36511 | 1681 |
.build(); |
1682 |
||
1683 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1684 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1685 |
Configuration cf = resolve(finder, "m1"); |
36511 | 1686 |
|
1687 |
assertTrue(cf.modules().size() == 2); |
|
1688 |
assertTrue(cf.findModule("m1").isPresent()); |
|
1689 |
assertTrue(cf.findModule("m2").isPresent()); |
|
1690 |
||
1691 |
// m1 reads m2, m2 reads nothing |
|
1692 |
ResolvedModule m1 = cf.findModule("m1").get(); |
|
1693 |
ResolvedModule m2 = cf.findModule("m2").get(); |
|
1694 |
assertTrue(m1.reads().size() == 1); |
|
1695 |
assertTrue(m1.reads().contains(m2)); |
|
1696 |
assertTrue(m2.reads().size() == 0); |
|
1697 |
} |
|
1698 |
||
1699 |
||
1700 |
/** |
|
1701 |
* Test the scenario where a module that exports a package that is also |
|
1702 |
* exported by a module that it reads in a parent layer. |
|
1703 |
*/ |
|
1704 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1705 |
public void testExportSamePackageAsBootLayer() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1706 |
ModuleDescriptor descriptor = newBuilder("m1") |
36511 | 1707 |
.requires("java.base") |
1708 |
.exports("java.lang") |
|
1709 |
.build(); |
|
1710 |
||
1711 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor); |
|
1712 |
||
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
1713 |
Configuration bootConfiguration = ModuleLayer.boot().configuration(); |
36511 | 1714 |
|
1715 |
// m1 contains package java.lang, java.base exports package java.lang to m1 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1716 |
resolve(bootConfiguration, finder, "m1"); |
36511 | 1717 |
} |
1718 |
||
1719 |
||
1720 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1721 |
* Test "uses p.S" where p is contained in the same module. |
36511 | 1722 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1723 |
public void testContainsService1() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1724 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1725 |
.packages(Set.of("p")) |
36511 | 1726 |
.uses("p.S") |
1727 |
.build(); |
|
1728 |
||
1729 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1730 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1731 |
Configuration cf = resolve(finder, "m1"); |
36511 | 1732 |
|
1733 |
assertTrue(cf.modules().size() == 1); |
|
1734 |
assertTrue(cf.findModule("m1").isPresent()); |
|
1735 |
} |
|
1736 |
||
1737 |
||
1738 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1739 |
* Test "uses p.S" where p is contained in a different module. |
36511 | 1740 |
*/ |
1741 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1742 |
public void testContainsService2() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1743 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1744 |
.packages(Set.of("p")) |
36511 | 1745 |
.build(); |
1746 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1747 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1748 |
.requires("m1") |
1749 |
.uses("p.S") |
|
1750 |
.build(); |
|
1751 |
||
1752 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1753 |
||
1754 |
// m2 does not read a module that exports p |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1755 |
resolve(finder, "m2"); |
36511 | 1756 |
} |
1757 |
||
1758 |
||
1759 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1760 |
* Test "provides p.S" where p is contained in the same module. |
36511 | 1761 |
*/ |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1762 |
public void testContainsService3() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1763 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1764 |
.packages(Set.of("p", "q")) |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1765 |
.provides("p.S", List.of("q.S1")) |
36511 | 1766 |
.build(); |
1767 |
||
1768 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1769 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1770 |
Configuration cf = resolve(finder, "m1"); |
36511 | 1771 |
|
1772 |
assertTrue(cf.modules().size() == 1); |
|
1773 |
assertTrue(cf.findModule("m1").isPresent()); |
|
1774 |
} |
|
1775 |
||
1776 |
||
1777 |
/** |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1778 |
* Test "provides p.S" where p is contained in a different module. |
36511 | 1779 |
*/ |
1780 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1781 |
public void testContainsService4() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1782 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1783 |
.packages(Set.of("p")) |
36511 | 1784 |
.build(); |
1785 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1786 |
ModuleDescriptor descriptor2 = newBuilder("m2") |
36511 | 1787 |
.requires("m1") |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1788 |
.provides("p.S", List.of("q.S1")) |
36511 | 1789 |
.build(); |
1790 |
||
1791 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2); |
|
1792 |
||
1793 |
// m2 does not read a module that exports p |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1794 |
resolve(finder, "m2"); |
36511 | 1795 |
} |
1796 |
||
1797 |
||
1798 |
/** |
|
1799 |
* Test "uses p.S" where p is not exported to the module. |
|
1800 |
*/ |
|
1801 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1802 |
public void testServiceTypePackageNotExported1() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1803 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
36511 | 1804 |
.uses("p.S") |
1805 |
.build(); |
|
1806 |
||
1807 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1808 |
||
1809 |
// m1 does not read a module that exports p |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1810 |
resolve(finder, "m1"); |
36511 | 1811 |
} |
1812 |
||
1813 |
||
1814 |
/** |
|
1815 |
* Test "provides p.S" where p is not exported to the module. |
|
1816 |
*/ |
|
1817 |
@Test(expectedExceptions = { ResolutionException.class }) |
|
1818 |
public void testServiceTypePackageNotExported2() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1819 |
ModuleDescriptor descriptor1 = newBuilder("m1") |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1820 |
.provides("p.S", List.of("q.T")) |
36511 | 1821 |
.build(); |
1822 |
||
1823 |
ModuleFinder finder = ModuleUtils.finderOf(descriptor1); |
|
1824 |
||
1825 |
// m1 does not read a module that exports p |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1826 |
resolve(finder, "m1"); |
36511 | 1827 |
} |
1828 |
||
1829 |
||
1830 |
/** |
|
1831 |
* Test the empty configuration. |
|
1832 |
*/ |
|
1833 |
public void testEmptyConfiguration() { |
|
1834 |
Configuration cf = Configuration.empty(); |
|
1835 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1836 |
assertTrue(cf.parents().isEmpty()); |
36511 | 1837 |
|
1838 |
assertTrue(cf.modules().isEmpty()); |
|
1839 |
assertFalse(cf.findModule("java.base").isPresent()); |
|
1840 |
} |
|
1841 |
||
1842 |
||
1843 |
// platform specific modules |
|
1844 |
||
1845 |
@DataProvider(name = "platformmatch") |
|
1846 |
public Object[][] createPlatformMatches() { |
|
1847 |
return new Object[][]{ |
|
1848 |
||
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1849 |
{ "", "" }, |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1850 |
{ "linux-arm", "" }, |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1851 |
{ "linux-arm", "linux-arm" }, |
36511 | 1852 |
|
1853 |
}; |
|
1854 |
||
1855 |
}; |
|
1856 |
||
1857 |
@DataProvider(name = "platformmismatch") |
|
1858 |
public Object[][] createBad() { |
|
1859 |
return new Object[][] { |
|
1860 |
||
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1861 |
{ "linux-x64", "linux-arm" }, |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1862 |
{ "linux-x64", "windows-x64" }, |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1863 |
|
36511 | 1864 |
}; |
1865 |
} |
|
1866 |
||
1867 |
/** |
|
1868 |
* Test creating a configuration containing platform specific modules. |
|
1869 |
*/ |
|
1870 |
@Test(dataProvider = "platformmatch") |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1871 |
public void testPlatformMatch(String s1, String s2) throws IOException { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1872 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1873 |
ModuleDescriptor base = ModuleDescriptor.newModule("java.base").build(); |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1874 |
Path system = writeModule(base, null); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1875 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1876 |
ModuleDescriptor descriptor1 = ModuleDescriptor.newModule("m1") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1877 |
.requires("m2") |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1878 |
.build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1879 |
Path dir1 = writeModule(descriptor1, s1); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1880 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1881 |
ModuleDescriptor descriptor2 = ModuleDescriptor.newModule("m2").build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1882 |
Path dir2 = writeModule(descriptor2, s2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1883 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1884 |
ModuleFinder finder = ModuleFinder.of(system, dir1, dir2); |
36511 | 1885 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1886 |
Configuration cf = resolve(finder, "m1"); |
36511 | 1887 |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1888 |
assertTrue(cf.modules().size() == 3); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1889 |
assertTrue(cf.findModule("java.base").isPresent()); |
36511 | 1890 |
assertTrue(cf.findModule("m1").isPresent()); |
1891 |
assertTrue(cf.findModule("m2").isPresent()); |
|
1892 |
} |
|
1893 |
||
1894 |
/** |
|
1895 |
* Test attempting to create a configuration with modules for different |
|
1896 |
* platforms. |
|
1897 |
*/ |
|
1898 |
@Test(dataProvider = "platformmismatch", |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1899 |
expectedExceptions = FindException.class ) |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1900 |
public void testPlatformMisMatch(String s1, String s2) throws IOException { |
36511 | 1901 |
testPlatformMatch(s1, s2); |
1902 |
} |
|
1903 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1904 |
// no parents |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1905 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1906 |
@Test(expectedExceptions = { IllegalArgumentException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1907 |
public void testResolveRequiresWithNoParents() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1908 |
ModuleFinder empty = ModuleFinder.of(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1909 |
Configuration.resolve(empty, List.of(), empty, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1910 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1911 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1912 |
@Test(expectedExceptions = { IllegalArgumentException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1913 |
public void testResolveRequiresAndUsesWithNoParents() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1914 |
ModuleFinder empty = ModuleFinder.of(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1915 |
Configuration.resolveAndBind(empty, List.of(), empty, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1916 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1917 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1918 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1919 |
// parents with modules for specific platforms |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1920 |
@Test(dataProvider = "platformmatch") |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1921 |
public void testResolveRequiresWithCompatibleParents(String s1, String s2) |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1922 |
throws IOException |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1923 |
{ |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1924 |
ModuleDescriptor base = ModuleDescriptor.newModule("java.base").build(); |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
1925 |
Path system = writeModule(base, null); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1926 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1927 |
ModuleDescriptor descriptor1 = ModuleDescriptor.newModule("m1").build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1928 |
Path dir1 = writeModule(descriptor1, s1); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1929 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1930 |
ModuleDescriptor descriptor2 = ModuleDescriptor.newModule("m2").build(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1931 |
Path dir2 = writeModule(descriptor2, s2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1932 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1933 |
ModuleFinder finder1 = ModuleFinder.of(system, dir1); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1934 |
Configuration cf1 = resolve(finder1, "m1"); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1935 |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1936 |
ModuleFinder finder2 = ModuleFinder.of(system, dir2); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1937 |
Configuration cf2 = resolve(finder2, "m2"); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1938 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1939 |
Configuration cf3 = Configuration.resolve(ModuleFinder.of(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1940 |
List.of(cf1, cf2), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1941 |
ModuleFinder.of(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1942 |
Set.of()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1943 |
assertTrue(cf3.parents().size() == 2); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1944 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1945 |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1946 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1947 |
@Test(dataProvider = "platformmismatch", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1948 |
expectedExceptions = IllegalArgumentException.class ) |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1949 |
public void testResolveRequiresWithConflictingParents(String s1, String s2) |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1950 |
throws IOException |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1951 |
{ |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
1952 |
testResolveRequiresWithCompatibleParents(s1, s2); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1953 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1954 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1955 |
|
36511 | 1956 |
// null handling |
1957 |
||
1958 |
// finder1, finder2, roots |
|
1959 |
||
1960 |
||
1961 |
@Test(expectedExceptions = { NullPointerException.class }) |
|
1962 |
public void testResolveRequiresWithNull1() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1963 |
resolve((ModuleFinder)null, ModuleFinder.of()); |
36511 | 1964 |
} |
1965 |
||
1966 |
@Test(expectedExceptions = { NullPointerException.class }) |
|
1967 |
public void testResolveRequiresWithNull2() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1968 |
resolve(ModuleFinder.of(), (ModuleFinder)null); |
36511 | 1969 |
} |
1970 |
||
1971 |
@Test(expectedExceptions = { NullPointerException.class }) |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1972 |
public void testResolveRequiresWithNull3() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1973 |
Configuration empty = Configuration.empty(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1974 |
Configuration.resolve(null, List.of(empty), ModuleFinder.of(), Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1975 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1976 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1977 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1978 |
public void testResolveRequiresWithNull4() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1979 |
ModuleFinder empty = ModuleFinder.of(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1980 |
Configuration.resolve(empty, null, empty, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1981 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1982 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1983 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1984 |
public void testResolveRequiresWithNull5() { |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
1985 |
Configuration cf = ModuleLayer.boot().configuration(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1986 |
Configuration.resolve(ModuleFinder.of(), List.of(cf), null, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1987 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1988 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1989 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1990 |
public void testResolveRequiresWithNull6() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1991 |
ModuleFinder empty = ModuleFinder.of(); |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
1992 |
Configuration cf = ModuleLayer.boot().configuration(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1993 |
Configuration.resolve(empty, List.of(cf), empty, null); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1994 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1995 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
1996 |
@Test(expectedExceptions = { NullPointerException.class }) |
36511 | 1997 |
public void testResolveRequiresAndUsesWithNull1() { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
1998 |
resolveAndBind((ModuleFinder) null, ModuleFinder.of()); |
36511 | 1999 |
} |
2000 |
||
2001 |
@Test(expectedExceptions = { NullPointerException.class }) |
|
2002 |
public void testResolveRequiresAndUsesWithNull2() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2003 |
resolveAndBind(ModuleFinder.of(), (ModuleFinder) null); |
36511 | 2004 |
} |
2005 |
||
2006 |
@Test(expectedExceptions = { NullPointerException.class }) |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2007 |
public void testResolveRequiresAndUsesWithNull3() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2008 |
Configuration empty = Configuration.empty(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2009 |
Configuration.resolveAndBind(null, List.of(empty), ModuleFinder.of(), Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2010 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2011 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2012 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2013 |
public void testResolveRequiresAndUsesWithNull4() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2014 |
ModuleFinder empty = ModuleFinder.of(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2015 |
Configuration.resolveAndBind(empty, null, empty, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2016 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2017 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2018 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2019 |
public void testResolveRequiresAndUsesWithNull5() { |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
2020 |
Configuration cf = ModuleLayer.boot().configuration(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2021 |
Configuration.resolveAndBind(ModuleFinder.of(), List.of(cf), null, Set.of()); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2022 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2023 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2024 |
@Test(expectedExceptions = { NullPointerException.class }) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2025 |
public void testResolveRequiresAndUsesWithNull6() { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2026 |
ModuleFinder empty = ModuleFinder.of(); |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
2027 |
Configuration cf = ModuleLayer.boot().configuration(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2028 |
Configuration.resolveAndBind(empty, List.of(cf), empty, null); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2029 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2030 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39124
diff
changeset
|
2031 |
@Test(expectedExceptions = { NullPointerException.class }) |
36511 | 2032 |
public void testFindModuleWithNull() { |
2033 |
Configuration.empty().findModule(null); |
|
2034 |
} |
|
2035 |
||
2036 |
// immutable sets |
|
2037 |
||
2038 |
@Test(expectedExceptions = { UnsupportedOperationException.class }) |
|
2039 |
public void testImmutableSet1() { |
|
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
2040 |
Configuration cf = ModuleLayer.boot().configuration(); |
36511 | 2041 |
ResolvedModule base = cf.findModule("java.base").get(); |
2042 |
cf.modules().add(base); |
|
2043 |
} |
|
2044 |
||
2045 |
@Test(expectedExceptions = { UnsupportedOperationException.class }) |
|
2046 |
public void testImmutableSet2() { |
|
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
2047 |
Configuration cf = ModuleLayer.boot().configuration(); |
36511 | 2048 |
ResolvedModule base = cf.findModule("java.base").get(); |
2049 |
base.reads().add(base); |
|
2050 |
} |
|
2051 |
||
2052 |
||
2053 |
/** |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2054 |
* Invokes parent.resolve(...) |
36511 | 2055 |
*/ |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2056 |
private Configuration resolve(Configuration parent, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2057 |
ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2058 |
ModuleFinder after, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2059 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2060 |
return parent.resolve(before, after, Set.of(roots)); |
36511 | 2061 |
} |
2062 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2063 |
private Configuration resolve(Configuration parent, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2064 |
ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2065 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2066 |
return resolve(parent, before, ModuleFinder.of(), roots); |
36511 | 2067 |
} |
2068 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2069 |
private Configuration resolve(ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2070 |
ModuleFinder after, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2071 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2072 |
return resolve(Configuration.empty(), before, after, roots); |
36511 | 2073 |
} |
2074 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2075 |
private Configuration resolve(ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2076 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2077 |
return resolve(Configuration.empty(), before, roots); |
36511 | 2078 |
} |
2079 |
||
2080 |
||
2081 |
/** |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2082 |
* Invokes parent.resolveAndBind(...) |
36511 | 2083 |
*/ |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2084 |
private Configuration resolveAndBind(Configuration parent, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2085 |
ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2086 |
ModuleFinder after, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2087 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2088 |
return parent.resolveAndBind(before, after, Set.of(roots)); |
36511 | 2089 |
} |
2090 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2091 |
private Configuration resolveAndBind(Configuration parent, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2092 |
ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2093 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2094 |
return resolveAndBind(parent, before, ModuleFinder.of(), roots); |
36511 | 2095 |
} |
2096 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2097 |
private Configuration resolveAndBind(ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2098 |
ModuleFinder after, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2099 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2100 |
return resolveAndBind(Configuration.empty(), before, after, roots); |
36511 | 2101 |
} |
2102 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2103 |
private Configuration resolveAndBind(ModuleFinder before, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2104 |
String... roots) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2105 |
return resolveAndBind(Configuration.empty(), before, roots); |
36511 | 2106 |
} |
2107 |
||
2108 |
||
2109 |
/** |
|
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2110 |
* Writes a module-info.class. If {@code targetPlatform} is not null then |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2111 |
* it includes the ModuleTarget class file attribute with the target platform. |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2112 |
*/ |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2113 |
static Path writeModule(ModuleDescriptor descriptor, String targetPlatform) |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2114 |
throws IOException |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2115 |
{ |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2116 |
ModuleTarget target; |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2117 |
if (targetPlatform != null) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2118 |
target = new ModuleTarget(targetPlatform); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2119 |
} else { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2120 |
target = null; |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
2121 |
} |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2122 |
String name = descriptor.name(); |
45833
882f4885ec80
8183536: Update jdk tests to allow for unique test classes directory
alanb
parents:
45004
diff
changeset
|
2123 |
Path dir = Files.createTempDirectory(Paths.get(""), name); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2124 |
Path mi = dir.resolve("module-info.class"); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2125 |
try (OutputStream out = Files.newOutputStream(mi)) { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2126 |
ModuleInfoWriter.write(descriptor, target, out); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2127 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
2128 |
return dir; |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42338
diff
changeset
|
2129 |
} |
36511 | 2130 |
} |