mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +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
|
|
@ -1,383 +0,0 @@
|
|||
/*
|
||||
* 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
|
||||
* @bug 8161906 8161596
|
||||
* @summary tests for "requires static"
|
||||
* @library /tools/lib
|
||||
* @modules
|
||||
* jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
|
||||
* @run main RequiresStaticTest
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
|
||||
import toolbox.JavaTask;
|
||||
import toolbox.JavacTask;
|
||||
import toolbox.Task;
|
||||
import toolbox.Task.OutputKind;
|
||||
|
||||
public class RequiresStaticTest extends ModuleTestBase {
|
||||
|
||||
public static void main(String... args) throws Exception {
|
||||
RequiresStaticTest t = new RequiresStaticTest();
|
||||
t.runTests();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testJavaSE_OK(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src,
|
||||
"module m { requires static java.se; }",
|
||||
"import java.awt.Frame;\n" // in java.se
|
||||
+ "class Test {\n"
|
||||
+ " Frame f;\n"
|
||||
+ "}");
|
||||
Path classes = base.resolve("classes");
|
||||
Files.createDirectories(classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.files(findJavaFiles(src))
|
||||
.outdir(classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testJavaSE_Fail(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
tb.writeJavaFiles(src,
|
||||
"module m { requires static java.se; }",
|
||||
"import com.sun.source.tree.Tree;\n" // not in java.se (in jdk.compiler)
|
||||
+ "class Test {\n"
|
||||
+ " Tree t;\n"
|
||||
+ "}");
|
||||
Path classes = base.resolve("classes");
|
||||
Files.createDirectories(classes);
|
||||
|
||||
String log = new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("-XDrawDiagnostics")
|
||||
.files(findJavaFiles(src))
|
||||
.outdir(classes)
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
|
||||
if (!log.contains("Test.java:1:22: compiler.err.package.not.visible: com.sun.source.tree, (compiler.misc.not.def.access.does.not.read: m, com.sun.source.tree, jdk.compiler)"))
|
||||
throw new Exception("expected output not found");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testComplex_OK(Path base) throws Exception {
|
||||
Path src = getComplexSrc(base, "", "");
|
||||
Path classes = base.resolve("classes");
|
||||
Files.createDirectories(classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-source-path", src.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.outdir(classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testComplex_Fail(Path base) throws Exception {
|
||||
Path src = getComplexSrc(base,
|
||||
"import p5.C5; import p6.C6; import p7.C7; import p8.C8;\n",
|
||||
"C5 c5; C6 c6; C7 c7; C8 c8;\n");
|
||||
Path classes = base.resolve("classes");
|
||||
Files.createDirectories(classes);
|
||||
|
||||
String log = new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("-XDrawDiagnostics",
|
||||
"--module-source-path", src.toString())
|
||||
.files(findJavaFiles(src))
|
||||
.outdir(classes)
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
|
||||
String[] expect = {
|
||||
"C1.java:5:8: compiler.err.package.not.visible: p5, (compiler.misc.not.def.access.does.not.read: m1x, p5, m5x)",
|
||||
"C1.java:5:22: compiler.err.package.not.visible: p6, (compiler.misc.not.def.access.does.not.read: m1x, p6, m6x)",
|
||||
"C1.java:5:36: compiler.err.package.not.visible: p7, (compiler.misc.not.def.access.does.not.read: m1x, p7, m7x)",
|
||||
"C1.java:5:50: compiler.err.package.not.visible: p8, (compiler.misc.not.def.access.does.not.read: m1x, p8, m8x)"
|
||||
};
|
||||
|
||||
for (String e: expect) {
|
||||
if (!log.contains(e))
|
||||
throw new Exception("expected output not found: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Set up the following module graph
|
||||
* m1x -> m2x => m3x -=-> m4x --> m5
|
||||
* \ /
|
||||
* \ /
|
||||
* v v
|
||||
* m6x => m7x --> m8
|
||||
* where -> is requires, => is requires transitive, --> is requires static, -=-> is requires transitive static
|
||||
*/
|
||||
Path getComplexSrc(Path base, String m1_extraImports, String m1_extraUses) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
|
||||
Path src_m1 = src.resolve("m1x");
|
||||
tb.writeJavaFiles(src_m1,
|
||||
"module m1x { requires m2x; }",
|
||||
"package p1;\n"
|
||||
+ "import p2.C2;\n"
|
||||
+ "import p3.C3;\n"
|
||||
+ "import p4.C4;\n"
|
||||
+ m1_extraImports
|
||||
+ "class C1 {\n"
|
||||
+ " C2 c2; C3 c3; C4 c4;\n"
|
||||
+ m1_extraUses
|
||||
+ "}\n");
|
||||
|
||||
Path src_m2 = src.resolve("m2x");
|
||||
tb.writeJavaFiles(src_m2,
|
||||
"module m2x {\n"
|
||||
+ " requires transitive m3x;\n"
|
||||
+ " requires static m6x;\n"
|
||||
+ " exports p2;\n"
|
||||
+ "}",
|
||||
"package p2;\n"
|
||||
+ "public class C2 {p7.C7 c7; p6.C6 c6; p4.C4 c4;}\n");
|
||||
|
||||
Path src_m3 = src.resolve("m3x");
|
||||
tb.writeJavaFiles(src_m3,
|
||||
"module m3x { requires transitive static m4x; exports p3; }",
|
||||
"package p3;\n"
|
||||
+ "public class C3 { }\n");
|
||||
|
||||
Path src_m4 = src.resolve("m4x");
|
||||
tb.writeJavaFiles(src_m4,
|
||||
"module m4x { requires m5x; requires static m6x; exports p4; }",
|
||||
"package p4;\n"
|
||||
+ "public class C4 { p6.C6 c6; p7.C7 c7;}\n");
|
||||
|
||||
Path src_m5 = src.resolve("m5x");
|
||||
tb.writeJavaFiles(src_m5,
|
||||
"module m5x { exports p5; }",
|
||||
"package p5;\n"
|
||||
+ "public class C5 { }\n");
|
||||
|
||||
Path src_m6 = src.resolve("m6x");
|
||||
tb.writeJavaFiles(src_m6,
|
||||
"module m6x { requires transitive m7x; exports p6; }",
|
||||
"package p6;\n"
|
||||
+ "public class C6 { p7.C7 c7; }\n");
|
||||
|
||||
Path src_m7 = src.resolve("m7x");
|
||||
tb.writeJavaFiles(src_m7,
|
||||
"module m7x { requires static m8x; exports p7; }",
|
||||
"package p7;\n"
|
||||
+ "public class C7 { p8.C8 c8; }\n");
|
||||
|
||||
Path src_m8 = src.resolve("m8x");
|
||||
tb.writeJavaFiles(src_m8,
|
||||
"module m8x { exports p8; }",
|
||||
"package p8;\n"
|
||||
+ "public class C8 { }\n");
|
||||
|
||||
return src;
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRequiresStatic(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x { exports m1x; }",
|
||||
"package m1x;" +
|
||||
"public class Api { }\n");
|
||||
|
||||
Path classes = base.resolve("classes");
|
||||
Path m1Classes = classes.resolve("m1x");
|
||||
Files.createDirectories(m1Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.files(findJavaFiles(m1))
|
||||
.outdir(m1Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path m3 = src.resolve("m3x");
|
||||
tb.writeJavaFiles(m3,
|
||||
"module m3x { requires static m1x; }",
|
||||
"package m3x;\n" +
|
||||
"public class Test {\n" +
|
||||
" public static void main(String... args) {\n" +
|
||||
" try {\n" +
|
||||
" Class.forName(\"m1x.Api\");\n" +
|
||||
" } catch (ClassNotFoundException e) {\n" +
|
||||
" System.err.println(\"ok\");\n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
"}",
|
||||
"package m3x;\n" +
|
||||
"public class ApiUse{\n" +
|
||||
" m1x.Api api;\n" +
|
||||
"}");
|
||||
|
||||
Path m3Classes = classes.resolve("m3x");
|
||||
Files.createDirectories(m3Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", m1Classes.toString())
|
||||
.files(findJavaFiles(m3))
|
||||
.outdir(m3Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
String log = new JavaTask(tb)
|
||||
.vmOptions("--module-path", m3Classes.toString(), "--add-modules", "m3x")
|
||||
.className("m3x.Test")
|
||||
.run()
|
||||
.writeAll()
|
||||
.getOutput(OutputKind.STDERR);
|
||||
|
||||
String expected = "ok" + System.getProperty("line.separator");
|
||||
|
||||
if (!expected.equals(log)) {
|
||||
throw new AssertionError("Unexpected output: " + log);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRequiresTransitiveStatic(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x { exports m1x; }",
|
||||
"package m1x;" +
|
||||
"public class Api { }\n");
|
||||
|
||||
Path classes = base.resolve("classes");
|
||||
Path m1Classes = classes.resolve("m1x");
|
||||
Files.createDirectories(m1Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.files(findJavaFiles(m1))
|
||||
.outdir(m1Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path m2 = src.resolve("m2x");
|
||||
tb.writeJavaFiles(m2,
|
||||
"module m2x { requires transitive static m1x; }");
|
||||
|
||||
Path m2Classes = classes.resolve("m2x");
|
||||
Files.createDirectories(m2Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", m1Classes.toString())
|
||||
.files(findJavaFiles(m2))
|
||||
.outdir(m2Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path m3 = src.resolve("m3x");
|
||||
tb.writeJavaFiles(m3,
|
||||
"module m3x { requires m2x; }",
|
||||
"package m3x;\n" +
|
||||
"public class Test {\n" +
|
||||
" public static void main(String... args) {\n" +
|
||||
" try {\n" +
|
||||
" Class.forName(\"m1x.Api\");\n" +
|
||||
" } catch (ClassNotFoundException e) {\n" +
|
||||
" System.err.println(\"ok\");\n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
"}",
|
||||
"package m3x;\n" +
|
||||
"public class ApiUse{\n" +
|
||||
" m1x.Api api;\n" +
|
||||
"}");
|
||||
|
||||
Path m3Classes = classes.resolve("m3x");
|
||||
Files.createDirectories(m3Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", m1Classes.toString() + File.pathSeparator + m2Classes.toString())
|
||||
.files(findJavaFiles(m3))
|
||||
.outdir(m3Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
String log = new JavaTask(tb)
|
||||
.vmOptions("--module-path", m2Classes.toString() + File.pathSeparator + m3Classes.toString(),
|
||||
"--add-modules", "m3x")
|
||||
.className("m3x.Test")
|
||||
.run()
|
||||
.writeAll()
|
||||
.getOutput(OutputKind.STDERR);
|
||||
|
||||
String expected = "ok" + System.getProperty("line.separator");
|
||||
|
||||
if (!expected.equals(log)) {
|
||||
throw new AssertionError("Unexpected output: " + log);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRequiresStaticTransitive(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x { exports m1x; }",
|
||||
"package m1x;" +
|
||||
"public class Api { }\n");
|
||||
|
||||
Path classes = base.resolve("classes");
|
||||
Path m1Classes = classes.resolve("m1x");
|
||||
Files.createDirectories(m1Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.files(findJavaFiles(m1))
|
||||
.outdir(m1Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
Path m2 = src.resolve("m2x");
|
||||
tb.writeJavaFiles(m2,
|
||||
"module m2x { requires transitive static m1x; }");
|
||||
|
||||
Path m2Classes = classes.resolve("m2x");
|
||||
Files.createDirectories(m2Classes);
|
||||
|
||||
new JavacTask(tb, Task.Mode.CMDLINE)
|
||||
.options("--module-path", m1Classes.toString())
|
||||
.files(findJavaFiles(m2))
|
||||
.outdir(m2Classes)
|
||||
.run()
|
||||
.writeAll();
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue