0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of asserts in helper classes #2295 (#2418)

Browse source 
* Get rid of asserts in helper classes #2295

* Fixed step description

* Deleted description of ConnectorCreateView

Co-authored-by: anezboretskiy <anezboretskiy@modeln.com>
Co-authored-by: Vlad Senyuta <66071557+VladSenyuta@users.noreply.github.com>
This commit is contained in:
Alexandr Nezboretskiy 2022-08-09 17:28:58 +03:00 • committed by GitHub
parent ffb62d3eab
commit d781ac45da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/MainPage.java
View file

@ -26,7 +26,7 @@ public class MainPage {
} }
@Step @Step
public MainPage isOnPage() { public MainPage waitUntilScreenReady() {
$(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear); $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
$("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible); $("input[name=switchRoundedDefault]").parent().$("span").shouldBe(Condition.visible);
return this; return this;

4
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorCreateView.java
View file

@ -34,8 +34,8 @@ public class ConnectorCreateView {
return new ConnectorsView(); return new ConnectorsView();
} }
@Step("Verify that page 'Create Connector' opened") @Step
public ConnectorCreateView isOnConnectorCreatePage() { public ConnectorCreateView waitUntilScreenReady() {
nameField.shouldBe(Condition.visible); nameField.shouldBe(Condition.visible);
return this; return this;
} }

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/connector/ConnectorsList.java
View file

@ -24,7 +24,7 @@ public class ConnectorsList {
} }
@Step @Step
public ConnectorsList isOnPage() { public ConnectorsList waitUntilScreenReady() {
$(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible); $(By.xpath("//h1[text()='Connectors']")).shouldBe(Condition.visible);
return this; return this;
} }

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/schema/SchemaView.java
View file

@ -12,7 +12,7 @@ import static com.codeborne.selenide.Selenide.$x;
public class SchemaView { public class SchemaView {
@Step @Step
public SchemaView isOnSchemaViewPage() { public SchemaView waitUntilScreenReady() {
$("div#schema").shouldBe(Condition.visible); $("div#schema").shouldBe(Condition.visible);
return this; return this;
} }

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicView.java
View file

@ -29,7 +29,7 @@ public class TopicView {
} }
@Step @Step
public TopicView isOnTopicViewPage() { public TopicView waitUntilScreenReady() {
$(By.linkText("Overview")).shouldBe(Condition.visible); $(By.linkText("Overview")).shouldBe(Condition.visible);
return this; return this;
} }

2
kafka-ui-e2e-checks/src/main/java/com/provectus/kafka/ui/pages/topic/TopicsList.java
View file

@ -25,7 +25,7 @@ public class TopicsList {
} }
@Step @Step
public TopicsList isOnPage() { public TopicsList waitUntilScreenReady() {
$(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear); $(By.xpath("//*[contains(text(),'Loading')]")).shouldBe(Condition.disappear);
$(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible); $(By.xpath("//h1[text()='All Topics']")).shouldBe(Condition.visible);
return this; return this;

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

@ -16,7 +16,7 @@ public class SmokeTests extends BaseTest {
@DisplayName("main page should load") @DisplayName("main page should load")
void mainPageLoads() { void mainPageLoads() {
pages.open() pages.open()
.isOnPage(); .waitUntilScreenReady();
compareScreenshots("main"); compareScreenshots("main");
} }

10
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/ConnectorsTests.java
View file

@ -70,14 +70,14 @@ public class ConnectorsTests extends BaseTest {
@Test @Test
public void createConnector() { public void createConnector() {
pages.openConnectorsList(LOCAL_CLUSTER) pages.openConnectorsList(LOCAL_CLUSTER)
.isOnPage() .waitUntilScreenReady()
.clickCreateConnectorButton() .clickCreateConnectorButton()
.isOnConnectorCreatePage() .waitUntilScreenReady()
.setConnectorConfig( .setConnectorConfig(
SINK_CONNECTOR, SINK_CONNECTOR,
FileUtils.getResourceAsString("config_for_create_connector.json")); FileUtils.getResourceAsString("config_for_create_connector.json"));
pages.openConnectorsList(LOCAL_CLUSTER) pages.openConnectorsList(LOCAL_CLUSTER)
.isOnPage() .waitUntilScreenReady()
.connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR); .connectorIsVisibleInList(SINK_CONNECTOR, TOPIC_FOR_CONNECTOR);
} }
@ -89,7 +89,7 @@ public class ConnectorsTests extends BaseTest {
@Test @Test
public void updateConnector() { public void updateConnector() {
pages.openConnectorsList(LOCAL_CLUSTER) pages.openConnectorsList(LOCAL_CLUSTER)
.isOnPage() .waitUntilScreenReady()
.openConnector(CONNECTOR_FOR_UPDATE); .openConnector(CONNECTOR_FOR_UPDATE);
pages.connectorsView.connectorIsVisibleOnOverview(); pages.connectorsView.connectorIsVisibleOnOverview();
pages.connectorsView.openEditConfig() pages.connectorsView.openEditConfig()
@ -106,7 +106,7 @@ public class ConnectorsTests extends BaseTest {
@Test @Test
public void deleteConnector() { public void deleteConnector() {
pages.openConnectorsList(LOCAL_CLUSTER) pages.openConnectorsList(LOCAL_CLUSTER)
.isOnPage() .waitUntilScreenReady()
.openConnector(CONNECTOR_FOR_DELETE); .openConnector(CONNECTOR_FOR_DELETE);
pages.connectorsView.clickDeleteButton(); pages.connectorsView.clickDeleteButton();
pages.openConnectorsList(LOCAL_CLUSTER) pages.openConnectorsList(LOCAL_CLUSTER)

16
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/SchemasTests.java
View file

@ -71,7 +71,7 @@ public class SchemasTests extends BaseTest {
.setSchemaField(readFileAsString(PATH_AVRO_VALUE)) .setSchemaField(readFileAsString(PATH_AVRO_VALUE))
.selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO) .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.AVRO)
.clickSubmit() .clickSubmit()
.isOnSchemaViewPage(); .waitUntilScreenReady();
pages.mainPage pages.mainPage
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE); pages.schemaRegistry.isSchemaVisible(SCHEMA_AVRO_CREATE);
@ -88,12 +88,12 @@ public class SchemasTests extends BaseTest {
pages.openMainPage() pages.openMainPage()
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE) pages.schemaRegistry.openSchema(SCHEMA_AVRO_API_UPDATE)
.isOnSchemaViewPage() .waitUntilScreenReady()
.openEditSchema() .openEditSchema()
.selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE) .selectCompatibilityLevelFromDropdown(CompatibilityLevel.CompatibilityEnum.NONE)
.setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE)) .setNewSchemaValue(readFileAsString(PATH_AVRO_FOR_UPDATE))
.clickSubmit() .clickSubmit()
.isOnSchemaViewPage() .waitUntilScreenReady()
.isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE); .isCompatibility(CompatibilityLevel.CompatibilityEnum.NONE);
} }
@ -108,7 +108,7 @@ public class SchemasTests extends BaseTest {
pages.openMainPage() pages.openMainPage()
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.openSchema(SCHEMA_AVRO_API) pages.schemaRegistry.openSchema(SCHEMA_AVRO_API)
.isOnSchemaViewPage() .waitUntilScreenReady()
.removeSchema() .removeSchema()
.isNotVisible(SCHEMA_AVRO_API); .isNotVisible(SCHEMA_AVRO_API);
} }
@ -128,7 +128,7 @@ public class SchemasTests extends BaseTest {
.setSchemaField(readFileAsString(PATH_JSON_VALUE)) .setSchemaField(readFileAsString(PATH_JSON_VALUE))
.selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON) .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.JSON)
.clickSubmit() .clickSubmit()
.isOnSchemaViewPage(); .waitUntilScreenReady();
pages.mainPage pages.mainPage
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE); pages.schemaRegistry.isSchemaVisible(SCHEMA_JSON_CREATE);
@ -145,7 +145,7 @@ public class SchemasTests extends BaseTest {
pages.openMainPage() pages.openMainPage()
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.openSchema(SCHEMA_JSON_API) pages.schemaRegistry.openSchema(SCHEMA_JSON_API)
.isOnSchemaViewPage() .waitUntilScreenReady()
.removeSchema() .removeSchema()
.isNotVisible(SCHEMA_JSON_API); .isNotVisible(SCHEMA_JSON_API);
} }
@ -165,7 +165,7 @@ public class SchemasTests extends BaseTest {
.setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE)) .setSchemaField(readFileAsString(PATH_PROTOBUF_VALUE))
.selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF) .selectSchemaTypeFromDropdown(SchemaCreateView.SchemaType.PROTOBUF)
.clickSubmit() .clickSubmit()
.isOnSchemaViewPage(); .waitUntilScreenReady();
pages.mainPage pages.mainPage
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE); pages.schemaRegistry.isSchemaVisible(SCHEMA_PROTOBUF_CREATE);
@ -182,7 +182,7 @@ public class SchemasTests extends BaseTest {
pages.openMainPage() pages.openMainPage()
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY); .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.SCHEMA_REGISTRY);
pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API) pages.schemaRegistry.openSchema(SCHEMA_PROTOBUF_API)
.isOnSchemaViewPage() .waitUntilScreenReady()
.removeSchema() .removeSchema()
.isNotVisible(SCHEMA_PROTOBUF_API); .isNotVisible(SCHEMA_PROTOBUF_API);
} }

