From a5eb3b677ab3528346cb838f7e1a8f9627058e5b Mon Sep 17 00:00:00 2001
From: 9Lukas5 <lukas.wiest@infinite-tech.solutions>
Date: Sun, 3 Jan 2021 21:47:54 +0100
Subject: [PATCH] refactor: change json format
---
.../de/hftstuttgart/modocot/Testrunner.java | 17 ++++++-----------
.../modocot/model/ModocotResult.java | 3 ++-
.../modocot/model/ModocotResultSummary.java | 13 ++++---------
3 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/main/java/de/hftstuttgart/modocot/Testrunner.java b/src/main/java/de/hftstuttgart/modocot/Testrunner.java
index c0d61b3..22486c0 100644
--- a/src/main/java/de/hftstuttgart/modocot/Testrunner.java
+++ b/src/main/java/de/hftstuttgart/modocot/Testrunner.java
@@ -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;
}
diff --git a/src/main/java/de/hftstuttgart/modocot/model/ModocotResult.java b/src/main/java/de/hftstuttgart/modocot/model/ModocotResult.java
index 955ed62..5d24d64 100644
--- a/src/main/java/de/hftstuttgart/modocot/model/ModocotResult.java
+++ b/src/main/java/de/hftstuttgart/modocot/model/ModocotResult.java
@@ -16,8 +16,9 @@ public class ModocotResult
public static enum State
{
+ UNKNOWN,
SUCCESS,
FAILURE,
- UNKNOWN
+ COMPILATIONERROR,
}
}
diff --git a/src/main/java/de/hftstuttgart/modocot/model/ModocotResultSummary.java b/src/main/java/de/hftstuttgart/modocot/model/ModocotResultSummary.java
index a9e563c..8998413 100644
--- a/src/main/java/de/hftstuttgart/modocot/model/ModocotResultSummary.java
+++ b/src/main/java/de/hftstuttgart/modocot/model/ModocotResultSummary.java
@@ -1,16 +1,11 @@
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<>();
}
--
GitLab