tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix tests after changes in UI

pull/7670/head
Serafym Tuhai 3 years ago
parent
0c4762f968
commit
832b406420
10 changed files with 75 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java
  2. 11
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java
  3. 6
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java
  4. 4
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java
  5. 17
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java
  6. 36
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java
  7. 10
      msa/black-box-tests/src/test/resources/all.xml
  8. 7
      msa/black-box-tests/src/test/resources/smokesCustomer.xml
  9. 7
      msa/black-box-tests/src/test/resources/smokesRuleChain.xml
  10. 10
      msa/black-box-tests/src/test/resources/uiTests.xml

5
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/OtherPageElements.java
View File

@ -28,6 +28,7 @@ public class OtherPageElements extends AbstractBasePage {
protected static final String ENTITY = "//mat-row//span[contains(text(),'%s')]";
protected static final String DELETE_BTN = ENTITY + "/../..//mat-icon[contains(text(),' delete')]/../..";
protected static final String DETAILS_BTN = ENTITY + "/../..//mat-icon[contains(text(),'edit')]/../..";
private static final String ENTITY_COUNT = "//div[@class='mat-paginator-range-label']";
private static final String WARNING_DELETE_POPUP_YES = "//tb-confirm-dialog//button[2]";
private static final String WARNING_DELETE_POPUP_TITLE = "//tb-confirm-dialog/h2";
@ -214,6 +215,10 @@ public class OtherPageElements extends AbstractBasePage {
return waitUntilVisibilityOfElementLocated(String.format(DELETE_BTN, entityName));
}
public WebElement detailsBtn(String entityName) {
return waitUntilVisibilityOfElementLocated(String.format(DETAILS_BTN, entityName));
}
public WebElement entity(String entityName) {
return waitUntilElementToBeClickable(String.format(ENTITY, entityName));
}

11
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/CreateRuleChainTest.java
View File

@ -63,6 +63,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.openCreateRuleChainView();
ruleChainsPage.nameField().click();
ruleChainsPage.nameField().sendKeys(ruleChainName);
ruleChainsPage.addBtnC().click();
ruleChainsPage.refreshBtn().click();
@ -84,7 +85,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
ruleChainsPage.addBtnC().click();
ruleChainsPage.refreshBtn().click();
this.ruleChainName = ruleChainName;
ruleChainsPage.entity(ENTITY_NAME).click();
ruleChainsPage.detailsBtn(ENTITY_NAME).click();
ruleChainsPage.setHeaderName();
Assert.assertEquals(ruleChainsPage.getHeaderName(), ruleChainName);
@ -118,8 +119,9 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
@Test(priority = 20, groups = "smoke")
@Description
public void createRuleChainWithSameName() {
ruleChainName = ENTITY_NAME;
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(EntityPrototypes.defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.openCreateRuleChainView();
@ -142,12 +144,13 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
@Test(priority = 30, groups = "smoke")
@Description
public void createRuleChainWithoutRefresh() {
ruleChainName = ENTITY_NAME;
String ruleChainName = ENTITY_NAME;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.openCreateRuleChainView();
ruleChainsPage.nameField().sendKeys(ruleChainName);
ruleChainsPage.addBtnC().click();
this.ruleChainName = ruleChainName;
Assert.assertNotNull(ruleChainsPage.entity(ruleChainName));
Assert.assertTrue(ruleChainsPage.entity(ruleChainName).isDisplayed());
@ -160,7 +163,7 @@ public class CreateRuleChainTest extends AbstractDriverBaseTest {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.setRuleChainNameWithoutRoot();
ruleChainsPage.entity(ruleChainsPage.getRuleChainName()).click();
ruleChainsPage.detailsBtn(ruleChainsPage.getRuleChainName()).click();
ruleChainsPage.goToHelpPage();
Assert.assertTrue(urlContains(urlPath));

6
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/DeleteRuleChainTest.java
View File

@ -77,7 +77,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest {
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.entity(ENTITY_NAME).click();
ruleChainsPage.detailsBtn(ENTITY_NAME).click();
String deletedRuleChain = ruleChainsPage.deleteRuleChainFromView(ruleChainName);
ruleChainsPage.refreshBtn().click();
@ -104,7 +104,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest {
@Description
public void removeFromRootRuleChainView() {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.entity(ROOT_RULE_CHAIN_NAME).click();
ruleChainsPage.detailsBtn(ROOT_RULE_CHAIN_NAME).click();
ruleChainsPage.deleteBtnFromView();
Assert.assertTrue(ruleChainsPage.deleteBtnInRootRuleChainIsNotDisplayed());
@ -147,7 +147,7 @@ public class DeleteRuleChainTest extends AbstractDriverBaseTest {
String deletedRuleChain = "Thermostat";
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.entity(deletedRuleChain).click();
ruleChainsPage.detailsBtn(deletedRuleChain).click();
ruleChainsPage.deleteBtnFromView().click();
ruleChainsPage.warningPopUpYesBtn().click();

4
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/MakeRuleChainRootTest.java
View File

@ -65,7 +65,7 @@ public class MakeRuleChainRootTest extends AbstractDriverBaseTest {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.setRuleChainNameWithoutRoot(0);
String ruleChain = ruleChainsPage.getRuleChainName();
ruleChainsPage.entity(ruleChain).click();
ruleChainsPage.detailsBtn(ruleChain).click();
ruleChainsPage.makeRootFromViewBtn().click();
ruleChainsPage.warningPopUpYesBtn().click();
ruleChainsPage.closeEntityViewBtn().click();
@ -79,7 +79,7 @@ public class MakeRuleChainRootTest extends AbstractDriverBaseTest {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.setRuleChainNameWithoutRoot(0);
String ruleChain = ruleChainsPage.getRuleChainName();
ruleChainsPage.entity(ruleChain).click();
ruleChainsPage.detailsBtn(ruleChain).click();
ruleChainsPage.makeRootFromViewBtn().click();
ruleChainsPage.warningPopUpYesBtn().click();
ruleChainsPage.closeEntityViewBtn().click();

17
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/OpenRuleChainTest.java
View File

@ -27,11 +27,9 @@ import org.thingsboard.server.msa.ui.pages.RuleChainsPageHelper;
import org.thingsboard.server.msa.ui.pages.SideBarMenuViewElements;
import org.thingsboard.server.msa.ui.utils.EntityPrototypes;
import static org.thingsboard.server.msa.TestProperties.getBaseUiUrl;
import static org.thingsboard.server.msa.ui.utils.Const.ENTITY_NAME;
import static org.thingsboard.server.msa.ui.utils.Const.TENANT_EMAIL;
import static org.thingsboard.server.msa.ui.utils.Const.TENANT_PASSWORD;
import static org.thingsboard.server.msa.ui.utils.Const.URL;
public class OpenRuleChainTest extends AbstractDriverBaseTest {
@ -66,7 +64,7 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest {
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.openRuleChainBtn(ruleChainName).click();
ruleChainsPage.entity(ruleChainName).click();
openRuleChainPage.setHeadName();
Assert.assertTrue(urlContains(String.valueOf(getRuleChainByName(ruleChainName).getId())));
@ -83,7 +81,7 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest {
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.entity(ruleChainName).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.openRuleChainFromViewBtn().click();
openRuleChainPage.setHeadName();
@ -92,15 +90,4 @@ public class OpenRuleChainTest extends AbstractDriverBaseTest {
Assert.assertTrue(openRuleChainPage.inputNode().isDisplayed());
Assert.assertEquals(ruleChainName, openRuleChainPage.getHeadName());
}
@Test(priority = 20, groups = "smoke")
@Description
public void openRuleChainDoubleClick() {
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.setRuleChainNameWithoutRoot(0);
String ruleChain = ruleChainsPage.getRuleChainName();
ruleChainsPage.doubleClickOnRuleChain(ruleChain);
Assert.assertEquals(getUrl(), getBaseUiUrl() + "/ruleChains");
}
}

36
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/ruleChainsSmoke/RuleChainEditMenuTest.java
View File

@ -57,29 +57,35 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest {
@Test(priority = 10, groups = "smoke")
@Description
public void changeName() {
String name = "Changed";
testRestClient.postRuleChain(defaultRuleChainPrototype(ENTITY_NAME));
ruleChainName = name;
String newRuleChainName = "Changed";
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.notRootRuleChainsNames().get(0).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.setHeaderName();
String nameBefore = ruleChainsPage.getHeaderName();
ruleChainsPage.editPencilBtn().click();
ruleChainsPage.changeNameEditMenu(name);
ruleChainsPage.changeNameEditMenu(newRuleChainName);
ruleChainsPage.doneBtnEditView().click();
this.ruleChainName = newRuleChainName;
ruleChainsPage.setHeaderName();
String nameAfter = ruleChainsPage.getHeaderName();
Assert.assertNotEquals(nameBefore, nameAfter);
Assert.assertEquals(name, nameAfter);
Assert.assertEquals(newRuleChainName, nameAfter);
}
@Test(priority = 20, groups = "smoke")
@Description
public void deleteName() {
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.notRootRuleChainsNames().get(0).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.editPencilBtn().click();
ruleChainsPage.changeNameEditMenu("");
@ -89,8 +95,12 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest {
@Test(priority = 20, groups = "smoke")
@Description
public void saveOnlyWithSpace() {
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.notRootRuleChainsNames().get(0).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.editPencilBtn().click();
ruleChainsPage.changeNameEditMenu(" ");
ruleChainsPage.doneBtnEditView().click();
@ -103,12 +113,13 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest {
@Test(priority = 20, groups = "smoke")
@Description
public void editDescription() {
ruleChainName = ENTITY_NAME;
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
String description = "Description";
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.notRootRuleChainsNames().get(0).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.editPencilBtn().click();
ruleChainsPage.descriptionEntityView().sendKeys(description);
ruleChainsPage.doneBtnEditView().click();
@ -129,11 +140,12 @@ public class RuleChainEditMenuTest extends AbstractDriverBaseTest {
@Test(priority = 20, groups = "smoke")
@Description
public void debugMode() {
ruleChainName = ENTITY_NAME;
String ruleChainName = ENTITY_NAME;
testRestClient.postRuleChain(defaultRuleChainPrototype(ruleChainName));
this.ruleChainName = ruleChainName;
sideBarMenuView.ruleChainsBtn().click();
ruleChainsPage.notRootRuleChainsNames().get(0).click();
ruleChainsPage.detailsBtn(ruleChainName).click();
ruleChainsPage.editPencilBtn().click();
ruleChainsPage.debugCheckboxEdit().click();
ruleChainsPage.doneBtnEditView().click();

10
msa/black-box-tests/src/test/resources/all.xml
View File

@ -28,11 +28,21 @@
</packages>
</test>
<test name="Smoke rule chains tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/>
</packages>
</test>
<test name="Smoke customers tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.customerSmoke"/>
</packages>

7
msa/black-box-tests/src/test/resources/smokesCustomer.xml
View File

@ -22,7 +22,12 @@
<listeners>
<listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
</listeners>
<test name="ui">
<test name="Customer ui smoke tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.customerSmoke"/>
</packages>

7
msa/black-box-tests/src/test/resources/smokesRuleChain.xml
View File

@ -22,7 +22,12 @@
<listeners>
<listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
</listeners>
<test name="ui">
<test name="Rule Chain ui smoke tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/>
</packages>

10
msa/black-box-tests/src/test/resources/uiTests.xml
View File

@ -23,11 +23,21 @@
<listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
</listeners>
<test name="Smoke rule chains tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.ruleChainsSmoke"/>
</packages>
</test>
<test name="Smoke customers tests">
<groups>
<run>
<exclude name="broken"/>
</run>
</groups>
<packages>
<package name="org.thingsboard.server.msa.ui.tests.customerSmoke"/>
</packages>

Write Preview
Loading…
Cancel
Save