Require at least one successful test with junit runner

2 files changed, 4 insertions, 4 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
index 945b7603fe4..a9ac950e30a 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java
@@ -39,7 +39,7 @@ public class TestReport {
     }
 
     public TestRunner.Status status() {
-        return failedCount > 0 ? FAILURE : inconclusiveCount > 0 ? INCONCLUSIVE : (successCount + abortedCount + ignoredCount) > -1 ? SUCCESS : NO_TESTS; // TODO: require at least one test
+        return failedCount > 0 ? FAILURE : inconclusiveCount > 0 ? INCONCLUSIVE : successCount > 0 ? SUCCESS : NO_TESTS;
     }
 
     public static Builder builder(){
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java
index 2881da774f5..f8e13ac5d6a 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java
@@ -147,12 +147,12 @@ class AggregateTestRunnerTest {
 
     @Test
     void testReportStatus() {
-        assertEquals(SUCCESS, TestReport.builder().build().status()); // TODO: require at least 1 test
+        assertEquals(NO_TESTS, TestReport.builder().build().status());
         assertEquals(SUCCESS, TestReport.builder().withSuccessCount(1).build().status());
         assertEquals(INCONCLUSIVE, TestReport.builder().withSuccessCount(1).withInconclusiveCount(1).build().status());
         assertEquals(FAILURE, TestReport.builder().withSuccessCount(1).withFailedCount(1).build().status());
-        assertEquals(SUCCESS, TestReport.builder().withAbortedCount(1).build().status());
-        assertEquals(SUCCESS, TestReport.builder().withIgnoredCount(1).build().status());
+        assertEquals(NO_TESTS, TestReport.builder().withAbortedCount(1).build().status());
+        assertEquals(NO_TESTS, TestReport.builder().withIgnoredCount(1).build().status());
         assertEquals(FAILURE, JunitRunner.createReportWithFailedInitialization(new RuntimeException("hello")).status());
     }