Merge pull request #20071 from vespa-engine/jonmv/vespa-cli-test-runnerv7.503.19

Jonmv/vespa cli test runner

1 files changed, 19 insertions, 7 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
index 31474d6c348..d70a3f60c7d 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunner.java
@@ -1,20 +1,32 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.testrunner;
 
-import ai.vespa.hosted.api.TestDescriptor;
-import com.yahoo.vespa.testrunner.legacy.LegacyTestRunner;
+import java.util.Collection;
+import java.util.concurrent.CompletableFuture;
+import java.util.logging.LogRecord;
 
 /**
+ * @author jonmv
  * @author mortent
  */
 public interface TestRunner {
-    void executeTests(TestDescriptor.TestCategory category, byte[] testConfig);
+
+    Collection<LogRecord> getLog(long after);
+
+    Status getStatus();
+
+    CompletableFuture<?> test(Suite suite, byte[] config);
 
     boolean isSupported();
 
-    LegacyTestRunner.Status getStatus();
+    default TestReport getReport() { return null; }
+
+    enum Status {
+        NOT_STARTED, RUNNING, FAILURE, ERROR, SUCCESS
+    }
 
-    TestReport getReport();
+    enum Suite {
+        SYSTEM_TEST, STAGING_SETUP_TEST, STAGING_TEST, PRODUCTION_TEST
+    }
 
-    String getReportAsJson();
-}
+}
\ No newline at end of file