Let successful test status take precedence over skipped/aborted

5 files changed, 7 insertions, 7 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 6c26f0e67a4..1641bd7802f 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
@@ -311,10 +311,10 @@ public class TestReport {
 
     public enum Status {
 
-        // Must be kept in order of increasing severity.
-        successful,
+        // Must be kept in order of increasing importance.
         skipped,
         aborted,
+        successful,
         inconclusive,
         failed,
         error;
@@ -322,7 +322,7 @@ public class TestReport {
     }
 
     static Level levelOf(Status status) {
-        return status.compareTo(Status.failed) >= 0 ? Level.SEVERE : status.compareTo(Status.skipped) >= 0 ? Level.WARNING : Level.INFO;
+        return status.compareTo(Status.failed) >= 0 ? Level.SEVERE : status == Status.successful ? Level.INFO : Level.WARNING;
     }
 
     /**
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledClassTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledClassTest.java
index 795bf8c6a1e..417ca4b6c9e 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledClassTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledClassTest.java
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 @Disabled("because")
-@Expect(skipped = 2, status = 1)
+@Expect(skipped = 2, status = 2)
 public class DisabledClassTest {
 
     @Test
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledTest.java
index 561ec81e865..be36954d1bb 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/DisabledTest.java
@@ -4,7 +4,7 @@ import com.yahoo.vespa.testrunner.Expect;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-@Expect(skipped = 1, status = 1)
+@Expect(skipped = 1, status = 2)
 public class DisabledTest {
 
     @Test
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/SucceedingTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/SucceedingTest.java
index 59a56a1c9c7..8fd25d618a9 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/SucceedingTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/SucceedingTest.java
@@ -3,7 +3,7 @@ package com.yahoo.vespa.test.samples;
 import com.yahoo.vespa.testrunner.Expect;
 import org.junit.jupiter.api.Test;
 
-@Expect(successful = 1, status = 0)
+@Expect(successful = 1, status = 2)
 public class SucceedingTest {
 
     @Test
diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/UsingTestRuntimeTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/UsingTestRuntimeTest.java
index 62547bd34bf..67b236f75a2 100644
--- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/UsingTestRuntimeTest.java
+++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/test/samples/UsingTestRuntimeTest.java
@@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-@Expect(successful = 1, status = 0)
+@Expect(successful = 1, status = 2)
 public class UsingTestRuntimeTest {
 
     @Test