Skip to content
This repository has been archived by the owner on Jan 8, 2025. It is now read-only.

Print validation results in submit #365

Merged
merged 3 commits into from
Jul 1, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/main/java/fi/helsinki/cs/tmc/cli/io/ResultPrinter.java
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,11 @@ private void printFailedSubmissionResult(SubmissionResult submResult, boolean pr
io.println(valgrind);
totalTests++;
}
// TODO: check validations when it's fixed in tmc-core (hangs atm if validation fails)

if (submResult.validationsFailed()) {
printValidationErrors(submResult.getValidationResult());
totalTests++;
}

io.println("Test results: " + passedTests + "/" + totalTests + " tests passed");
if (printResultBar) {
Expand Down
25 changes: 24 additions & 1 deletion src/test/java/fi/helsinki/cs/tmc/cli/io/ResultPrinterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult.TestResultStatus;
import fi.helsinki.cs.tmc.core.domain.submission.ValidationErrorImpl;
import fi.helsinki.cs.tmc.core.domain.submission.ValidationResultImpl;
import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
import fi.helsinki.cs.tmc.langs.abstraction.ValidationError;
import fi.helsinki.cs.tmc.langs.domain.RunResult;
import fi.helsinki.cs.tmc.langs.domain.RunResult.Status;
Expand Down Expand Up @@ -137,7 +138,7 @@ public void printLocalTestResultIfCompilationFail() {
}

@Test
public void printValidationErrors() {
public void printValidationErrorsInLocalTests() {
testResults = ImmutableList.of(new TestResult("test1", true, "Cool!"));
runResult = new RunResult(Status.PASSED, testResults, logs);

Expand All @@ -153,4 +154,26 @@ public void printValidationErrors() {
printer.printLocalTestResult(runResult, valResult, false);
io.assertContains("validation error");
}

@Test
public void printValidationErrorsInSubmit() {
ValidationErrorImpl error = new ValidationErrorImpl();
error.setMessage("Incorrect indentation");

File file = new File("Test.java");
Map valErrors = new HashMap<>();
valErrors.put(file, ImmutableList.of((ValidationError) error));

ValidationResultImpl valResult = new ValidationResultImpl();
valResult.setStrategy(Strategy.FAIL);
valResult.setValidationErrors(valErrors);

SubmissionResult subResult = new SubmissionResult();
subResult.setStatus(SubmissionResult.Status.FAIL);
subResult.setValidationResult(valResult);

printer.printSubmissionResult(subResult, false);
io.assertContains("Validation error:");
io.assertContains("Incorrect indentation");
}
}