diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2022-02-28 12:45:52 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2022-02-28 12:45:52 +0100 |
commit | 0c6522dc84f9e982feed6add6bd2879f058c14a5 (patch) | |
tree | 9ea131eafdfba3ec8a5066e1a997905a7bc8f500 /vespa-osgi-testrunner | |
parent | ee779f9f10bbef345c3317bd630333821990ffff (diff) |
Require at least one successful test with junit runner
Diffstat (limited to 'vespa-osgi-testrunner')
-rw-r--r-- | vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestReport.java | 2 | ||||
-rw-r--r-- | vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java | 6 |
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()); } |