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
284 lines
8.7 KiB
Java
284 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.jartool/sun.tools.jar
|
|
* jdk.jlink/jdk.tools.jmod
|
|
* jdk.compiler
|
|
* @build BasicTest CompilerUtils jdk.testlibrary.*
|
|
* @run testng BasicTest
|
|
* @summary Basic test of starting an application as a module
|
|
*/
|
|
|
|
import java.io.File;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.nio.file.Paths;
|
|
|
|
import static jdk.testlibrary.ProcessTools.*;
|
|
|
|
import org.testng.annotations.BeforeTest;
|
|
import org.testng.annotations.Test;
|
|
import static org.testng.Assert.*;
|
|
|
|
|
|
@Test
|
|
public class BasicTest {
|
|
|
|
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 TEST_MODULE = "test";
|
|
|
|
// the module main class
|
|
private static final String MAIN_CLASS = "jdk.test.Main";
|
|
|
|
|
|
@BeforeTest
|
|
public void compileTestModule() throws Exception {
|
|
|
|
// javac -d mods/$TESTMODULE src/$TESTMODULE/**
|
|
boolean compiled
|
|
= CompilerUtils.compile(SRC_DIR.resolve(TEST_MODULE),
|
|
MODS_DIR.resolve(TEST_MODULE));
|
|
|
|
assertTrue(compiled, "test module did not compile");
|
|
}
|
|
|
|
|
|
/**
|
|
* The initial module is loaded from an exploded module
|
|
*/
|
|
public void testRunWithExplodedModule() throws Exception {
|
|
String dir = MODS_DIR.toString();
|
|
String subdir = MODS_DIR.resolve(TEST_MODULE).toString();
|
|
String mid = TEST_MODULE + "/" + MAIN_CLASS;
|
|
|
|
// java -mp mods -m $TESTMODULE/$MAINCLASS
|
|
int exitValue
|
|
= executeTestJava("-mp", dir, "-m", mid)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
assertTrue(exitValue == 0);
|
|
|
|
// java -mp mods/$TESTMODULE -m $TESTMODULE/$MAINCLASS
|
|
exitValue
|
|
= executeTestJava("-mp", subdir, "-m", mid)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
assertTrue(exitValue == 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* The initial module is loaded from a modular JAR file
|
|
*/
|
|
public void testRunWithModularJar() throws Exception {
|
|
Path dir = Files.createTempDirectory(USER_DIR, "mlib");
|
|
Path jar = dir.resolve("m.jar");
|
|
|
|
// jar --create ...
|
|
String classes = MODS_DIR.resolve(TEST_MODULE).toString();
|
|
String[] args = {
|
|
"--create",
|
|
"--file=" + jar,
|
|
"--main-class=" + MAIN_CLASS,
|
|
"-C", classes, "."
|
|
};
|
|
boolean success
|
|
= new sun.tools.jar.Main(System.out, System.out, "jar")
|
|
.run(args);
|
|
assertTrue(success);
|
|
|
|
// java -mp mlib -m $TESTMODULE
|
|
int exitValue
|
|
= executeTestJava("-mp", dir.toString(),
|
|
"-m", TEST_MODULE)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
assertTrue(exitValue == 0);
|
|
|
|
// java -mp mlib/m.jar -m $TESTMODULE
|
|
exitValue
|
|
= executeTestJava("-mp", jar.toString(),
|
|
"-m", TEST_MODULE)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
assertTrue(exitValue == 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Attempt to run with the initial module packaged as a JMOD file.
|
|
*/
|
|
public void testTryRunWithJMod() throws Exception {
|
|
Path dir = Files.createTempDirectory(USER_DIR, "mlib");
|
|
|
|
// jmod create ...
|
|
String cp = MODS_DIR.resolve(TEST_MODULE).toString();
|
|
String jmod = dir.resolve("m.jmod").toString();
|
|
String[] args = {
|
|
"create",
|
|
"--class-path", cp,
|
|
"--main-class", MAIN_CLASS,
|
|
jmod
|
|
};
|
|
jdk.tools.jmod.JmodTask task = new jdk.tools.jmod.JmodTask();
|
|
assertEquals(task.run(args), 0);
|
|
|
|
// java -mp mods -m $TESTMODULE
|
|
int exitValue
|
|
= executeTestJava("-mp", dir.toString(),
|
|
"-m", TEST_MODULE)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Run the test with a non-existent file on the application module path.
|
|
* It should be silently ignored.
|
|
*/
|
|
public void testRunWithNonExistentEntry() throws Exception {
|
|
String mp = "DoesNotExist" + File.pathSeparator + MODS_DIR.toString();
|
|
String mid = TEST_MODULE + "/" + MAIN_CLASS;
|
|
|
|
// java -mp mods -m $TESTMODULE/$MAINCLASS
|
|
int exitValue
|
|
= executeTestJava("-mp", mp,
|
|
"-m", mid)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue == 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Attempt to run an unknown initial module
|
|
*/
|
|
public void testTryRunWithBadModule() throws Exception {
|
|
String modulepath = MODS_DIR.toString();
|
|
|
|
// java -mp mods -m $TESTMODULE
|
|
int exitValue
|
|
= executeTestJava("-mp", modulepath,
|
|
"-m", "rhubarb")
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.shouldContain("not found")
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Attempt to run with -m specifying a main class that does not
|
|
* exist.
|
|
*/
|
|
public void testTryRunWithBadMainClass() throws Exception {
|
|
String modulepath = MODS_DIR.toString();
|
|
String mid = TEST_MODULE + "/p.rhubarb";
|
|
|
|
// java -mp mods -m $TESTMODULE/$MAINCLASS
|
|
int exitValue
|
|
= executeTestJava("-mp", modulepath,
|
|
"-m", mid)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Attempt to run with -m specifying a modular JAR that does not have
|
|
* a MainClass attribute
|
|
*/
|
|
public void testTryRunWithMissingMainClass() throws Exception {
|
|
Path dir = Files.createTempDirectory(USER_DIR, "mlib");
|
|
|
|
// jar --create ...
|
|
String classes = MODS_DIR.resolve(TEST_MODULE).toString();
|
|
String jar = dir.resolve("m.jar").toString();
|
|
String[] args = {
|
|
"--create",
|
|
"--file=" + jar,
|
|
"-C", classes, "."
|
|
};
|
|
boolean success
|
|
= new sun.tools.jar.Main(System.out, System.out, "jar")
|
|
.run(args);
|
|
assertTrue(success);
|
|
|
|
// java -mp mods -m $TESTMODULE
|
|
int exitValue
|
|
= executeTestJava("-mp", dir.toString(),
|
|
"-m", TEST_MODULE)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.shouldContain("does not have a MainClass attribute")
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
|
|
/**
|
|
* Attempt to run with -m specifying a main class that is a different
|
|
* module to that specified to -m
|
|
*/
|
|
public void testTryRunWithMainClassInWrongModule() throws Exception {
|
|
String modulepath = MODS_DIR.toString();
|
|
String mid = "java.base/" + MAIN_CLASS;
|
|
|
|
// java -mp mods -m $TESTMODULE/$MAINCLASS
|
|
int exitValue
|
|
= executeTestJava("-mp", modulepath,
|
|
"-m", mid)
|
|
.outputTo(System.out)
|
|
.errorTo(System.out)
|
|
.getExitValue();
|
|
|
|
assertTrue(exitValue != 0);
|
|
}
|
|
|
|
}
|