Browse Source

add -Dsuite

VladSenyuta 2 years ago
parent
commit
9710ad43b6

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

@@ -12,6 +12,6 @@ public interface Profiles extends Config {
     String browser();
     String browser();
 
 
     @Key("suite")
     @Key("suite")
-    @DefaultValue("smoke")
+    @DefaultValue("custom")
     String suite();
     String suite();
 }
 }

+ 7 - 5
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/QaseUtils.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/QaseExtension.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils;
+package com.provectus.kafka.ui.utilities.qaseUtils;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -6,21 +6,23 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 
 
 import static com.provectus.kafka.ui.settings.BaseSource.SUITE;
 import static com.provectus.kafka.ui.settings.BaseSource.SUITE;
+import static org.apache.commons.lang3.BooleanUtils.FALSE;
+import static org.apache.commons.lang3.BooleanUtils.TRUE;
 
 
 @Slf4j
 @Slf4j
-public class QaseUtils {
+public class QaseExtension {
 
 
     public static void setupQaseExtension() {
     public static void setupQaseExtension() {
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
         String qaseApiToken = System.getProperty("QASEIO_API_TOKEN");
         if (qaseApiToken.isEmpty()) {
         if (qaseApiToken.isEmpty()) {
             log.warn("QASEIO_API_TOKEN system property wasn't set. Support for Qase will be disabled.");
             log.warn("QASEIO_API_TOKEN system property wasn't set. Support for Qase will be disabled.");
-            System.setProperty("QASE_ENABLE", "false");
+            System.setProperty("QASE_ENABLE", FALSE);
         } else {
         } else {
             log.warn("QASEIO_API_TOKEN was set. Find this run at https://app.qase.io/run/KAFKAUI.");
             log.warn("QASEIO_API_TOKEN was set. Find this run at https://app.qase.io/run/KAFKAUI.");
-            System.setProperty("QASE_ENABLE", "true");
+            System.setProperty("QASE_ENABLE", TRUE);
             System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
             System.setProperty("QASE_PROJECT_CODE", "KAFKAUI");
             System.setProperty("QASE_API_TOKEN", qaseApiToken);
             System.setProperty("QASE_API_TOKEN", qaseApiToken);
-            System.setProperty("QASE_USE_BULK", "false");
+            System.setProperty("QASE_USE_BULK", TRUE);
             System.setProperty("QASE_RUN_NAME", "Automation " + SUITE.toUpperCase() + ": " +
             System.setProperty("QASE_RUN_NAME", "Automation " + SUITE.toUpperCase() + ": " +
                     new SimpleDateFormat("dd.MM.yyyy HH:mm").format(new Date()));
                     new SimpleDateFormat("dd.MM.yyyy HH:mm").format(new Date()));
         }
         }

+ 2 - 2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/AutomationStatus.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/AutomationStatus.java

@@ -1,6 +1,6 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
 
 
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.RetentionPolicy;

+ 1 - 1
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/annotations/Suite.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/annotations/Suite.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.annotations;
+package com.provectus.kafka.ui.utilities.qaseUtils.annotations;
 
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.RetentionPolicy;

+ 1 - 1
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseIoUtils/enums/Status.java → kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/utilities/qaseUtils/enums/Status.java

@@ -1,4 +1,4 @@
-package com.provectus.kafka.ui.utilities.qaseIoUtils.enums;
+package com.provectus.kafka.ui.utilities.qaseUtils.enums;
 
 
 public enum Status {
 public enum Status {
     AUTOMATED, TO_BE_AUTOMATED, MANUAL
     AUTOMATED, TO_BE_AUTOMATED, MANUAL

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

@@ -27,7 +27,7 @@ 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.CONTAINER;
 import static com.provectus.kafka.ui.settings.configs.Profiles.LOCAL;
 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.settings.drivers.LocalWebDriver.*;
-import static com.provectus.kafka.ui.utilities.qaseIoUtils.QaseUtils.setupQaseExtension;
+import static com.provectus.kafka.ui.utilities.qaseUtils.QaseExtension.setupQaseExtension;
 
 
 @Slf4j
 @Slf4j
 @Listeners({AllureListener.class, LoggerListener.class, QaseListener.class})
 @Listeners({AllureListener.class, LoggerListener.class, QaseListener.class})

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

@@ -2,8 +2,8 @@ package com.provectus.kafka.ui.smokeSuite;
 
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.annotations.Test;
 import org.testng.annotations.Test;
 
 

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/brokers/BrokersTest.java

@@ -2,9 +2,9 @@ package com.provectus.kafka.ui.smokeSuite.brokers;
 
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
 import org.testng.Assert;

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/connectors/ConnectorsTest.java

@@ -3,9 +3,9 @@ package com.provectus.kafka.ui.smokeSuite.connectors;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Connector;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.models.Topic;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
 import org.testng.Assert;

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/ksqlDb/KsqlDbTest.java

@@ -3,9 +3,9 @@ package com.provectus.kafka.ui.smokeSuite.ksqlDb;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Stream;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
 import com.provectus.kafka.ui.pages.ksqlDb.models.Table;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.testng.annotations.Test;

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/schemas/SchemasTest.java

@@ -4,9 +4,9 @@ import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.api.model.CompatibilityLevel;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Schema;
 import com.provectus.kafka.ui.models.Schema;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Step;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
 import org.testng.Assert;

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/MessagesTest.java

@@ -3,9 +3,9 @@ package com.provectus.kafka.ui.smokeSuite.topics;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Step;
 import io.qameta.allure.Step;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;

+ 3 - 3
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/smokeSuite/topics/TopicsTest.java

@@ -4,9 +4,9 @@ import com.codeborne.selenide.Condition;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.BaseTest;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.models.Topic;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
 import com.provectus.kafka.ui.pages.topics.TopicDetails;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.AutomationStatus;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.annotations.Suite;
-import com.provectus.kafka.ui.utilities.qaseIoUtils.enums.Status;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.AutomationStatus;
+import com.provectus.kafka.ui.utilities.qaseUtils.annotations.Suite;
+import com.provectus.kafka.ui.utilities.qaseUtils.enums.Status;
 import io.qameta.allure.Issue;
 import io.qameta.allure.Issue;
 import io.qase.api.annotation.CaseId;
 import io.qase.api.annotation.CaseId;
 import org.testng.Assert;
 import org.testng.Assert;