mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 23:34:52 +02:00
8187443: Forest Consolidation: Move files to unified layout
Reviewed-by: darcy, ihse
This commit is contained in:
Erik Joelsson
parent
270fe13182
commit
3789983e89
56923 changed files with 3 additions and 15727 deletions
292
test/langtools/tools/javac/modules/UpgradeModulePathTest.java
Normal file
292
test/langtools/tools/javac/modules/UpgradeModulePathTest.java
Normal file
|
|
@ -0,0 +1,292 @@
|
|||
/*
|
||||
* 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 --upgrade-module-path
|
||||
* @library /tools/lib
|
||||
* @modules
|
||||
* jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
|
||||
* @run main UpgradeModulePathTest
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import toolbox.JavacTask;
|
||||
import toolbox.ModuleBuilder;
|
||||
import toolbox.Task;
|
||||
|
||||
public class UpgradeModulePathTest extends ModuleTestBase {
|
||||
|
||||
public static void main(String... args) throws Exception {
|
||||
UpgradeModulePathTest t = new UpgradeModulePathTest();
|
||||
t.runTests();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void simpleUsage(Path base) throws Exception {
|
||||
Path modules = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(modules);
|
||||
|
||||
final Path upgradeModules = base.resolve("upgradeModules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class E { }")
|
||||
.build(upgradeModules);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.E.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", modules.toString(),
|
||||
"--upgrade-module-path", upgradeModules.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onlyUpgradeModulePath(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(module);
|
||||
|
||||
final Path upgradeModule = base.resolve("upgradeModule");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class E { }")
|
||||
.build(upgradeModule);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.E.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--upgrade-module-path", upgradeModule + File.pathSeparator + module)
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void withModuleSourcePath(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(module);
|
||||
|
||||
final Path upgradeModule = base.resolve("upgradeModule");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class E { }")
|
||||
.build(upgradeModule);
|
||||
|
||||
final Path s = base.resolve("source");
|
||||
tb.writeJavaFiles(s.resolve("m3x"), "module m3x { }");
|
||||
|
||||
final Path upgradeModule3 = base.resolve("upgradeModule");
|
||||
new ModuleBuilder(tb, "m3x")
|
||||
.exports("pkg3")
|
||||
.classes("package pkg3; public class E { }")
|
||||
.build(upgradeModule);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src.resolve("m2x"), "module m2x { requires m1x; requires m3x; }",
|
||||
"package p; class A { void main() { pkg2.E.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", module.toString(),
|
||||
"--module-source-path", src + File.pathSeparator + s,
|
||||
"--upgrade-module-path", upgradeModule + File.pathSeparator + upgradeModule3)
|
||||
.outdir(module)
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void sameUpgradeAndModulePath(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(module);
|
||||
|
||||
final Path upgradeModule = base.resolve("upgradeModule");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class E { }")
|
||||
.build(upgradeModule);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.E.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", upgradeModule + File.pathSeparator + module,
|
||||
"--upgrade-module-path", upgradeModule.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dummyFileInUpgradeModulePath(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(module);
|
||||
|
||||
Path dummy = base.resolve("dummy.txt");
|
||||
tb.writeFile(dummy, "");
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.E.class.getName(); } }");
|
||||
|
||||
String output = new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("-XDrawDiagnostics",
|
||||
"--module-path", module.toString(),
|
||||
"--upgrade-module-path", dummy.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
if (!output.contains("compiler.err.illegal.argument.for.option: --upgrade-module-path, " + dummy)) {
|
||||
throw new Exception("Expected output was not found");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void severalUpgradeModules(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class A { }")
|
||||
.build(module);
|
||||
|
||||
new ModuleBuilder(tb, "m2x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class B { }")
|
||||
.build(module);
|
||||
|
||||
Path upgradeModule = base.resolve("upgradeModule");
|
||||
new ModuleBuilder(tb, "m2x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class BC { }")
|
||||
.build(upgradeModule);
|
||||
new ModuleBuilder(tb, "m3x")
|
||||
.exports("pkg3")
|
||||
.classes("package pkg3; public class DC { }")
|
||||
.build(upgradeModule);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m4x { requires m1x; requires m2x; requires m3x; }",
|
||||
"package p; class A { void main() { pkg1.A.class.getName(); pkg2.BC.class.getName(); pkg3.DC.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", module.toString(),
|
||||
"--upgrade-module-path", upgradeModule.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path src2 = base.resolve("src2");
|
||||
tb.writeJavaFiles(src2, "module m4x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.B.class.getName(); } }");
|
||||
|
||||
String log = new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("-XDrawDiagnostics",
|
||||
"--module-path", module.toString(),
|
||||
"--upgrade-module-path", upgradeModule.toString())
|
||||
.files(findJavaFiles(src2))
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
if (!log.contains("compiler.err.doesnt.exist: pkg2")) {
|
||||
throw new Exception("Expected output was not found");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void severalUpgradeModulePathsLastWin(Path base) throws Exception {
|
||||
final Path module = base.resolve("modules");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg1")
|
||||
.classes("package pkg1; public class E { }")
|
||||
.build(module);
|
||||
|
||||
final Path upgradeModule1 = base.resolve("upgradeModule1");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class EC1 { }")
|
||||
.build(upgradeModule1);
|
||||
|
||||
final Path upgradeModule2 = base.resolve("upgradeModule2");
|
||||
new ModuleBuilder(tb, "m1x")
|
||||
.exports("pkg2")
|
||||
.classes("package pkg2; public class EC2 { }")
|
||||
.build(upgradeModule2);
|
||||
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.EC2.class.getName(); } }");
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", module.toString(),
|
||||
"--upgrade-module-path", upgradeModule1.toString(),
|
||||
"--upgrade-module-path", upgradeModule2.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path src2 = base.resolve("src2");
|
||||
tb.writeJavaFiles(src2, "module m2x { requires m1x; }",
|
||||
"package p; class A { void main() { pkg2.EC1.class.getName(); } }");
|
||||
|
||||
final String log = new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("-XDrawDiagnostics",
|
||||
"--module-path", module.toString(),
|
||||
"--upgrade-module-path", upgradeModule1.toString(),
|
||||
"--upgrade-module-path", upgradeModule2.toString())
|
||||
.files(findJavaFiles(src2))
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
|
||||
if (!log.contains("compiler.err.cant.resolve.location: kindname.class, EC1, , , (compiler.misc.location: kindname.package, pkg2, null)")) {
|
||||
throw new Exception("Expected output was not found");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue