Reimplement JUnit integratino, with unit tests, and structured report

1 files changed, 1 insertions, 17 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/AggregateTestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/AggregateTestRunner.java
index 15aeef18013..9b8d4a1494b 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/AggregateTestRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/AggregateTestRunner.java
@@ -88,23 +88,7 @@ public class AggregateTestRunner implements TestRunner {
     }
 
     static TestReport merge(TestReport first, TestReport second) {
-        return first == null ? second
-                             : second == null ? first
-                                              : TestReport.builder()
-                                                          .withAbortedCount(first.abortedCount + second.abortedCount)
-                                                          .withFailedCount(first.failedCount + second.failedCount)
-                                                          .withIgnoredCount(first.ignoredCount + second.ignoredCount)
-                                                          .withSuccessCount(first.successCount + second.successCount)
-                                                          .withFailures(merged(first.failures, second.failures))
-                                                          .withLogs(merged(first.logLines, second.logLines))
-                                                          .build();
-    }
-
-    static <T> List<T> merged(List<T> first, List<T> second) {
-        ArrayList<T> merged = new ArrayList<>();
-        merged.addAll(first);
-        merged.addAll(second);
-        return merged;
+        return first == null ? second : second == null ? first : first.mergedWith(second);
     }
 
 }