--- old/test/runtime/modules/Visibility/XpatchVisibility.java 2016-07-15 07:00:27.360894804 +0100 +++ /dev/null 2016-02-05 17:55:23.637999981 +0000 @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2015, 2016, 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test - * @summary Ensure that a newly introduced java.base package placed within the -Xpatch directory - * is considered part of the boot loader's visibility boundary - * @requires !(os.family == "windows") - * @library /testlibrary - * @modules java.base/jdk.internal.misc - * java.management - * @run main/othervm XpatchVisibility - */ - -import java.io.File; -import java.nio.file.Files; -import java.nio.file.Paths; - -import jdk.test.lib.*; - -public class XpatchVisibility { - - public static void main(String[] args) throws Throwable { - - String Vis2_B_src = - "package p2;" + - "public class Vis2_B {" + - " public void m() {" + - " System.out.println(\"In B's m()\");" + - " }" + - "}"; - - String Vis2_A_src = - "import p2.*;" + - "public class Vis2_A {" + - " public static void main(String args[]) throws Exception {" + - // Try loading a class within a newly introduced java.base - // package. Make sure the class can be found via -Xpatch. - " try {" + - " p2.Vis2_B b = new p2.Vis2_B();" + - " if (b.getClass().getClassLoader() != null) {" + - " throw new RuntimeException(\"XpatchVisibility FAILED - class B " + - "should be loaded by boot class loader\\n\");" + - " }" + - " b.m();" + - " } catch (Throwable e) {" + - " throw new RuntimeException(\"XpatchVisibility FAILED - test " + - "should not throw an error or exception\\n\");" + - " }" + - " System.out.println(\"XpatchVisibility PASSED\\n\");" + - " }" + - "}"; - - ClassFileInstaller.writeClassToDisk("p2/Vis2_B", - InMemoryJavaCompiler.compile("p2.Vis2_B", Vis2_B_src), System.getProperty("test.classes")); - ClassFileInstaller.writeClassToDisk("p2/Vis2_B", "mods2/java.base"); - - ClassFileInstaller.writeClassToDisk("Vis2_A", - InMemoryJavaCompiler.compile("Vis2_A", Vis2_A_src), System.getProperty("test.classes")); - - // Make sure the classes are actually being loaded from mods2 - Files.delete(Paths.get(System.getProperty("test.classes") + File.separator + - "p2" + File.separator + "Vis2_B.class")); - - new OutputAnalyzer(ProcessTools.createJavaProcessBuilder( - "-Xpatch:java.base=mods2/java.base", - "-XaddExports:java.base/p2=ALL-UNNAMED", - "Vis2_A") - .start()).shouldHaveExitValue(0); - } -} --- /dev/null 2016-02-05 17:55:23.637999981 +0000 +++ new/test/runtime/modules/Visibility/PatchModuleVisibility.java 2016-07-15 07:00:27.187882983 +0100 @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2015, 2016, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @summary Ensure that a newly introduced java.base package placed within the --patch-module + * directory is considered part of the boot loader's visibility boundary + * @requires !(os.family == "windows") + * @library /testlibrary + * @modules java.base/jdk.internal.misc + * java.management + * @run main/othervm PatchModuleVisibility + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Paths; + +import jdk.test.lib.*; + +public class PatchModuleVisibility { + + public static void main(String[] args) throws Throwable { + + String Vis2_B_src = + "package p2;" + + "public class Vis2_B {" + + " public void m() {" + + " System.out.println(\"In B's m()\");" + + " }" + + "}"; + + String Vis2_A_src = + "import p2.*;" + + "public class Vis2_A {" + + " public static void main(String args[]) throws Exception {" + + // Try loading a class within a newly introduced java.base + // package. Make sure the class can be found via --patch-module. + " try {" + + " p2.Vis2_B b = new p2.Vis2_B();" + + " if (b.getClass().getClassLoader() != null) {" + + " throw new RuntimeException(\"PatchModuleVisibility FAILED - class B " + + "should be loaded by boot class loader\\n\");" + + " }" + + " b.m();" + + " } catch (Throwable e) {" + + " throw new RuntimeException(\"PatchModuleVisibility FAILED - test " + + "should not throw an error or exception\\n\");" + + " }" + + " System.out.println(\"PatchModuleVisibility PASSED\\n\");" + + " }" + + "}"; + + ClassFileInstaller.writeClassToDisk("p2/Vis2_B", + InMemoryJavaCompiler.compile("p2.Vis2_B", Vis2_B_src), System.getProperty("test.classes")); + ClassFileInstaller.writeClassToDisk("p2/Vis2_B", "mods2/java.base"); + + ClassFileInstaller.writeClassToDisk("Vis2_A", + InMemoryJavaCompiler.compile("Vis2_A", Vis2_A_src), System.getProperty("test.classes")); + + // Make sure the classes are actually being loaded from mods2 + Files.delete(Paths.get(System.getProperty("test.classes") + File.separator + + "p2" + File.separator + "Vis2_B.class")); + + new OutputAnalyzer(ProcessTools.createJavaProcessBuilder( + "--patch-module=java.base=mods2/java.base", + "--add-exports=java.base/p2=ALL-UNNAMED", + "Vis2_A") + .start()).shouldHaveExitValue(0); + } +}