From b0ecb5b86f0842eb4eec71248425747a37f776d4 Mon Sep 17 00:00:00 2001 From: Seraphym-Tuhai Date: Wed, 19 Apr 2023 13:26:53 +0300 Subject: [PATCH] add setRuleChain() --- .../server/msa/ui/base/AbstractDriverBaseTest.java | 7 +++++++ .../ui/tests/rulechainssmoke/MakeRuleChainRootTest.java | 2 +- .../msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java index 7147228a6a..c3d9aa6147 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/base/AbstractDriverBaseTest.java @@ -207,4 +207,11 @@ abstract public class AbstractDriverBaseTest extends AbstractContainerTest { ruleChains.forEach(rc -> testRestClient.deleteRuleChain(rc.getId())); } } + + public void setRootRuleChain(String ruleChainName) { + List ruleChains = getRuleChainsByName(ruleChainName); + if (!ruleChains.isEmpty()) { + testRestClient.setRootRuleChain(ruleChains.stream().findFirst().get().getId()); + } + } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java index 0caf74e4db..809e6c02fb 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/MakeRuleChainRootTest.java @@ -27,7 +27,7 @@ public class MakeRuleChainRootTest extends AbstractRuleChainTest { @AfterMethod public void makeRoot() { - testRestClient.setRootRuleChain(getRuleChainByName("Root Rule Chain").getId()); + setRootRuleChain("Root Rule Chain"); } @Test(priority = 10, groups = "smoke") diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java index 6e23603522..8602fe982e 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/tests/rulechainssmoke/OpenRuleChainTest.java @@ -39,7 +39,6 @@ public class OpenRuleChainTest extends AbstractRuleChainTest { ruleChainsPage.entity(ruleChainName).click(); openRuleChainPage.setHeadName(); - assertThat(ruleChain).as("Rule chain created").isNotNull(); assertThat(urlContains(ruleChain.getUuidId().toString())).as("URL contains rule chain's ID").isTrue(); assertIsDisplayed(openRuleChainPage.headRuleChainName()); assertIsDisplayed(openRuleChainPage.inputNode());