jdk-sandbox: comparison test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java

equal deleted inserted replaced

-:c51f9eea6d2b
+:794cbfa7a309
 import java.util.Map;
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
 import jdk.test.lib.compiler.CompilerUtils;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 /**
 * Basic test of ModuleLayer.defineModulesWithOneLoader
 *
 * Test scenario:
-*   m1 requires m2 and m3
+* m1 requires m2 and m3
 */
 public void testWithOneLoader() throws Exception {
 Configuration cf = resolve("m1");
 ClassLoader scl = ClassLoader.getSystemClassLoader();
 /**
 * Basic test of ModuleLayer.defineModulesWithManyLoaders
 *
 * Test scenario:
-*   m1 requires m2 and m3
+* m1 requires m2 and m3
 */
 public void testWithManyLoaders() throws Exception {
 Configuration cf = resolve("m1");
 ClassLoader scl = ClassLoader.getSystemClassLoader();
 /**
 * Basic test of ModuleLayer.defineModulesWithOneLoader where one of the
 * modules is a service provider module.
 *
 * Test scenario:
-*    m1 requires m2 and m3
+* m1 requires m2 and m3
-*    m1 uses S
+* m1 uses S
-*    m4 provides S with ...
+* m4 provides S with ...
 */
 public void testServicesWithOneLoader() throws Exception {
 Configuration cf = resolveAndBind("m1");
 ClassLoader scl = ClassLoader.getSystemClassLoader();
 /**
 * Basic test of ModuleLayer.defineModulesWithManyLoaders where one of the
 * modules is a service provider module.
 *
 * Test scenario:
-*    m1 requires m2 and m3
+* m1 requires m2 and m3
-*    m1 uses S
+* m1 uses S
-*    m4 provides S with ...
+* m4 provides S with ...
 */
 public void testServicesWithManyLoaders() throws Exception {
 Configuration cf = resolveAndBind("m1");
 ClassLoader scl = ClassLoader.getSystemClassLoader();
 // one loader
 ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, parent);
 testLoad(layer, cn);
 // one loader with boot loader as parent
 layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, null);
 testLoadFail(layer, cn);
 // many loaders
 layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, parent);
 /**
 * Test defineModulesWithXXX when modules that have overlapping packages.
 *
 * Test scenario:
-*   m1 exports p
+* m1 exports p
-*   m2 exports p
+* m2 exports p
 */
 public void testOverlappingPackages() {
 ModuleDescriptor descriptor1
 = ModuleDescriptor.newModule("m1").exports("p").build();
 ModuleDescriptor descriptor2
 = ModuleDescriptor.newModule("m2").exports("p").build();
 ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2);
 Configuration cf = ModuleLayer.boot()
 .configuration()
 .resolve(finder, ModuleFinder.of(), Set.of("m1", "m2"));
 // cannot define both module m1 and m2 to the same class loader
 try {
 ModuleLayer.boot().defineModulesWithOneLoader(cf, null);
 assertTrue(false);
 /**
 * Test ModuleLayer.defineModulesWithXXX with split delegation.
 *
 * Test scenario:
-*   layer1: m1 exports p, m2 exports p
+* layer1: m1 exports p, m2 exports p
-*   layer2: m3 reads m1, m4 reads m2
+* layer2: m3 reads m1, m4 reads m2
 */
 public void testSplitDelegation() {
 ModuleDescriptor descriptor1
 = ModuleDescriptor.newModule("m1").exports("p").build();
 ModuleDescriptor descriptor2
 = ModuleDescriptor.newModule("m2").exports("p").build();
 ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2);
 Configuration cf1 = ModuleLayer.boot()
 .configuration()
 .resolve(finder1, ModuleFinder.of(), Set.of("m1", "m2"));
 ModuleLayer layer1 = ModuleLayer.boot().defineModulesWithManyLoaders(cf1, null);
 checkLayer(layer1, "m1", "m2");
 ModuleDescriptor descriptor3
 = ModuleDescriptor.newModule("m3").requires("m1").build();
 ModuleDescriptor descriptor4
 = ModuleDescriptor.newModule("m4").requires("m2").build();
 ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4);
 Configuration cf2 = cf1.resolve(finder2, ModuleFinder.of(),
 Set.of("m3", "m4"));
 // package p cannot be supplied by two class loaders
 try {
 layer1.defineModulesWithOneLoader(cf2, null);
 assertTrue(false);
 /**
 * Test ModuleLayer.defineModulesWithXXX when the modules that override same
 * named modules in the parent layer.
 *
 * Test scenario:
-*   layer1: m1, m2, m3 => same loader
+* layer1: m1, m2, m3 => same loader
-*   layer2: m1, m2, m4 => same loader
+* layer2: m1, m2, m4 => same loader
 */
 public void testOverriding1() throws Exception {
 Configuration cf1 = resolve("m1");
 ModuleLayer layer1 = ModuleLayer.boot().defineModulesWithOneLoader(cf1, null);
 checkLayer(layer1, "m1", "m2", "m3");
 ModuleFinder finder = ModuleFinder.of(MODS_DIR);
 Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
 Set.of("m1"));
 ModuleLayer layer2 = layer1.defineModulesWithOneLoader(cf2, null);
 checkLayer(layer2, "m1", "m2", "m3");
 invoke(layer1, "m1", "p.Main");
 /**
 * Test Layer defineModulesWithXXX when the modules that override same
 * named modules in the parent layer.
 *
 * Test scenario:
-*   layer1: m1, m2, m3 => loader pool
+* layer1: m1, m2, m3 => loader pool
-*   layer2: m1, m2, m3 => loader pool
+* layer2: m1, m2, m3 => loader pool
 */
 public void testOverriding2() throws Exception {
 Configuration cf1 = resolve("m1");
 ModuleLayer layer1 = ModuleLayer.boot().defineModulesWithManyLoaders(cf1, null);
 checkLayer(layer1, "m1", "m2", "m3");
 ModuleFinder finder = ModuleFinder.of(MODS_DIR);
 Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
 Set.of("m1"));
 ModuleLayer layer2 = layer1.defineModulesWithManyLoaders(cf2, null);
 checkLayer(layer2, "m1", "m2", "m3");
 invoke(layer1, "m1", "p.Main");
 checkLayer(layer1, "m1", "m2", "m3");
 ModuleFinder finder = finderFor("m1", "m3");
 Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
 Set.of("m1"));
 ModuleLayer layer2 = layer1.defineModulesWithOneLoader(cf2, null);
 checkLayer(layer2, "m1", "m3");
 invoke(layer1, "m1", "p.Main");
 checkLayer(layer1, "m1", "m2", "m3");
 ModuleFinder finder = finderFor("m1", "m3");
 Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
 Set.of("m1"));
 ModuleLayer layer2 = layer1.defineModulesWithManyLoaders(cf2, null);
 checkLayer(layer2, "m1", "m3");
 invoke(layer1, "m1", "p.Main");
 assertTrue(loader4.loadClass("w.Hello").getClassLoader() == loader6);
 assertTrue(loader6.loadClass("w.Hello").getClassLoader() == loader6);
 }
 /**
 * Basic test for locating resources with a class loader created by
 * defineModulesWithOneLoader.
 */
 public void testResourcesWithOneLoader() throws Exception {
+testResourcesWithOneLoader(ClassLoader.getSystemClassLoader());
+testResourcesWithOneLoader(null);
+}
+/**
+* Test locating resources with the class loader created by
+* defineModulesWithOneLoader. The class loader has the given class
+* loader as its parent.
+*/
+void testResourcesWithOneLoader(ClassLoader parent) throws Exception {
 Configuration cf = resolve("m1");
-ClassLoader scl = ClassLoader.getSystemClassLoader();
+ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, parent);
-ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, scl);
 ClassLoader loader = layer.findLoader("m1");
 assertNotNull(loader);
