--- /dev/null 2018-02-08 21:21:41.723217456 -0800 +++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java 2018-04-08 23:15:55.300161085 -0700 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2018, 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 + * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds + * @modules jdk.compiler + * jdk.jartool/sun.tools.jar + * jdk.jlink + * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.* + * @run main AddReads + * @summary sanity test the --add-reads option + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.testlibrary.ProcessTools; +import jdk.testlibrary.Asserts; + +public class AddReads { + + private static final Path USER_DIR = Paths.get(System.getProperty("user.dir")); + + private static final String TEST_SRC = System.getProperty("test.src"); + + private static final Path SRC_DIR = Paths.get(TEST_SRC, "src"); + private static final Path MODS_DIR = Paths.get("mods"); + + // the module name of the test module + private static final String MAIN_MODULE = "com.norequires"; + private static final String SUB_MODULE = "org.astro"; + + // the module main class + private static final String MAIN_CLASS = "com.norequires.Main"; + private static final String APP_CLASS = "org.astro.World"; + + private static Path moduleDir = null; + private static Path subJar = null; + private static Path mainJar = null; + + public static void buildTestModule() throws Exception { + + // javac -d mods/$TESTMODULE src/$TESTMODULE/** + JarBuilder.compileModule(SRC_DIR.resolve(SUB_MODULE), + MODS_DIR.resolve(SUB_MODULE), + null); + + Asserts.assertTrue(CompilerUtils + .compile(SRC_DIR.resolve(MAIN_MODULE), + MODS_DIR.resolve(MAIN_MODULE), + "-cp", MODS_DIR.resolve(SUB_MODULE).toString(), + "--add-reads", "com.norequires=ALL-UNNAMED")); + + moduleDir = Files.createTempDirectory(USER_DIR, "mlib"); + subJar = moduleDir.resolve(SUB_MODULE + ".jar"); + String classes = MODS_DIR.resolve(SUB_MODULE).toString(); + JarBuilder.createModularJar(subJar.toString(), classes, null); + + mainJar = moduleDir.resolve(MAIN_MODULE + ".jar"); + classes = MODS_DIR.resolve(MAIN_MODULE).toString(); + JarBuilder.createModularJar(mainJar.toString(), classes, MAIN_CLASS); + } + + public static void main(String... args) throws Exception { + // compile the modules and create the modular jar files + buildTestModule(); + String appClasses[] = {MAIN_CLASS, APP_CLASS}; + // create an archive with the classes in the modules built in the + // previous step + OutputAnalyzer output = TestCommon.createArchive( + null, appClasses, + "--module-path", moduleDir.toString(), + "--add-modules", SUB_MODULE, + "--add-reads", "com.norequires=org.astro", + "-m", MAIN_MODULE); + TestCommon.checkDump(output); + String prefix[] = {"-cp", "\"\"", "-Xlog:class+load=trace", + "--add-modules", SUB_MODULE, + "--add-reads", "com.norequires=org.astro"}; + + // run the com.norequires module with the archive with the same args + // used during dump time. + // The classes should be loaded from the archive. + TestCommon.runWithModules(prefix, + null, // --upgrade-module-path + moduleDir.toString(), // --module-path + MAIN_MODULE) // -m + .assertNormalExit(out -> { + out.shouldContain("[class,load] com.norequires.Main source: shared objects file") + .shouldContain("[class,load] org.astro.World source: shared objects file"); + }); + + // create an archive with -cp pointing to the jar file containing the + // org.astro module and --module-path pointing to the main module + output = TestCommon.createArchive( + subJar.toString(), appClasses, + "--module-path", moduleDir.toString(), + "--add-modules", SUB_MODULE, + "--add-reads", "com.norequires=org.astro", + "-m", MAIN_MODULE); + TestCommon.checkDump(output); + // run the com.norequires module with the archive with the sub-module + // in the -cp and with -add-reads=com.norequires=ALL-UNNAMED + // The main class should be loaded from the archive. + // The org.astro.World should be loaded from the jar. + String prefix2[] = {"-cp", subJar.toString(), "-Xlog:class+load=trace", + "--add-reads", "com.norequires=ALL-UNNAMED"}; + TestCommon.runWithModules(prefix2, + null, // --upgrade-module-path + moduleDir.toString(), // --module-path + MAIN_MODULE) // -m + .assertNormalExit(out -> { + out.shouldContain("[class,load] com.norequires.Main source: shared objects file") + .shouldMatch(".class.load. org.astro.World source:.*org.astro.jar"); + }); + + } +}