298 lines
12 KiB
Java
298 lines
12 KiB
Java
|
/*
|
||
|
|
* Copyright (c) 2015, 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
|
||
|
|
* @summary tests for multi-module mode compilation
|
||
|
|
* @library /tools/lib
|
||
|
|
* @modules
|
||
|
|
* jdk.compiler/com.sun.tools.javac.api
|
||
|
|
* jdk.compiler/com.sun.tools.javac.main
|
||
|
|
* jdk.jdeps/com.sun.tools.javap
|
||
|
|
* @build ToolBox ModuleTestBase
|
||
|
|
* @run main XModuleTest
|
||
|
|
*/
|
||
|
|
|
||
|
|
import java.nio.file.Path;
|
||
|
|
import java.util.Arrays;
|
||
|
|
import java.util.List;
|
||
|
|
|
||
|
|
public class XModuleTest extends ModuleTestBase {
|
||
|
|
|
||
|
|
public static void main(String... args) throws Exception {
|
||
|
|
new XModuleTest().runTests();
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testCorrectXModule(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
String log = tb.new JavacTask()
|
||
|
|
.options("-Xmodule:java.compiler")
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run()
|
||
|
|
.writeAll()
|
||
|
|
.getOutput(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
if (!log.isEmpty())
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testSourcePath(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, Other { }", "package javax.lang.model.element; interface Other { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
String log = tb.new JavacTask()
|
||
|
|
.options("-Xmodule:java.compiler", "-sourcepath", src.toString())
|
||
|
|
.outdir(classes)
|
||
|
|
.files(src.resolve("javax/lang/model/element/Extra.java"))
|
||
|
|
.run()
|
||
|
|
.writeAll()
|
||
|
|
.getOutput(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
if (!log.isEmpty())
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testClassPath(Path base) throws Exception {
|
||
|
|
Path cpSrc = base.resolve("cpSrc");
|
||
|
|
tb.writeJavaFiles(cpSrc, "package p; public interface Other { }");
|
||
|
|
Path cpClasses = base.resolve("cpClasses");
|
||
|
|
tb.createDirectories(cpClasses);
|
||
|
|
|
||
|
|
String cpLog = tb.new JavacTask()
|
||
|
|
.outdir(cpClasses)
|
||
|
|
.files(findJavaFiles(cpSrc))
|
||
|
|
.run()
|
||
|
|
.writeAll()
|
||
|
|
.getOutput(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
if (!cpLog.isEmpty())
|
||
|
|
throw new Exception("expected output not found: " + cpLog);
|
||
|
|
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, p.Other { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
String log = tb.new JavacTask()
|
||
|
|
.options("-Xmodule:java.compiler", "-classpath", cpClasses.toString())
|
||
|
|
.outdir(classes)
|
||
|
|
.files(src.resolve("javax/lang/model/element/Extra.java"))
|
||
|
|
.run()
|
||
|
|
.writeAll()
|
||
|
|
.getOutput(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
if (!log.isEmpty())
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testNoModuleInfoOnSourcePath(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src,
|
||
|
|
"module java.compiler {}",
|
||
|
|
"package javax.lang.model.element; public interface Extra { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
List<String> log = tb.new JavacTask()
|
||
|
|
.options("-XDrawDiagnostics", "-Xmodule:java.compiler")
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run(ToolBox.Expect.FAIL)
|
||
|
|
.writeAll()
|
||
|
|
.getOutputLines(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
List<String> expected = Arrays.asList("Extra.java:1:1: compiler.err.module-info.with.xmodule.sourcepath",
|
||
|
|
"1 error");
|
||
|
|
|
||
|
|
if (!expected.equals(log))
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testNoModuleInfoInClassOutput(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path srcMod = base.resolve("src-mod");
|
||
|
|
tb.writeJavaFiles(srcMod,
|
||
|
|
"module mod {}");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
String logMod = tb.new JavacTask()
|
||
|
|
.options()
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(srcMod))
|
||
|
|
.run()
|
||
|
|
.writeAll()
|
||
|
|
.getOutput(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
if (!logMod.isEmpty())
|
||
|
|
throw new Exception("unexpected output found: " + logMod);
|
||
|
|
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src,
|
||
|
|
"package javax.lang.model.element; public interface Extra { }");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
List<String> log = tb.new JavacTask()
|
||
|
|
.options("-XDrawDiagnostics", "-Xmodule:java.compiler")
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run(ToolBox.Expect.FAIL)
|
||
|
|
.writeAll()
|
||
|
|
.getOutputLines(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
List<String> expected = Arrays.asList("Extra.java:1:1: compiler.err.module-info.with.xmodule.classpath",
|
||
|
|
"1 error");
|
||
|
|
|
||
|
|
if (!expected.equals(log))
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testModuleSourcePathXModule(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
List<String> log = tb.new JavacTask()
|
||
|
|
.options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-modulesourcepath", src.toString())
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run(ToolBox.Expect.FAIL)
|
||
|
|
.writeAll()
|
||
|
|
.getOutputLines(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
List<String> expected = Arrays.asList("- compiler.err.xmodule.no.module.sourcepath",
|
||
|
|
"1 error");
|
||
|
|
|
||
|
|
if (!expected.equals(log))
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testXModuleTooMany(Path base) throws Exception {
|
||
|
|
//note: avoiding use of java.base, as that gets special handling on some places:
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
|
||
|
|
Path classes = base.resolve("classes");
|
||
|
|
tb.createDirectories(classes);
|
||
|
|
|
||
|
|
List<String> log = tb.new JavacTask(ToolBox.Mode.CMDLINE)
|
||
|
|
.options("-XDrawDiagnostics", "-Xmodule:java.compiler", "-Xmodule:java.compiler")
|
||
|
|
.outdir(classes)
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run(ToolBox.Expect.FAIL)
|
||
|
|
.writeAll()
|
||
|
|
.getOutputLines(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
List<String> expected = Arrays.asList("javac: option -Xmodule: can only be specified once",
|
||
|
|
"Usage: javac <options> <source files>",
|
||
|
|
"use -help for a list of possible options");
|
||
|
|
|
||
|
|
if (!expected.equals(log))
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testWithModulePath(Path base) throws Exception {
|
||
|
|
Path module = base.resolve("modules");
|
||
|
|
new ModuleBuilder("m1")
|
||
|
|
.classes("package pkg1; public interface E { }")
|
||
|
|
.build(module);
|
||
|
|
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }");
|
||
|
|
|
||
|
|
tb.new JavacTask(ToolBox.Mode.CMDLINE)
|
||
|
|
.options("-modulepath", module.toString(),
|
||
|
|
"-Xmodule:m1")
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run()
|
||
|
|
.writeAll();
|
||
|
|
|
||
|
|
//checks module bounds still exist
|
||
|
|
new ModuleBuilder("m2")
|
||
|
|
.classes("package pkg2; public interface D { }")
|
||
|
|
.build(module);
|
||
|
|
|
||
|
|
Path src2 = base.resolve("src2");
|
||
|
|
tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }");
|
||
|
|
|
||
|
|
List<String> log = tb.new JavacTask(ToolBox.Mode.CMDLINE)
|
||
|
|
.options("-XDrawDiagnostics",
|
||
|
|
"-modulepath", module.toString(),
|
||
|
|
"-Xmodule:m1")
|
||
|
|
.files(findJavaFiles(src2))
|
||
|
|
.run(ToolBox.Expect.FAIL)
|
||
|
|
.writeAll()
|
||
|
|
.getOutputLines(ToolBox.OutputKind.DIRECT);
|
||
|
|
|
||
|
|
List<String> expected = Arrays.asList("A.java:1:36: compiler.err.doesnt.exist: pkg2",
|
||
|
|
"1 error");
|
||
|
|
|
||
|
|
if (!expected.equals(log))
|
||
|
|
throw new Exception("expected output not found: " + log);
|
||
|
|
}
|
||
|
|
|
||
|
|
@Test
|
||
|
|
void testWithUpgradeModulePath(Path base) throws Exception {
|
||
|
|
Path module = base.resolve("modules");
|
||
|
|
new ModuleBuilder("m1")
|
||
|
|
.classes("package pkg1; public interface E { }")
|
||
|
|
.build(module);
|
||
|
|
|
||
|
|
Path upgrade = base.resolve("upgrade");
|
||
|
|
new ModuleBuilder("m1")
|
||
|
|
.classes("package pkg1; public interface D { }")
|
||
|
|
.build(upgrade);
|
||
|
|
|
||
|
|
Path src = base.resolve("src");
|
||
|
|
tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }");
|
||
|
|
|
||
|
|
tb.new JavacTask(ToolBox.Mode.CMDLINE)
|
||
|
|
.options("-modulepath", module.toString(),
|
||
|
|
"-upgrademodulepath", upgrade.toString(),
|
||
|
|
"-Xmodule:m1")
|
||
|
|
.files(findJavaFiles(src))
|
||
|
|
.run()
|
||
|
|
.writeAll();
|
||
|
|
}
|
||
|
|
}
|