< prev index next >

jdk/test/tools/launcher/modules/addreads/AddReadsTest.java

Print this page

        

*** 25,35 **** * @test * @library /lib/testlibrary * @modules jdk.compiler * @build AddReadsTest CompilerUtils JarUtils jdk.testlibrary.* * @run testng AddReadsTest ! * @summary Basic tests for java -XaddReads */ import java.nio.file.Path; import java.nio.file.Paths; --- 25,35 ---- * @test * @library /lib/testlibrary * @modules jdk.compiler * @build AddReadsTest CompilerUtils JarUtils jdk.testlibrary.* * @run testng AddReadsTest ! * @summary Basic tests for java --add-reads */ import java.nio.file.Path; import java.nio.file.Paths;
*** 43,53 **** /** * The tests consists of two modules: m1 and junit. * Code in module m1 calls into code in module junit but the module-info.java * does not have a 'requires'. Instead a read edge is added via the command ! * line option -XaddReads. */ @Test public class AddReadsTest { --- 43,53 ---- /** * The tests consists of two modules: m1 and junit. * Code in module m1 calls into code in module junit but the module-info.java * does not have a 'requires'. Instead a read edge is added via the command ! * line option --add-reads. */ @Test public class AddReadsTest {
*** 70,80 **** // javac -d mods/m1 -cp classes/ src/m1/** assertTrue(CompilerUtils .compile(SRC_DIR.resolve("m1"), MODS_DIR.resolve("m1"), "-cp", CLASSES_DIR.toString(), ! "-XaddReads:m1=ALL-UNNAMED")); // jar cf mods/junit.jar -C classes . JarUtils.createJarFile(MODS_DIR.resolve("junit.jar"), CLASSES_DIR); } --- 70,80 ---- // javac -d mods/m1 -cp classes/ src/m1/** assertTrue(CompilerUtils .compile(SRC_DIR.resolve("m1"), MODS_DIR.resolve("m1"), "-cp", CLASSES_DIR.toString(), ! "--add-reads", "m1=ALL-UNNAMED")); // jar cf mods/junit.jar -C classes . JarUtils.createJarFile(MODS_DIR.resolve("junit.jar"), CLASSES_DIR); }
*** 89,204 **** /** * Run with junit as a module on the module path. */ public void testJUnitOnModulePath() throws Exception { ! // java -mp mods -addmods junit -XaddReads:m1=junit -m .. int exitValue ! = run("-mp", MODS_DIR.toString(), ! "-addmods", "junit", ! "-XaddReads:m1=junit", "-m", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Exercise -XaddReads:m1=ALL-UNNAMED by running with junit on the * class path. */ public void testJUnitOnClassPath() throws Exception { ! // java -mp mods -cp mods/junit.jar -XaddReads:m1=ALL-UNNAMED -m .. String cp = MODS_DIR.resolve("junit.jar").toString(); int exitValue ! = run("-mp", MODS_DIR.toString(), "-cp", cp, ! "-XaddReads:m1=ALL-UNNAMED", "-m", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Run with junit as a module on the module path but without -XaddReads. */ public void testJUnitOnModulePathMissingAddReads() throws Exception { ! // java -mp mods -addmods junit -m .. int exitValue ! = run("-mp", MODS_DIR.toString(), ! "-addmods", "junit", ! "-m", MAIN) .shouldContain("IllegalAccessError") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Run with junit on the class path but without -XaddReads. */ public void testJUnitOnClassPathMissingAddReads() throws Exception { ! // java -mp mods -cp mods/junit.jar -m .. String cp = MODS_DIR.resolve("junit.jar").toString(); int exitValue ! = run("-mp", MODS_DIR.toString(), "-cp", cp, "-m", MAIN) .shouldContain("IllegalAccessError") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Exercise -XaddReads with a more than one source module. */ public void testJUnitWithMultiValueOption() throws Exception { int exitValue ! = run("-mp", MODS_DIR.toString(), ! "-addmods", "java.xml,junit", ! "-XaddReads:m1=java.xml,junit", ! "-m", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Exercise -XaddReads where the target module is specified more than once */ public void testWithTargetSpecifiedManyTimes() throws Exception { int exitValue ! = run("-mp", MODS_DIR.toString(), ! "-addmods", "java.xml,junit", ! "-XaddReads:m1=java.xml", ! "-XaddReads:m1=junit", "-m", MAIN) .shouldContain("specified more than once") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Exercise -XaddReads with bad values */ @Test(dataProvider = "badvalues") public void testWithBadValue(String value, String ignore) throws Exception { ! // -XaddExports:$VALUE -version ! assertTrue(run("-XaddReads:" + value, "-version").getExitValue() != 0); } @DataProvider(name = "badvalues") public Object[][] badValues() { return new Object[][]{ --- 89,204 ---- /** * Run with junit as a module on the module path. */ public void testJUnitOnModulePath() throws Exception { ! // java --module-path mods --add-modules junit --add-reads m1=junit -m .. int exitValue ! = run("--module-path", MODS_DIR.toString(), ! "--add-modules", "junit", ! "--add-reads", "m1=junit", "-m", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Exercise --add-reads m1=ALL-UNNAMED by running with junit on the * class path. */ public void testJUnitOnClassPath() throws Exception { ! // java --module-path mods -cp mods/junit.jar --add-reads m1=ALL-UNNAMED -m .. String cp = MODS_DIR.resolve("junit.jar").toString(); int exitValue ! = run("--module-path", MODS_DIR.toString(), "-cp", cp, ! "--add-reads", "m1=ALL-UNNAMED", "-m", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Run with junit as a module on the module path but without --add-reads. */ public void testJUnitOnModulePathMissingAddReads() throws Exception { ! // java --module-path mods --add-modules junit --module .. int exitValue ! = run("--module-path", MODS_DIR.toString(), ! "--add-modules", "junit", ! "--module", MAIN) .shouldContain("IllegalAccessError") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Run with junit on the class path but without --add-reads. */ public void testJUnitOnClassPathMissingAddReads() throws Exception { ! // java --module-path mods -cp mods/junit.jar -m .. String cp = MODS_DIR.resolve("junit.jar").toString(); int exitValue ! = run("--module-path", MODS_DIR.toString(), "-cp", cp, "-m", MAIN) .shouldContain("IllegalAccessError") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Exercise --add-reads with a more than one source module. */ public void testJUnitWithMultiValueOption() throws Exception { int exitValue ! = run("--module-path", MODS_DIR.toString(), ! "--add-modules", "java.xml,junit", ! "--add-reads", "m1=java.xml,junit", ! "--module", MAIN) .getExitValue(); assertTrue(exitValue == 0); } /** ! * Exercise --add-reads where the target module is specified more than once */ public void testWithTargetSpecifiedManyTimes() throws Exception { int exitValue ! = run("--module-path", MODS_DIR.toString(), ! "--add-modules", "java.xml,junit", ! "--add-reads", "m1=java.xml", ! "--add-reads", "m1=junit", "-m", MAIN) .shouldContain("specified more than once") .getExitValue(); assertTrue(exitValue != 0); } /** ! * Exercise --add-reads with bad values */ @Test(dataProvider = "badvalues") public void testWithBadValue(String value, String ignore) throws Exception { ! // --add-exports $VALUE -version ! assertTrue(run("--add-reads", value, "-version").getExitValue() != 0); } @DataProvider(name = "badvalues") public Object[][] badValues() { return new Object[][]{
< prev index next >