8335385: javac crash on unattributed piece of AST
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda
parent
b20e8c8e85
commit
3e3f83f62c
@ -2423,7 +2423,14 @@ public class Resolve {
|
||||
* (a subset of VAL, TYP, PCK).
|
||||
*/
|
||||
Symbol findIdent(DiagnosticPosition pos, Env<AttrContext> env, Name name, KindSelector kind) {
|
||||
return checkNonExistentType(checkRestrictedType(pos, findIdentInternal(pos, env, name, kind), name));
|
||||
try {
|
||||
return checkNonExistentType(checkRestrictedType(pos, findIdentInternal(pos, env, name, kind), name));
|
||||
} catch (ClassFinder.BadClassFile err) {
|
||||
return new BadClassFileError(err);
|
||||
} catch (CompletionFailure cf) {
|
||||
chk.completionError(pos, cf);
|
||||
return typeNotFound;
|
||||
}
|
||||
}
|
||||
|
||||
Symbol findIdentInternal(DiagnosticPosition pos, Env<AttrContext> env, Name name, KindSelector kind) {
|
||||
@ -2495,7 +2502,14 @@ public class Resolve {
|
||||
Symbol findIdentInType(DiagnosticPosition pos,
|
||||
Env<AttrContext> env, Type site,
|
||||
Name name, KindSelector kind) {
|
||||
return checkNonExistentType(checkRestrictedType(pos, findIdentInTypeInternal(env, site, name, kind), name));
|
||||
try {
|
||||
return checkNonExistentType(checkRestrictedType(pos, findIdentInTypeInternal(env, site, name, kind), name));
|
||||
} catch (ClassFinder.BadClassFile err) {
|
||||
return new BadClassFileError(err);
|
||||
} catch (CompletionFailure cf) {
|
||||
chk.completionError(pos, cf);
|
||||
return typeNotFound;
|
||||
}
|
||||
}
|
||||
|
||||
private Symbol checkNonExistentType(Symbol symbol) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2018, 2024, 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
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 8198378
|
||||
* @bug 8198378 8335385
|
||||
* @summary Verify that BadClassFile related to imports are handled properly.
|
||||
* @library /tools/lib
|
||||
* @modules jdk.compiler/com.sun.tools.javac.api
|
||||
@ -53,7 +53,9 @@ public class BadClassFileDuringImport {
|
||||
new JavacTask(tb)
|
||||
.outdir(".")
|
||||
.sources("package p; public class A { }",
|
||||
"package p; public class B { public static class I { } }")
|
||||
"package p; public class B { public static class I { } }",
|
||||
"package m; public class A { }",
|
||||
"package m; public class B { public static class I { } }")
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
@ -65,80 +67,165 @@ public class BadClassFileDuringImport {
|
||||
out.write("broken".getBytes("UTF-8"));
|
||||
}
|
||||
|
||||
Files.delete(Paths.get(".", "m", "A.class"));
|
||||
Files.delete(Paths.get(".", "m", "B$I.class"));
|
||||
|
||||
doTest("import p.A;",
|
||||
"",
|
||||
"Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.A;",
|
||||
"",
|
||||
"Test.java:2:9: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, m, null)",
|
||||
"1 error");
|
||||
doTest("import p.A;",
|
||||
"A a;",
|
||||
"Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"Test.java:2:33: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import m.A;",
|
||||
"A a;",
|
||||
"Test.java:2:9: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, m, null)",
|
||||
"Test.java:2:33: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import p.A;",
|
||||
"void test() { A a; }",
|
||||
"Test.java:2:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"Test.java:2:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import m.A;",
|
||||
"void test() { A a; }",
|
||||
"Test.java:2:9: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.package, m, null)",
|
||||
"Test.java:2:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import p.*;",
|
||||
"",
|
||||
(String[]) null);
|
||||
doTest("import m.*;",
|
||||
"",
|
||||
(String[]) null);
|
||||
doTest("import p.*;",
|
||||
"A a;",
|
||||
"Test.java:2:33: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.*;",
|
||||
"A a;",
|
||||
"Test.java:2:33: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
doTest("import p.*;",
|
||||
"void test() { A a; }",
|
||||
"Test.java:2:47: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.*;",
|
||||
"void test() { A a; }",
|
||||
"Test.java:2:47: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
|
||||
doTest("import p.B.I;",
|
||||
"",
|
||||
"Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.B.I;",
|
||||
"",
|
||||
"Test.java:2:11: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"1 error");
|
||||
doTest("import p.B.I;",
|
||||
"I i;",
|
||||
"Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
"Test.java:2:35: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import m.B.I;",
|
||||
"I i;",
|
||||
"Test.java:2:11: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"Test.java:2:35: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import p.B.I;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
"Test.java:2:49: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import m.B.I;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:11: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"Test.java:2:49: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import p.B.*;",
|
||||
"",
|
||||
(String[]) null);
|
||||
doTest("import m.B.*;",
|
||||
"",
|
||||
(String[]) null);
|
||||
doTest("import p.B.*;",
|
||||
"I i;",
|
||||
"Test.java:2:35: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.B.*;",
|
||||
"I i;",
|
||||
"Test.java:2:35: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
doTest("import m.B.*;",
|
||||
"I i;",
|
||||
"Test.java:2:35: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
doTest("import p.B.*;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:49: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import m.B.*;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:49: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
|
||||
doTest("import static p.B.I;",
|
||||
"",
|
||||
"Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.I;",
|
||||
"",
|
||||
"Test.java:2:1: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"1 error");
|
||||
doTest("import static p.B.I;",
|
||||
"I i;",
|
||||
"Test.java:2:42: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.I;",
|
||||
"I i;",
|
||||
"Test.java:2:42: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"1 error");
|
||||
doTest("import static p.B.I;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.I;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:1: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"Test.java:2:56: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("import static p.B.*;",
|
||||
"",
|
||||
"Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.*;",
|
||||
"",
|
||||
"Test.java:2:1: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"1 error");
|
||||
doTest("import static p.B.*;",
|
||||
"I i;",
|
||||
"Test.java:2:42: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.*;",
|
||||
"I i;",
|
||||
"Test.java:2:42: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"1 error");
|
||||
doTest("import static p.B.*;",
|
||||
"void test() { I i; }",
|
||||
"Test.java:2:1: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("import static m.B.*;",
|
||||
"void test() { M m; }",
|
||||
"Test.java:2:1: compiler.err.cant.access: m.B.I, (compiler.misc.class.file.not.found: m.B$I)",
|
||||
"Test.java:2:56: compiler.err.cant.resolve.location: kindname.class, M, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
}
|
||||
|
||||
void doTest(String importText, String useText, String... expectedOutput) {
|
||||
@ -146,7 +233,8 @@ public class BadClassFileDuringImport {
|
||||
.classpath(".")
|
||||
.sources("\n" + importText + " public class Test { " + useText + " }")
|
||||
.options("-XDrawDiagnostics")
|
||||
.run(expectedOutput != null ? Task.Expect.FAIL : Task.Expect.SUCCESS)
|
||||
.run(expectedOutput != null ? Task.Expect.FAIL : Task.Expect.SUCCESS,
|
||||
expectedOutput != null ? 1 : 0)
|
||||
.writeAll()
|
||||
.getOutputLines(Task.OutputKind.DIRECT);
|
||||
|
||||
|
||||
@ -0,0 +1,227 @@
|
||||
/*
|
||||
* Copyright (c) 2024, 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 8335385
|
||||
* @summary Verify that BadClassFile related to imports are handled properly.
|
||||
* @library /tools/lib
|
||||
* @modules jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* @build toolbox.ToolBox toolbox.JavacTask
|
||||
* @run main ASTAttributesFilledForReferencesOnMissingTypes
|
||||
*/
|
||||
|
||||
import com.sun.source.tree.IdentifierTree;
|
||||
import com.sun.source.tree.MemberSelectTree;
|
||||
import com.sun.source.util.TaskEvent;
|
||||
import com.sun.source.util.TaskListener;
|
||||
import com.sun.source.util.TreePathScanner;
|
||||
import com.sun.source.util.Trees;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.lang.model.element.Element;
|
||||
|
||||
import toolbox.JavacTask;
|
||||
import toolbox.Task;
|
||||
import toolbox.ToolBox;
|
||||
|
||||
public class ASTAttributesFilledForReferencesOnMissingTypes {
|
||||
public static void main(String... args) throws Exception {
|
||||
new ASTAttributesFilledForReferencesOnMissingTypes().run();
|
||||
}
|
||||
|
||||
ToolBox tb = new ToolBox();
|
||||
|
||||
void run() throws Exception {
|
||||
new JavacTask(tb)
|
||||
.outdir(".")
|
||||
.sources("package p; public class A { }",
|
||||
"package p; public class B { public static class I { } public static class M { } }",
|
||||
"package p; public class C { }")
|
||||
.run()
|
||||
.writeAll();
|
||||
|
||||
try (OutputStream out = Files.newOutputStream(Paths.get(".", "p", "A.class"))) {
|
||||
out.write("broken".getBytes("UTF-8"));
|
||||
}
|
||||
|
||||
try (OutputStream out = Files.newOutputStream(Paths.get(".", "p", "B$I.class"))) {
|
||||
out.write("broken".getBytes("UTF-8"));
|
||||
}
|
||||
|
||||
Files.delete(Paths.get(".", "p", "C.class"));
|
||||
Files.delete(Paths.get(".", "p", "B$M.class"));
|
||||
|
||||
//tests for findIdent (must be in some global scope):
|
||||
doTest("""
|
||||
package p;
|
||||
public class Test {
|
||||
A a;
|
||||
}
|
||||
""",
|
||||
"Test.java:3:5: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("""
|
||||
import p.*;
|
||||
public class Test {
|
||||
A a;
|
||||
}
|
||||
""",
|
||||
"Test.java:3:5: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("""
|
||||
package p;
|
||||
public class Test {
|
||||
C c;
|
||||
}
|
||||
""",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, C, , , (compiler.misc.location: kindname.class, p.Test, null)",
|
||||
"1 error");
|
||||
doTest("""
|
||||
import p.*;
|
||||
public class Test {
|
||||
C c;
|
||||
}
|
||||
""",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, C, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"1 error");
|
||||
|
||||
//tests for findIdentInPackage:
|
||||
doTest("""
|
||||
import p.A;
|
||||
public class Test {
|
||||
A a;
|
||||
}
|
||||
""",
|
||||
"Test.java:1:9: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, A, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("""
|
||||
public class Test {
|
||||
p.A a;
|
||||
}
|
||||
""",
|
||||
"Test.java:2:6: compiler.err.cant.access: p.A, (compiler.misc.bad.class.file.header: A.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("""
|
||||
import p.C;
|
||||
public class Test {
|
||||
C c;
|
||||
}
|
||||
""",
|
||||
"Test.java:1:9: compiler.err.cant.resolve.location: kindname.class, C, , , (compiler.misc.location: kindname.package, p, null)",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, C, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("""
|
||||
public class Test {
|
||||
p.C c;
|
||||
}
|
||||
""",
|
||||
"Test.java:2:6: compiler.err.cant.resolve.location: kindname.class, C, , , (compiler.misc.location: kindname.package, p, null)",
|
||||
"1 error");
|
||||
|
||||
//tests for findIdentInType:
|
||||
doTest("""
|
||||
import p.B.I;
|
||||
public class Test {
|
||||
I i;
|
||||
}
|
||||
""",
|
||||
"Test.java:1:11: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, I, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("""
|
||||
import p.B.M;
|
||||
public class Test {
|
||||
M m;
|
||||
}
|
||||
""",
|
||||
"Test.java:1:11: compiler.err.cant.access: p.B.M, (compiler.misc.class.file.not.found: p.B$M)",
|
||||
"Test.java:3:5: compiler.err.cant.resolve.location: kindname.class, M, , , (compiler.misc.location: kindname.class, Test, null)",
|
||||
"2 errors");
|
||||
doTest("""
|
||||
public class Test {
|
||||
p.B.I i;
|
||||
}
|
||||
""",
|
||||
"Test.java:2:8: compiler.err.cant.access: p.B.I, (compiler.misc.bad.class.file.header: B$I.class, (compiler.misc.illegal.start.of.class.file))",
|
||||
"1 error");
|
||||
doTest("""
|
||||
public class Test {
|
||||
p.B.M m;
|
||||
}
|
||||
""",
|
||||
"Test.java:2:8: compiler.err.cant.access: p.B.M, (compiler.misc.class.file.not.found: p.B$M)",
|
||||
"1 error");
|
||||
}
|
||||
|
||||
void doTest(String code, String... expectedOutput) {
|
||||
List<String> log = new JavacTask(tb)
|
||||
.classpath(".")
|
||||
.sources(code)
|
||||
.options("-XDrawDiagnostics")
|
||||
.callback(task -> {
|
||||
task.addTaskListener(new TaskListener() {
|
||||
@Override
|
||||
public void finished(TaskEvent e) {
|
||||
if (e.getKind() != TaskEvent.Kind.ANALYZE) {
|
||||
return ;
|
||||
}
|
||||
Trees trees = Trees.instance(task);
|
||||
new TreePathScanner<Void, Void>() {
|
||||
@Override
|
||||
public Void visitIdentifier(IdentifierTree node, Void p) {
|
||||
validateAttributes();
|
||||
return super.visitIdentifier(node, p);
|
||||
}
|
||||
@Override
|
||||
public Void visitMemberSelect(MemberSelectTree node, Void p) {
|
||||
if (!node.getIdentifier().contentEquals("*")) {
|
||||
validateAttributes();
|
||||
}
|
||||
return super.visitMemberSelect(node, p);
|
||||
}
|
||||
void validateAttributes() {
|
||||
Element el = trees.getElement(getCurrentPath());
|
||||
if (el == null) {
|
||||
throw new AssertionError("A null sym attribute for: " + getCurrentPath().getLeaf() + "!");
|
||||
}
|
||||
}
|
||||
}.scan(e.getCompilationUnit(), null);
|
||||
}
|
||||
});
|
||||
})
|
||||
.run(expectedOutput != null ? Task.Expect.FAIL : Task.Expect.SUCCESS,
|
||||
expectedOutput != null ? 1 : 0)
|
||||
.writeAll()
|
||||
.getOutputLines(Task.OutputKind.DIRECT);
|
||||
|
||||
if (expectedOutput != null && !log.equals(Arrays.asList(expectedOutput))) {
|
||||
throw new AssertionError("Unexpected output: " + log);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user