jdk-sandbox: comparison hotspot/test/runtime/modules/AccessCheck/UmodUpkg

equal deleted inserted replaced

-:a5aa7536131c
+:4bb003cad9b9
 /*
-* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * questions.
 */
 /*
 * @test
-* @summary Test that if class c5 in an unnamed module can read package p6 in module m2, but package p6 in module m2 is
+* @summary Test that if class c5 in an unnamed module can read package p6 in module m2x, but package p6 in module m2x is
-*          exported qualifiedly to module m3, then class c5 in an unnamed module can not read p6.c6 in module m2.
+*          exported qualifiedly to module m3x, then class c5 in an unnamed module can not read p6.c6 in module m2x.
 * @modules java.base/jdk.internal.misc
 * @library /test/lib
 * @compile myloaders/MySameClassLoader.java
 * @compile p6/c6.java
 * @compile c5.java
 import java.util.Map;
 import java.util.Set;
 import myloaders.MySameClassLoader;
 //
-// ClassLoader1 --> defines m1 --> no packages
+// ClassLoader1 --> defines m1x --> no packages
-//                  defines m2 --> packages p6
+//                  defines m2x --> packages p6
-//                  defines m3 --> packages p3
+//                  defines m3x --> packages p3
 //
-// m1 can read m2
+// m1x can read m2x
-// package p6 in m2 is exported to m3
+// package p6 in m2x is exported to m3x
 //
-// class c5 defined in m1 tries to access p6.c6 defined in m2
+// class c5 defined in m1x tries to access p6.c6 defined in m2x
-// Access denied since although m1 can read m2, p6 is exported only to m3.
+// Access denied since although m1x can read m2x, p6 is exported only to m3x.
 //
 public class UmodUpkg_ExpQualOther {
 // Create a Layer over the boot layer.
 // Define modules within this layer to test access between
 // publically defined classes within packages of those modules.
 public void createLayerOnBoot() throws Throwable {
-// Define module:     m1 (need to define m1 to establish the Layer successfully)
+// Define module:     m1x (need to define m1x to establish the Layer successfully)
-// Can read:          java.base, m2, m3
+// Can read:          java.base, m2x, m3x
 // Packages:          none
 // Packages exported: none
-ModuleDescriptor descriptor_m1 =
+ModuleDescriptor descriptor_m1x =
-ModuleDescriptor.module("m1")
+ModuleDescriptor.newModule("m1x")
 .requires("java.base")
-.requires("m2")
+.requires("m2x")
-.requires("m3")
+.requires("m3x")
 .build();
-// Define module:     m2
+// Define module:     m2x
 // Can read:          java.base
 // Packages:          p6
-// Packages exported: p6 is exported to m3
+// Packages exported: p6 is exported to m3x
-ModuleDescriptor descriptor_m2 =
+ModuleDescriptor descriptor_m2x =
-ModuleDescriptor.module("m2")
+ModuleDescriptor.newModule("m2x")
 .requires("java.base")
-.exports("p6", Set.of("m3"))
+.exports("p6", Set.of("m3x"))
 .build();
-// Define module:     m3
+// Define module:     m3x
 // Can read:          java.base
 // Packages:          p3
 // Packages exported: none
-ModuleDescriptor descriptor_m3 =
+ModuleDescriptor descriptor_m3x =
-ModuleDescriptor.module("m3")
+ModuleDescriptor.newModule("m3x")
 .requires("java.base")
 .build();
 // Set up a ModuleFinder containing all modules for this layer.
-ModuleFinder finder = ModuleLibrary.of(descriptor_m1, descriptor_m2, descriptor_m3);
+ModuleFinder finder = ModuleLibrary.of(descriptor_m1x, descriptor_m2x, descriptor_m3x);
-// Resolves "m1"
+// Resolves "m1x"
 Configuration cf = Layer.boot()
 .configuration()
-.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
+.resolve(finder, ModuleFinder.of(), Set.of("m1x"));
 // map each module to differing class loaders for this test
 Map<String, ClassLoader> map = new HashMap<>();
-map.put("m1", MySameClassLoader.loader1);
+map.put("m1x", MySameClassLoader.loader1);
-map.put("m2", MySameClassLoader.loader1);
+map.put("m2x", MySameClassLoader.loader1);
-map.put("m3", MySameClassLoader.loader1);
+map.put("m3x", MySameClassLoader.loader1);
-// Create Layer that contains m1, m2 and m3
+// Create Layer that contains m1x, m2x and m3x
 Layer layer = Layer.boot().defineModules(cf, map::get);
-assertTrue(layer.findLoader("m1") == MySameClassLoader.loader1);
+assertTrue(layer.findLoader("m1x") == MySameClassLoader.loader1);
-assertTrue(layer.findLoader("m2") == MySameClassLoader.loader1);
+assertTrue(layer.findLoader("m2x") == MySameClassLoader.loader1);
-assertTrue(layer.findLoader("m3") == MySameClassLoader.loader1);
+assertTrue(layer.findLoader("m3x") == MySameClassLoader.loader1);
 assertTrue(layer.findLoader("java.base") == null);
 // now use the same loader to load class c5
 Class c5_class = MySameClassLoader.loader1.loadClass("c5");
 try {
 c5_class.newInstance();
-throw new RuntimeException("Failed to get IAE (p6 in m2 is exported to m3, not unqualifiedly to everyone)");
+throw new RuntimeException("Failed to get IAE (p6 in m2x is exported to m3x, not unqualifiedly to everyone)");
 } catch (IllegalAccessError e) {
 System.out.println(e.getMessage());
 if (!e.getMessage().contains("does not export")) {
 throw new RuntimeException("Wrong message: " + e.getMessage());
 }

changeset 43665	4bb003cad9b9
parent 42307	cefc81dc1d52
child 44520	0553e129e0ec