--- old/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java 2016-12-13 21:43:14.000000000 -0800 +++ new/jdk/test/jdk/modules/etc/VerifyModuleDelegation.java 2016-12-13 21:43:14.000000000 -0800 @@ -24,9 +24,7 @@ /** * @test * @summary Verify the defining class loader of each module never delegates - * to its child class loader. Also sanity check java.compact2 - * requires. - * @modules java.compact2 + * to its child class loader. * @run testng/othervm --add-modules=ALL-SYSTEM VerifyModuleDelegation */ @@ -46,21 +44,10 @@ public class VerifyModuleDelegation { private static final String JAVA_BASE = "java.base"; - private static final String JAVA_COMPACT1 = "java.compact1"; - private static final String JAVA_COMPACT2 = "java.compact2"; private static final ModuleDescriptor BASE = ModuleDescriptor.module(JAVA_BASE).build(); - private static final ModuleDescriptor COMPACT2 - = ModuleDescriptor.module(JAVA_COMPACT2) - .requires(Set.of(MANDATED), JAVA_BASE) - .requires(Set.of(TRANSITIVE), JAVA_COMPACT1) - .requires(Set.of(TRANSITIVE), "java.rmi") - .requires(Set.of(TRANSITIVE), "java.sql") - .requires(Set.of(TRANSITIVE), "java.xml") - .build(); - private static final Set MREFS = Layer.boot().modules().stream().map(Module::getDescriptor) .collect(toSet()); @@ -79,14 +66,6 @@ check(md, BASE); } - @Test - public void checkCompact2() { - ModuleDescriptor md = - MREFS.stream() - .filter(d -> d.name().equals(JAVA_COMPACT2)) - .findFirst().orElseThrow(Error::new); - check(md, COMPACT2); - } @Test public void checkLoaderDelegation() {