Remove TestCategory from api

2 files changed, 17 insertions, 14 deletions

diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
index 2a827659695..cb337a0c176 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/TestRunnerHandler.java
@@ -1,6 +1,7 @@
 // Copyright Verizon Media. 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.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.inject.Inject;
@@ -101,7 +102,7 @@ public class TestRunnerHandler extends LoggingRequestHandler {
             TestProfile testProfile = TestProfile.valueOf(type.toUpperCase() + "_TEST");
             byte[] config = request.getData().readAllBytes();
             if (useOsgiMode) {
-                junitRunner.executeTests(testProfile.testCategory(), config);
+                junitRunner.executeTests(categoryFromProfile(testProfile), config);
                 log.info("Started tests of type " + type + " and status is " + junitRunner.getStatus());
                 return new Response("Successfully started " + type + " tests");
             } else {
@@ -113,6 +114,16 @@ public class TestRunnerHandler extends LoggingRequestHandler {
         return new Response(Status.NOT_FOUND, "Not found: " + request.getUri().getPath());
     }
 
+    TestDescriptor.TestCategory categoryFromProfile(TestProfile testProfile) {
+        switch(testProfile) {
+            case SYSTEM_TEST: return TestDescriptor.TestCategory.systemtest;
+            case STAGING_SETUP_TEST: return TestDescriptor.TestCategory.stagingsetuptest;
+            case STAGING_TEST: return TestDescriptor.TestCategory.stagingtest;
+            case PRODUCTION_TEST: return TestDescriptor.TestCategory.productiontest;
+            default: throw new RuntimeException("Unknown test profile: " + testProfile.name());
+        }
+    }
+
     private static String lastElement(String path) {
         if (path.endsWith("/"))
             path = path.substring(0, path.length() - 1);
diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/TestProfile.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/TestProfile.java
index f3173d6758c..59576209043 100644
--- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/TestProfile.java
+++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/legacy/TestProfile.java
@@ -1,24 +1,21 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.testrunner.legacy;
 
-import ai.vespa.hosted.api.TestDescriptor;
-
 /**
  * @author valerijf
  * @author jvenstad
  */
 public enum TestProfile {
 
-    SYSTEM_TEST("system, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true, TestDescriptor.TestCategory.systemtest),
-    STAGING_SETUP_TEST("staging-setup", false, TestDescriptor.TestCategory.stagingsetuptest),
-    STAGING_TEST("staging, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true, TestDescriptor.TestCategory.stagingtest),
-    PRODUCTION_TEST("production, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false, TestDescriptor.TestCategory.productiontest);
+    SYSTEM_TEST("system, com.yahoo.vespa.tenant.systemtest.base.SystemTest", true),
+    STAGING_SETUP_TEST("staging-setup", false),
+    STAGING_TEST("staging, com.yahoo.vespa.tenant.systemtest.base.StagingTest", true),
+    PRODUCTION_TEST("production, com.yahoo.vespa.tenant.systemtest.base.ProductionTest", false);
 
     private final String group;
     private final boolean failIfNoTests;
-    private TestDescriptor.TestCategory testCategory;
 
-    TestProfile(String group, boolean failIfNoTests, TestDescriptor.TestCategory testCategory) {
+    TestProfile(String group, boolean failIfNoTests) {
         this.group = group;
         this.failIfNoTests = failIfNoTests;
     }
@@ -30,9 +27,4 @@ public enum TestProfile {
     public boolean failIfNoTests() {
         return failIfNoTests;
     }
-
-    public TestDescriptor.TestCategory testCategory() {
-        return testCategory;
-    }
-
 }