626: refactor names of class and methods

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/SmokeTests.java

@@ -13,7 +13,7 @@ public class SmokeTests extends BaseTest {
     @Issue("380")
     void mainPageLoads() {
         pages.open()
-                .shouldBeOnPage();
+                .isOnPage();
         compareScreenshots("main");
     }
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/Utils.java → kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/helpers/WaitUtils.java

@@ -8,7 +8,7 @@ import org.openqa.selenium.By;
 import static com.codeborne.selenide.Selenide.*;
 import static com.codeborne.selenide.Selenide.$;
 
-public class Utils {
+public class WaitUtils {
     public static void refreshUntil(By by) {
         int i = 0;
         do {

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/MainPage.java

@@ -6,7 +6,7 @@ import lombok.SneakyThrows;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.*;
-import static com.provectus.kafka.ui.helpers.Utils.refreshUntil;
+import static com.provectus.kafka.ui.helpers.WaitUtils.refreshUntil;
 
 public class MainPage {
 
@@ -15,14 +15,14 @@ public class MainPage {
   public static final String path = "";
 
   @Step
-  public MainPage shouldBeOnPage() {
+  public MainPage isOnPage() {
     $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
     $(By.xpath("//h5[text()='Clusters']")).shouldBe(Condition.visible);
     return this;
   }
 
   @SneakyThrows
-  public void shouldBeTopic(String topicName) {
+  public void isTopic(String topicName) {
     refreshUntil(By.xpath("//div[contains(@class,'section')]//table//a[text()='%s']".formatted(topicName)));
   }
 

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/Pages.java

@@ -8,8 +8,8 @@ public class Pages {
     public static Pages INSTANCE = new Pages();
 
     public MainPage mainPage = new MainPage();
-    public TopicsListPage topicsListPage = new TopicsListPage();
-    public TopicViewPage topicViewPage = new TopicViewPage();
+    public TopicsList topicsList = new TopicsList();
+    public TopicView topicView = new TopicView();
 
     private Pages goTo(String path) {
         Selenide.open(TestConfiguration.BASE_URL+path);
@@ -24,8 +24,8 @@ public class Pages {
         return goTo(MainPage.path).mainPage;
     }
 
-    public TopicsListPage openTopicsListPage() {
-        return goTo(TopicsListPage.path).topicsListPage;
+    public TopicsList openTopicsList() {
+        return goTo(TopicsList.path).topicsList;
     }
 
     public TopicViewPage openTopicViewPage(String path) {

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicViewPage.java → kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicView.java

@@ -14,7 +14,7 @@ public class TopicViewPage {
     public SelenideElement maxMessageBytes = $(By.name("maxMessageBytes"));
 
     @SneakyThrows
-    public TopicViewPage openEditSettings() {
+    public TopicView openEditSettings() {
         $(By.xpath("//a[@class=\"button\" and text()='Edit settings']")).click();
         return this;
     }
@@ -26,28 +26,28 @@ public class TopicViewPage {
     }
 
     @SneakyThrows
-    public TopicViewPage changeCleanupPolicy(String cleanupPolicyValue) {
+    public TopicView changeCleanupPolicy(String cleanupPolicyValue) {
         cleanupPolicy.click();
         $(By.xpath("//select/option[@value = '%s']".formatted(cleanupPolicyValue))).click();
         return this;
     }
 
     @SneakyThrows
-    public TopicViewPage changeTimeToRetainValue(String timeToRetainValue) {
+    public TopicView changeTimeToRetainValue(String timeToRetainValue) {
         timeToRetain.clear();
         timeToRetain.sendKeys(String.valueOf(timeToRetainValue));
         return this;
     }
 
     @SneakyThrows
-    public TopicViewPage changeMaxSizeOnDisk(String maxSizeOnDiskValue) {
+    public TopicView changeMaxSizeOnDisk(String maxSizeOnDiskValue) {
         maxSizeOnDisk.click();
         $(By.xpath("//select/option[text() = '%s']".formatted(maxSizeOnDiskValue))).click();
         return this;
     }
 
     @SneakyThrows
-    public TopicViewPage changeMaxMessageBytes(String maxMessageBytesValue) {
+    public TopicView changeMaxMessageBytes(String maxMessageBytesValue) {
         maxMessageBytes.clear();
         maxMessageBytes.sendKeys(String.valueOf(maxMessageBytesValue));
         return this;

kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsListPage.java → kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/pages/TopicsList.java

@@ -6,13 +6,13 @@ import lombok.SneakyThrows;
 import org.openqa.selenium.By;
 
 import static com.codeborne.selenide.Selenide.$;
-import static com.provectus.kafka.ui.helpers.Utils.refreshUntil;
+import static com.provectus.kafka.ui.helpers.WaitUtils.refreshUntil;
 
-public class TopicsListPage {
+public class TopicsList {
     public static final String path = "ui/clusters/secondLocal/topics";
 
     @Step
-    public TopicsListPage shouldBeOnPage() {
+    public TopicsList isOnPage() {
         $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
         $(By.xpath("//span[text()='All Topics']")).shouldBe(Condition.visible);
         return this;
@@ -27,7 +27,7 @@ public class TopicsListPage {
     }
 
     @SneakyThrows
-    public TopicsListPage shouldBeDeleted(String topicName) {
+    public TopicsList isDeleted(String topicName) {
         refreshUntil(By.xpath("//div[contains(@class,'section')]//table"));
         $(By.xpath("//a[text()='%s']".formatted(topicName))).shouldNotBe(Condition.visible);
         return this;

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

@@ -3,7 +3,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.pages.MainPage;
-import com.provectus.kafka.ui.pages.TopicViewPage;
+import com.provectus.kafka.ui.pages.TopicView;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.DisplayName;
@@ -16,7 +16,7 @@ public class TopicTests extends BaseTest {
 
     public static final String NEW_TOPIC = "new-topic";
     public static final String UPDATE_TOPIC = "update-topic";
-    public static final String DELETE_TOPIC = "delete-topic";
+    public static final String TOPIC_TO_DELETE = "delete-topic";
     public static final String SECOND_LOCAL = "secondLocal";
     public static final String COMPACT_POLICY_VALUE = "compact";
     public static final String UPDATED_TIME_TO_RETAIN_VALUE = "604800001";
@@ -27,14 +27,14 @@ public class TopicTests extends BaseTest {
     @SneakyThrows
     public static void beforeAll() {
         Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, UPDATE_TOPIC);
-        Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, DELETE_TOPIC);
+        Helpers.INSTANCE.apiHelper.createTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
     }
 
     @AfterAll
     @SneakyThrows
     public static void afterAll() {
         Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, UPDATE_TOPIC);
-        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, DELETE_TOPIC);
+        Helpers.INSTANCE.apiHelper.deleteTopic(SECOND_LOCAL, TOPIC_TO_DELETE);
     }
 
     @SneakyThrows
@@ -44,9 +44,9 @@ public class TopicTests extends BaseTest {
         try {
             helpers.apiHelper.createTopic(SECOND_LOCAL, NEW_TOPIC);
             pages.open()
-                    .shouldBeOnPage()
+                    .isOnPage()
                     .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
-                    .shouldBeTopic(NEW_TOPIC);
+                    .isTopic(NEW_TOPIC);
         } finally {
             helpers.apiHelper.deleteTopic(SECOND_LOCAL, NEW_TOPIC);
         }