< prev index next >
jdk/test/tools/launcher/modules/addexports/AddExportsTest.java
Print this page
*** 25,35 ****
* @test
* @library /lib/testlibrary
* @modules jdk.compiler
* @build AddExportsTest CompilerUtils jdk.testlibrary.*
* @run testng AddExportsTest
! * @summary Basic tests for java -XaddExports
*/
import java.nio.file.Path;
import java.nio.file.Paths;
--- 25,35 ----
* @test
* @library /lib/testlibrary
* @modules jdk.compiler
* @build AddExportsTest CompilerUtils jdk.testlibrary.*
* @run testng AddExportsTest
! * @summary Basic tests for java --add-exports
*/
import java.nio.file.Path;
import java.nio.file.Paths;
*** 69,93 ****
// javac -d mods/m1 src/m1/**
boolean compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST1_MODULE),
MODS_DIR.resolve(TEST1_MODULE),
! "-XaddExports:java.base/jdk.internal.misc=m1");
assertTrue(compiled, "module " + TEST1_MODULE + " did not compile");
// javac -d upgrademods/java.transaction src/java.transaction/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve("java.transaction"),
UPGRADE_MODS_DIRS.resolve("java.transaction"));
assertTrue(compiled, "module java.transaction did not compile");
! // javac -upgrademodulepath upgrademods -d mods/m2 src/m2/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST2_MODULE),
MODS_DIR.resolve(TEST2_MODULE),
! "-upgrademodulepath", UPGRADE_MODS_DIRS.toString(),
! "-XaddExports:java.transaction/javax.transaction.internal=m2");
assertTrue(compiled, "module " + TEST2_MODULE + " did not compile");
// javac -d mods/m3 src/m3/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST3_MODULE),
--- 69,93 ----
// javac -d mods/m1 src/m1/**
boolean compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST1_MODULE),
MODS_DIR.resolve(TEST1_MODULE),
! "--add-exports", "java.base/jdk.internal.misc=m1");
assertTrue(compiled, "module " + TEST1_MODULE + " did not compile");
// javac -d upgrademods/java.transaction src/java.transaction/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve("java.transaction"),
UPGRADE_MODS_DIRS.resolve("java.transaction"));
assertTrue(compiled, "module java.transaction did not compile");
! // javac --upgrade-module-path upgrademods -d mods/m2 src/m2/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST2_MODULE),
MODS_DIR.resolve(TEST2_MODULE),
! "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
! "--add-exports", "java.transaction/javax.transaction.internal=m2");
assertTrue(compiled, "module " + TEST2_MODULE + " did not compile");
// javac -d mods/m3 src/m3/**
compiled = CompilerUtils.compile(
SRC_DIR.resolve(TEST3_MODULE),
*** 105,115 ****
* Sanity check with -version
*/
public void testSanity() throws Exception {
int exitValue
! = executeTestJava("-XaddExports:java.base/jdk.internal.reflect=ALL-UNNAMED",
"-version")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
--- 105,115 ----
* Sanity check with -version
*/
public void testSanity() throws Exception {
int exitValue
! = executeTestJava("--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
"-version")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
*** 120,135 ****
/**
* Run class path application that uses jdk.internal.misc.Unsafe
*/
public void testUnnamedModule() throws Exception {
! // java -XaddExports:java.base/jdk.internal.misc=ALL-UNNAMED \
// -cp mods/$TESTMODULE jdk.test.UsesUnsafe
String classpath = MODS_DIR.resolve(TEST1_MODULE).toString();
int exitValue
! = executeTestJava("-XaddExports:java.base/jdk.internal.misc=ALL-UNNAMED",
"-cp", classpath,
TEST1_MAIN_CLASS)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
--- 120,135 ----
/**
* Run class path application that uses jdk.internal.misc.Unsafe
*/
public void testUnnamedModule() throws Exception {
! // java --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
// -cp mods/$TESTMODULE jdk.test.UsesUnsafe
String classpath = MODS_DIR.resolve(TEST1_MODULE).toString();
int exitValue
! = executeTestJava("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
"-cp", classpath,
TEST1_MAIN_CLASS)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
*** 141,216 ****
/**
* Run named module that uses jdk.internal.misc.Unsafe
*/
public void testNamedModule() throws Exception {
! // java -XaddExports:java.base/jdk.internal.misc=test \
! // -mp mods -m $TESTMODULE/$MAIN_CLASS
String mid = TEST1_MODULE + "/" + TEST1_MAIN_CLASS;
int exitValue =
! executeTestJava("-XaddExports:java.base/jdk.internal.misc=" + TEST1_MODULE,
! "-mp", MODS_DIR.toString(),
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * Test -XaddExports with upgraded module
*/
public void testWithUpgradedModule() throws Exception {
! // java -XaddExports:java.transaction/javax.transaction.internal=m2
! // -upgrademodulepath upgrademods -mp mods -m ...
String mid = TEST2_MODULE + "/" + TEST2_MAIN_CLASS;
int exitValue = executeTestJava(
! "-XaddExports:java.transaction/javax.transaction.internal=m2",
! "-upgrademodulepath", UPGRADE_MODS_DIRS.toString(),
! "-mp", MODS_DIR.toString(),
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * Test -XaddExports with module that is added to the set of root modules
! * with -addmods.
*/
public void testWithAddMods() throws Exception {
! // java -XaddExports:m4/jdk.test4=m3 -mp mods -m ...
String mid = TEST3_MODULE + "/" + TEST3_MAIN_CLASS;
int exitValue = executeTestJava(
! "-XaddExports:m4/jdk.test4=m3",
! "-mp", MODS_DIR.toString(),
! "-addmods", TEST4_MODULE,
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * -XaddExports can only be specified once
*/
public void testWithDuplicateOption() throws Exception {
int exitValue
! = executeTestJava("-XaddExports:java.base/jdk.internal.reflect=ALL-UNNAMED",
! "-XaddExports:java.base/jdk.internal.reflect=ALL-UNNAMED",
"-version")
.outputTo(System.out)
.errorTo(System.out)
.shouldContain("specified more than once")
.getExitValue();
--- 141,216 ----
/**
* Run named module that uses jdk.internal.misc.Unsafe
*/
public void testNamedModule() throws Exception {
! // java --add-exports java.base/jdk.internal.misc=test \
! // --module-path mods -m $TESTMODULE/$MAIN_CLASS
String mid = TEST1_MODULE + "/" + TEST1_MAIN_CLASS;
int exitValue =
! executeTestJava("--add-exports", "java.base/jdk.internal.misc=" + TEST1_MODULE,
! "--module-path", MODS_DIR.toString(),
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * Test --add-exports with upgraded module
*/
public void testWithUpgradedModule() throws Exception {
! // java --add-exports java.transaction/javax.transaction.internal=m2
! // --upgrade-module-path upgrademods --module-path mods -m ...
String mid = TEST2_MODULE + "/" + TEST2_MAIN_CLASS;
int exitValue = executeTestJava(
! "--add-exports", "java.transaction/javax.transaction.internal=m2",
! "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
! "--module-path", MODS_DIR.toString(),
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * Test --add-exports with module that is added to the set of root modules
! * with --add-modules.
*/
public void testWithAddMods() throws Exception {
! // java --add-exports m4/jdk.test4=m3 --module-path mods -m ...
String mid = TEST3_MODULE + "/" + TEST3_MAIN_CLASS;
int exitValue = executeTestJava(
! "--add-exports", "m4/jdk.test4=m3",
! "--module-path", MODS_DIR.toString(),
! "--add-modules", TEST4_MODULE,
"-m", mid)
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
assertTrue(exitValue == 0);
}
/**
! * --add-exports can only be specified once
*/
public void testWithDuplicateOption() throws Exception {
int exitValue
! = executeTestJava("--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
! "--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
"-version")
.outputTo(System.out)
.errorTo(System.out)
.shouldContain("specified more than once")
.getExitValue();
*** 218,235 ****
assertTrue(exitValue != 0);
}
/**
! * Exercise -XaddExports with bad values
*/
@Test(dataProvider = "badvalues")
public void testWithBadValue(String value, String ignore) throws Exception {
! // -XaddExports:$VALUE -version
int exitValue =
! executeTestJava("-XaddExports:" + value,
"-version")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
--- 218,235 ----
assertTrue(exitValue != 0);
}
/**
! * Exercise --add-exports with bad values
*/
@Test(dataProvider = "badvalues")
public void testWithBadValue(String value, String ignore) throws Exception {
! // --add-exports $VALUE -version
int exitValue =
! executeTestJava("--add-exports", value,
"-version")
.outputTo(System.out)
.errorTo(System.out)
.getExitValue();
< prev index next >