20
kafka-ui-e2e-checks/src/test/java/com/provectus/kafka/ui/tests/TopicTests.java
View file

@ -55,7 +55,7 @@ public class TopicTests extends BaseTest {
pages.topicsList.pressCreateNewTopic() pages.topicsList.pressCreateNewTopic()
.setTopicName(NEW_TOPIC) .setTopicName(NEW_TOPIC)
.sendData() .sendData()
.isOnTopicViewPage(); .waitUntilScreenReady();
pages.open() pages.open()
.goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS) .goToSideMenu(SECOND_LOCAL, MainPage.SideMenuOptions.TOPICS)
.topicIsVisible(NEW_TOPIC); .topicIsVisible(NEW_TOPIC);
@ -74,9 +74,9 @@ public class TopicTests extends BaseTest {
@Test @Test
public void updateTopic() { public void updateTopic() {
pages.openTopicsList(SECOND_LOCAL) pages.openTopicsList(SECOND_LOCAL)
.isOnPage(); .waitUntilScreenReady();
pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE) pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
.isOnTopicViewPage() .waitUntilScreenReady()
.openEditSettings() .openEditSettings()
.selectCleanupPolicy(COMPACT_POLICY_VALUE) .selectCleanupPolicy(COMPACT_POLICY_VALUE)
.setMinInsyncReplicas(10) .setMinInsyncReplicas(10)
@ -84,10 +84,10 @@ public class TopicTests extends BaseTest {
.setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK) .setMaxSizeOnDiskInGB(UPDATED_MAX_SIZE_ON_DISK)
.setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES) .setMaxMessageBytes(UPDATED_MAX_MESSAGE_BYTES)
.sendData() .sendData()
.isOnTopicViewPage(); .waitUntilScreenReady();
pages.openTopicsList(SECOND_LOCAL) pages.openTopicsList(SECOND_LOCAL)
.isOnPage(); .waitUntilScreenReady();
pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE) pages.openTopicView(SECOND_LOCAL, TOPIC_TO_UPDATE)
.openEditSettings() .openEditSettings()
// Assertions // Assertions
@ -105,11 +105,11 @@ public class TopicTests extends BaseTest {
@Test @Test
public void deleteTopic() { public void deleteTopic() {
pages.openTopicsList(SECOND_LOCAL) pages.openTopicsList(SECOND_LOCAL)
.isOnPage() .waitUntilScreenReady()
.openTopic(TOPIC_TO_DELETE) .openTopic(TOPIC_TO_DELETE)
.isOnTopicViewPage() .waitUntilScreenReady()
.deleteTopic() .deleteTopic()
.isOnPage() .waitUntilScreenReady()
.isTopicNotVisible(TOPIC_TO_DELETE); .isTopicNotVisible(TOPIC_TO_DELETE);
} }
@ -121,9 +121,9 @@ public class TopicTests extends BaseTest {
@Test @Test
void produceMessage() { void produceMessage() {
pages.openTopicsList(SECOND_LOCAL) pages.openTopicsList(SECOND_LOCAL)
.isOnPage() .waitUntilScreenReady()
.openTopic(TOPIC_TO_UPDATE) .openTopic(TOPIC_TO_UPDATE)
.isOnTopicViewPage() .waitUntilScreenReady()
.openTopicMenu(TopicView.TopicMenu.MESSAGES) .openTopicMenu(TopicView.TopicMenu.MESSAGES)
.clickOnButton("Produce Message") .clickOnButton("Produce Message")
.setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE)) .setContentFiled(readFileAsString(CONTENT_TO_PRODUCE_MESSAGE))