diff --git a/msa/black-box-tests/README.md b/msa/black-box-tests/README.md index c91e1203fb..a4bbe48961 100644 --- a/msa/black-box-tests/README.md +++ b/msa/black-box-tests/README.md @@ -34,9 +34,13 @@ As result, in REPOSITORY column, next images should be present: mvn clean install -DblackBoxTests.skip=false -DrunLocal=true -- To run ui smoke tests in the [msa/black-box-tests](../black-box-tests) directory specifying suiteFile property: +- To run ui smoke tests in the [msa/black-box-tests](../black-box-tests) directory specifying suite name: - mvn clean install -DblackBoxTests.skip=false -DsuiteFile=src/test/resources/smokeTests.xml + mvn clean install -DblackBoxTests.skip=false -Dsuite=uiTests + +- To run all tests in the [msa/black-box-tests](../black-box-tests) directory specifying suite name: + + mvn clean install -DblackBoxTests.skip=false -Dsuite=all diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index f99fb21343..380f9abbaa 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${basedir}/../.. - src/test/resources/testNG.xml + blackBox @@ -184,7 +184,7 @@ maven-surefire-plugin - ${suiteFile} + src/test/resources/${suite}.xml ${blackBoxTests.skip} diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageElements.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageElements.java index e10fb7d1ed..05da22e4db 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageElements.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CustomerPageElements.java @@ -70,6 +70,7 @@ public class CustomerPageElements extends OtherPageElementsHelper { private static final String MANAGE_CUSTOMERS_DEVICE_BTN_VIEW = "Manage devices"; private static final String MANAGE_CUSTOMERS_DASHBOARD_BTN_VIEW = "Manage dashboards"; private static final String MANAGE_CUSTOMERS_EDGE_BTN_VIEW = "Manage edges "; + private static final String DELETE_FROM_VIEW_BTN = "//tb-customer//span[contains(text(),' Delete')]"; public WebElement titleFieldAddEntityView() { return waitUntilElementToBeClickable(ADD_ENTITY_VIEW + String.format(INPUT_FIELD, INPUT_FIELD_NAME_TITLE)); @@ -274,4 +275,8 @@ public class CustomerPageElements extends OtherPageElementsHelper { public WebElement manageCustomersEdgeBtnView() { return waitUntilElementToBeClickable(String.format(MANAGE_BTN_VIEW, MANAGE_CUSTOMERS_EDGE_BTN_VIEW)); } + + public WebElement customerViewDeleteBtn() { + return waitUntilElementToBeClickable(DELETE_FROM_VIEW_BTN); + } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java index 289a8d02df..582a2f797f 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/CustomerEditMenuTest.java @@ -256,7 +256,6 @@ public class CustomerEditMenuTest extends AbstractDiverBaseTest { public void addAllInformation() { customerName = ENTITY_NAME; testRestClient.postCustomer(defaultCustomerPrototype(customerName)); - ; String text = "Text"; String email = "email@mail.com"; String number = "2015550123"; diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java index 5fb851216d..d801b58638 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/customerSmoke/DeleteCustomerTest.java @@ -81,10 +81,11 @@ public class DeleteCustomerTest extends AbstractDiverBaseTest { sideBarMenuView.customerBtn().click(); customerPage.entity(customerName).click(); - String deletedCustomer = ruleChainsPage.deleteRuleChainFromView(customerName); - ruleChainsPage.refreshBtn().click(); + customerPage.customerViewDeleteBtn().click(); + customerPage.warningPopUpYesBtn().click(); + customerPage.refreshBtn().click(); - Assert.assertTrue(ruleChainsPage.entityIsNotPresent(deletedCustomer)); + Assert.assertTrue(customerPage.entityIsNotPresent(customerName)); } @Test(priority = 20, groups = "smoke") diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java index 71f3e01f88..cff351387e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainImportTest.java @@ -101,6 +101,7 @@ public class CreateRuleChainImportTest extends AbstractDiverBaseTest { @Test(priority = 30, groups = "smoke") @Description public void importRuleChainAndSave() { + ruleChainName = IMPORT_RULE_CHAIN_NAME; sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.openImportRuleChainView(); ruleChainsPage.browseFile().sendKeys(absolutePathToFileImportRuleChain); @@ -108,7 +109,6 @@ public class CreateRuleChainImportTest extends AbstractDiverBaseTest { openRuleChainPage.doneBtn().click(); openRuleChainPage.waitUntilDoneBtnDisable(); sideBarMenuView.ruleChainsBtn().click(); - ruleChainName = IMPORT_RULE_CHAIN_NAME; Assert.assertNotNull(ruleChainsPage.entity(IMPORT_RULE_CHAIN_NAME)); Assert.assertTrue(ruleChainsPage.entity(IMPORT_RULE_CHAIN_NAME).isDisplayed()); @@ -119,7 +119,6 @@ public class CreateRuleChainImportTest extends AbstractDiverBaseTest { public void importRuleChainAndSaveWithSameName() { ruleChainName = IMPORT_RULE_CHAIN_NAME; testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName)); - ; sideBarMenuView.ruleChainsBtn().click(); ruleChainsPage.openImportRuleChainView(); diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml new file mode 100644 index 0000000000..3a35ec5c16 --- /dev/null +++ b/msa/black-box-tests/src/test/resources/all.xml @@ -0,0 +1,26 @@ + + + + + + + + + + \ No newline at end of file diff --git a/msa/black-box-tests/src/test/resources/testNG.xml b/msa/black-box-tests/src/test/resources/blackBox.xml similarity index 100% rename from msa/black-box-tests/src/test/resources/testNG.xml rename to msa/black-box-tests/src/test/resources/blackBox.xml diff --git a/msa/black-box-tests/src/test/resources/smokeTests.xml b/msa/black-box-tests/src/test/resources/uiTests.xml similarity index 95% rename from msa/black-box-tests/src/test/resources/smokeTests.xml rename to msa/black-box-tests/src/test/resources/uiTests.xml index 85080e2bfd..73754c8381 100644 --- a/msa/black-box-tests/src/test/resources/smokeTests.xml +++ b/msa/black-box-tests/src/test/resources/uiTests.xml @@ -18,7 +18,7 @@ --> - +