Bläddra i källkod

add isSuiteEnabled

VladSenyuta 2 år sedan
förälder
incheckning
b040f3b085

+ 4 - 4
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/settings/configs/Profiles.java

@@ -2,16 +2,16 @@ package com.provectus.kafka.ui.settings.configs;
 
 import org.aeonbits.owner.Config;
 
-public interface Profiles extends Config {
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Suite.CUSTOM;
 
-    String CONTAINER = "container";
-    String LOCAL = "local";
+public interface Profiles extends Config {
 
     @Key("browser")
     @DefaultValue(CONTAINER)
     String browser();
 
     @Key("suite")
-    @DefaultValue("custom")
+    @DefaultValue(CUSTOM)
     String suite();
 }

+ 11 - 3
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseExtension.java

@@ -7,6 +7,7 @@ import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 import static com.provectus.kafka.ui.settings.BaseSource.SUITE;
+import static com.provectus.kafka.ui.variables.Suite.*;
 import static org.apache.commons.lang3.BooleanUtils.FALSE;
 import static org.apache.commons.lang3.BooleanUtils.TRUE;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
@@ -14,13 +15,20 @@ import static org.apache.commons.lang3.StringUtils.isEmpty;
 @Slf4j
 public class QaseExtension {
 
+    private static boolean isSuiteEnabled() {
+        return switch (SUITE) {
+            case CUSTOM, SMOKE -> false;
+            case REGRESSION, SANITY -> true;
+        };
+    }
+
     public static void testRunSetup() {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
-        if (isEmpty(qaseApiToken)) {
-            log.warn("QASEIO_API_TOKEN system property wasn't set. Support for Qase will be disabled.");
+        if (isEmpty(qaseApiToken) || !isSuiteEnabled()) {
+            log.warn("Integration with Qase is disabled due to suite settings or token wasn't defined.");
             System.setProperty("QASE_ENABLE", FALSE);
         } else {
-            log.warn("QASEIO_API_TOKEN was set. Find this run at https://app.qase.io/run/KAFKAUI.");
+            log.warn("Integration with Qase is enabled. Find this run at https://app.qase.io/run/KAFKAUI.");
             System.setProperty("QASE_ENABLE", TRUE);
             System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
             System.setProperty("QASE_API_TOKEN", qaseApiToken);

+ 7 - 0
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Browser.java

@@ -0,0 +1,7 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Browser {
+
+    String CONTAINER = "container";
+    String LOCAL = "local";
+}

+ 9 - 0
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/variables/Suite.java

@@ -0,0 +1,9 @@
+package com.provectus.kafka.ui.variables;
+
+public interface Suite {
+
+    String CUSTOM = "custom";
+    String REGRESSION = "regression";
+    String SANITY = "sanity";
+    String SMOKE = "smoke";
+}

+ 2 - 2
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/BaseTest.java

@@ -24,10 +24,10 @@ import java.util.List;
 
 import static com.provectus.kafka.ui.pages.NaviSideBar.SideMenuOption.TOPICS;
 import static com.provectus.kafka.ui.settings.BaseSource.*;
-import static com.provectus.kafka.ui.settings.configs.Profiles.CONTAINER;
-import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
 import static com.provectus.kafka.ui.settings.drivers.LocalWebDriver.*;
 import static com.provectus.kafka.ui.utilities.qaseUtils.QaseExtension.testRunSetup;
+import static com.provectus.kafka.ui.variables.Browser.CONTAINER;
+import static com.provectus.kafka.ui.variables.Browser.LOCAL;
 
 @Slf4j
 @Listeners({AllureListener.class, LoggerListener.class, QaseListener.class})