Verified Commit a5eb3b67 authored by Lukas Wiest's avatar Lukas Wiest 🚂
Browse files

refactor: change json format

parent da1f504a
......@@ -87,7 +87,7 @@ public class Testrunner
ModocotResultSummary resultSummary = runTests();
// add compilation errors to summary
resultSummary.compilationErrors = compilationErrors;
resultSummary.results.addAll(compilationErrors);
// serialize result
writeResult(resultSummary);
......@@ -217,7 +217,7 @@ public class Testrunner
Matcher matcher = pattern.matcher(String.valueOf(e.getSource()));
result.name = (matcher.matches() && matcher.group(1) != null) ? matcher.group(1) : String.valueOf(e.getSource());
result.state = ModocotResult.State.FAILURE.ordinal();
result.state = ModocotResult.State.COMPILATIONERROR.ordinal();
result.failureReason = e.getMessage(Locale.ENGLISH);
result.failureType = "Compilation Failed";
result.stacktrace = e.toString();
......@@ -247,7 +247,7 @@ public class Testrunner
));
ModocotResultSummary resultSummary = new ModocotResultSummary();
resultSummary.successes = successes.stream().map(s ->
resultSummary.results.addAll(successes.stream().map(s ->
{
ModocotResult result = new ModocotResult();
result.name = s.getDisplayName();
......@@ -255,9 +255,9 @@ public class Testrunner
return result;
})
.collect(Collectors.toCollection(HashSet::new));
.collect(Collectors.toCollection(HashSet::new)));
resultSummary.failures = summary.getFailures().stream().map(f ->
resultSummary.results.addAll(summary.getFailures().stream().map(f ->
{
ModocotResult result = new ModocotResult();
result.name = f.getTestIdentifier().getDisplayName();
......@@ -272,12 +272,7 @@ public class Testrunner
return result;
})
.collect(Collectors.toCollection(HashSet::new));
resultSummary.timestamp = System.currentTimeMillis() / 1000;
resultSummary.testCount = (int) summary.getTestsStartedCount();
resultSummary.successCount = resultSummary.successes.size();
resultSummary.failureCount = resultSummary.failures.size();
.collect(Collectors.toCollection(HashSet::new)));
return resultSummary;
}
......
......@@ -16,8 +16,9 @@ public class ModocotResult
public static enum State
{
UNKNOWN,
SUCCESS,
FAILURE,
UNKNOWN
COMPILATIONERROR,
}
}
package de.hftstuttgart.modocot.model;
import java.util.HashSet;
import java.util.Set;
public class ModocotResultSummary
{
public long timestamp;
public int testCount;
public int failureCount;
public int successCount;
public String globalStacktrace;
public Set<ModocotResult> successes;
public Set<ModocotResult> failures;
public Set<ModocotResult> compilationErrors;
public long timestamp = System.currentTimeMillis() / 1000;
public String globalStacktrace = null;
public Set<ModocotResult> results = new HashSet<>();
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment