--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Wed Nov 23 16:16:34 2016 +0000
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Thu Dec 01 08:56:41 2016 +0000
@@ -70,7 +70,7 @@
// Packages: p1
// Packages exported: p1 is exported unqualifiedly
ModuleDescriptor descriptor_m1 =
- new ModuleDescriptor.Builder("m1")
+ ModuleDescriptor.module("m1")
.requires("java.base")
.requires("m2")
.requires("m3")
@@ -82,9 +82,9 @@
// Packages: p2
// Packages exported: p2 is exported to m3
ModuleDescriptor descriptor_m2 =
- new ModuleDescriptor.Builder("m2")
+ ModuleDescriptor.module("m2")
.requires("java.base")
- .exports("p2", "m3")
+ .exports("p2", Set.of("m3"))
.build();
// Define module: m3
@@ -92,10 +92,10 @@
// Packages: p3
// Packages exported: none
ModuleDescriptor descriptor_m3 =
- new ModuleDescriptor.Builder("m3")
+ ModuleDescriptor.module("m3")
.requires("java.base")
.requires("m2")
- .conceals("p3")
+ .contains("p3")
.build();
// Set up a ModuleFinder containing all modules for this layer.