Skip to content

Show syntax errors and code snippets from failing test files #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aspiers wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Show syntax errors and code snippets from failing test files #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
efff141
show syntax errors from failing test files
aspiers Jan 30, 2020
bcf147b
show code snippets from failing test files
aspiers Jan 30, 2020
89587a4
Slightly tweak formatting of console failure lines
aspiers Feb 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/src/main/java/ship/build/ConsoleServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ protected void print(final TestReportNode node) {
if (node.isSuccess()) {
printer.println(NL_4, node.getName());
} else {
printer.println(NL_5, node.getName());
Object detail = node.getResultDetail();
if (detail == null) {
detail = "";
}
printer.println(NL_5, node.getName(), detail);
}
node.getChildren().forEach(child -> this.printSuite((TestReportNode) child));
}
Expand Down
17 changes: 8 additions & 9 deletions core/src/main/java/ship/command/TestProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,17 @@ protected void executeTest(final Builder builder, final String testPath) {
testReporter.start(testPath);
final TestResult testResult = new LuaRunner().run(executable);
final TestReportNode<LuaErrorInformation> testFile = testReporter.getCurrentTestFile();
if (!testResult.isSuccess()) {
logger.info("{} failed", testFile.getName());
testFile.setResult(TestReportNodeResult.Failure);
testFile.setResultDetail(testResult.getError());
}

logger.debug("Test {} => {}", testPath, testResult);
logger.debug("Test result for {} => {}", testPath, testResult);
if (!testResult.isSuccess()) {
final LuaErrorInformation error = testResult.getError();
final int lineNumber = error.getLineNumber();
logger.debug("Lua Script:\n{}",
executable.toString(lineNumber - 5, lineNumber + 5, singletonList(lineNumber)));
String snippet = executable.toString(lineNumber - 5, lineNumber + 5,
singletonList(lineNumber));
error.setCodeSnippet(snippet.replaceAll("(?m)^", " "));
logger.info("Test failure at {}:{}\n{}",
testPath, error.toString(), snippet);
testFile.setResult(TestReportNodeResult.Failure);
testFile.setResultDetail(error);
}
testReporter.end();
}
Expand Down
11 changes: 10 additions & 1 deletion core/src/main/java/ship/test/LuaErrorInformation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package ship.test;

import lombok.Getter;
import lombok.Setter;

public class LuaErrorInformation {

Expand All @@ -17,6 +18,10 @@ public class LuaErrorInformation {
@Getter
protected final int columnNumber;

@Getter
@Setter
protected String codeSnippet;

/**
* Constructor with not parsed error message.
* <p>
Expand Down Expand Up @@ -50,6 +55,10 @@ public LuaErrorInformation(final String message, final int lineNumber, final int

@Override
public String toString() {
return lineNumber + ":" + columnNumber + " - Message: " + message;
String s = lineNumber + ":" + columnNumber + " - Message: " + message;
if (this.codeSnippet != null) {
s += "\n" + this.codeSnippet;
}
return s;
}
}
4 changes: 2 additions & 2 deletions core/src/main/resources/message.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ ship.build.ConsoleServer.1=<bg_green><black> SUCCESS </black></bg_green> <g
ship.build.ConsoleServer.2=<bg_red><black> ERROR! </black></bg_red> {0}<bright_black>{1}</bright_black>
ship.build.ConsoleServer.3=<bg_red><black> TEST FAILURE! </black></bg_red>{0}<bright_black>{1}</bright_black>
ship.build.ConsoleServer.4=\ <bg_green> P </bg_green> <green>{0}</green>
ship.build.ConsoleServer.5=\ <bg_red> F </bg_red> <red>{0}</red>
ship.build.ConsoleServer.5=\ <bg_red> F </bg_red> <red>{0}</red> {1}
ship.build.ConsoleServer.6=\ * {0}(<red>{1}</red> / {2})
ship.build.ConsoleServer.7=\ * {0}({1} / {2})
ship.build.ConsoleServer.8=\ - {0} <bright_black>{1} ms</bright_black>
ship.build.ConsoleServer.9=\ - <bg_red> {0}</bg_red><red>- {1} </red>
ship.build.ConsoleServer.9=\ - <bg_red>{0}</bg_red> <red>- {1} </red>

ship.exception.PackageNotFoundException.0="Package {0} not found: {1}"
ship.exception.DirectoryNotEmptyException.0=<yellow>{0}</yellow> is not empty. You can reset project with <blue>-f</blue> but It make aergo.json overwritten!!
Expand Down