archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8264664: use text blocks in javac module tests

Browse source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2021-04-03 01:18:00 +00:00
parent cec66cf8ef
commit e8eda655bb
18 changed files with 630 additions and 503 deletions
Download patch file Download diff file Expand all files Collapse all files

143
test/langtools/tools/javac/modules/RequiresStaticTest.java
View file

@ -56,11 +56,12 @@ public class RequiresStaticTest extends ModuleTestBase {
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"
+ "}");
// use class in java.se
"""
import java.awt.Frame;
class Test {
Frame f;
}""");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
@ -76,10 +77,12 @@ public class RequiresStaticTest extends ModuleTestBase {
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"
+ "}");
// use class not in java.se (in jdk.compiler)
"""
import com.sun.source.tree.Tree;
class Test {
Tree t;
}""");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
@ -154,61 +157,73 @@ public class RequiresStaticTest extends ModuleTestBase {
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"
"""
package p1;
import p2.C2;
import p3.C3;
import p4.C4;
"""
+ m1_extraImports
+ "class C1 {\n"
+ " C2 c2; C3 c3; C4 c4;\n"
+ """
class C1 {
C2 c2; C3 c3; C4 c4;
"""
+ 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");
"""
module m2x {
requires transitive m3x;
requires static m6x;
exports p2;
}""",
"""
package p2;
public class C2 {p7.C7 c7; p6.C6 c6; p4.C4 c4;}""");
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");
"""
package p3;
public class C3 { }""");
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");
"""
package p4;
public class C4 { p6.C6 c6; p7.C7 c7;}""");
Path src_m5 = src.resolve("m5x");
tb.writeJavaFiles(src_m5,
"module m5x { exports p5; }",
"package p5;\n"
+ "public class C5 { }\n");
"""
package p5;
public class C5 { }""");
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");
"""
package p6;
public class C6 { p7.C7 c7; }""");
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");
"""
package p7;
public class C7 { p8.C8 c8; }""");
Path src_m8 = src.resolve("m8x");
tb.writeJavaFiles(src_m8,
"module m8x { exports p8; }",
"package p8;\n"
+ "public class C8 { }\n");
"""
package p8;
public class C8 { }""");
return src;
}
@ -235,20 +250,22 @@ public class RequiresStaticTest extends ModuleTestBase {
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" +
"}");
"""
package m3x;
public class Test {
public static void main(String... args) {
try {
Class.forName("m1x.Api");
} catch (ClassNotFoundException e) {
System.err.println("ok");
}
}
}""",
"""
package m3x;
public class ApiUse{
m1x.Api api;
}""");
Path m3Classes = classes.resolve("m3x");
Files.createDirectories(m3Classes);
@ -307,20 +324,22 @@ public class RequiresStaticTest extends ModuleTestBase {
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" +
"}");
"""
package m3x;
public class Test {
public static void main(String... args) {
try {
Class.forName("m1x.Api");
} catch (ClassNotFoundException e) {
System.err.println("ok");
}
}
}""",
"""
package m3x;
public class ApiUse{
m1x.Api api;
}""");
Path m3Classes = classes.resolve("m3x");
Files.createDirectories(m3Classes);