8264664: use text blocks in javac module tests

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

View file

@ -66,11 +66,12 @@ public class SubpackageTest extends ModuleTestBase {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"package p.q;\n"
+ "import p.E;\n"
+ "class Test {\n"
+ " void m() { throw new E(); }\n"
+ "}");
"""
package p.q;
import p.E;
class Test {
void m() { throw new E(); }
}""");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
@ -95,17 +96,18 @@ public class SubpackageTest extends ModuleTestBase {
"module mpqr { exports p.q.r; }",
"package p.q.r; public class C3 { }");
tb.writeJavaFiles(src.resolve("m"),
"module m {"
+ " requires mp;\n"
+ " requires mpq;\n"
+ " requires mpqr;\n"
+ "}",
"package x;\n"
+ "class C {\n"
+ " p.C1 c1;\n"
+ " p.q.C2 c2;\n"
+ " p.q.r.C3 c3;\n"
+ "}");
"""
module m { requires mp;
requires mpq;
requires mpqr;
}""",
"""
package x;
class C {
p.C1 c1;
p.q.C2 c2;
p.q.r.C3 c3;
}""");
Path modules = base.resolve("modules");
Files.createDirectories(modules);