Lines 134-139
Link Here
|
134 |
Module m1 = mgr.create(new File(jars, "simple-module.jar"), null, false, false, false); |
134 |
Module m1 = mgr.create(new File(jars, "simple-module.jar"), null, false, false, false); |
135 |
assertEquals("org.foo", m1.getCodeNameBase()); |
135 |
assertEquals("org.foo", m1.getCodeNameBase()); |
136 |
assertEquals("org.bar", m2.getCodeNameBase()); |
136 |
assertEquals("org.bar", m2.getCodeNameBase()); |
|
|
137 |
assertCnb(m1); |
138 |
assertCnb(m2); |
137 |
assertEquals(Collections.EMPTY_SET, m1.getDependencies()); |
139 |
assertEquals(Collections.EMPTY_SET, m1.getDependencies()); |
138 |
assertEquals(Dependency.create(Dependency.TYPE_MODULE, "org.foo/1"), m2.getDependencies()); |
140 |
assertEquals(Dependency.create(Dependency.TYPE_MODULE, "org.foo/1"), m2.getDependencies()); |
139 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
141 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
Lines 902-909
Link Here
|
902 |
try { |
904 |
try { |
903 |
Module m1 = mgr.create(new File(jars, "prov-foo.jar"), null, false, false, false); |
905 |
Module m1 = mgr.create(new File(jars, "prov-foo.jar"), null, false, false, false); |
904 |
Module m2 = mgr.create(new File(jars, "req-foo.jar"), null, false, false, false); |
906 |
Module m2 = mgr.create(new File(jars, "req-foo.jar"), null, false, false, false); |
905 |
assertEquals(Collections.singletonList("foo"), Arrays.asList(m1.getProvides())); |
907 |
assertEquals(Collections.singletonList("foo"), assertCnb(m1)); |
906 |
assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides())); |
908 |
assertEquals(Collections.EMPTY_LIST, assertCnb(m2)); |
907 |
assertEquals(Collections.EMPTY_SET, m1.getDependencies()); |
909 |
assertEquals(Collections.EMPTY_SET, m1.getDependencies()); |
908 |
assertEquals(Dependency.create(Dependency.TYPE_REQUIRES, "foo"), m2.getDependencies()); |
910 |
assertEquals(Dependency.create(Dependency.TYPE_REQUIRES, "foo"), m2.getDependencies()); |
909 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
911 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
Lines 1134-1141
Link Here
|
1134 |
} else { |
1136 |
} else { |
1135 |
m2 = mgr.create(new File(jars, "needs-foo.jar"), null, false, false, false); |
1137 |
m2 = mgr.create(new File(jars, "needs-foo.jar"), null, false, false, false); |
1136 |
} |
1138 |
} |
1137 |
assertEquals(Collections.singletonList("foo"), Arrays.asList(m1.getProvides())); |
1139 |
assertEquals(Collections.singletonList("foo"), assertCnb(m1)); |
1138 |
assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides())); |
1140 |
assertEquals(Collections.EMPTY_LIST, assertCnb(m2)); |
1139 |
assertEquals(1, m1.getDependencies().size()); |
1141 |
assertEquals(1, m1.getDependencies().size()); |
1140 |
int type = recommends ? Dependency.TYPE_RECOMMENDS : Dependency.TYPE_NEEDS; |
1142 |
int type = recommends ? Dependency.TYPE_RECOMMENDS : Dependency.TYPE_NEEDS; |
1141 |
assertEquals(Dependency.create(type, "foo"), m2.getDependencies()); |
1143 |
assertEquals(Dependency.create(type, "foo"), m2.getDependencies()); |
Lines 1321-1328
Link Here
|
1321 |
"OpenIDE-Module-Recommends: foo\n"; |
1323 |
"OpenIDE-Module-Recommends: foo\n"; |
1322 |
m3 = mgr.create(copyJar(m2.getJarFile(), manifest), null, false, false, false); |
1324 |
m3 = mgr.create(copyJar(m2.getJarFile(), manifest), null, false, false, false); |
1323 |
} |
1325 |
} |
1324 |
assertEquals(Collections.singletonList("foo"), Arrays.asList(m1.getProvides())); |
1326 |
assertEquals(Collections.singletonList("foo"), assertCnb(m1)); |
1325 |
assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides())); |
1327 |
assertEquals(Collections.EMPTY_LIST, assertCnb(m2)); |
1326 |
assertEquals(1, m1.getDependencies().size()); |
1328 |
assertEquals(1, m1.getDependencies().size()); |
1327 |
int type = recommends ? Dependency.TYPE_RECOMMENDS : Dependency.TYPE_NEEDS; |
1329 |
int type = recommends ? Dependency.TYPE_RECOMMENDS : Dependency.TYPE_NEEDS; |
1328 |
assertEquals(Dependency.create(type, "foo"), m2.getDependencies()); |
1330 |
assertEquals(Dependency.create(type, "foo"), m2.getDependencies()); |
Lines 1401-1407
Link Here
|
1401 |
mgr.mutexPrivileged().enterWriteAccess(); |
1403 |
mgr.mutexPrivileged().enterWriteAccess(); |
1402 |
try { |
1404 |
try { |
1403 |
Module m2 = mgr.create(new File(jars, "recommends-foo.jar"), null, false, false, false); |
1405 |
Module m2 = mgr.create(new File(jars, "recommends-foo.jar"), null, false, false, false); |
1404 |
assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides())); |
1406 |
assertEquals(Collections.EMPTY_LIST, assertCnb(m2)); |
1405 |
assertEquals(Dependency.create(Dependency.TYPE_RECOMMENDS, "foo"), m2.getDependencies()); |
1407 |
assertEquals(Dependency.create(Dependency.TYPE_RECOMMENDS, "foo"), m2.getDependencies()); |
1406 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
1408 |
Map<String,Module> modulesByName = new HashMap<String,Module>(); |
1407 |
modulesByName.put(m2.getCodeNameBase(), m2); |
1409 |
modulesByName.put(m2.getCodeNameBase(), m2); |
Lines 1457-1463
Link Here
|
1457 |
mgr.mutexPrivileged().enterWriteAccess(); |
1459 |
mgr.mutexPrivileged().enterWriteAccess(); |
1458 |
try { |
1460 |
try { |
1459 |
Module m2 = mgr.create(new File(jars, "recommends-foo.jar"), null, false, false, false); |
1461 |
Module m2 = mgr.create(new File(jars, "recommends-foo.jar"), null, false, false, false); |
1460 |
assertEquals(Collections.EMPTY_LIST, Arrays.asList(m2.getProvides())); |
1462 |
assertEquals(Collections.EMPTY_LIST, assertCnb(m2)); |
1461 |
|
1463 |
|
1462 |
Module m1; |
1464 |
Module m1; |
1463 |
{ |
1465 |
{ |
Lines 2717-2720
Link Here
|
2717 |
return mgr.createFixed(new Manifest(new ByteArrayInputStream(manifest.getBytes())), null, ModuleManagerTest.class.getClassLoader()); |
2719 |
return mgr.createFixed(new Manifest(new ByteArrayInputStream(manifest.getBytes())), null, ModuleManagerTest.class.getClassLoader()); |
2718 |
} |
2720 |
} |
2719 |
|
2721 |
|
|
|
2722 |
private static Collection<String> assertCnb(Module m) { |
2723 |
String token = "cnb." + m.getCodeNameBase(); |
2724 |
List<String> arr = new ArrayList<String>(); |
2725 |
boolean ok = false; |
2726 |
for (String t : m.getProvides()) { |
2727 |
if (token.equals(t)) { |
2728 |
ok = true; |
2729 |
} else { |
2730 |
arr.add(t); |
2731 |
} |
2732 |
} |
2733 |
assertTrue(token + " is not among the list of provides of module " + m + " which is " + arr, ok); |
2734 |
return arr; |
2735 |
} |
2720 |
} |
2736 |
} |