+assertTrue(loader.getParent() == parent);
 // check that getResource and getResources are consistent
 URL url1 = loader.getResource("module-info.class");
 URL url2 = loader.getResources("module-info.class").nextElement();
 assertEquals(url1.toURI(), url2.toURI());
 /**
 * Basic test for locating resources with class loaders created by
 * defineModulesWithManyLoaders.
 */
 public void testResourcesWithManyLoaders() throws Exception {
+testResourcesWithManyLoaders(ClassLoader.getSystemClassLoader());
+testResourcesWithManyLoaders(null);
+}
+/**
+* Test locating resources with class loaders created by
+* defineModulesWithManyLoaders. The class loaders have the given class
+* loader as their parent.
+*/
+void testResourcesWithManyLoaders(ClassLoader parent) throws Exception {
 Configuration cf = resolve("m1");
-ClassLoader scl = ClassLoader.getSystemClassLoader();
+ModuleLayer layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, parent);
-ModuleLayer layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, scl);
 for (Module m : layer.modules()) {
 String name = m.getName();
 ClassLoader loader = m.getClassLoader();
 assertNotNull(loader);
+assertTrue(loader.getParent() == parent);
 // getResource should find the module-info.class for the module
 URL url = loader.getResource("module-info.class");
 assertEquals(readModuleName(url), name);

changeset 48076	794cbfa7a309
parent 47216	71c04702a3d5
child 52102	19f6b12df31a