Browse Source

626: provide encapsulation for TopicView fields

Anna Antipova 4 years ago
parent
commit
08843343bb

+ 24 - 7
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java

@@ -2,16 +2,17 @@ package com.provectus.kafka.ui.pages;
 
 import com.codeborne.selenide.SelenideElement;
 import lombok.SneakyThrows;
+import org.junit.jupiter.api.Assertions;
 import org.openqa.selenium.By;
 
-import static com.codeborne.selenide.Selenide.$;
+import static com.codeborne.selenide.Selenide.*;
 
-public class TopicViewPage {
-
-    public SelenideElement cleanupPolicy = $(By.name("cleanupPolicy"));
-    public SelenideElement timeToRetain = $(By.id("timeToRetain"));
-    public SelenideElement maxSizeOnDisk = $(By.name("retentionBytes"));
-    public SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
+public class TopicView {
+    static final String path = "ui/clusters/%s/topics/%s";
+    private SelenideElement cleanupPolicy = $(By.name("cleanupPolicy"));
+    private SelenideElement timeToRetain = $(By.id("timeToRetain"));
+    private SelenideElement maxSizeOnDisk = $(By.name("retentionBytes"));
+    private SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
 
     @SneakyThrows
     public TopicView openEditSettings() {
@@ -57,4 +58,20 @@ public class TopicViewPage {
     public void submitSettingChanges() {
         $(By.xpath("//input[@type='submit']")).click();
     }
+
+    public SelenideElement getCleanupPolicy() {
+        return cleanupPolicy;
+    }
+
+    public SelenideElement getTimeToRetain() {
+        return timeToRetain;
+    }
+
+    public SelenideElement getMaxSizeOnDisk() {
+        return maxSizeOnDisk;
+    }
+
+    public SelenideElement getMaxMessageBytes() {
+        return maxMessageBytes;
+    }
 }

+ 5 - 4
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/topics/TopicTests.java

@@ -2,6 +2,7 @@ package com.provectus.kafka.ui.topics;
 
 import com.provectus.kafka.ui.base.BaseTest;
 import com.provectus.kafka.ui.helpers.Helpers;
+import com.provectus.kafka.ui.helpers.WaitUtils;
 import com.provectus.kafka.ui.pages.MainPage;
 import com.provectus.kafka.ui.pages.TopicView;
 import lombok.SneakyThrows;
@@ -72,11 +73,11 @@ public class TopicTests extends BaseTest {
         TopicViewPage topicViewPage = pages.openTopicViewPage(path)
                 .openEditSettings();
 
-        waitForSelectedValue(topicViewPage.cleanupPolicy, COMPACT_POLICY_VALUE);
+        WaitUtils.waitForSelectedValue(topicView.getCleanupPolicy(), COMPACT_POLICY_VALUE);
 
-        Assertions.assertEquals(UPDATED_TIME_TO_RETAIN_VALUE,topicViewPage.timeToRetain.getValue());
-        Assertions.assertEquals(UPDATED_MAX_SIZE_ON_DISK,topicViewPage.maxSizeOnDisk.getSelectedText());
-        Assertions.assertEquals(UPDATED_MAX_MESSAGE_BYTES,topicViewPage.maxMessageBytes.getValue());
+        Assertions.assertEquals(UPDATED_TIME_TO_RETAIN_VALUE, topicView.getTimeToRetain().getValue());
+        Assertions.assertEquals(UPDATED_MAX_SIZE_ON_DISK, topicView.getMaxSizeOnDisk().getSelectedText());
+        Assertions.assertEquals(UPDATED_MAX_MESSAGE_BYTES, topicView.getMaxMessageBytes().getValue());
     }
 
     @SneakyThrows