db4d383614
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282 Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com> Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com> Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com> Co-authored-by: Amy Lu <amy.lu@oracle.com> Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com> Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com> Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com> Co-authored-by: Harold Seigel <harold.seigel@oracle.com> Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com> Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com> Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com> Co-authored-by: James Laskey <james.laskey@oracle.com> Co-authored-by: Lois Foltan <lois.foltan@oracle.com> Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com> Co-authored-by: Huaming Li <huaming.li@oracle.com> Co-authored-by: Sean Mullan <sean.mullan@oracle.com> Co-authored-by: Naoto Sato <naoto.sato@oracle.com> Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com> Co-authored-by: Peter Levart <peter.levart@gmail.com> Co-authored-by: Philip Race <philip.race@oracle.com> Co-authored-by: Claes Redestad <claes.redestad@oracle.com> Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com> Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com> Co-authored-by: Volker Simonis <volker.simonis@gmail.com> Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com> Co-authored-by: Stuart Marks <stuart.marks@oracle.com> Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com> Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com> Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com> Co-authored-by: Valerie Peng <valerie.peng@oracle.com> Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com> Co-authored-by: Weijun Wang <weijun.wang@oracle.com> Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com> Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com> Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com> Co-authored-by: Felix Yang <felix.yang@oracle.com> Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com> Co-authored-by: Frank Yuan <frank.yuan@oracle.com> Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com> Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com> Co-authored-by: Tiantian Du <tiantian.du@oracle.com> Co-authored-by: Sha Jiang <sha.jiang@oracle.com> Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
254 lines
8.7 KiB
Java
254 lines
8.7 KiB
Java
/*
|
|
* Copyright (c) 2014, 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
|
|
* @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;
|
|
|
|
import static jdk.testlibrary.ProcessTools.*;
|
|
|
|
import org.testng.annotations.BeforeTest;
|
|
import org.testng.annotations.DataProvider;
|
|
import org.testng.annotations.Test;
|
|
import static org.testng.Assert.*;
|
|
|
|
|
|
@Test
|
|
public class AddExportsTest {
|
|
|
|
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");
|
|
private static final Path UPGRADE_MODS_DIRS = Paths.get("upgrademods");
|
|
|
|
// test module m1 that uses Unsafe
|
|
private static final String TEST1_MODULE = "m1";
|
|
private static final String TEST1_MAIN_CLASS = "jdk.test1.Main";
|
|
|
|
// test module m2 uses java.transaction internals
|
|
private static final String TEST2_MODULE = "m2";
|
|
private static final String TEST2_MAIN_CLASS = "jdk.test2.Main";
|
|
|
|
// test module m3 uses m4 internals
|
|
private static final String TEST3_MODULE = "m3";
|
|
private static final String TEST3_MAIN_CLASS = "jdk.test3.Main";
|
|
private static final String TEST4_MODULE = "m4";
|
|
|
|
|
|
@BeforeTest
|
|
public void compileTestModules() throws Exception {
|
|
|
|
// javac -d mods/m1 src/m1/**
|
|
boolean compiled = CompilerUtils.compile(
|
|
SRC_DIR.resolve(TEST1_MODULE),
|
|
MODS_DIR.resolve(TEST1_MODULE),
|
|
"-XaddExports:java.base/sun.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),
|
|
MODS_DIR.resolve(TEST3_MODULE));
|
|
assertTrue(compiled, "module " + TEST3_MODULE + " did not compile");
|
|
|
|
// javac -d mods/m4 src/m4/**
|
|
compiled = CompilerUtils.compile(
|
|
SRC_DIR.resolve(TEST4_MODULE),
|
|
MODS_DIR.resolve(TEST4_MODULE));
|
|
assertTrue(compiled, "module " + TEST4_MODULE + " did not compile");
|
|
}
|
|
|
|
/**
|
|
* Sanity check with -version
|
|
*/
|
|
public void testSanity() throws Exception {
|
|
|
|
int exitValue
|
|
= executeTestJava("-XaddExports:java.base/sun.reflect=ALL-UNNAMED",
|
|
"-version")
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue == 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Run class path application that uses sun.misc.Unsafe
|
|
*/
|
|
public void testUnnamedModule() throws Exception {
|
|
|
|
// java -XaddExports:java.base/sun.misc=ALL-UNNAMED \
|
|
// -cp mods/$TESTMODULE jdk.test.UsesUnsafe
|
|
|
|
String classpath = MODS_DIR.resolve(TEST1_MODULE).toString();
|
|
int exitValue
|
|
= executeTestJava("-XaddExports:java.base/sun.misc=ALL-UNNAMED",
|
|
"-cp", classpath,
|
|
TEST1_MAIN_CLASS)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue == 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Run named module that uses sun.misc.Unsafe
|
|
*/
|
|
public void testNamedModule() throws Exception {
|
|
|
|
// java -XaddExports:java.base/sun.misc=test \
|
|
// -mp mods -m $TESTMODULE/$MAIN_CLASS
|
|
|
|
String mid = TEST1_MODULE + "/" + TEST1_MAIN_CLASS;
|
|
int exitValue =
|
|
executeTestJava("-XaddExports:java.base/sun.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/sun.reflect=ALL-UNNAMED",
|
|
"-XaddExports:java.base/sun.reflect=ALL-UNNAMED",
|
|
"-version")
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.shouldContain("specified more than once")
|
|
.getExitValue();
|
|
|
|
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();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
@DataProvider(name = "badvalues")
|
|
public Object[][] badValues() {
|
|
return new Object[][]{
|
|
|
|
{ "java.base/sun.misc", null }, // missing target
|
|
{ "java.base/sun.misc=sun.monkey", null }, // unknown target
|
|
{ "java.monkey/sun.monkey=ALL-UNNAMED", null }, // unknown module
|
|
{ "java.base/sun.monkey=ALL-UNNAMED", null }, // unknown package
|
|
{ "java.monkey/sun.monkey=ALL-UNNAMED", null }, // unknown module/package
|
|
{ "java.base=ALL-UNNAMED", null }, // missing package
|
|
{ "java.base/=ALL-UNNAMED", null } // missing package
|
|
|
|
};
|
|
}
|
|
}
|